3638 files changed, 83164 insertions, 147220 deletions

diff --git a/arch/.gitignore b/arch/.gitignore
new file mode 100644
index 000000000..b2c60ea46
--- /dev/null
+++ b/arch/.gitignore
@@ -0,0 +1,15 @@
+*/*/pkg
+*/*/src
+*/*/*.tar.bz2
+*/*/*.tar.xz
+*/*/*.pkg.tar.xz
+*/*/*.pkg.tar.zst
+*/*/*.sig
+*/*/*.log
+*/*/*.log.*
+tde-meta/pkg
+tde-meta/*.pkg.tar.xz
+tde-meta/*.pkg.tar.zst
+tde-meta/*.sig
+out
+*~
diff --git a/arch/3.5.13/trinity-apps/trinity-amarok/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-amarok/PKGBUILD
deleted file mode 100644
index 5b3f987bb..000000000
--- a/arch/3.5.13/trinity-apps/trinity-amarok/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-amarok
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity Amarok music player and manager"
-depends=('trinity-kdebase' 'libifp' 'libmtp' 'taglib' 'libnjb' 'python-daap' 'ruby')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/amarok-3.5.13.tar.gz)
-md5sums=('7145ebee38f104bef6cfaf56e7f81959')
-
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  _prefix="/opt/trinity"
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  # Baho additions
-  CFLAGS=${CFLAGS}" -fpermissive"
-  CXXFLAGS=${CXXFLAGS}" -fpermissive"
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/applications/amarok \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DQT_VERSION=3 \
-    -DWITH_IFP=ON \
-    -DWITH_NJB=ON \
-    -DWITH_MTP=ON \
-    -DWITH_DAAP=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-#   rm -r ${srcdir}/${_svnmod}
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-digikam/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-digikam/PKGBUILD
deleted file mode 100644
index a011713d4..000000000
--- a/arch/3.5.13/trinity-apps/trinity-digikam/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-digikam
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity Photo Management and Retouching Suite"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=()
-provides=($pkgname)
-conflicts=()
-replaces=()
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/digikam-3.5.13.tar.gz)
-md5sums=('81cfcd75dc9c067ba6761aa1147c31e7')
-
-_builddir=applications/digikam
-_prefix=/opt/trinity
-
-build() {
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < digikam.patch
-  
-  msg "Starting automake..."
-  cd "$srcdir/${_builddir}"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${_builddir}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-dolphin/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-dolphin/PKGBUILD
deleted file mode 100644
index 9b820cab8..000000000
--- a/arch/3.5.13/trinity-apps/trinity-dolphin/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-# PKGBUILD by Pawel "l0ner" Soltys <sh4dou@gmail.com>
-
-pkgname=trinity-dolphin
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity Do3phin file manager"
-depends=('trinity-kdebase')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/dolphin-3.5.13.tar.gz)
-md5sums=('67040323c527d83978f58c76b47a91f6')
-
-_svnmod=applications/dolphin
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-fileligt/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-fileligt/PKGBUILD
deleted file mode 100644
index b59688892..000000000
--- a/arch/3.5.13/trinity-apps/trinity-fileligt/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-filelight
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity File system Viewer"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=()
-provides=($pkgname)
-conflicts=()
-replaces=()
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/filelight-3.5.13.tar.gz)
-md5sums=('b53cb6b46942e56aa247100cdb84d85f')
-
-_builddir=applications/filelight
-_prefix=/opt/trinity
-
-build() {
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < filelight.patch
-  
-  msg "Starting automake..."
-  cd "$srcdir/${_builddir}"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${_builddir}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-gwenview/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-gwenview/PKGBUILD
deleted file mode 100644
index 69fc976e9..000000000
--- a/arch/3.5.13/trinity-apps/trinity-gwenview/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-gwenview
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity Image Viewer"
-depends=('trinity-kdelibs' 'trinity-libkexiv2' 'trinity-libkipi')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=()
-provides=($pkgname)
-conflicts=()
-replaces=()
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/gwenview-3.5.13.tar.gz)
-md5sums=('3ff9b8c4049dc40f26f89b4be3c21b96')
-
-_builddir=applications/gwenview
-_prefix=/opt/trinity
-
-build() {
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < gwenview.patch
-  
-  msg "Starting automake..."
-  cd "$srcdir/${_builddir}"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${_builddir}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-k3b/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-k3b/PKGBUILD
deleted file mode 100644
index 532def469..000000000
--- a/arch/3.5.13/trinity-apps/trinity-k3b/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-k3b
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity CD and DVD burning"
-depends=('trinity-kdelibs' 'hal' 'dbus' 'alsa-lib' 'ffmpeg' 'flac' 'libvorbis' 'libmpcdec' 'lame' 'libmad' 'libsndfile' 'libdvdread' 'cdrdao' 'cdrkit' 'transcode' 'dvd+rw-tools' 'emovix' 'sox' 'normalize')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=()
-provides=($pkgname)
-conflicts=()
-replaces=()
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/k3b-3.5.13.tar.gz)
-md5sums=('f022338d361632223106ba444fe1e60e')
-
-_builddir=applications/k3b
-_prefix=/opt/trinity
-
-build() {
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < k3b.patch
-  
-  msg "Starting automake..."
-  cd "$srcdir/${_builddir}"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-alsa \
-     --enable-ffmpeg-all-codecs \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${_builddir}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-kbfx/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-kbfx/PKGBUILD
deleted file mode 100644
index f5fbba0a8..000000000
--- a/arch/3.5.13/trinity-apps/trinity-kbfx/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kbfx
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity Kbfx KMenu replacement"
-depends=('trinity-kdebase')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kbfx-3.5.13.tar.gz' 'kbfx.patch')
-md5sums=('04921c66fe2dc26d6eab7143e5950446'
-         '510638db000827e86f9d542662199064')
-
-_svnmod=applications/kbfx
-
-build() {
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
-
-  patch -N -d ${srcdir} -p0 < kbfx.patch
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DUSE_MENUDRAKE=OFF \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-kbfx/kbfx.patch b/arch/3.5.13/trinity-apps/trinity-kbfx/kbfx.patch
deleted file mode 100644
index 49325c48a..000000000
--- a/arch/3.5.13/trinity-apps/trinity-kbfx/kbfx.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Only in src/applications/kbfx: \
-diff -u -r applications/kbfx/CMakeLists.txt src/applications/kbfx/CMakeLists.txt
---- applications/kbfx/CMakeLists.txt	2011-08-22 00:24:16.000000000 +0200
-+++ src/applications/kbfx/CMakeLists.txt	2011-12-16 13:09:09.000000000 +0100
-@@ -219,10 +219,10 @@
- 
- SET(KBFX_LIB_INSTALL_DIR ${LIB_INSTALL_DIR})
- 
--SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt")
--SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc")
-+SET(QT_UIC_EXECUTABLE "/opt/trinity/bin/uic-tqt")
-+SET(QT_MOC_EXECUTABLE "/opt/trinity/bin/tmoc")
- 
--SET(CMAKE_CXX_FLAGS "-I/usr/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
-+SET(CMAKE_CXX_FLAGS "-I/opt/trinity/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
- 
- ADD_SUBDIRECTORY(kbfxlib/data)
- ADD_SUBDIRECTORY(kbfxlib/common)
diff --git a/arch/3.5.13/trinity-apps/trinity-kdesvn/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-kdesvn/PKGBUILD
deleted file mode 100644
index f70e3731c..000000000
--- a/arch/3.5.13/trinity-apps/trinity-kdesvn/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdesvn
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity SVN frontend gui"
-depends=('trinity-kdebase' 'sqlite3' 'subversion')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kdesvn-3.5.13.tar.gz' 'kdesvn.patch')
-md5sums=('f65e86f0d2f7882b4f958f2e89fe0d34'
-         '9def57c42b258c4caf2b5709eb25ba25')
-
-_svnmod=applications/kdesvn
-
-build() {
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
-
-  patch -N -d ${srcdir} -p0 < kdesvn.patch
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-kdesvn/kdesvn.patch b/arch/3.5.13/trinity-apps/trinity-kdesvn/kdesvn.patch
deleted file mode 100644
index f861bb97b..000000000
--- a/arch/3.5.13/trinity-apps/trinity-kdesvn/kdesvn.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -u -r applications/kdesvn/CMakeLists.txt src/applications/kdesvn/CMakeLists.txt
---- applications/kdesvn/CMakeLists.txt	2011-08-22 00:35:16.000000000 +0200
-+++ src/applications/kdesvn/CMakeLists.txt	2011-12-16 14:14:17.000000000 +0100
-@@ -111,8 +111,10 @@
-     DEPENDS doc
-     WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
- 
--SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt")
--SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc")
-+SET(QT_UIC_EXECUTABLE "/opt/trinity/bin/uic-tqt")
-+SET(QT_MOC_EXECUTABLE "/opt/trinity/bin/tmoc")
-+
-+SET(CMAKE_CXX_FLAGS "-I/opt/trinity/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
- 
- ADD_SUBDIRECTORY(src)
- ADD_SUBDIRECTORY(po)
-Only in src/applications/kdesvn: .CMakeLists.txt.swp
diff --git a/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD
deleted file mode 100644
index e3a81c70b..000000000
--- a/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-konversation
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity Konversation IRC client"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/konversation-3.5.13.tar.gz)
-md5sums=('0f0e0415dad4c19bc885c9addadf4026')
-
-_builddir=applications/konversation
-_prefix=/opt/trinity
-
-build() {
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-  
-  msg "Starting autoconf..."
-  cd "$srcdir/$_builddir"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-
-  # fix for correct Qt/TQt detection
-  sed -i -e "s@/usr/include/tqt@${TDEDIR}/include/tqt@" admin/acinclude.m4.in
-
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure \
-     --with-qt-dir=${QTDIR} \
-     --with-qt-inculdes=${QTDIR}/include \
-     --with-qt-libraries=${QTDIR}/lib \
-     --prefix=${_prefix} \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-#  cd ${srcdir}/build
-  cd ${srcdir}/${_builddir}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-kpowersave/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-kpowersave/PKGBUILD
deleted file mode 100644
index 61fa5e46b..000000000
--- a/arch/3.5.13/trinity-apps/trinity-kpowersave/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kpowersave
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity kpowersave"
-depends=('xscreensaver'
-        'libxss'
-        'trinity-kdebase')
-makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kpowersave-3.5.13.tar.gz)
-md5sums=('c887eb282fd035655b370f133ce58664')
-
-_svnmod=applications/kpowersave
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
-
-  # patch for inactivity.cpp
-  # patch -p0 -i ${srcdir}/kpowersave-app-inactivity.cpp.patch || return 1
-
-  trinity_prefix="/opt/trinity"
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DQT_VERSION=3 \
-    -DWITH_QT3=ON \
-    -DQTDIR=/opt/qt \
-    -DQT_DOCDIR=/opt/qt/man \
-    -DQT_LIBRARY_DIRS=/opt/qt/lib \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-#   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-#   rm -r ${srcdir}/${_svnmod}
-}
diff --git a/arch/3.5.13/trinity-apps/trinity-kpowersave/kpowersave-inactivity.cpp.patch b/arch/3.5.13/trinity-apps/trinity-kpowersave/kpowersave-inactivity.cpp.patch
deleted file mode 100644
index 08645af32..000000000
--- a/arch/3.5.13/trinity-apps/trinity-kpowersave/kpowersave-inactivity.cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kpowersave/src/inactivity.cpp
-+++ kpowersave/src/inactivity.cpp	2011-03-12 18:40:52.000000000 -0600
-@@ -325,7 +325,7 @@
- 		blacklisted_running = false;
- 	} 
- 	else {
--		if (pids.contains(QRegExp::QRegExp("[0-9]"))) {
-+		if (pids.contains(QRegExp("[0-9]"))) {
- 			kdDebug() << "BLACKLISTED IS RUNNING" << endl;
- 			blacklisted_running = true;
- 			blacklisted_running_last = idleTime;
diff --git a/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD
deleted file mode 100644
index dbb404541..000000000
--- a/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-ktorrent
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-apps')
-pkgdesc="Trinity - pkgdesc"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/ktorrent-3.5.13.tar.gz)
-md5sums=('3bf211ec2a41f92d935e12ee8753fa06')
-
-_builddir=applications/ktorrent
-_prefix=/opt/trinity
-
-build() {
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < ktorrent.patch
-  
-  msg "Starting automake..."
-  cd "$srcdir/${_builddir}"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${_builddir}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-artwork/trinity-gtk-qt-engine/PKGBUILD b/arch/3.5.13/trinity-artwork/trinity-gtk-qt-engine/PKGBUILD
deleted file mode 100644
index c72518ab3..000000000
--- a/arch/3.5.13/trinity-artwork/trinity-gtk-qt-engine/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-gtk-qt-engine
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-artwork')
-pkgdesc="Trinity - Qt wrapper for GTK, makes gtk2 apps look pretty under TDE"
-depends=('trinity-kdebase' 'gtk2')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/gtk-qt-engine-3.5.13.tar.gz)
-md5sums=('96da675949ef8743d4fe91531f734030')
-
-_svnmod=applications/gtk-qt-engine
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DQT_VERSION=3 \
-    -DWITH_QT3=ON \
-    -DQTDIR=/opt/qt \
-    -DQT_DOCDIR=/opt/qt/man \
-    -DQT_LIBRARY_DIRS=/opt/qt/lib \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-#   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-#   rm -r ${srcdir}/${_svnmod}
-}
diff --git a/arch/3.5.13/trinity-artwork/trinity-style-lipstik/PKGBUILD b/arch/3.5.13/trinity-artwork/trinity-style-lipstik/PKGBUILD
deleted file mode 100644
index cb77e3fb9..000000000
--- a/arch/3.5.13/trinity-artwork/trinity-style-lipstik/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kde-style-lipstik
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-artwork')
-pkgdesc="Trinity - Lipstik style"
-depends=('trinity-kdelibs' 'trinity-kdebase')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kde-style-lipstik-3.5.13.tar.gz)
-md5sums=('1585d4df7f0c68499fafa0b8ecb82dab')
-
-_builddir=applications/kde-style-lipstik
-_prefix=/opt/trinity
-
-build() {
-
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  msg "Starting autoconf..."
-  cd "$srcdir/${_builddir}"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${_builddir}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-artwork/trinity-style-qtcurve/PKGBUILD b/arch/3.5.13/trinity-artwork/trinity-style-qtcurve/PKGBUILD
deleted file mode 100644
index 37fc97422..000000000
--- a/arch/3.5.13/trinity-artwork/trinity-style-qtcurve/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-qtcurve
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-artwork')
-pkgdesc="Trinity - QtCurve style"
-depends=('trinity-kdebase')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kde-style-qtcurve-3.5.13.tar.gz')
-
-_svnmod=applications/kde-style-qtcurve
-md5sums=('98133893b9c6736804d4dfc134a3a256')
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
-
-#   cd ${srcdir}/${_svnmod}
-
-  trinity_prefix="/opt/trinity"
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DQT_VERSION=3 \
-    -DWITH_QT3=ON \
-    -DQTDIR=/opt/qt \
-    -DQT_DOCDIR=/opt/qt/man \
-    -DQT_LIBRARY_DIRS=/opt/qt/lib \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-#   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-#   rm -r ${srcdir}/${_svnmod}
-}
diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD
deleted file mode 100644
index 03ad188d7..000000000
--- a/arch/3.5.13/trinity-base/hal/PKGBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# Maintainer: Pawel "l0ner" Soltys <pwslts@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-# Contributor: Calvin Morisson <mutantturkey@gmail.com>
-
-pkgname=hal
-pkgver=0.5.14
-pkgrel=7
-pkgdesc="Hardware Abstraction Layer"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-url="http://www.freedesktop.org/wiki/Software/hal"
-depends=('dbus-glib>=0.82' 'libusb-compat' 'udev>=146' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'consolekit>=0.4.1' 'util-linux-ng>=2.16' 'v4l-utils')
-makedepends=('pkgconfig' 'gperf')
-options=('!libtool' '!makeflags')
-install=hal.install
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-         hald
-         hal.patch
-         udev-update.patch)
-#        patches/hal-0.5.9-hide-diagnostic.patch
-#        patches/hal-remove-dell-killswitch.patch
-#        patches/hal-KVM-evdev.patch
-#        patches/hal-HDAPS-blacklist.patch
-#        patches/hal-xen-unignore-axes.patch
-#        patches/hal-use-at-console.patch
-#        patches/fix-libusb-detection.patch
-#        patches/dbus-error-init.patch
-#        patches/path-max.patch
-#        patches/handle-input-touchpad.patch
-#        patches/macbook-fix-ioperm.patch
-#        patches/hal-ignore-internal-dm-devices.patch
-
-md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
-         '4cdfc673ad65ddb51919f5a757f62145'
-         '185dd5d6ffc703ec8395b4eb3a1ae498'
-         'cad3564de1708603c7a1e0facf6b1921')
-#         '4d4b6801a1cedca22b8bdd9db73b16fb'
-#         '6d87c3e63184ae3a69caafc846f538a3'
-#         '6507e5091ee2d11a87ae738a8e2caecb'
-#         '1171c2d83b76059f2da7a3538e08fa4e'
-#         '52bd305299aa22ae07f1a862c22d30fa'
-#         '3f11234fb5e5044fbfc5199ec65b182c'
-#         'da088f12cfc2d190bbf95b747e19ab9e'
-#         '634f4ec2203eff7de8fa2ed2c6b9cbe0'
-#         'f8c9b3a40d03907b498feef571d42466'
-#         '0575677614db0632b17b1a719798c7e0'
-#         '46a5db3ff896ee37762aa8d7e70942c4'
-#         '17bc2b911f245cef4a1d98769d5c4d14'
-
-build() {
-   cd $srcdir
-  patch -Np1 -d ${srcdir} < hal.patch
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/udev-update.patch"
-#  patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
-#  patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch"
-#  patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch"
-#  patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch"
-#  patch -Np1 -i "${srcdir}/hal-use-at-console.patch"
-#  patch -Np1 -i "${srcdir}/fix-libusb-detection.patch"
-#  patch -Np1 -i "${srcdir}/dbus-error-init.patch"
-#  patch -Np1 -i "${srcdir}/path-max.patch"
-#  patch -Np1 -i "${srcdir}/handle-input-touchpad.patch"
-#  patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch"
-#  patch -Np1 -i "${srcdir}/hal-ignore-internal-dm-devices.patch"
-  
-  libtoolize --force
-  aclocal
-  autoconf
-  automake
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \
-      --enable-static=no --disable-acpi-ibm \
-      --disable-docbook-docs --disable-console-kit \
-      --disable-policy-kit --disable-acl-management \
-      --enable-umount-helper --disable-smbios \
-      --with-hal-user=hal --with-hal-group=hal \
-      --with-pid-file=/var/run/hald.pid \
-      --disable-gtk-doc
-  make
-
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 -d "${pkgdir}/media"
-  install -m755 "${srcdir}/hald" "${pkgdir}/etc/rc.d/hal"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-  
-  # Fix udev rule location
-  install -d -m755 "${pkgdir}/lib"
-  mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
-}
diff --git a/arch/3.5.13/trinity-base/hal/hal.install b/arch/3.5.13/trinity-base/hal/hal.install
deleted file mode 100644
index d6afee384..000000000
--- a/arch/3.5.13/trinity-base/hal/hal.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  getent group hal >/dev/null || usr/sbin/groupadd -g 82 hal
-  getent group optical >/dev/null || usr/sbin/groupadd -g 93 optical
-  getent group floppy >/dev/null || usr/sbin/groupadd -g 94 floppy
-  getent group storage >/dev/null || usr/sbin/groupadd -g 95 storage
-  getent passwd hal >/dev/null || usr/sbin/useradd -c 'HAL daemon' -u 82 -g hal -G optical,floppy,storage -d '/' -s /bin/false hal
-  usr/bin/passwd -l hal &>/dev/null
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-post_remove() {
-  if getent passwd hal &>/dev/null; then
-    usr/sbin/userdel hal
-  fi
-  if getent group hal &>/dev/null; then
-    usr/sbin/groupdel hal
-  fi
-}
diff --git a/arch/3.5.13/trinity-base/hal/hal.patch b/arch/3.5.13/trinity-base/hal/hal.patch
deleted file mode 100644
index d5e2709a5..000000000
--- a/arch/3.5.13/trinity-base/hal/hal.patch
+++ /dev/null
@@ -1,24335 +0,0 @@
-diff -u -r hal-0.5.14/aclocal.m4 src/hal-0.5.14/aclocal.m4
---- hal-0.5.14/aclocal.m4	2009-11-30 23:22:30.000000000 +0100
-+++ src/hal-0.5.14/aclocal.m4	2011-12-19 20:40:08.000000000 +0100
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-@@ -13,8 +13,8 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
--[m4_warning([this file was generated for autoconf 2.64.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-+[m4_warning([this file was generated for autoconf 2.68.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -22,7 +22,8 @@
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- #
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+#                 Foundation, Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- # This file is free software; the Free Software Foundation gives
-@@ -31,7 +32,8 @@
- 
- m4_define([_LT_COPYING], [dnl
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+#                 Foundation, Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- #   This file is part of GNU Libtool.
-@@ -58,7 +60,7 @@
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- ])
- 
--# serial 56 LT_INIT
-+# serial 57 LT_INIT
- 
- 
- # LT_PREREQ(VERSION)
-@@ -87,6 +89,7 @@
- # ------------------
- AC_DEFUN([LT_INIT],
- [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
- AC_BEFORE([$0], [LT_LANG])dnl
- AC_BEFORE([$0], [LT_OUTPUT])dnl
- AC_BEFORE([$0], [LTDL_INIT])dnl
-@@ -103,6 +106,8 @@
- AC_REQUIRE([LTOBSOLETE_VERSION])dnl
- m4_require([_LT_PROG_LTMAIN])dnl
- 
-+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-+
- dnl Parse OPTIONS
- _LT_SET_OPTIONS([$0], [$1])
- 
-@@ -139,7 +144,7 @@
-     *) break;;
-   esac
- done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
- ])
- 
- 
-@@ -159,6 +164,11 @@
- m4_defun([_LT_SETUP],
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-+
-+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-+dnl
- _LT_DECL([], [host_alias], [0], [The host system])dnl
- _LT_DECL([], [host], [0])dnl
- _LT_DECL([], [host_os], [0])dnl
-@@ -181,10 +191,13 @@
- dnl
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
- m4_require([_LT_CMD_RELOAD])dnl
- m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
- m4_require([_LT_CMD_OLD_ARCHIVE])dnl
- m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+m4_require([_LT_WITH_SYSROOT])dnl
- 
- _LT_CONFIG_LIBTOOL_INIT([
- # See if we are running on zsh, and set the options which allow our
-@@ -200,7 +213,6 @@
- _LT_CHECK_OBJDIR
- 
- m4_require([_LT_TAG_COMPILER])dnl
--_LT_PROG_ECHO_BACKSLASH
- 
- case $host_os in
- aix3*)
-@@ -214,23 +226,6 @@
-   ;;
- esac
- 
--# Sed substitution that helps us do robust quoting.  It backslashifies
--# metacharacters that are still active within double-quoted strings.
--sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
--
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\([["`\\]]\)/\\\1/g'
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to delay expansion of an escaped single quote.
--delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
--
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--
- # Global variables:
- ofile=libtool
- can_build_shared=yes
-@@ -271,6 +266,28 @@
- ])# _LT_SETUP
- 
- 
-+# _LT_PREPARE_SED_QUOTE_VARS
-+# --------------------------
-+# Define a few sed substitution that help us do robust quoting.
-+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-+[# Backslashify metacharacters that are still active within
-+# double-quoted strings.
-+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+])
-+
- # _LT_PROG_LTMAIN
- # ---------------
- # Note that this code is called both from `configure', and `config.status'
-@@ -423,7 +440,7 @@
- # declaration there will have the same value as in `configure'.  VARNAME
- # must have a single quote delimited value for this to work.
- m4_define([_LT_CONFIG_STATUS_DECLARE],
--[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
- 
- 
- # _LT_CONFIG_STATUS_DECLARATIONS
-@@ -433,7 +450,7 @@
- # embedded single quotes properly.  In configure, this macro expands
- # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
- #
--#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
- m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
- [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-@@ -532,12 +549,20 @@
- LTCFLAGS='$LTCFLAGS'
- compiler='$compiler_DEFAULT'
- 
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+  eval 'cat <<_LTECHO_EOF
-+\$[]1
-+_LTECHO_EOF'
-+}
-+
- # Quote evaled strings.
- for var in lt_decl_all_varnames([[ \
- ]], lt_decl_quote_varnames); do
--    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-     *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-       ;;
-     *)
-       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -548,9 +573,9 @@
- # Double-quote double-evaled strings.
- for var in lt_decl_all_varnames([[ \
- ]], lt_decl_dquote_varnames); do
--    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-     *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-       ;;
-     *)
-       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -558,16 +583,38 @@
-     esac
- done
- 
--# Fix-up fallback echo if it was mangled by the above quoting rules.
--case \$lt_ECHO in
--*'\\\[$]0 --fallback-echo"')dnl "
--  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
--  ;;
--esac
--
- _LT_OUTPUT_LIBTOOL_INIT
- ])
- 
-+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-+# ------------------------------------
-+# Generate a child script FILE with all initialization necessary to
-+# reuse the environment learned by the parent script, and make the
-+# file executable.  If COMMENT is supplied, it is inserted after the
-+# `#!' sequence but before initialization text begins.  After this
-+# macro, additional text can be appended to FILE to form the body of
-+# the child script.  The macro ends with non-zero status if the
-+# file could not be fully written (such as if the disk is full).
-+m4_ifdef([AS_INIT_GENERATED],
-+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-+[m4_defun([_LT_GENERATED_FILE_INIT],
-+[m4_require([AS_PREPARE])]dnl
-+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-+[lt_write_fail=0
-+cat >$1 <<_ASEOF || lt_write_fail=1
-+#! $SHELL
-+# Generated by $as_me.
-+$2
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$1 <<\_ASEOF || lt_write_fail=1
-+AS_SHELL_SANITIZE
-+_AS_PREPARE
-+exec AS_MESSAGE_FD>&1
-+_ASEOF
-+test $lt_write_fail = 0 && chmod +x $1[]dnl
-+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
- 
- # LT_OUTPUT
- # ---------
-@@ -577,20 +624,11 @@
- AC_DEFUN([LT_OUTPUT],
- [: ${CONFIG_LT=./config.lt}
- AC_MSG_NOTICE([creating $CONFIG_LT])
--cat >"$CONFIG_LT" <<_LTEOF
--#! $SHELL
--# Generated by $as_me.
--# Run this file to recreate a libtool stub with the current configuration.
--
--lt_cl_silent=false
--SHELL=\${CONFIG_SHELL-$SHELL}
--_LTEOF
-+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-+[# Run this file to recreate a libtool stub with the current configuration.])
- 
- cat >>"$CONFIG_LT" <<\_LTEOF
--AS_SHELL_SANITIZE
--_AS_PREPARE
--
--exec AS_MESSAGE_FD>&1
-+lt_cl_silent=false
- exec AS_MESSAGE_LOG_FD>>config.log
- {
-   echo
-@@ -616,7 +654,7 @@
- m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
- configured by $[0], generated by m4_PACKAGE_STRING.
- 
--Copyright (C) 2008 Free Software Foundation, Inc.
-+Copyright (C) 2011 Free Software Foundation, Inc.
- This config.lt script is free software; the Free Software Foundation
- gives unlimited permision to copy, distribute and modify it."
- 
-@@ -661,15 +699,13 @@
- # appending to config.log, which fails on DOS, as config.log is still kept
- # open by configure.  Here we exec the FD to /dev/null, effectively closing
- # config.log, so it can be properly (re)opened and appended to by config.lt.
--if test "$no_create" != yes; then
--  lt_cl_success=:
--  test "$silent" = yes &&
--    lt_config_lt_args="$lt_config_lt_args --quiet"
--  exec AS_MESSAGE_LOG_FD>/dev/null
--  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
--  exec AS_MESSAGE_LOG_FD>>config.log
--  $lt_cl_success || AS_EXIT(1)
--fi
-+lt_cl_success=:
-+test "$silent" = yes &&
-+  lt_config_lt_args="$lt_config_lt_args --quiet"
-+exec AS_MESSAGE_LOG_FD>/dev/null
-+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-+exec AS_MESSAGE_LOG_FD>>config.log
-+$lt_cl_success || AS_EXIT(1)
- ])# LT_OUTPUT
- 
- 
-@@ -732,15 +768,12 @@
-   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-   # text mode, it properly converts lines to CR/LF.  This bash problem
-   # is reportedly fixed, but why not run on old versions too?
--  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
--
--  _LT_PROG_XSI_SHELLFNS
-+  sed '$q' "$ltmain" >> "$cfgfile" \
-+     || (rm -f "$cfgfile"; exit 1)
- 
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
-+  _LT_PROG_REPLACE_SHELLFNS
- 
--  mv -f "$cfgfile" "$ofile" ||
-+   mv -f "$cfgfile" "$ofile" ||
-     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-   chmod +x "$ofile"
- ],
-@@ -785,6 +818,7 @@
- m4_case([$1],
-   [C],			[_LT_LANG(C)],
-   [C++],		[_LT_LANG(CXX)],
-+  [Go],			[_LT_LANG(GO)],
-   [Java],		[_LT_LANG(GCJ)],
-   [Fortran 77],		[_LT_LANG(F77)],
-   [Fortran],		[_LT_LANG(FC)],
-@@ -806,6 +840,29 @@
- ])# _LT_LANG
- 
- 
-+m4_ifndef([AC_PROG_GO], [
-+# NOTE: This macro has been submitted for inclusion into   #
-+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-+#  a released version of Autoconf we should remove this    #
-+#  macro and use it instead.                               #
-+m4_defun([AC_PROG_GO],
-+[AC_LANG_PUSH(Go)dnl
-+AC_ARG_VAR([GOC],     [Go compiler command])dnl
-+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-+_AC_ARG_VAR_LDFLAGS()dnl
-+AC_CHECK_TOOL(GOC, gccgo)
-+if test -z "$GOC"; then
-+  if test -n "$ac_tool_prefix"; then
-+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-+  fi
-+fi
-+if test -z "$GOC"; then
-+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-+fi
-+])#m4_defun
-+])#m4_ifndef
-+
-+
- # _LT_LANG_DEFAULT_CONFIG
- # -----------------------
- m4_defun([_LT_LANG_DEFAULT_CONFIG],
-@@ -836,6 +893,10 @@
-        m4_ifdef([LT_PROG_GCJ],
- 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
- 
-+AC_PROVIDE_IFELSE([AC_PROG_GO],
-+  [LT_LANG(GO)],
-+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-+
- AC_PROVIDE_IFELSE([LT_PROG_RC],
-   [LT_LANG(RC)],
-   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-@@ -846,11 +907,13 @@
- AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
- AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
- AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
- dnl aclocal-1.4 backwards compatibility:
- dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
- dnl AC_DEFUN([AC_LIBTOOL_F77], [])
- dnl AC_DEFUN([AC_LIBTOOL_FC], [])
- dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
- 
- 
- # _LT_TAG_COMPILER
-@@ -936,7 +999,13 @@
- 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-         _lt_result=$?
--	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-+	# If there is a non-empty error log, and "single_module"
-+	# appears in it, assume the flag caused a linker warning
-+        if test -s conftest.err && $GREP single_module conftest.err; then
-+	  cat conftest.err >&AS_MESSAGE_LOG_FD
-+	# Otherwise, if the output was created with a 0 exit code from
-+	# the compiler, it worked.
-+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
- 	  lt_cv_apple_cc_single_mod=yes
- 	else
- 	  cat conftest.err >&AS_MESSAGE_LOG_FD
-@@ -944,6 +1013,7 @@
- 	rm -rf libconftest.dylib*
- 	rm -f conftest.*
-       fi])
-+
-     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-       [lt_cv_ld_exported_symbols_list],
-       [lt_cv_ld_exported_symbols_list=no
-@@ -955,6 +1025,34 @@
- 	[lt_cv_ld_exported_symbols_list=no])
- 	LDFLAGS="$save_LDFLAGS"
-     ])
-+
-+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-+      [lt_cv_ld_force_load=no
-+      cat > conftest.c << _LT_EOF
-+int forced_loaded() { return 2;}
-+_LT_EOF
-+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-+      cat > conftest.c << _LT_EOF
-+int main() { return 0;}
-+_LT_EOF
-+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-+      _lt_result=$?
-+      if test -s conftest.err && $GREP force_load conftest.err; then
-+	cat conftest.err >&AS_MESSAGE_LOG_FD
-+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-+	lt_cv_ld_force_load=yes
-+      else
-+	cat conftest.err >&AS_MESSAGE_LOG_FD
-+      fi
-+        rm -f conftest.err libconftest.a conftest conftest.c
-+        rm -rf conftest.dSYM
-+    ])
-     case $host_os in
-     rhapsody* | darwin1.[[012]])
-       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -982,7 +1080,7 @@
-     else
-       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     fi
--    if test "$DSYMUTIL" != ":"; then
-+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-       _lt_dsymutil='~$DSYMUTIL $lib || :'
-     else
-       _lt_dsymutil=
-@@ -992,8 +1090,8 @@
- ])
- 
- 
--# _LT_DARWIN_LINKER_FEATURES
--# --------------------------
-+# _LT_DARWIN_LINKER_FEATURES([TAG])
-+# ---------------------------------
- # Checks for linker and compiler features on darwin
- m4_defun([_LT_DARWIN_LINKER_FEATURES],
- [
-@@ -1002,7 +1100,13 @@
-   _LT_TAGVAR(hardcode_direct, $1)=no
-   _LT_TAGVAR(hardcode_automatic, $1)=yes
-   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-+  else
-+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-+  fi
-   _LT_TAGVAR(link_all_deplibs, $1)=yes
-   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-   case $cc_basename in
-@@ -1010,7 +1114,7 @@
-      *) _lt_dar_can_shared=$GCC ;;
-   esac
-   if test "$_lt_dar_can_shared" = "yes"; then
--    output_verbose_link_cmd=echo
-+    output_verbose_link_cmd=func_echo_all
-     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -1026,203 +1130,142 @@
-   fi
- ])
- 
--# _LT_SYS_MODULE_PATH_AIX
--# -----------------------
-+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-+# ----------------------------------
- # Links a minimal program and checks the executable
- # for the system default hardcoded library path. In most cases,
- # this is /usr/lib:/lib, but when the MPI compilers are used
- # the location of the communication and MPI libs are included too.
- # If we don't find anything, use the default library path according
- # to the aix ld manual.
-+# Store the results from the different compilers for each TAGNAME.
-+# Allow to override them for all tags through lt_cv_aix_libpath.
- m4_defun([_LT_SYS_MODULE_PATH_AIX],
- [m4_require([_LT_DECL_SED])dnl
--AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--	/^0/ {
--	    s/^0  *\(.*\)$/\1/
--	    p
--	}
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi],[])
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+if test "${lt_cv_aix_libpath+set}" = set; then
-+  aix_libpath=$lt_cv_aix_libpath
-+else
-+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-+  lt_aix_libpath_sed='[
-+      /Import File Strings/,/^$/ {
-+	  /^0/ {
-+	      s/^0  *\([^ ]*\) *$/\1/
-+	      p
-+	  }
-+      }]'
-+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  # Check for a 64-bit object if we didn't find anything.
-+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  fi],[])
-+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-+  fi
-+  ])
-+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-+fi
- ])# _LT_SYS_MODULE_PATH_AIX
- 
- 
- # _LT_SHELL_INIT(ARG)
- # -------------------
- m4_define([_LT_SHELL_INIT],
--[ifdef([AC_DIVERSION_NOTICE],
--	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
--	 [AC_DIVERT_PUSH(NOTICE)])
--$1
--AC_DIVERT_POP
--])# _LT_SHELL_INIT
-+[m4_divert_text([M4SH-INIT], [$1
-+])])# _LT_SHELL_INIT
-+
- 
- 
- # _LT_PROG_ECHO_BACKSLASH
- # -----------------------
--# Add some code to the start of the generated configure script which
--# will find an echo command which doesn't interpret backslashes.
-+# Find how we can fake an echo command that does not interpret backslash.
-+# In particular, with Autoconf 2.60 or later we add some code to the start
-+# of the generated configure script which will find a shell with a builtin
-+# printf (which we can use as an echo command).
- m4_defun([_LT_PROG_ECHO_BACKSLASH],
--[_LT_SHELL_INIT([
--# Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
--
--case X$lt_ECHO in
--X*--fallback-echo)
--  # Remove one level of quotation (which was required for Make).
--  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
--  ;;
--esac
--
--ECHO=${lt_ECHO-echo}
--if test "X[$]1" = X--no-reexec; then
--  # Discard the --no-reexec flag, and continue.
--  shift
--elif test "X[$]1" = X--fallback-echo; then
--  # Avoid inline document here, it may be left over
--  :
--elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
--  # Yippee, $ECHO works!
--  :
-+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+
-+AC_MSG_CHECKING([how to print strings])
-+# Test print first, because it will be a builtin if present.
-+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-+  ECHO='print -r --'
-+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-+  ECHO='printf %s\n'
- else
--  # Restart under the correct shell.
--  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
--fi
--
--if test "X[$]1" = X--fallback-echo; then
--  # used as fallback echo
--  shift
--  cat <<_LT_EOF
--[$]*
--_LT_EOF
--  exit 0
-+  # Use this function as a fallback that always works.
-+  func_fallback_echo ()
-+  {
-+    eval 'cat <<_LTECHO_EOF
-+$[]1
-+_LTECHO_EOF'
-+  }
-+  ECHO='func_fallback_echo'
- fi
- 
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--
--if test -z "$lt_ECHO"; then
--  if test "X${echo_test_string+set}" != Xset; then
--    # find a string as large as possible, as long as the shell can cope with it
--    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
--      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
--	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
--      then
--        break
--      fi
--    done
--  fi
--
--  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
--     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
--     test "X$echo_testing_string" = "X$echo_test_string"; then
--    :
--  else
--    # The Solaris, AIX, and Digital Unix default echo programs unquote
--    # backslashes.  This makes it impossible to quote backslashes using
--    #   echo "$something" | sed 's/\\/\\\\/g'
--    #
--    # So, first we look for a working echo in the user's PATH.
--
--    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--    for dir in $PATH /usr/ucb; do
--      IFS="$lt_save_ifs"
--      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
--         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
--         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
--         test "X$echo_testing_string" = "X$echo_test_string"; then
--        ECHO="$dir/echo"
--        break
--      fi
--    done
--    IFS="$lt_save_ifs"
--
--    if test "X$ECHO" = Xecho; then
--      # We didn't find a better echo, so look for alternatives.
--      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
--         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
--         test "X$echo_testing_string" = "X$echo_test_string"; then
--        # This shell has a builtin print -r that does the trick.
--        ECHO='print -r'
--      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
--	   test "X$CONFIG_SHELL" != X/bin/ksh; then
--        # If we have ksh, try running configure again with it.
--        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
--        export ORIGINAL_CONFIG_SHELL
--        CONFIG_SHELL=/bin/ksh
--        export CONFIG_SHELL
--        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
--      else
--        # Try using printf.
--        ECHO='printf %s\n'
--        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
--	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
--	   test "X$echo_testing_string" = "X$echo_test_string"; then
--	  # Cool, printf works
--	  :
--        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
--	     test "X$echo_testing_string" = 'X\t' &&
--	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	     test "X$echo_testing_string" = "X$echo_test_string"; then
--	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
--	  export CONFIG_SHELL
--	  SHELL="$CONFIG_SHELL"
--	  export SHELL
--	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
--        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
--	     test "X$echo_testing_string" = 'X\t' &&
--	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	     test "X$echo_testing_string" = "X$echo_test_string"; then
--	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
--        else
--	  # maybe with a smaller string...
--	  prev=:
--
--	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
--	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
--	    then
--	      break
--	    fi
--	    prev="$cmd"
--	  done
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
-+{
-+    $ECHO "$*" 
-+}
- 
--	  if test "$prev" != 'sed 50q "[$]0"'; then
--	    echo_test_string=`eval $prev`
--	    export echo_test_string
--	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
--	  else
--	    # Oops.  We lost completely, so just stick with echo.
--	    ECHO=echo
--	  fi
--        fi
--      fi
--    fi
--  fi
--fi
-+case "$ECHO" in
-+  printf*) AC_MSG_RESULT([printf]) ;;
-+  print*) AC_MSG_RESULT([print -r]) ;;
-+  *) AC_MSG_RESULT([cat]) ;;
-+esac
- 
--# Copy echo and quote the copy suitably for passing to libtool from
--# the Makefile, instead of quoting the original, which is used later.
--lt_ECHO=$ECHO
--if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
--   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
--fi
-+m4_ifdef([_AS_DETECT_SUGGESTED],
-+[_AS_DETECT_SUGGESTED([
-+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+    PATH=/empty FPATH=/empty; export PATH FPATH
-+    test "X`printf %s $ECHO`" = "X$ECHO" \
-+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
- 
--AC_SUBST(lt_ECHO)
--])
- _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
--_LT_DECL([], [ECHO], [1],
--    [An echo program that does not interpret backslashes])
-+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
- ])# _LT_PROG_ECHO_BACKSLASH
- 
- 
-+# _LT_WITH_SYSROOT
-+# ----------------
-+AC_DEFUN([_LT_WITH_SYSROOT],
-+[AC_MSG_CHECKING([for sysroot])
-+AC_ARG_WITH([sysroot],
-+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-+                        (or the compiler's sysroot if not specified).],
-+[], [with_sysroot=no])
-+
-+dnl lt_sysroot will always be passed unquoted.  We quote it here
-+dnl in case the user passed a directory name.
-+lt_sysroot=
-+case ${with_sysroot} in #(
-+ yes)
-+   if test "$GCC" = yes; then
-+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-+   fi
-+   ;; #(
-+ /*)
-+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-+   ;; #(
-+ no|'')
-+   ;; #(
-+ *)
-+   AC_MSG_RESULT([${with_sysroot}])
-+   AC_MSG_ERROR([The sysroot must be an absolute path.])
-+   ;;
-+esac
-+
-+ AC_MSG_RESULT([${lt_sysroot:-no}])
-+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-+[dependent libraries, and in which our libraries should be installed.])])
-+
- # _LT_ENABLE_LOCK
- # ---------------
- m4_defun([_LT_ENABLE_LOCK],
-@@ -1251,7 +1294,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
-     if test "$lt_cv_prog_gnu_ld" = yes; then
-       case `/usr/bin/file conftest.$ac_objext` in
-@@ -1344,14 +1387,27 @@
-     CFLAGS="$SAVE_CFLAGS"
-   fi
-   ;;
--sparc*-*solaris*)
-+*-*solaris*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
-     case `/usr/bin/file conftest.o` in
-     *64-bit*)
-       case $lt_cv_prog_gnu_ld in
--      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      yes*)
-+        case $host in
-+        i?86-*-solaris*)
-+          LD="${LD-ld} -m elf_x86_64"
-+          ;;
-+        sparc*-*-solaris*)
-+          LD="${LD-ld} -m elf64_sparc"
-+          ;;
-+        esac
-+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-+          LD="${LD-ld}_sol2"
-+        fi
-+        ;;
-       *)
- 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- 	  LD="${LD-ld} -64"
-@@ -1369,14 +1425,47 @@
- ])# _LT_ENABLE_LOCK
- 
- 
-+# _LT_PROG_AR
-+# -----------
-+m4_defun([_LT_PROG_AR],
-+[AC_CHECK_TOOLS(AR, [ar], false)
-+: ${AR=ar}
-+: ${AR_FLAGS=cru}
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-+
-+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-+  [lt_cv_ar_at_file=no
-+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-+     [echo conftest.$ac_objext > conftest.lst
-+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-+      AC_TRY_EVAL([lt_ar_try])
-+      if test "$ac_status" -eq 0; then
-+	# Ensure the archiver fails upon bogus file names.
-+	rm -f conftest.$ac_objext libconftest.a
-+	AC_TRY_EVAL([lt_ar_try])
-+	if test "$ac_status" -ne 0; then
-+          lt_cv_ar_at_file=@
-+        fi
-+      fi
-+      rm -f conftest.* libconftest.a
-+     ])
-+  ])
-+
-+if test "x$lt_cv_ar_at_file" = xno; then
-+  archiver_list_spec=
-+else
-+  archiver_list_spec=$lt_cv_ar_at_file
-+fi
-+_LT_DECL([], [archiver_list_spec], [1],
-+  [How to feed a file listing to the archiver])
-+])# _LT_PROG_AR
-+
-+
- # _LT_CMD_OLD_ARCHIVE
- # -------------------
- m4_defun([_LT_CMD_OLD_ARCHIVE],
--[AC_CHECK_TOOL(AR, ar, false)
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--_LT_DECL([], [AR], [1], [The archiver])
--_LT_DECL([], [AR_FLAGS], [1])
-+[_LT_PROG_AR
- 
- AC_CHECK_TOOL(STRIP, strip, :)
- test -z "$STRIP" && STRIP=:
-@@ -1395,18 +1484,27 @@
- if test -n "$RANLIB"; then
-   case $host_os in
-   openbsd*)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-     ;;
-   *)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-     ;;
-   esac
--  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
- fi
-+
-+case $host_os in
-+  darwin*)
-+    lock_old_archive_extraction=yes ;;
-+  *)
-+    lock_old_archive_extraction=no ;;
-+esac
- _LT_DECL([], [old_postinstall_cmds], [2])
- _LT_DECL([], [old_postuninstall_cmds], [2])
- _LT_TAGDECL([], [old_archive_cmds], [2],
-     [Commands used to build an old-style archive])
-+_LT_DECL([], [lock_old_archive_extraction], [0],
-+    [Whether to use a lock for old archive extraction])
- ])# _LT_CMD_OLD_ARCHIVE
- 
- 
-@@ -1431,15 +1529,15 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        $2=yes
-@@ -1479,7 +1577,7 @@
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&AS_MESSAGE_LOG_FD
--       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
-          $2=yes
-@@ -1542,6 +1640,11 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-+  mint*)
-+    # On MiNT this can take a long time and run out of memory.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-   amigaos*)
-     # On AmigaOS with pdksh, this test takes hours, literally.
-     # So we just punt and use a minimum line length of 8192.
-@@ -1567,6 +1670,11 @@
-     lt_cv_sys_max_cmd_len=196608
-     ;;
- 
-+  os2*)
-+    # The test takes a long time on OS/2.
-+    lt_cv_sys_max_cmd_len=8192
-+    ;;
-+
-   osf*)
-     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-@@ -1606,8 +1714,8 @@
-       # If test is not a shell built-in, we'll probably end up computing a
-       # maximum length that is only half of the actual maximum length, but
-       # we can't tell.
--      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
--	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
- 	      test $i != 17 # 1/2 MB should be enough
-       do
-         i=`expr $i + 1`
-@@ -1658,7 +1766,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--[#line __oline__ "configure"
-+[#line $LINENO "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -1699,7 +1807,13 @@
- #  endif
- #endif
- 
--void fnord() { int i=42;}
-+/* When -fvisbility=hidden is used, assume the code has been annotated
-+   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-+int fnord () __attribute__((visibility("default")));
-+#endif
-+
-+int fnord () { return 42; }
- int main ()
- {
-   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -1708,7 +1822,11 @@
-   if (self)
-     {
-       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      else
-+        {
-+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-+          else puts (dlerror ());
-+	}
-       /* dlclose (self); */
-     }
-   else
-@@ -1884,16 +2002,16 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-@@ -2052,6 +2170,7 @@
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_DECL_OBJDUMP])dnl
- m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
- AC_MSG_CHECKING([dynamic linker characteristics])
- m4_if([$1],
- 	[], [
-@@ -2060,16 +2179,23 @@
-     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-     *) lt_awk_arg="/^libraries:/" ;;
-   esac
--  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-+  case $host_os in
-+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-+    *) lt_sed_strip_eq="s,=/,/,g" ;;
-+  esac
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-+  case $lt_search_path_spec in
-+  *\;*)
-     # if the path contains ";" then we assume it to be the separator
-     # otherwise default to the standard path separator (i.e. ":") - it is
-     # assumed that no part of a normal pathname contains ";" but that should
-     # okay in the real world where ";" in dirpaths is itself problematic.
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
--  else
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
--  fi
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-+    ;;
-+  *)
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-+    ;;
-+  esac
-   # Ok, now we have the path, separated by spaces, we can step through it
-   # and add multilib dir if necessary.
-   lt_tmp_lt_search_path_spec=
-@@ -2082,7 +2208,7 @@
- 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-     fi
-   done
--  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
- BEGIN {RS=" "; FS="/|\n";} {
-   lt_foo="";
-   lt_count=0;
-@@ -2102,7 +2228,13 @@
-   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
- }'`
--  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-+  # AWK program above erroneously prepends '/' to C:/dos/paths
-+  # for these hosts.
-+  case $host_os in
-+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-+  esac
-+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
- else
-   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi])
-@@ -2128,7 +2260,7 @@
- 
- case $host_os in
- aix3*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-   shlibpath_var=LIBPATH
- 
-@@ -2137,7 +2269,7 @@
-   ;;
- 
- aix[[4-9]]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   hardcode_into_libs=yes
-@@ -2190,7 +2322,7 @@
-   m68k)
-     library_names_spec='$libname.ixlibrary $libname.a'
-     # Create ${libname}_ixlibrary.a entries in /sys/libs.
--    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-     ;;
-   esac
-   ;;
-@@ -2202,7 +2334,7 @@
-   ;;
- 
- bsdi[[45]]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -2221,8 +2353,9 @@
-   need_version=no
-   need_lib_prefix=no
- 
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+  case $GCC,$cc_basename in
-+  yes,*)
-+    # gcc
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -2243,36 +2376,83 @@
-     cygwin*)
-       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+m4_if([$1], [],[
-+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-       ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
--        # It is most probably a Windows format PATH printed by
--        # mingw gcc, but we are running on Cygwin. Gcc prints its search
--        # path with ; separators, and with drive letters. We can handle the
--        # drive letters (cygwin fileutils understands them), so leave them,
--        # especially as we might pass files found there to a mingw objdump,
--        # which wouldn't understand a cygwinified path. Ahh.
--        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
--      else
--        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
--      fi
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-+    dynamic_linker='Win32 ld.exe'
-+    ;;
-+
-+  *,cl*)
-+    # Native MSVC
-+    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
-+
-+    case $build_os in
-+    mingw*)
-+      sys_lib_search_path_spec=
-+      lt_save_ifs=$IFS
-+      IFS=';'
-+      for lt_path in $LIB
-+      do
-+        IFS=$lt_save_ifs
-+        # Let DOS variable expansion print the short 8.3 style file name.
-+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-+      done
-+      IFS=$lt_save_ifs
-+      # Convert to MSYS style.
-+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-+      ;;
-+    cygwin*)
-+      # Convert to unix form, then to dos form, then back to unix form
-+      # but this time dos style (no spaces!) so that the unix form looks
-+      # like /cygdrive/c/PROGRA~1:/cygdr...
-+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      ;;
-+    *)
-+      sys_lib_search_path_spec="$LIB"
-+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-+        # It is most probably a Windows format PATH.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      # FIXME: find the short name or the path components, as spaces are
-+      # common. (e.g. "Program Files" -> "PROGRA~1")
-+      ;;
-+    esac
-+
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+    dynamic_linker='Win32 link.exe'
-     ;;
- 
-   *)
-+    # Assume MSVC wrapper
-     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    dynamic_linker='Win32 ld.exe'
-     ;;
-   esac
--  dynamic_linker='Win32 ld.exe'
-   # FIXME: first we should search . and the directory the executable is in
-   shlibpath_var=PATH
-   ;;
-@@ -2293,7 +2473,7 @@
-   ;;
- 
- dgux*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-@@ -2301,10 +2481,6 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -2312,7 +2488,7 @@
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[[123]]*) objformat=aout ;;
-+    freebsd[[23]].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -2330,7 +2506,7 @@
-   esac
-   shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in
--  freebsd2*)
-+  freebsd2.*)
-     shlibpath_overrides_runpath=yes
-     ;;
-   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-@@ -2350,12 +2526,26 @@
-   ;;
- 
- gnu*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+haiku*)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-   hardcode_into_libs=yes
-   ;;
- 
-@@ -2401,12 +2591,14 @@
-     soname_spec='${libname}${release}${shared_ext}$major'
-     ;;
-   esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-   postinstall_cmds='chmod 555 $lib'
-+  # or fails outright, so override atomically:
-+  install_override_mode=555
-   ;;
- 
- interix[[3-9]]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-@@ -2422,7 +2614,7 @@
-     nonstopux*) version_type=nonstopux ;;
-     *)
- 	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
-+		version_type=linux # correct to gnu/linux during the next big refactor
- 	else
- 		version_type=irix
- 	fi ;;
-@@ -2459,9 +2651,9 @@
-   dynamic_linker=no
-   ;;
- 
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
--  version_type=linux
-+# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2469,16 +2661,21 @@
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-+
-   # Some binutils ld are patched to set DT_RUNPATH
--  save_LDFLAGS=$LDFLAGS
--  save_libdir=$libdir
--  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
--       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
--  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
--    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
--       [shlibpath_overrides_runpath=yes])])
--  LDFLAGS=$save_LDFLAGS
--  libdir=$save_libdir
-+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-+    [lt_cv_shlibpath_overrides_runpath=no
-+    save_LDFLAGS=$LDFLAGS
-+    save_libdir=$libdir
-+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-+	 [lt_cv_shlibpath_overrides_runpath=yes])])
-+    LDFLAGS=$save_LDFLAGS
-+    libdir=$save_libdir
-+    ])
-+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
- 
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-@@ -2487,7 +2684,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -2500,18 +2697,6 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -2531,7 +2716,7 @@
-   ;;
- 
- newsos6)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
-@@ -2600,7 +2785,7 @@
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2625,7 +2810,7 @@
-   ;;
- 
- sysv4 | sysv4.3*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -2649,7 +2834,7 @@
- 
- sysv4*MP*)
-   if test -d /usr/nec ;then
--    version_type=linux
-+    version_type=linux # correct to gnu/linux during the next big refactor
-     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-     soname_spec='$libname${shared_ext}.$major'
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -2680,7 +2865,7 @@
- 
- tpf*)
-   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2690,7 +2875,7 @@
-   ;;
- 
- uts4*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -2732,6 +2917,8 @@
-     The last name is the one that the linker finds with -lNAME]])
- _LT_DECL([], [soname_spec], [1],
-     [[The coded name of the library, if different from the real name]])
-+_LT_DECL([], [install_override_mode], [1],
-+    [Permission mode override for installation of shared libraries])
- _LT_DECL([], [postinstall_cmds], [2],
-     [Command to use after installation of a shared archive])
- _LT_DECL([], [postuninstall_cmds], [2],
-@@ -2844,6 +3031,7 @@
- AC_REQUIRE([AC_CANONICAL_BUILD])dnl
- m4_require([_LT_DECL_SED])dnl
- m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
- 
- AC_ARG_WITH([gnu-ld],
-     [AS_HELP_STRING([--with-gnu-ld],
-@@ -2965,6 +3153,11 @@
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    if test "$GCC" != yes; then
-+      reload_cmds=false
-+    fi
-+    ;;
-   darwin*)
-     if test "$GCC" = yes; then
-       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -2973,8 +3166,8 @@
-     fi
-     ;;
- esac
--_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
--_LT_DECL([], [reload_cmds], [2])dnl
-+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-+_LT_TAGDECL([], [reload_cmds], [2])dnl
- ])# _LT_CMD_RELOAD
- 
- 
-@@ -3026,16 +3219,18 @@
-   # Base MSYS/MinGW do not provide the 'file' command needed by
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
--  if ( file / ) >/dev/null 2>&1; then
-+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
--    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    # Keep this pattern in sync with the one in func_win32_libid.
-+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-     lt_cv_file_magic_cmd='$OBJDUMP -f'
-   fi
-   ;;
- 
--cegcc)
-+cegcc*)
-   # use the weaker test based on 'objdump'. See mingw*.
-   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-   lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -3065,6 +3260,10 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+haiku*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
-   case $host_cpu in
-@@ -3073,11 +3272,11 @@
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-     ;;
-   hppa*64*)
--    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-     ;;
-   *)
--    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-     lt_cv_file_magic_test_file=/usr/lib/libc.sl
-     ;;
-   esac
-@@ -3098,12 +3297,12 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd* | netbsdelf*-gnu)
-+netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -3177,6 +3376,21 @@
-   ;;
- esac
- ])
-+
-+file_magic_glob=
-+want_nocaseglob=no
-+if test "$build" = "$host"; then
-+  case $host_os in
-+  mingw* | pw32*)
-+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-+      want_nocaseglob=yes
-+    else
-+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-+    fi
-+    ;;
-+  esac
-+fi
-+
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -3184,7 +3398,11 @@
- _LT_DECL([], [deplibs_check_method], [1],
-     [Method to check whether dependent libraries are shared objects])
- _LT_DECL([], [file_magic_cmd], [1],
--    [Command to use when deplibs_check_method == "file_magic"])
-+    [Command to use when deplibs_check_method = "file_magic"])
-+_LT_DECL([], [file_magic_glob], [1],
-+    [How to find potential files when deplibs_check_method = "file_magic"])
-+_LT_DECL([], [want_nocaseglob], [1],
-+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
- ])# _LT_CHECK_MAGIC_METHOD
- 
- 
-@@ -3241,9 +3459,21 @@
-   NM="$lt_cv_path_NM"
- else
-   # Didn't find any BSD compatible name lister, look for dumpbin.
--  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
--  AC_SUBST([DUMPBIN])
--  if test "$DUMPBIN" != ":"; then
-+  if test -n "$DUMPBIN"; then :
-+    # Let the user override the test.
-+  else
-+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-+    *COFF*)
-+      DUMPBIN="$DUMPBIN -symbols"
-+      ;;
-+    *)
-+      DUMPBIN=:
-+      ;;
-+    esac
-+  fi
-+  AC_SUBST([DUMPBIN])
-+  if test "$DUMPBIN" != ":"; then
-     NM="$DUMPBIN"
-   fi
- fi
-@@ -3254,13 +3484,13 @@
- AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-   [lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&AS_MESSAGE_LOG_FD
--  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&AS_MESSAGE_LOG_FD
--  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
-+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-   cat conftest.out >&AS_MESSAGE_LOG_FD
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -3275,6 +3505,67 @@
- dnl AC_DEFUN([AM_PROG_NM], [])
- dnl AC_DEFUN([AC_PROG_NM], [])
- 
-+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-+# --------------------------------
-+# how to determine the name of the shared library
-+# associated with a specific link library.
-+#  -- PORTME fill in with the dynamic library characteristics
-+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-+[m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
-+m4_require([_LT_DECL_DLLTOOL])
-+AC_CACHE_CHECK([how to associate runtime and link libraries],
-+lt_cv_sharedlib_from_linklib_cmd,
-+[lt_cv_sharedlib_from_linklib_cmd='unknown'
-+
-+case $host_os in
-+cygwin* | mingw* | pw32* | cegcc*)
-+  # two different shell functions defined in ltmain.sh
-+  # decide which to use based on capabilities of $DLLTOOL
-+  case `$DLLTOOL --help 2>&1` in
-+  *--identify-strict*)
-+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-+    ;;
-+  *)
-+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-+    ;;
-+  esac
-+  ;;
-+*)
-+  # fallback: assume linklib IS sharedlib
-+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-+  ;;
-+esac
-+])
-+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-+
-+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-+    [Command to associate shared and link libraries])
-+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-+
-+
-+# _LT_PATH_MANIFEST_TOOL
-+# ----------------------
-+# locate the manifest tool
-+m4_defun([_LT_PATH_MANIFEST_TOOL],
-+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-+  [lt_cv_path_mainfest_tool=no
-+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-+  cat conftest.err >&AS_MESSAGE_LOG_FD
-+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-+    lt_cv_path_mainfest_tool=yes
-+  fi
-+  rm -f conftest*])
-+if test "x$lt_cv_path_mainfest_tool" != xyes; then
-+  MANIFEST_TOOL=:
-+fi
-+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-+])# _LT_PATH_MANIFEST_TOOL
-+
- 
- # LT_LIB_M
- # --------
-@@ -3283,7 +3574,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case $host in
--*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-   # These system don't have libm, or don't need it
-   ;;
- *-ncr-sysv4.3*)
-@@ -3311,7 +3602,12 @@
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
- 
- if test "$GCC" = yes; then
--  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+  case $cc_basename in
-+  nvcc*)
-+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-+  *)
-+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-+  esac
- 
-   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-     lt_cv_prog_compiler_rtti_exceptions,
-@@ -3328,6 +3624,7 @@
- m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_AWK])dnl
- AC_REQUIRE([LT_PATH_NM])dnl
- AC_REQUIRE([LT_PATH_LD])dnl
- m4_require([_LT_DECL_SED])dnl
-@@ -3395,8 +3692,8 @@
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- 
- # Transform an extracted symbol line into symbol name and symbol address
--lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
--lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
- 
- # Handle CRLF in mingw tool chain
- opt_cr=
-@@ -3420,6 +3717,7 @@
-     # which start with @ or ?.
-     lt_cv_sys_global_symbol_pipe="$AWK ['"\
- "     {last_section=section; section=\$ 3};"\
-+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
- "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
- "     \$ 0!~/External *\|/{next};"\
- "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-@@ -3432,6 +3730,7 @@
-   else
-     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-   fi
-+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -3453,7 +3752,7 @@
-   if AC_TRY_EVAL(ac_compile); then
-     # Now try to grab the symbols.
-     nlist=conftest.nm
--    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-       # Try sorting and uniquifying the output.
-       if sort "$nlist" | uniq > "$nlist"T; then
- 	mv -f "$nlist"T "$nlist"
-@@ -3465,6 +3764,18 @@
-       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- 	  cat <<_LT_EOF > conftest.$ac_ext
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-+# define LT@&t@_DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data.  */
-+# define LT@&t@_DLSYM_CONST
-+#else
-+# define LT@&t@_DLSYM_CONST const
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -3476,7 +3787,7 @@
- 	  cat <<_LT_EOF >> conftest.$ac_ext
- 
- /* The mapping between symbol names and symbols.  */
--const struct {
-+LT@&t@_DLSYM_CONST struct {
-   const char *name;
-   void       *address;
- }
-@@ -3502,15 +3813,15 @@
- _LT_EOF
- 	  # Now try linking the two files.
- 	  mv conftest.$ac_objext conftstm.$ac_objext
--	  lt_save_LIBS="$LIBS"
--	  lt_save_CFLAGS="$CFLAGS"
-+	  lt_globsym_save_LIBS=$LIBS
-+	  lt_globsym_save_CFLAGS=$CFLAGS
- 	  LIBS="conftstm.$ac_objext"
- 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
- 	    pipe_works=yes
- 	  fi
--	  LIBS="$lt_save_LIBS"
--	  CFLAGS="$lt_save_CFLAGS"
-+	  LIBS=$lt_globsym_save_LIBS
-+	  CFLAGS=$lt_globsym_save_CFLAGS
- 	else
- 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
- 	fi
-@@ -3543,6 +3854,13 @@
-   AC_MSG_RESULT(ok)
- fi
- 
-+# Response file support.
-+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+  nm_file_list_spec='@'
-+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-+  nm_file_list_spec='@'
-+fi
-+
- _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-     [Take the output of nm and produce a listing of raw symbols and C names])
- _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-@@ -3553,6 +3871,8 @@
- _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-     [Transform the output of nm in a C name address pair when lib prefix is needed])
-+_LT_DECL([], [nm_file_list_spec], [1],
-+    [Specify filename containing input files for $NM])
- ]) # _LT_CMD_GLOBAL_SYMBOLS
- 
- 
-@@ -3564,7 +3884,6 @@
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- 
--AC_MSG_CHECKING([for $compiler option to produce PIC])
- m4_if([$1], [CXX], [
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -3615,6 +3934,11 @@
-       # DJGPP does not support shared libraries at all
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-       ;;
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-+      ;;
-     interix[[3-9]]*)
-       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-       # Instead, we relocate shared libraries at runtime.
-@@ -3664,6 +3988,12 @@
- 	  ;;
- 	esac
- 	;;
-+      mingw* | cygwin* | os2* | pw32* | cegcc*)
-+	# This hack is so that the source file can tell whether it is being
-+	# built for inclusion in a dll (and should export symbols for example).
-+	m4_if([$1], [GCJ], [],
-+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+	;;
-       dgux*)
- 	case $cc_basename in
- 	  ec++*)
-@@ -3720,7 +4050,7 @@
- 	    ;;
- 	esac
- 	;;
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
- 	case $cc_basename in
- 	  KCC*)
- 	    # KAI C++ Compiler
-@@ -3753,8 +4083,8 @@
- 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- 	    ;;
--	  xlc* | xlC*)
--	    # IBM XL 8.0 on PPC
-+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
- 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-@@ -3784,7 +4114,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd* | netbsdelf*-gnu)
-+      netbsd*)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3816,7 +4146,7 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC*)
-+	  CC* | sunCC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -3920,6 +4250,12 @@
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-       ;;
- 
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-+      ;;
-+
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -3962,6 +4298,15 @@
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       ;;
-     esac
-+
-+    case $cc_basename in
-+    nvcc*) # Cuda Compiler Driver 2.2
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-+      fi
-+      ;;
-+    esac
-   else
-     # PORTME Check for flag to pass linker flags through the system compiler.
-     case $host_os in
-@@ -4004,7 +4349,7 @@
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-       ;;
- 
--    linux* | k*bsd*-gnu)
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-       case $cc_basename in
-       # old Intel for x86_64 which still supported -KPIC.
-       ecc*)
-@@ -4025,7 +4370,13 @@
- 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
- 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
- 	;;
--      pgcc* | pgf77* | pgf90* | pgf95*)
-+      nagfor*)
-+	# NAG Fortran compiler
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	;;
-+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
- 	# which looks to be a dead project)
- 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -4037,25 +4388,40 @@
-         # All Alpha code is PIC.
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-         ;;
--      xl*)
--	# IBM XL C 8.0/Fortran 10.1 on PPC
-+      xl* | bgxl* | bgf* | mpixl*)
-+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
- 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
- 	;;
-       *)
- 	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-+	  ;;
-+	*Sun\ F* | *Sun*Fortran*)
-+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	  ;;
- 	*Sun\ C*)
- 	  # Sun C 5.9
- 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	  ;;
--	*Sun\ F*)
--	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
--	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+        *Intel*\ [[CF]]*Compiler*)
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+	  ;;
-+	*Portland\ Group*)
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
- 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
- 	  ;;
- 	esac
- 	;;
-@@ -4087,7 +4453,7 @@
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-       case $cc_basename in
--      f77* | f90* | f95*)
-+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-       *)
- 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4144,9 +4510,11 @@
-     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-     ;;
- esac
--AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
--_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
--	[How to pass a linker flag through the compiler])
-+
-+AC_CACHE_CHECK([for $compiler option to produce PIC],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
- 
- #
- # Check to make sure the PIC flag actually works.
-@@ -4165,6 +4533,8 @@
- _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
- 	[Additional compiler flags for building library objects])
- 
-+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-+	[How to pass a linker flag through the compiler])
- #
- # Check to make sure the static flag actually works.
- #
-@@ -4185,6 +4555,7 @@
- m4_defun([_LT_LINKER_SHLIBS],
- [AC_REQUIRE([LT_PATH_LD])dnl
- AC_REQUIRE([LT_PATH_NM])dnl
-+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_DECL_EGREP])dnl
- m4_require([_LT_DECL_SED])dnl
-@@ -4193,30 +4564,37 @@
- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- m4_if([$1], [CXX], [
-   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-   case $host_os in
-   aix[[4-9]]*)
-     # If we're using GNU nm, then we don't want the "-C" option.
-     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    # Also, AIX nm treats weak defined symbols like other global defined
-+    # symbols, whereas GNU nm marks them as "W".
-     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-     else
-       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-     fi
-     ;;
-   pw32*)
-     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
--  ;;
-+    ;;
-   cygwin* | mingw* | cegcc*)
--    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
--  linux* | k*bsd*-gnu)
--    _LT_TAGVAR(link_all_deplibs, $1)=no
--  ;;
-+    case $cc_basename in
-+    cl*)
-+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-+      ;;
-+    *)
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-+      ;;
-+    esac
-+    ;;
-   *)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
-+    ;;
-   esac
--  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- ], [
-   runpath_var=
-   _LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -4231,7 +4609,6 @@
-   _LT_TAGVAR(hardcode_direct, $1)=no
-   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-   _LT_TAGVAR(hardcode_libdir_separator, $1)=
-   _LT_TAGVAR(hardcode_minus_L, $1)=no
-   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -4276,13 +4653,36 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
--  linux* | k*bsd*-gnu)
--    _LT_TAGVAR(link_all_deplibs, $1)=no
--    ;;
-   esac
- 
-   _LT_TAGVAR(ld_shlibs, $1)=yes
-+
-+  # On some targets, GNU ld is compatible enough with the native linker
-+  # that we're better off using the native interface for both.
-+  lt_use_gnu_ld_interface=no
-   if test "$with_gnu_ld" = yes; then
-+    case $host_os in
-+      aix*)
-+	# The AIX port of GNU ld has always aspired to compatibility
-+	# with the native linker.  However, as the warning in the GNU ld
-+	# block says, versions before 2.19.5* couldn't really create working
-+	# shared libraries, regardless of the interface used.
-+	case `$LD -v 2>&1` in
-+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-+	  *)
-+	    lt_use_gnu_ld_interface=yes
-+	    ;;
-+	esac
-+	;;
-+      *)
-+	lt_use_gnu_ld_interface=yes
-+	;;
-+    esac
-+  fi
-+
-+  if test "$lt_use_gnu_ld_interface" = yes; then
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-@@ -4300,6 +4700,7 @@
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4315,11 +4716,12 @@
- 	_LT_TAGVAR(ld_shlibs, $1)=no
- 	cat <<_LT_EOF 1>&2
- 
--*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** Warning: the GNU linker, at least up to release 2.19, is reported
- *** to be unable to reliably create shared libraries on AIX.
- *** Therefore, libtool is disabling shared libraries support.  If you
--*** really care for shared libraries, you may want to modify your PATH
--*** so that a non-GNU linker is found, and then restart.
-+*** really care for shared libraries, you may want to install binutils
-+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-+*** You will then need to restart the configuration process.
- 
- _LT_EOF
-       fi
-@@ -4355,10 +4757,12 @@
-       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-       # as there is no search path for DLLs.
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-       _LT_TAGVAR(always_export_symbols, $1)=no
-       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
- 
-       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -4376,6 +4780,11 @@
-       fi
-       ;;
- 
-+    haiku*)
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
-     interix[[3-9]]*)
-       _LT_TAGVAR(hardcode_direct, $1)=no
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4391,7 +4800,7 @@
-       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    gnu* | linux* | tpf* | k*bsd*-gnu)
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-       tmp_diet=no
-       if test "$host_os" = linux-dietlibc; then
- 	case $cc_basename in
-@@ -4401,15 +4810,16 @@
-       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- 	 && test "$tmp_diet" = no
-       then
--	tmp_addflag=
-+	tmp_addflag=' $pic_flag'
- 	tmp_sharedflag='-shared'
- 	case $cc_basename,$host_cpu in
-         pgcc*)				# Portland Group C compiler
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag'
- 	  ;;
--	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	pgf77* | pgf90* | pgf95* | pgfortran*)
-+					# Portland Group f77 and f90 compilers
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag -Mnomain' ;;
- 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
- 	  tmp_addflag=' -i_dynamic' ;;
-@@ -4420,13 +4830,17 @@
- 	lf95*)				# Lahey Fortran 8.1
- 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
- 	  tmp_sharedflag='--shared' ;;
--	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
- 	  tmp_sharedflag='-qmkshrobj'
- 	  tmp_addflag= ;;
-+	nvcc*)	# Cuda Compiler Driver 2.2
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-+	  ;;
- 	esac
- 	case `$CC -V 2>&1 | sed 5q` in
- 	*Sun\ C*)			# Sun C 5.9
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
- 	  tmp_sharedflag='-G' ;;
- 	*Sun\ F*)			# Sun Fortran 8.3
-@@ -4442,17 +4856,16 @@
-         fi
- 
- 	case $cc_basename in
--	xlf*)
-+	xlf* | bgf* | bgxlf* | mpixlf*)
- 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
- 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- 	  if test "x$supports_anon_versioning" = xyes; then
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- 	      echo "local: *; };" >> $output_objdir/$libname.ver~
--	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- 	  fi
- 	  ;;
- 	esac
-@@ -4461,13 +4874,13 @@
-       fi
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-       else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       fi
-       ;;
- 
-@@ -4485,8 +4898,8 @@
- 
- _LT_EOF
-       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	_LT_TAGVAR(ld_shlibs, $1)=no
-       fi
-@@ -4532,8 +4945,8 @@
- 
-     *)
-       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	_LT_TAGVAR(ld_shlibs, $1)=no
-       fi
-@@ -4573,8 +4986,10 @@
-       else
- 	# If we're using GNU nm, then we don't want the "-C" option.
- 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	# Also, AIX nm treats weak defined symbols like other global
-+	# defined symbols, whereas GNU nm marks them as "W".
- 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- 	else
- 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- 	fi
-@@ -4636,7 +5051,6 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
--	_LT_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -4662,9 +5076,9 @@
- 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-         # Determine the default libpath from the value encoded in an
-         # empty executable.
--        _LT_SYS_MODULE_PATH_AIX
-+        _LT_SYS_MODULE_PATH_AIX([$1])
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
- 	if test "$host_cpu" = ia64; then
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -4673,14 +5087,19 @@
- 	else
- 	 # Determine the default libpath from the value encoded in an
- 	 # empty executable.
--	 _LT_SYS_MODULE_PATH_AIX
-+	 _LT_SYS_MODULE_PATH_AIX([$1])
- 	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- 	  # Warning - without using the other run time loading flags,
- 	  # -berok will link without error, but may produce a broken library.
- 	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- 	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	  # Exported symbols can be pulled into shared objects from archives
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	  if test "$with_gnu_ld" = yes; then
-+	    # We only use this code for GNU lds that support --whole-archive.
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	  else
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	  fi
- 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -4712,20 +5131,64 @@
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
--      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      # Tell ltmain to make .lib files, not .a files.
--      libext=lib
--      # Tell ltmain to make .dll files, not .so files.
--      shrext_cmds=".dll"
--      # FIXME: Setting linknames here is a bad hack.
--      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
--      # FIXME: Should let the user specify the lib program.
--      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
--      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
--      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      case $cc_basename in
-+      cl*)
-+	# Native MSVC
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	_LT_TAGVAR(always_export_symbols, $1)=yes
-+	_LT_TAGVAR(file_list_spec, $1)='@'
-+	# Tell ltmain to make .lib files, not .a files.
-+	libext=lib
-+	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
-+	# FIXME: Setting linknames here is a bad hack.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	  else
-+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	  fi~
-+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	  linknames='
-+	# The linker will not automatically build a static lib if we build a DLL.
-+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+	# Don't use ranlib
-+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	  case $lt_outputfile in
-+	    *.exe|*.EXE) ;;
-+	    *)
-+	      lt_outputfile="$lt_outputfile.exe"
-+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-+	      ;;
-+	  esac~
-+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	    $RM "$lt_outputfile.manifest";
-+	  fi'
-+	;;
-+      *)
-+	# Assume MSVC wrapper
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	# Tell ltmain to make .lib files, not .a files.
-+	libext=lib
-+	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
-+	# FIXME: Setting linknames here is a bad hack.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-+	# The linker will automatically build a .lib file if we build a DLL.
-+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+	# FIXME: Should let the user specify the lib program.
-+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+	;;
-+      esac
-       ;;
- 
-     darwin* | rhapsody*)
-@@ -4738,10 +5201,6 @@
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    freebsd1*)
--      _LT_TAGVAR(ld_shlibs, $1)=no
--      ;;
--
-     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-     # support.  Future versions do this automatically, but an explicit c++rt0.o
-     # does not break anything, and helps significantly (at the cost of a little
-@@ -4754,7 +5213,7 @@
-       ;;
- 
-     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
-+    freebsd2.*)
-       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-       _LT_TAGVAR(hardcode_direct, $1)=yes
-       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-@@ -4763,7 +5222,7 @@
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-     freebsd* | dragonfly*)
--      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_TAGVAR(hardcode_direct, $1)=yes
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4771,7 +5230,7 @@
- 
-     hpux9*)
-       if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       else
- 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       fi
-@@ -4786,14 +5245,13 @@
-       ;;
- 
-     hpux10*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-       else
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-       fi
-       if test "$with_gnu_ld" = no; then
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- 	_LT_TAGVAR(hardcode_direct, $1)=yes
- 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-@@ -4805,16 +5263,16 @@
-       ;;
- 
-     hpux11*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- 	case $host_cpu in
- 	hppa*64*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	ia64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       else
-@@ -4826,7 +5284,14 @@
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	m4_if($1, [], [
-+	  # Older versions of the 11.00 compiler do not understand -b yet
-+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-+	  _LT_LINKER_OPTION([if $CC understands -b],
-+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
- 	  ;;
- 	esac
-       fi
-@@ -4854,19 +5319,34 @@
- 
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	# Try to use the -exported_symbol ld option, if it does not
- 	# work, assume that -exports_file does not work either and
- 	# implicitly export all symbols.
--        save_LDFLAGS="$LDFLAGS"
--        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
--        AC_LINK_IFELSE(int foo(void) {},
--          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
--        )
--        LDFLAGS="$save_LDFLAGS"
-+	# This should be the same for all languages, so no per-tag cache variable.
-+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-+	  [lt_cv_irix_exported_symbol],
-+	  [save_LDFLAGS="$LDFLAGS"
-+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+	   AC_LINK_IFELSE(
-+	     [AC_LANG_SOURCE(
-+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-+			      [C++], [[int foo (void) { return 0; }]],
-+			      [Fortran 77], [[
-+      subroutine foo
-+      end]],
-+			      [Fortran], [[
-+      subroutine foo
-+      end]])])],
-+	      [lt_cv_irix_exported_symbol=yes],
-+	      [lt_cv_irix_exported_symbol=no])
-+           LDFLAGS="$save_LDFLAGS"])
-+	if test "$lt_cv_irix_exported_symbol" = yes; then
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+	fi
-       else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-       fi
-       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4875,7 +5355,7 @@
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -4928,17 +5408,17 @@
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-       _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
- 
-     osf3*)
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-       fi
-       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4948,13 +5428,13 @@
-     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-       else
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
--	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4967,9 +5447,9 @@
-       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-       if test "$GCC" = yes; then
- 	wlarc='${wl}'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-       else
- 	case `$CC -V 2>&1` in
- 	*"Compilers 5.0"*)
-@@ -5145,36 +5625,38 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
--      $RM conftest*
--      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
--	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
--        _LT_TAGVAR(allow_undefined_flag, $1)=
--        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
--        then
--	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--        else
--	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--        fi
--        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $RM conftest*
--      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-+	[$RM conftest*
-+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+	  soname=conftest
-+	  lib=conftest
-+	  libobjs=conftest.$ac_objext
-+	  deplibs=
-+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-+	  compiler_flags=-v
-+	  linker_flags=-v
-+	  verstring=
-+	  output_objdir=.
-+	  libname=conftest
-+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=
-+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-+	  then
-+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+	  else
-+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	  fi
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+	else
-+	  cat conftest.err 1>&5
-+	fi
-+	$RM conftest*
-+	])
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-       ;;
-     esac
-   fi
-@@ -5211,9 +5693,6 @@
- _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-     [Flag to hardcode $libdir into a binary during linking.
-     This must work even if $libdir does not exist])
--_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
--    [[If ld is used when linking, flag to hardcode $libdir into a binary
--    during linking.  This must work even if $libdir does not exist]])
- _LT_TAGDECL([], [hardcode_libdir_separator], [1],
-     [Whether we need a single "-rpath" flag with a separated argument])
- _LT_TAGDECL([], [hardcode_direct], [0],
-@@ -5239,8 +5718,6 @@
-     to runtime path list])
- _LT_TAGDECL([], [link_all_deplibs], [0],
-     [Whether libtool must link a program against all its dependency libraries])
--_LT_TAGDECL([], [fix_srcfile_path], [1],
--    [Fix the shell variable $srcfile for the compiler])
- _LT_TAGDECL([], [always_export_symbols], [0],
-     [Set to "yes" if exported symbols are required])
- _LT_TAGDECL([], [export_symbols_cmds], [2],
-@@ -5251,6 +5728,8 @@
-     [Symbols that must always be exported])
- _LT_TAGDECL([], [prelink_cmds], [2],
-     [Commands necessary for linking programs (against libraries) with templates])
-+_LT_TAGDECL([], [postlink_cmds], [2],
-+    [Commands necessary for finishing linking programs])
- _LT_TAGDECL([], [file_list_spec], [1],
-     [Specify filename containing input files])
- dnl FIXME: Not yet implemented
-@@ -5340,37 +5819,22 @@
- ])# _LT_LANG_C_CONFIG
- 
- 
--# _LT_PROG_CXX
--# ------------
--# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
--# compiler, we have our own version here.
--m4_defun([_LT_PROG_CXX],
--[
--pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
--AC_PROG_CXX
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
--    (test "X$CXX" != "Xg++"))) ; then
--  AC_PROG_CXXCPP
--else
--  _lt_caught_CXX_error=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_CXX
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_CXX], [])
--
--
- # _LT_LANG_CXX_CONFIG([TAG])
- # --------------------------
- # Ensure that the configuration variables for a C++ compiler are suitably
- # defined.  These variables are subsequently used by _LT_CONFIG to write
- # the compiler configuration to `libtool'.
- m4_defun([_LT_LANG_CXX_CONFIG],
--[AC_REQUIRE([_LT_PROG_CXX])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+else
-+  _lt_caught_CXX_error=yes
-+fi
- 
- AC_LANG_PUSH(C++)
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -5382,7 +5846,6 @@
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -5392,6 +5855,8 @@
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
- _LT_TAGVAR(no_undefined_flag, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -5423,6 +5888,7 @@
- 
-   # Allow CC to be a program name with arguments.
-   lt_save_CC=$CC
-+  lt_save_CFLAGS=$CFLAGS
-   lt_save_LD=$LD
-   lt_save_GCC=$GCC
-   GCC=$GXX
-@@ -5440,6 +5906,7 @@
-   fi
-   test -z "${LDCXX+set}" || LD=$LDCXX
-   CC=${CXX-"c++"}
-+  CFLAGS=$CXXFLAGS
-   compiler=$CC
-   _LT_TAGVAR(compiler, $1)=$CC
-   _LT_CC_BASENAME([$compiler])
-@@ -5461,8 +5928,8 @@
-       # Check if GNU C++ uses GNU ld as the underlying linker, since the
-       # archiving commands below assume that GNU ld is being used.
-       if test "$with_gnu_ld" = yes; then
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5494,7 +5961,7 @@
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
--      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 
-     else
-       GXX=no
-@@ -5603,10 +6070,10 @@
-           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-           # Determine the default libpath from the value encoded in an empty
-           # executable.
--          _LT_SYS_MODULE_PATH_AIX
-+          _LT_SYS_MODULE_PATH_AIX([$1])
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
--          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-         else
-           if test "$host_cpu" = ia64; then
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -5615,14 +6082,19 @@
-           else
- 	    # Determine the default libpath from the value encoded in an
- 	    # empty executable.
--	    _LT_SYS_MODULE_PATH_AIX
-+	    _LT_SYS_MODULE_PATH_AIX([$1])
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- 	    # Warning - without using the other run time loading flags,
- 	    # -berok will link without error, but may produce a broken library.
- 	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- 	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	    # Exported symbols can be pulled into shared objects from archives
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	    if test "$with_gnu_ld" = yes; then
-+	      # We only use this code for GNU lds that support --whole-archive.
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	    else
-+	      # Exported symbols can be pulled into shared objects from archives
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	    fi
- 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	    # This is similar to how AIX traditionally builds its shared
- 	    # libraries.
-@@ -5652,28 +6124,75 @@
-         ;;
- 
-       cygwin* | mingw* | pw32* | cegcc*)
--        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--        # as there is no search path for DLLs.
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--        _LT_TAGVAR(always_export_symbols, $1)=no
--        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--
--        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
--          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--          # If the export-symbols file already is a .def file (1st line
--          # is EXPORTS), use it as is; otherwise, prepend...
--          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--	    cp $export_symbols $output_objdir/$soname.def;
--          else
--	    echo EXPORTS > $output_objdir/$soname.def;
--	    cat $export_symbols >> $output_objdir/$soname.def;
--          fi~
--          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--        else
--          _LT_TAGVAR(ld_shlibs, $1)=no
--        fi
--        ;;
-+	case $GXX,$cc_basename in
-+	,cl* | no,cl*)
-+	  # Native MSVC
-+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-+	  # no search path for DLLs.
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	  _LT_TAGVAR(always_export_symbols, $1)=yes
-+	  _LT_TAGVAR(file_list_spec, $1)='@'
-+	  # Tell ltmain to make .lib files, not .a files.
-+	  libext=lib
-+	  # Tell ltmain to make .dll files, not .so files.
-+	  shrext_cmds=".dll"
-+	  # FIXME: Setting linknames here is a bad hack.
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	    else
-+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	    fi~
-+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	    linknames='
-+	  # The linker will not automatically build a static lib if we build a DLL.
-+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+	  # Don't use ranlib
-+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	    case $lt_outputfile in
-+	      *.exe|*.EXE) ;;
-+	      *)
-+		lt_outputfile="$lt_outputfile.exe"
-+		lt_tool_outputfile="$lt_tool_outputfile.exe"
-+		;;
-+	    esac~
-+	    func_to_tool_file "$lt_outputfile"~
-+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	      $RM "$lt_outputfile.manifest";
-+	    fi'
-+	  ;;
-+	*)
-+	  # g++
-+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+	  # as there is no search path for DLLs.
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	  _LT_TAGVAR(always_export_symbols, $1)=no
-+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	    # If the export-symbols file already is a .def file (1st line
-+	    # is EXPORTS), use it as is; otherwise, prepend...
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	      cp $export_symbols $output_objdir/$soname.def;
-+	    else
-+	      echo EXPORTS > $output_objdir/$soname.def;
-+	      cat $export_symbols >> $output_objdir/$soname.def;
-+	    fi~
-+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	  else
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	  fi
-+	  ;;
-+	esac
-+	;;
-       darwin* | rhapsody*)
-         _LT_DARWIN_LINKER_FEATURES($1)
- 	;;
-@@ -5696,7 +6215,7 @@
-         esac
-         ;;
- 
--      freebsd[[12]]*)
-+      freebsd2.*)
-         # C++ shared libraries reported to be fairly broken before
- 	# switch to ELF
-         _LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5715,6 +6234,11 @@
-       gnu*)
-         ;;
- 
-+      haiku*)
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(link_all_deplibs, $1)=yes
-+        ;;
-+
-       hpux9*)
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -5739,11 +6263,11 @@
-             # explicitly linking system object files so we need to strip them
-             # from the output so that they don't get included in the library
-             # dependencies.
--            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-             ;;
-           *)
-             if test "$GXX" = yes; then
--              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-             else
-               # FIXME: insert proper C++ library support
-               _LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5804,7 +6328,7 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- 	    ;;
-           *)
- 	    if test "$GXX" = yes; then
-@@ -5814,10 +6338,10 @@
- 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	            ;;
- 	          ia64*)
--	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	            ;;
- 	          *)
--	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	            ;;
- 	        esac
- 	      fi
-@@ -5847,7 +6371,7 @@
-         case $cc_basename in
-           CC*)
- 	    # SGI C++
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	    # Archives containing C++ object files must be created using
- 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -5858,9 +6382,9 @@
-           *)
- 	    if test "$GXX" = yes; then
- 	      if test "$with_gnu_ld" = no; then
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	      else
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
- 	      fi
- 	    fi
- 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -5871,7 +6395,7 @@
-         _LT_TAGVAR(inherit_rpath, $1)=yes
-         ;;
- 
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-         case $cc_basename in
-           KCC*)
- 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -5889,7 +6413,7 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- 
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5926,26 +6450,26 @@
-           pgCC* | pgcpp*)
-             # Portland Group C++ compiler
- 	    case `$CC -V` in
--	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
- 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
- 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- 		$RANLIB $oldlib'
- 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- 	      ;;
--	    *) # Version 6 will use weak symbols
-+	    *) # Version 6 and above use weak symbols
- 	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- 	      ;;
-@@ -5953,7 +6477,7 @@
- 
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-             ;;
- 	  cxx*)
- 	    # Compaq C++
-@@ -5972,9 +6496,9 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
- 	    ;;
--	  xl*)
-+	  xl* | mpixl* | bgxl*)
- 	    # IBM XL 8.0 on PPC, with GNU ld
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5994,13 +6518,13 @@
- 	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
- 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
- 
- 	      # Not sure whether something based on
- 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
- 	      # would be better.
--	      output_verbose_link_cmd='echo'
-+	      output_verbose_link_cmd='func_echo_all'
- 
- 	      # Archives containing C++ object files must be created using
- 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -6069,7 +6593,7 @@
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- 	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- 	  fi
--	  output_verbose_link_cmd=echo
-+	  output_verbose_link_cmd=func_echo_all
- 	else
- 	  _LT_TAGVAR(ld_shlibs, $1)=no
- 	fi
-@@ -6104,15 +6628,15 @@
- 	    case $host in
- 	      osf3*)
- 	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 		;;
- 	      *)
- 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	          echo "-hidden">> $lib.exp~
--	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- 	          $RM $lib.exp'
- 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- 		;;
-@@ -6128,17 +6652,17 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- 	    ;;
- 	  *)
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- 	      case $host in
- 	        osf3*)
--	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 		  ;;
- 	        *)
--	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 		  ;;
- 	      esac
- 
-@@ -6148,7 +6672,7 @@
- 	      # Commands to make compiler produce verbose output that lists
- 	      # what "hidden" libraries, object files and flags are used when
- 	      # linking a shared library.
--	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 
- 	    else
- 	      # FIXME: insert proper C++ library support
-@@ -6184,7 +6708,7 @@
- 
-       solaris*)
-         case $cc_basename in
--          CC*)
-+          CC* | sunCC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
-             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
- 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -6205,7 +6729,7 @@
- 	    esac
- 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
- 
--	    output_verbose_link_cmd='echo'
-+	    output_verbose_link_cmd='func_echo_all'
- 
- 	    # Archives containing C++ object files must be created using
- 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -6225,14 +6749,14 @@
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
- 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
- 
- 	        # Commands to make compiler produce verbose output that lists
- 	        # what "hidden" libraries, object files and flags are used when
- 	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 	      else
- 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
- 	        # platform.
-@@ -6243,7 +6767,7 @@
- 	        # Commands to make compiler produce verbose output that lists
- 	        # what "hidden" libraries, object files and flags are used when
- 	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 	      fi
- 
- 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-@@ -6297,6 +6821,10 @@
-           CC*)
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-+	      '"$_LT_TAGVAR(reload_cmds, $1)"
- 	    ;;
- 	  *)
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -6352,6 +6880,7 @@
-   fi # test -n "$compiler"
- 
-   CC=$lt_save_CC
-+  CFLAGS=$lt_save_CFLAGS
-   LDCXX=$LD
-   LD=$lt_save_LD
-   GCC=$lt_save_GCC
-@@ -6366,6 +6895,29 @@
- ])# _LT_LANG_CXX_CONFIG
- 
- 
-+# _LT_FUNC_STRIPNAME_CNF
-+# ----------------------
-+# func_stripname_cnf prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+#
-+# This function is identical to the (non-XSI) version of func_stripname,
-+# except this one can be used by m4 code that may be executed by configure,
-+# rather than the libtool script.
-+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-+AC_REQUIRE([_LT_DECL_SED])
-+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-+func_stripname_cnf ()
-+{
-+  case ${2} in
-+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+  esac
-+} # func_stripname_cnf
-+])# _LT_FUNC_STRIPNAME_CNF
-+
- # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
- # ---------------------------------
- # Figure out "hidden" library dependencies from verbose
-@@ -6374,6 +6926,7 @@
- # objects, libraries and library flags.
- m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
- [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
- # Dependencies to place before and after the object being linked:
- _LT_TAGVAR(predep_objects, $1)=
- _LT_TAGVAR(postdep_objects, $1)=
-@@ -6423,7 +6976,20 @@
-   }
- };
- _LT_EOF
-+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-+package foo
-+func foo() {
-+}
-+_LT_EOF
- ])
-+
-+_lt_libdeps_save_CFLAGS=$CFLAGS
-+case "$CC $CFLAGS " in #(
-+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-+esac
-+
- dnl Parse the compiler output and extract the necessary
- dnl objects, libraries and library flags.
- if AC_TRY_EVAL(ac_compile); then
-@@ -6435,7 +7001,7 @@
-   pre_test_object_deps_done=no
- 
-   for p in `eval "$output_verbose_link_cmd"`; do
--    case $p in
-+    case ${prev}${p} in
- 
-     -L* | -R* | -l*)
-        # Some compilers place space between "-{L,R}" and the path.
-@@ -6444,13 +7010,22 @@
-           test $p = "-R"; then
- 	 prev=$p
- 	 continue
--       else
--	 prev=
-        fi
- 
-+       # Expand the sysroot to ease extracting the directories later.
-+       if test -z "$prev"; then
-+         case $p in
-+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-+         esac
-+       fi
-+       case $p in
-+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-+       esac
-        if test "$pre_test_object_deps_done" = no; then
--	 case $p in
--	 -L* | -R*)
-+	 case ${prev} in
-+	 -L | -R)
- 	   # Internal compiler library paths should come after those
- 	   # provided the user.  The postdeps already come after the
- 	   # user supplied libs so there is no need to process them.
-@@ -6470,8 +7045,10 @@
- 	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
- 	 fi
-        fi
-+       prev=
-        ;;
- 
-+    *.lto.$objext) ;; # Ignore GCC LTO objects
-     *.$objext)
-        # This assumes that the test object file only shows up
-        # once in the compiler output.
-@@ -6507,6 +7084,7 @@
- fi
- 
- $RM -f confest.$objext
-+CFLAGS=$_lt_libdeps_save_CFLAGS
- 
- # PORTME: override above test on systems where it is broken
- m4_if([$1], [CXX],
-@@ -6543,7 +7121,7 @@
- 
- solaris*)
-   case $cc_basename in
--  CC*)
-+  CC* | sunCC*)
-     # The more standards-conforming stlport4 library is
-     # incompatible with the Cstd library. Avoid specifying
-     # it if it's in CXXFLAGS. Ignore libCrun as
-@@ -6587,32 +7165,16 @@
- ])# _LT_SYS_HIDDEN_LIBDEPS
- 
- 
--# _LT_PROG_F77
--# ------------
--# Since AC_PROG_F77 is broken, in that it returns the empty string
--# if there is no fortran compiler, we have our own version here.
--m4_defun([_LT_PROG_F77],
--[
--pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
--AC_PROG_F77
--if test -z "$F77" || test "X$F77" = "Xno"; then
--  _lt_disable_F77=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_F77
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_F77], [])
--
--
- # _LT_LANG_F77_CONFIG([TAG])
- # --------------------------
- # Ensure that the configuration variables for a Fortran 77 compiler are
- # suitably defined.  These variables are subsequently used by _LT_CONFIG
- # to write the compiler configuration to `libtool'.
- m4_defun([_LT_LANG_F77_CONFIG],
--[AC_REQUIRE([_LT_PROG_F77])dnl
--AC_LANG_PUSH(Fortran 77)
-+[AC_LANG_PUSH(Fortran 77)
-+if test -z "$F77" || test "X$F77" = "Xno"; then
-+  _lt_disable_F77=yes
-+fi
- 
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6622,7 +7184,6 @@
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_automatic, $1)=no
-@@ -6631,6 +7192,8 @@
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
- _LT_TAGVAR(no_undefined_flag, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6670,7 +7233,9 @@
-   # Allow CC to be a program name with arguments.
-   lt_save_CC="$CC"
-   lt_save_GCC=$GCC
-+  lt_save_CFLAGS=$CFLAGS
-   CC=${F77-"f77"}
-+  CFLAGS=$FFLAGS
-   compiler=$CC
-   _LT_TAGVAR(compiler, $1)=$CC
-   _LT_CC_BASENAME([$compiler])
-@@ -6724,38 +7289,24 @@
- 
-   GCC=$lt_save_GCC
-   CC="$lt_save_CC"
-+  CFLAGS="$lt_save_CFLAGS"
- fi # test "$_lt_disable_F77" != yes
- 
- AC_LANG_POP
- ])# _LT_LANG_F77_CONFIG
- 
- 
--# _LT_PROG_FC
--# -----------
--# Since AC_PROG_FC is broken, in that it returns the empty string
--# if there is no fortran compiler, we have our own version here.
--m4_defun([_LT_PROG_FC],
--[
--pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
--AC_PROG_FC
--if test -z "$FC" || test "X$FC" = "Xno"; then
--  _lt_disable_FC=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_FC
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_FC], [])
--
--
- # _LT_LANG_FC_CONFIG([TAG])
- # -------------------------
- # Ensure that the configuration variables for a Fortran compiler are
- # suitably defined.  These variables are subsequently used by _LT_CONFIG
- # to write the compiler configuration to `libtool'.
- m4_defun([_LT_LANG_FC_CONFIG],
--[AC_REQUIRE([_LT_PROG_FC])dnl
--AC_LANG_PUSH(Fortran)
-+[AC_LANG_PUSH(Fortran)
-+
-+if test -z "$FC" || test "X$FC" = "Xno"; then
-+  _lt_disable_FC=yes
-+fi
- 
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6765,7 +7316,6 @@
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_automatic, $1)=no
-@@ -6774,6 +7324,8 @@
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
- _LT_TAGVAR(no_undefined_flag, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6813,7 +7365,9 @@
-   # Allow CC to be a program name with arguments.
-   lt_save_CC="$CC"
-   lt_save_GCC=$GCC
-+  lt_save_CFLAGS=$CFLAGS
-   CC=${FC-"f95"}
-+  CFLAGS=$FCFLAGS
-   compiler=$CC
-   GCC=$ac_cv_fc_compiler_gnu
- 
-@@ -6869,7 +7423,8 @@
-   fi # test -n "$compiler"
- 
-   GCC=$lt_save_GCC
--  CC="$lt_save_CC"
-+  CC=$lt_save_CC
-+  CFLAGS=$lt_save_CFLAGS
- fi # test "$_lt_disable_FC" != yes
- 
- AC_LANG_POP
-@@ -6906,10 +7461,12 @@
- _LT_LINKER_BOILERPLATE
- 
- # Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
-+lt_save_CC=$CC
-+lt_save_CFLAGS=$CFLAGS
- lt_save_GCC=$GCC
- GCC=yes
- CC=${GCJ-"gcj"}
-+CFLAGS=$GCJFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_TAGVAR(LD, $1)="$LD"
-@@ -6919,6 +7476,8 @@
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- 
- _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
- 
- if test -n "$compiler"; then
-   _LT_COMPILER_NO_RTTI($1)
-@@ -6934,10 +7493,78 @@
- AC_LANG_RESTORE
- 
- GCC=$lt_save_GCC
--CC="$lt_save_CC"
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
- ])# _LT_LANG_GCJ_CONFIG
- 
- 
-+# _LT_LANG_GO_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Go compiler
-+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GO_CONFIG],
-+[AC_REQUIRE([LT_PROG_GO])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Go test sources.
-+ac_ext=go
-+
-+# Object file extension for compiled Go test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="package main; func main() { }"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='package main; func main() { }'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC=$CC
-+lt_save_CFLAGS=$CFLAGS
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GOC-"gccgo"}
-+CFLAGS=$GOFLAGS
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
-+
-+# Go did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(reload_flag, $1)=$reload_flag
-+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-+
-+if test -n "$compiler"; then
-+  _LT_COMPILER_NO_RTTI($1)
-+  _LT_COMPILER_PIC($1)
-+  _LT_COMPILER_C_O($1)
-+  _LT_COMPILER_FILE_LOCKS($1)
-+  _LT_LINKER_SHLIBS($1)
-+  _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+  _LT_CONFIG($1)
-+fi
-+
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
-+])# _LT_LANG_GO_CONFIG
-+
-+
- # _LT_LANG_RC_CONFIG([TAG])
- # -------------------------
- # Ensure that the configuration variables for the Windows resource compiler
-@@ -6969,9 +7596,11 @@
- 
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
-+lt_save_CFLAGS=$CFLAGS
- lt_save_GCC=$GCC
- GCC=
- CC=${RC-"windres"}
-+CFLAGS=
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-@@ -6984,7 +7613,8 @@
- 
- GCC=$lt_save_GCC
- AC_LANG_RESTORE
--CC="$lt_save_CC"
-+CC=$lt_save_CC
-+CFLAGS=$lt_save_CFLAGS
- ])# _LT_LANG_RC_CONFIG
- 
- 
-@@ -7004,6 +7634,13 @@
- dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
- 
- 
-+# LT_PROG_GO
-+# ----------
-+AC_DEFUN([LT_PROG_GO],
-+[AC_CHECK_TOOL(GOC, gccgo,)
-+])
-+
-+
- # LT_PROG_RC
- # ----------
- AC_DEFUN([LT_PROG_RC],
-@@ -7043,6 +7680,15 @@
- AC_SUBST([OBJDUMP])
- ])
- 
-+# _LT_DECL_DLLTOOL
-+# ----------------
-+# Ensure DLLTOOL variable is set.
-+m4_defun([_LT_DECL_DLLTOOL],
-+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-+AC_SUBST([DLLTOOL])
-+])
- 
- # _LT_DECL_SED
- # ------------
-@@ -7134,8 +7780,8 @@
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
--  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
--      = c,a/b,, \
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,b/c, \
-     && eval 'test $(( 1 + 1 )) -eq 2 \
-     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-   && xsi_shell=yes
-@@ -7174,222 +7820,177 @@
- ])# _LT_CHECK_SHELL_FEATURES
- 
- 
--# _LT_PROG_XSI_SHELLFNS
--# ---------------------
--# Bourne and XSI compatible variants of some useful shell functions.
--m4_defun([_LT_PROG_XSI_SHELLFNS],
--[case $xsi_shell in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--}
--
--# func_basename file
--func_basename ()
--{
--  func_basename_result="${1##*/}"
--}
--
--# func_dirname_and_basename file append nondir_replacement
--# perform func_basename and func_dirname in a single function
--# call:
--#   dirname:  Compute the dirname of FILE.  If nonempty,
--#             add APPEND to the result, otherwise set result
--#             to NONDIR_REPLACEMENT.
--#             value returned in "$func_dirname_result"
--#   basename: Compute filename of FILE.
--#             value retuned in "$func_basename_result"
--# Implementation must be kept synchronized with func_dirname
--# and func_basename. For efficiency, we do not delegate to
--# those functions but instead duplicate the functionality here.
--func_dirname_and_basename ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--  func_basename_result="${1##*/}"
--}
--
--# func_stripname prefix suffix name
--# strip PREFIX and SUFFIX off of NAME.
--# PREFIX and SUFFIX must not contain globbing or regex special
--# characters, hashes, percent signs, but SUFFIX may contain a leading
--# dot (in which case that matches only a dot).
--func_stripname ()
--{
--  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
--  # positional parameters, so assign one to ordinary parameter first.
--  func_stripname_result=${3}
--  func_stripname_result=${func_stripname_result#"${1}"}
--  func_stripname_result=${func_stripname_result%"${2}"}
--}
--
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=${1%%=*}
--  func_opt_split_arg=${1#*=}
--}
--
--# func_lo2o object
--func_lo2o ()
--{
--  case ${1} in
--    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
--    *)    func_lo2o_result=${1} ;;
--  esac
--}
--
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=${1%.*}.lo
--}
--
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=$(( $[*] ))
--}
-+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-+# ------------------------------------------------------
-+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-+m4_defun([_LT_PROG_FUNCTION_REPLACE],
-+[dnl {
-+sed -e '/^$1 ()$/,/^} # $1 /c\
-+$1 ()\
-+{\
-+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+])
- 
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=${#1}
--}
- 
--_LT_EOF
--    ;;
--  *) # Bourne compatible functions.
--    cat << \_LT_EOF >> "$cfgfile"
-+# _LT_PROG_REPLACE_SHELLFNS
-+# -------------------------
-+# Replace existing portable implementations of several shell functions with
-+# equivalent extended shell implementations where those features are available..
-+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-+[if test x"$xsi_shell" = xyes; then
-+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-+    case ${1} in
-+      */*) func_dirname_result="${1%/*}${2}" ;;
-+      *  ) func_dirname_result="${3}" ;;
-+    esac])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-+    func_basename_result="${1##*/}"])
-+
-+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-+    case ${1} in
-+      */*) func_dirname_result="${1%/*}${2}" ;;
-+      *  ) func_dirname_result="${3}" ;;
-+    esac
-+    func_basename_result="${1##*/}"])
- 
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
--  # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
--  if test "X$func_dirname_result" = "X${1}"; then
--    func_dirname_result="${3}"
--  else
--    func_dirname_result="$func_dirname_result${2}"
--  fi
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+    # positional parameters, so assign one to ordinary parameter first.
-+    func_stripname_result=${3}
-+    func_stripname_result=${func_stripname_result#"${1}"}
-+    func_stripname_result=${func_stripname_result%"${2}"}])
- 
--# func_basename file
--func_basename ()
--{
--  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-+    func_split_long_opt_name=${1%%=*}
-+    func_split_long_opt_arg=${1#*=}])
- 
--dnl func_dirname_and_basename
--dnl A portable version of this function is already defined in general.m4sh
--dnl so there is no need for it here.
-+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-+    func_split_short_opt_arg=${1#??}
-+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
- 
--# func_stripname prefix suffix name
--# strip PREFIX and SUFFIX off of NAME.
--# PREFIX and SUFFIX must not contain globbing or regex special
--# characters, hashes, percent signs, but SUFFIX may contain a leading
--# dot (in which case that matches only a dot).
--# func_strip_suffix prefix name
--func_stripname ()
--{
--  case ${2} in
--    .*) func_stripname_result=`$ECHO "X${3}" \
--           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
--    *)  func_stripname_result=`$ECHO "X${3}" \
--           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
--  esac
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-+    case ${1} in
-+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+      *)    func_lo2o_result=${1} ;;
-+    esac])
- 
--# sed scripts:
--my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
--my_sed_long_arg='1s/^-[[^=]]*=//'
-+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
- 
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
--  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
- 
--# func_lo2o object
--func_lo2o ()
--{
--  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-+fi
- 
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
--}
-+if test x"$lt_shell_append" = xyes; then
-+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
- 
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=`expr "$[@]"`
--}
-+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-+    func_quote_for_eval "${2}"
-+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
- 
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
--}
-+  # Save a `func_append' function call where possible by direct use of '+='
-+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+else
-+  # Save a `func_append' function call even when '+=' is not available
-+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+fi
- 
--_LT_EOF
--esac
-+if test x"$_lt_function_replace_fail" = x":"; then
-+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-+fi
-+])
- 
--case $lt_shell_append in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]+=\$[2]"
--}
--_LT_EOF
-+# _LT_PATH_CONVERSION_FUNCTIONS
-+# -----------------------------
-+# Determine which file name conversion functions should be used by
-+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-+# for certain cross-compile configurations and native mingw.
-+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_MSG_CHECKING([how to convert $build file names to $host format])
-+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-+[case $host in
-+  *-*-mingw* )
-+    case $build in
-+      *-*-mingw* ) # actually msys
-+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-+        ;;
-+      *-*-cygwin* )
-+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-+        ;;
-+      * ) # otherwise, assume *nix
-+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-+        ;;
-+    esac
-     ;;
--  *)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]=\$$[1]\$[2]"
--}
--
--_LT_EOF
-+  *-*-cygwin* )
-+    case $build in
-+      *-*-mingw* ) # actually msys
-+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-+        ;;
-+      *-*-cygwin* )
-+        lt_cv_to_host_file_cmd=func_convert_file_noop
-+        ;;
-+      * ) # otherwise, assume *nix
-+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-+        ;;
-+    esac
-     ;;
--  esac
-+  * ) # unhandled hosts (and "normal" native builds)
-+    lt_cv_to_host_file_cmd=func_convert_file_noop
-+    ;;
-+esac
- ])
-+to_host_file_cmd=$lt_cv_to_host_file_cmd
-+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-+         [0], [convert $build file names to $host format])dnl
-+
-+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-+[#assume ordinary cross tools, or native build.
-+lt_cv_to_tool_file_cmd=func_convert_file_noop
-+case $host in
-+  *-*-mingw* )
-+    case $build in
-+      *-*-mingw* ) # actually msys
-+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-+        ;;
-+    esac
-+    ;;
-+esac
-+])
-+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-+         [0], [convert $build files to toolchain format])dnl
-+])# _LT_PATH_CONVERSION_FUNCTIONS
- 
- # Helper functions for option handling.                    -*- Autoconf -*-
- #
--#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-+#   Inc.
- #   Written by Gary V. Vaughan, 2004
- #
- # This file is free software; the Free Software Foundation gives
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
- 
--# serial 6 ltoptions.m4
-+# serial 7 ltoptions.m4
- 
- # This is to help aclocal find these macros, as it can't see m4_define.
- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-@@ -7504,7 +8105,7 @@
- [enable_win32_dll=yes
- 
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-   AC_CHECK_TOOL(AS, as, false)
-   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -7512,13 +8113,13 @@
- esac
- 
- test -z "$AS" && AS=as
--_LT_DECL([], [AS],      [0], [Assembler program])dnl
-+_LT_DECL([], [AS],      [1], [Assembler program])dnl
- 
- test -z "$DLLTOOL" && DLLTOOL=dlltool
--_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
- 
- test -z "$OBJDUMP" && OBJDUMP=objdump
--_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
- ])# win32-dll
- 
- AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-@@ -7704,9 +8305,24 @@
- # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
- m4_define([_LT_WITH_PIC],
- [AC_ARG_WITH([pic],
--    [AS_HELP_STRING([--with-pic],
-+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
- 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
--    [pic_mode="$withval"],
-+    [lt_p=${PACKAGE-default}
-+    case $withval in
-+    yes|no) pic_mode=$withval ;;
-+    *)
-+      pic_mode=default
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for lt_pkg in $withval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$lt_pkg" = "X$lt_p"; then
-+	  pic_mode=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-     [pic_mode=default])
- 
- test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-@@ -7876,31 +8492,31 @@
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
- 
--# Generated from ltversion.in.
-+# @configure_input@
- 
--# serial 3012 ltversion.m4
-+# serial 3337 ltversion.m4
- # This file is part of GNU Libtool
- 
--m4_define([LT_PACKAGE_VERSION], [2.2.6])
--m4_define([LT_PACKAGE_REVISION], [1.3012])
-+m4_define([LT_PACKAGE_VERSION], [2.4.2])
-+m4_define([LT_PACKAGE_REVISION], [1.3337])
- 
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.6'
--macro_revision='1.3012'
-+[macro_version='2.4.2'
-+macro_revision='1.3337'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
- 
- # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
- #
--#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
- #   Written by Scott James Remnant, 2004.
- #
- # This file is free software; the Free Software Foundation gives
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
- 
--# serial 4 lt~obsolete.m4
-+# serial 5 lt~obsolete.m4
- 
- # These exist entirely to fool aclocal when bootstrapping libtool.
- #
-@@ -7970,7 +8586,6 @@
- m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
- m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
- m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
--m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
- m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
- m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
- m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-@@ -7983,8 +8598,16 @@
- m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
- m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
- m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
- 
- # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-+# serial 1 (pkg-config-0.24)
- # 
- # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
- #
-@@ -8011,8 +8634,12 @@
- # ----------------------------------
- AC_DEFUN([PKG_PROG_PKG_CONFIG],
- [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
--m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
--AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-+
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
- fi
-@@ -8025,7 +8652,6 @@
- 		AC_MSG_RESULT([no])
- 		PKG_CONFIG=""
- 	fi
--		
- fi[]dnl
- ])# PKG_PROG_PKG_CONFIG
- 
-@@ -8034,34 +8660,32 @@
- # Check to see whether a particular set of modules exists.  Similar
- # to PKG_CHECK_MODULES(), but does not set variables or print errors.
- #
--#
--# Similar to PKG_CHECK_MODULES, make sure that the first instance of
--# this or PKG_CHECK_MODULES is called, or make sure to call
--# PKG_CHECK_EXISTS manually
-+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+# only at the first occurence in configure.ac, so if the first place
-+# it's called might be skipped (such as if it is within an "if", you
-+# have to call PKG_CHECK_EXISTS manually
- # --------------------------------------------------------------
- AC_DEFUN([PKG_CHECK_EXISTS],
- [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
- if test -n "$PKG_CONFIG" && \
-     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
--  m4_ifval([$2], [$2], [:])
-+  m4_default([$2], [:])
- m4_ifvaln([$3], [else
-   $3])dnl
- fi])
- 
--
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$PKG_CONFIG"; then
--    if test -n "$$1"; then
--        pkg_cv_[]$1="$$1"
--    else
--        PKG_CHECK_EXISTS([$3],
--                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
--			 [pkg_failed=yes])
--    fi
--else
--	pkg_failed=untried
-+[if test -n "$$1"; then
-+    pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+    PKG_CHECK_EXISTS([$3],
-+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes ],
-+		     [pkg_failed=yes])
-+ else
-+    pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
- 
-@@ -8103,16 +8727,17 @@
- See the pkg-config man page for more details.])
- 
- if test $pkg_failed = yes; then
-+   	AC_MSG_RESULT([no])
-         _PKG_SHORT_ERRORS_SUPPORTED
-         if test $_pkg_short_errors_supported = yes; then
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-         else 
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- 
--	ifelse([$4], , [AC_MSG_ERROR(dnl
-+	m4_default([$4], [AC_MSG_ERROR(
- [Package requirements ($2) were not met:
- 
- $$1_PKG_ERRORS
-@@ -8120,25 +8745,24 @@
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--_PKG_TEXT
--])],
--		[AC_MSG_RESULT([no])
--                $4])
-+_PKG_TEXT])[]dnl
-+        ])
- elif test $pkg_failed = untried; then
--	ifelse([$4], , [AC_MSG_FAILURE(dnl
-+     	AC_MSG_RESULT([no])
-+	m4_default([$4], [AC_MSG_FAILURE(
- [The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
- _PKG_TEXT
- 
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
--		[$4])
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-+        ])
- else
- 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-         AC_MSG_RESULT([yes])
--	ifelse([$3], , :, [$3])
-+	$3
- fi[]dnl
- ])# PKG_CHECK_MODULES
- 
-@@ -8157,7 +8781,7 @@
- [am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version.  Point them to the right macro.
--m4_if([$1], [1.11], [],
-+m4_if([$1], [1.11.1], [],
-       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
- 
-@@ -8173,7 +8797,7 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-Only in src/hal-0.5.14: autom4te.cache
-Only in src/hal-0.5.14: config.h
-Only in src/hal-0.5.14: config.log
-Only in src/hal-0.5.14: config.status
-diff -u -r hal-0.5.14/configure src/hal-0.5.14/configure
---- hal-0.5.14/configure	2009-11-30 23:22:33.000000000 +0100
-+++ src/hal-0.5.14/configure	2011-12-19 20:40:11.000000000 +0100
-@@ -1,13 +1,15 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for hal 0.5.14.
-+# Generated by GNU Autoconf 2.68 for hal 0.5.14.
- #
- # Report bugs to <david@fubar.dk>.
- #
-+#
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
- # Foundation, Inc.
- #
-+#
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## -------------------- ##
-@@ -89,6 +91,7 @@
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
-+as_myself=
- case $0 in #((
-   *[\\/]* ) as_myself=$0 ;;
-   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -171,7 +174,15 @@
-   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
--test \$(( 1 + 1 )) = 2 || exit 1"
-+test \$(( 1 + 1 )) = 2 || exit 1
-+
-+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-+    PATH=/empty FPATH=/empty; export PATH FPATH
-+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
-   if (eval "$as_required") 2>/dev/null; then :
-   as_have_required=yes
- else
-@@ -214,11 +225,18 @@
-   # We cannot yet assume a decent shell, so we have to provide a
- 	# neutralization value for shells without unset; and this also
- 	# works around shells that cannot unset nonexistent variables.
-+	# Preserve -v and -x to the replacement shell.
- 	BASH_ENV=/dev/null
- 	ENV=/dev/null
- 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- 	export CONFIG_SHELL
--	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+	case $- in # ((((
-+	  *v*x* | *x*v* ) as_opts=-vx ;;
-+	  *v* ) as_opts=-v ;;
-+	  *x* ) as_opts=-x ;;
-+	  * ) as_opts= ;;
-+	esac
-+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
- fi
- 
-     if test x$as_have_required = xno; then :
-@@ -317,7 +335,7 @@
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
- 
- 
- } # as_fn_mkdir_p
-@@ -357,19 +375,19 @@
- fi # as_fn_arith
- 
- 
--# as_fn_error ERROR [LINENO LOG_FD]
--# ---------------------------------
-+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-+# ----------------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with status $?, using 1 if that was 0.
-+# script with STATUS, using 1 if that was 0.
- as_fn_error ()
- {
--  as_status=$?; test $as_status -eq 0 && as_status=1
--  if test "$3"; then
--    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  as_status=$1; test $as_status -eq 0 && as_status=1
-+  if test "$4"; then
-+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-   fi
--  $as_echo "$as_me: error: $1" >&2
-+  $as_echo "$as_me: error: $2" >&2
-   as_fn_exit $as_status
- } # as_fn_error
- 
-@@ -526,160 +544,14 @@
- # Sed expression to map a string onto a valid variable name.
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
--
--
--# Check that we are running under the correct shell.
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
--case X$lt_ECHO in
--X*--fallback-echo)
--  # Remove one level of quotation (which was required for Make).
--  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
--  ;;
--esac
--
--ECHO=${lt_ECHO-echo}
--if test "X$1" = X--no-reexec; then
--  # Discard the --no-reexec flag, and continue.
--  shift
--elif test "X$1" = X--fallback-echo; then
--  # Avoid inline document here, it may be left over
--  :
--elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
--  # Yippee, $ECHO works!
--  :
--else
--  # Restart under the correct shell.
--  exec $SHELL "$0" --no-reexec ${1+"$@"}
--fi
--
--if test "X$1" = X--fallback-echo; then
--  # used as fallback echo
--  shift
--  cat <<_LT_EOF
--$*
--_LT_EOF
--  exit 0
--fi
--
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--
--if test -z "$lt_ECHO"; then
--  if test "X${echo_test_string+set}" != Xset; then
--    # find a string as large as possible, as long as the shell can cope with it
--    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
--      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
--	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
--      then
--        break
--      fi
--    done
--  fi
--
--  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
--     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
--     test "X$echo_testing_string" = "X$echo_test_string"; then
--    :
--  else
--    # The Solaris, AIX, and Digital Unix default echo programs unquote
--    # backslashes.  This makes it impossible to quote backslashes using
--    #   echo "$something" | sed 's/\\/\\\\/g'
--    #
--    # So, first we look for a working echo in the user's PATH.
--
--    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--    for dir in $PATH /usr/ucb; do
--      IFS="$lt_save_ifs"
--      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
--         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
--         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
--         test "X$echo_testing_string" = "X$echo_test_string"; then
--        ECHO="$dir/echo"
--        break
--      fi
--    done
--    IFS="$lt_save_ifs"
--
--    if test "X$ECHO" = Xecho; then
--      # We didn't find a better echo, so look for alternatives.
--      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
--         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
--         test "X$echo_testing_string" = "X$echo_test_string"; then
--        # This shell has a builtin print -r that does the trick.
--        ECHO='print -r'
--      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
--	   test "X$CONFIG_SHELL" != X/bin/ksh; then
--        # If we have ksh, try running configure again with it.
--        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
--        export ORIGINAL_CONFIG_SHELL
--        CONFIG_SHELL=/bin/ksh
--        export CONFIG_SHELL
--        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
--      else
--        # Try using printf.
--        ECHO='printf %s\n'
--        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
--	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
--	   test "X$echo_testing_string" = "X$echo_test_string"; then
--	  # Cool, printf works
--	  :
--        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
--	     test "X$echo_testing_string" = 'X\t' &&
--	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	     test "X$echo_testing_string" = "X$echo_test_string"; then
--	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
--	  export CONFIG_SHELL
--	  SHELL="$CONFIG_SHELL"
--	  export SHELL
--	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
--        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
--	     test "X$echo_testing_string" = 'X\t' &&
--	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	     test "X$echo_testing_string" = "X$echo_test_string"; then
--	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
--        else
--	  # maybe with a smaller string...
--	  prev=:
--
--	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
--	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
--	    then
--	      break
--	    fi
--	    prev="$cmd"
--	  done
--
--	  if test "$prev" != 'sed 50q "$0"'; then
--	    echo_test_string=`eval $prev`
--	    export echo_test_string
--	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
--	  else
--	    # Oops.  We lost completely, so just stick with echo.
--	    ECHO=echo
--	  fi
--        fi
--      fi
--    fi
--  fi
--fi
--
--# Copy echo and quote the copy suitably for passing to libtool from
--# the Makefile, instead of quoting the original, which is used later.
--lt_ECHO=$ECHO
--if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
--   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
--fi
--
--
--
- 
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
- 
- # Name of the host.
--# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
-@@ -860,6 +732,8 @@
- USB_IDS_DIR
- PCI_IDS_DIR
- udev_prefix
-+PKG_CONFIG_LIBDIR
-+PKG_CONFIG_PATH
- PKG_CONFIG
- CXXCPP
- OTOOL64
-@@ -867,9 +741,11 @@
- LIPO
- NMEDIT
- DSYMUTIL
--lt_ECHO
-+MANIFEST_TOOL
- RANLIB
-+ac_ct_AR
- AR
-+DLLTOOL
- OBJDUMP
- LN_S
- NM
-@@ -992,6 +868,7 @@
- with_pic
- enable_fast_install
- with_gnu_ld
-+with_sysroot
- enable_libtool_lock
- enable_largefile
- with_os_type
-@@ -1058,6 +935,8 @@
- CPP
- CXXCPP
- PKG_CONFIG
-+PKG_CONFIG_PATH
-+PKG_CONFIG_LIBDIR
- PARTED_CFLAGS
- PARTED_LIBS
- POLKIT_CFLAGS
-@@ -1132,8 +1011,9 @@
-   fi
- 
-   case $ac_option in
--  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
--  *)	ac_optarg=yes ;;
-+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *=)   ac_optarg= ;;
-+  *)    ac_optarg=yes ;;
-   esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1178,7 +1058,7 @@
-     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error "invalid feature name: $ac_useropt"
-+      as_fn_error $? "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1204,7 +1084,7 @@
-     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error "invalid feature name: $ac_useropt"
-+      as_fn_error $? "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1408,7 +1288,7 @@
-     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error "invalid package name: $ac_useropt"
-+      as_fn_error $? "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1424,7 +1304,7 @@
-     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error "invalid package name: $ac_useropt"
-+      as_fn_error $? "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1454,8 +1334,8 @@
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries=$ac_optarg ;;
- 
--  -*) as_fn_error "unrecognized option: \`$ac_option'
--Try \`$0 --help' for more information."
-+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information"
-     ;;
- 
-   *=*)
-@@ -1463,7 +1343,7 @@
-     # Reject names that are not valid shell variable names.
-     case $ac_envvar in #(
-       '' | [0-9]* | *[!_$as_cr_alnum]* )
--      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-     esac
-     eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
-@@ -1473,7 +1353,7 @@
-     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
--    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-     ;;
- 
-   esac
-@@ -1481,13 +1361,13 @@
- 
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  as_fn_error "missing argument to $ac_option"
-+  as_fn_error $? "missing argument to $ac_option"
- fi
- 
- if test -n "$ac_unrecognized_opts"; then
-   case $enable_option_checking in
-     no) ;;
--    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-   esac
- fi
-@@ -1510,7 +1390,7 @@
-     [\\/$]* | ?:[\\/]* )  continue;;
-     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
--  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -1524,8 +1404,8 @@
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
--    If a cross compiler is detected then cross compile mode will be used." >&2
-+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used" >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-   fi
-@@ -1540,9 +1420,9 @@
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
--  as_fn_error "working directory cannot be determined"
-+  as_fn_error $? "working directory cannot be determined"
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
--  as_fn_error "pwd does not report name of working directory"
-+  as_fn_error $? "pwd does not report name of working directory"
- 
- 
- # Find the source files, if location was not specified.
-@@ -1581,11 +1461,11 @@
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
--  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
--	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
- 	pwd)`
- # When building in place, set srcdir=.
- if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1625,7 +1505,7 @@
-       --help=short        display options specific to this package
-       --help=recursive    display the short help of all the included packages
-   -V, --version           display version information and exit
--  -q, --quiet, --silent   do not print \`checking...' messages
-+  -q, --quiet, --silent   do not print \`checking ...' messages
-       --cache-file=FILE   cache test results in FILE [disabled]
-   -C, --config-cache      alias for \`--cache-file=config.cache'
-   -n, --no-create         do not create output files
-@@ -1708,7 +1588,7 @@
-   --enable-verbose-mode   support verbose debug mode
-   --enable-docbook-docs   build documentation (requires xmlto)
-   --enable-man-pages      build manual pages
--  --enable-gtk-doc        use gtk-doc to build documentation default=yes
-+  --enable-gtk-doc        use gtk-doc to build documentation [default=yes]
-   --disable-acpi-acpid    Do not use ACPI daemon event source
-   --disable-acpi-proc     Do not use ACPI kernel-interface directly
-   --enable-acpi-ibm       Forward IBM ACPI events
-@@ -1729,9 +1609,11 @@
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
--  --with-pic              try to use only PIC/non-PIC objects [default=use
-+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                           both]
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-+  --with-sysroot=DIR Search for dependent libraries within DIR
-+                        (or the compiler's sysroot if not specified).
-   --with-os-type=<os>     Distribution or OS (redhat)
-   --with-pid-file=<file>  PID file for HAL daemon
-   --with-hwdata=<dir>     Where PCI and USB IDs are found
-@@ -1766,13 +1648,17 @@
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
-   LIBS        libraries to pass to the linker, e.g. -l<library>
--  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CXX         C++ compiler command
-   CXXFLAGS    C++ compiler flags
-   CPP         C preprocessor
-   CXXCPP      C++ preprocessor
-   PKG_CONFIG  path to pkg-config utility
-+  PKG_CONFIG_PATH
-+              directories to add to pkg-config's search path
-+  PKG_CONFIG_LIBDIR
-+              path overriding pkg-config's built-in search path
-   PARTED_CFLAGS
-               C compiler flags for PARTED, overriding pkg-config
-   PARTED_LIBS linker flags for PARTED, overriding pkg-config
-@@ -1858,9 +1744,9 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- hal configure 0.5.14
--generated by GNU Autoconf 2.64
-+generated by GNU Autoconf 2.68
- 
--Copyright (C) 2009 Free Software Foundation, Inc.
-+Copyright (C) 2010 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1904,8 +1790,8 @@
- 
- 	ac_retval=1
- fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_compile
- 
-@@ -1950,8 +1836,8 @@
-   # interfere with the next link command; also delete a directory that is
-   # left behind by Apple's compiler.  We do this before executing the actions.
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_link
- 
-@@ -1988,8 +1874,8 @@
- 
- 	ac_retval=1
- fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_cxx_try_compile
- 
-@@ -2014,7 +1900,7 @@
-     mv -f conftest.er1 conftest.err
-   fi
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } >/dev/null && {
-+  test $ac_status = 0; } > conftest.i && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then :
-@@ -2025,8 +1911,8 @@
- 
-     ac_retval=1
- fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_cpp
- 
-@@ -2067,8 +1953,8 @@
-        ac_retval=$ac_status
- fi
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_run
- 
-@@ -2081,7 +1967,7 @@
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${$3+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2099,7 +1985,7 @@
- eval ac_res=\$$3
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- 
- } # ac_fn_c_check_header_compile
- 
-@@ -2111,7 +1997,7 @@
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${$3+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2166,7 +2052,7 @@
- eval ac_res=\$$3
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- 
- } # ac_fn_c_check_func
- 
-@@ -2191,7 +2077,7 @@
-     mv -f conftest.er1 conftest.err
-   fi
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } >/dev/null && {
-+  test $ac_status = 0; } > conftest.i && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then :
-@@ -2202,8 +2088,8 @@
- 
-     ac_retval=1
- fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_cxx_try_cpp
- 
-@@ -2248,8 +2134,8 @@
-   # interfere with the next link command; also delete a directory that is
-   # left behind by Apple's compiler.  We do this before executing the actions.
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_cxx_try_link
- 
-@@ -2261,10 +2147,10 @@
- ac_fn_c_check_header_mongrel ()
- {
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  if eval \${$3+:} false; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${$3+:} false; then :
-   $as_echo_n "(cached) " >&6
- fi
- eval ac_res=\$$3
-@@ -2300,7 +2186,7 @@
- else
-   ac_header_preproc=no
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
- 
-@@ -2323,17 +2209,15 @@
- $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--( cat <<\_ASBOX
--## ----------------------------- ##
-+( $as_echo "## ----------------------------- ##
- ## Report this to david@fubar.dk ##
--## ----------------------------- ##
--_ASBOX
-+## ----------------------------- ##"
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${$3+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=\$ac_header_compiler"
-@@ -2342,7 +2226,7 @@
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- 
- } # ac_fn_c_check_header_mongrel
- 
-@@ -2355,7 +2239,7 @@
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${$3+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=no"
-@@ -2396,7 +2280,7 @@
- eval ac_res=\$$3
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- 
- } # ac_fn_c_check_type
- cat >config.log <<_ACEOF
-@@ -2404,7 +2288,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by hal $as_me 0.5.14, which was
--generated by GNU Autoconf 2.64.  Invocation command line was
-+generated by GNU Autoconf 2.68.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2514,11 +2398,9 @@
-   {
-     echo
- 
--    cat <<\_ASBOX
--## ---------------- ##
-+    $as_echo "## ---------------- ##
- ## Cache variables. ##
--## ---------------- ##
--_ASBOX
-+## ---------------- ##"
-     echo
-     # The following way of writing the cache mishandles newlines in values,
- (
-@@ -2552,11 +2434,9 @@
- )
-     echo
- 
--    cat <<\_ASBOX
--## ----------------- ##
-+    $as_echo "## ----------------- ##
- ## Output variables. ##
--## ----------------- ##
--_ASBOX
-+## ----------------- ##"
-     echo
-     for ac_var in $ac_subst_vars
-     do
-@@ -2569,11 +2449,9 @@
-     echo
- 
-     if test -n "$ac_subst_files"; then
--      cat <<\_ASBOX
--## ------------------- ##
-+      $as_echo "## ------------------- ##
- ## File substitutions. ##
--## ------------------- ##
--_ASBOX
-+## ------------------- ##"
-       echo
-       for ac_var in $ac_subst_files
-       do
-@@ -2587,11 +2465,9 @@
-     fi
- 
-     if test -s confdefs.h; then
--      cat <<\_ASBOX
--## ----------- ##
-+      $as_echo "## ----------- ##
- ## confdefs.h. ##
--## ----------- ##
--_ASBOX
-+## ----------- ##"
-       echo
-       cat confdefs.h
-       echo
-@@ -2646,7 +2522,12 @@
- ac_site_file1=NONE
- ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
--  ac_site_file1=$CONFIG_SITE
-+  # We do not want a PATH search for config.site.
-+  case $CONFIG_SITE in #((
-+    -*)  ac_site_file1=./$CONFIG_SITE;;
-+    */*) ac_site_file1=$CONFIG_SITE;;
-+    *)   ac_site_file1=./$CONFIG_SITE;;
-+  esac
- elif test "x$prefix" != xNONE; then
-   ac_site_file1=$prefix/share/config.site
-   ac_site_file2=$prefix/etc/config.site
-@@ -2657,18 +2538,22 @@
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-   test "x$ac_site_file" = xNONE && continue
--  if test -r "$ac_site_file"; then
-+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
--    . "$ac_site_file"
-+    . "$ac_site_file" \
-+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "failed to load site script $ac_site_file
-+See \`config.log' for more details" "$LINENO" 5; }
-   fi
- done
- 
- if test -r "$cache_file"; then
--  # Some versions of bash will fail to source /dev/null (special
--  # files actually), so we avoid doing that.
--  if test -f "$cache_file"; then
-+  # Some versions of bash will fail to source /dev/null (special files
-+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-@@ -2737,7 +2622,7 @@
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- fi
- ## -------------------- ##
- ## Main body of script. ##
-@@ -2754,16 +2639,22 @@
- 
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
--  for ac_t in install-sh install.sh shtool; do
--    if test -f "$ac_dir/$ac_t"; then
--      ac_aux_dir=$ac_dir
--      ac_install_sh="$ac_aux_dir/$ac_t -c"
--      break 2
--    fi
--  done
-+  if test -f "$ac_dir/install-sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install-sh -c"
-+    break
-+  elif test -f "$ac_dir/install.sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install.sh -c"
-+    break
-+  elif test -f "$ac_dir/shtool"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/shtool install -c"
-+    break
-+  fi
- done
- if test -z "$ac_aux_dir"; then
--  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- fi
- 
- # These three variables are undocumented and unsupported,
-@@ -2792,7 +2683,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
- $as_echo_n "checking for a BSD-compatible install... " >&6; }
- if test -z "$INSTALL"; then
--if test "${ac_cv_path_install+set}" = set; then :
-+if ${ac_cv_path_install+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2879,11 +2770,11 @@
- '
- case `pwd` in
-   *[\\\"\#\$\&\'\`$am_lf]*)
--    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
- esac
- case $srcdir in
-   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
--    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
- esac
- 
- # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2905,7 +2796,7 @@
-       # if, for instance, CONFIG_SHELL is bash and it inherits a
-       # broken ls alias from the environment.  This has actually
-       # happened.  Such a system could not be considered "sane".
--      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
- alias in your environment" "$LINENO" 5
-    fi
- 
-@@ -2915,7 +2806,7 @@
-    # Ok.
-    :
- else
--   as_fn_error "newly created file is older than distributed files!
-+   as_fn_error $? "newly created file is older than distributed files!
- Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -2969,7 +2860,7 @@
- set dummy ${ac_tool_prefix}strip; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then :
-+if ${ac_cv_prog_STRIP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-@@ -3009,7 +2900,7 @@
- set dummy strip; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_STRIP"; then
-@@ -3062,7 +2953,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
- $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
- if test -z "$MKDIR_P"; then
--  if test "${ac_cv_path_mkdir+set}" = set; then :
-+  if ${ac_cv_path_mkdir+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -3087,6 +2978,7 @@
- 
- fi
- 
-+  test -d ./--version && rmdir ./--version
-   if test "${ac_cv_path_mkdir+set}" = set; then
-     MKDIR_P="$ac_cv_path_mkdir -p"
-   else
-@@ -3094,7 +2986,6 @@
-     # value for MKDIR_P within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the value is a relative name.
--    test -d ./--version && rmdir ./--version
-     MKDIR_P="$ac_install_sh -d"
-   fi
- fi
-@@ -3113,7 +3004,7 @@
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_AWK+set}" = set; then :
-+if ${ac_cv_prog_AWK+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$AWK"; then
-@@ -3153,7 +3044,7 @@
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
-@@ -3161,7 +3052,7 @@
- all:
- 	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
-   *@@@%%%=?*=@@@%%%*)
-     eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -3195,7 +3086,7 @@
-   am__isrc=' -I$(srcdir)'
-   # test to see if srcdir already configured
-   if test -f $srcdir/config.status; then
--    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-   fi
- fi
- 
-@@ -3376,7 +3267,7 @@
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3416,7 +3307,7 @@
- set dummy gcc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -3469,7 +3360,7 @@
- set dummy ${ac_tool_prefix}cc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3509,7 +3400,7 @@
- set dummy cc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3568,7 +3459,7 @@
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3612,7 +3503,7 @@
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -3666,8 +3557,8 @@
- 
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "no acceptable C compiler found in \$PATH
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details" "$LINENO" 5; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3688,32 +3579,30 @@
- ... rest of stderr output deleted ...
-          10q' conftest.err >conftest.er1
-     cat conftest.er1 >&5
--    rm -f conftest.er1 conftest.err
-   fi
-+  rm -f conftest.er1 conftest.err
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
- done
- 
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <stdio.h>
-+
- int
- main ()
- {
--FILE *f = fopen ("conftest.out", "w");
-- return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -3775,62 +3664,28 @@
- else
-   ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
--  $as_echo "$as_me: failed program was:" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ as_fn_set_status 77
--as_fn_error "C compiler cannot create executables
--See \`config.log' for more details." "$LINENO" 5; }; }
-+as_fn_error 77 "C compiler cannot create executables
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
- 
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
--  if { ac_try='./$ac_file'
--  { { case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then
--    cross_compiling=no
--  else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." "$LINENO" 5; }
--    fi
--  fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -3860,19 +3715,78 @@
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details" "$LINENO" 5; }
- fi
--rm -f conftest$ac_cv_exeext
-+rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+  { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+  if { ac_try='./conftest$ac_cv_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details" "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
--if test "${ac_cv_objext+set}" = set; then :
-+if ${ac_cv_objext+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3912,8 +3826,8 @@
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details" "$LINENO" 5; }
- fi
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
-@@ -3923,7 +3837,7 @@
- ac_objext=$OBJEXT
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+if ${ac_cv_c_compiler_gnu+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3960,7 +3874,7 @@
- ac_save_CFLAGS=$CFLAGS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then :
-+if ${ac_cv_prog_cc_g+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -4038,7 +3952,7 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+if ${ac_cv_prog_cc_c89+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
-@@ -4137,7 +4051,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4263,7 +4177,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
- $as_echo_n "checking for library containing strerror... " >&6; }
--if test "${ac_cv_search_strerror+set}" = set; then :
-+if ${ac_cv_search_strerror+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_func_search_save_LIBS=$LIBS
-@@ -4297,11 +4211,11 @@
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext
--  if test "${ac_cv_search_strerror+set}" = set; then :
-+  if ${ac_cv_search_strerror+:} false; then :
-   break
- fi
- done
--if test "${ac_cv_search_strerror+set}" = set; then :
-+if ${ac_cv_search_strerror+:} false; then :
- 
- else
-   ac_cv_search_strerror=no
-@@ -4327,7 +4241,7 @@
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -4367,7 +4281,7 @@
- set dummy gcc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -4420,7 +4334,7 @@
- set dummy ${ac_tool_prefix}cc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -4460,7 +4374,7 @@
- set dummy cc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -4519,7 +4433,7 @@
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -4563,7 +4477,7 @@
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -4617,8 +4531,8 @@
- 
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "no acceptable C compiler found in \$PATH
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details" "$LINENO" 5; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4639,15 +4553,15 @@
- ... rest of stderr output deleted ...
-          10q' conftest.err >conftest.er1
-     cat conftest.er1 >&5
--    rm -f conftest.er1 conftest.err
-   fi
-+  rm -f conftest.er1 conftest.err
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
- done
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+if ${ac_cv_c_compiler_gnu+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4684,7 +4598,7 @@
- ac_save_CFLAGS=$CFLAGS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then :
-+if ${ac_cv_prog_cc_g+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -4762,7 +4676,7 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+if ${ac_cv_prog_cc_c89+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
-@@ -4861,7 +4775,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5000,7 +4914,7 @@
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CXX+set}" = set; then :
-+if ${ac_cv_prog_CXX+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CXX"; then
-@@ -5044,7 +4958,7 @@
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CXX"; then
-@@ -5114,15 +5028,15 @@
- ... rest of stderr output deleted ...
-          10q' conftest.err >conftest.er1
-     cat conftest.er1 >&5
--    rm -f conftest.er1 conftest.err
-   fi
-+  rm -f conftest.er1 conftest.err
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
- done
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
- $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
--if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-+if ${ac_cv_cxx_compiler_gnu+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -5159,7 +5073,7 @@
- ac_save_CXXFLAGS=$CXXFLAGS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
- $as_echo_n "checking whether $CXX accepts -g... " >&6; }
--if test "${ac_cv_prog_cxx_g+set}" = set; then :
-+if ${ac_cv_prog_cxx_g+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-@@ -5245,7 +5159,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5377,7 +5291,7 @@
- fi
- set dummy $CC; ac_cc=`$as_echo "$2" |
- 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -5506,7 +5420,7 @@
-   CPP=
- fi
- if test -z "$CPP"; then
--  if test "${ac_cv_prog_CPP+set}" = set; then :
-+  if ${ac_cv_prog_CPP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CPP needs to be expanded
-@@ -5536,7 +5450,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -5552,11 +5466,11 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -5595,7 +5509,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -5611,18 +5525,18 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details" "$LINENO" 5; }
- fi
- 
- ac_ext=c
-@@ -5634,7 +5548,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then :
-+if ${ac_cv_path_GREP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$GREP"; then
-@@ -5683,7 +5597,7 @@
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_GREP"; then
--    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_GREP=$GREP
-@@ -5697,7 +5611,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
- $as_echo_n "checking for egrep... " >&6; }
--if test "${ac_cv_path_EGREP+set}" = set; then :
-+if ${ac_cv_path_EGREP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5749,7 +5663,7 @@
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_EGREP"; then
--    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_EGREP=$EGREP
-@@ -5764,7 +5678,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then :
-+if ${ac_cv_header_stdc+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -5882,8 +5796,8 @@
- 
- 
- 
--macro_version='2.2.6'
--macro_revision='1.3012'
-+macro_version='2.4.2'
-+macro_revision='1.3337'
- 
- 
- 
-@@ -5901,27 +5815,27 @@
- 
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
--  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
--if test "${ac_cv_build+set}" = set; then :
-+if ${ac_cv_build+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_build_alias=$build_alias
- test "x$ac_build_alias" = x &&
-   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
--  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
--  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
- 
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -5939,14 +5853,14 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
- $as_echo_n "checking host system type... " >&6; }
--if test "${ac_cv_host+set}" = set; then :
-+if ${ac_cv_host+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "x$host_alias" = x; then
-   ac_cv_host=$ac_cv_build
- else
-   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
--    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
- 
- fi
-@@ -5954,7 +5868,7 @@
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -5970,9 +5884,78 @@
- case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- 
- 
-+# Backslashify metacharacters that are still active within
-+# double-quoted strings.
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-+$as_echo_n "checking how to print strings... " >&6; }
-+# Test print first, because it will be a builtin if present.
-+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-+  ECHO='print -r --'
-+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-+  ECHO='printf %s\n'
-+else
-+  # Use this function as a fallback that always works.
-+  func_fallback_echo ()
-+  {
-+    eval 'cat <<_LTECHO_EOF
-+$1
-+_LTECHO_EOF'
-+  }
-+  ECHO='func_fallback_echo'
-+fi
-+
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
-+{
-+    $ECHO ""
-+}
-+
-+case "$ECHO" in
-+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-+$as_echo "printf" >&6; } ;;
-+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-+$as_echo "print -r" >&6; } ;;
-+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-+$as_echo "cat" >&6; } ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
- $as_echo_n "checking for a sed that does not truncate output... " >&6; }
--if test "${ac_cv_path_SED+set}" = set; then :
-+if ${ac_cv_path_SED+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6027,7 +6010,7 @@
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_SED"; then
--    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-   fi
- else
-   ac_cv_path_SED=$SED
-@@ -6054,7 +6037,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
- $as_echo_n "checking for fgrep... " >&6; }
--if test "${ac_cv_path_FGREP+set}" = set; then :
-+if ${ac_cv_path_FGREP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6106,7 +6089,7 @@
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_FGREP"; then
--    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_FGREP=$FGREP
-@@ -6185,7 +6168,7 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
- $as_echo_n "checking for non-GNU ld... " >&6; }
- fi
--if test "${lt_cv_path_LD+set}" = set; then :
-+if ${lt_cv_path_LD+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$LD"; then
-@@ -6222,10 +6205,10 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
--if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-+if ${lt_cv_prog_gnu_ld+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6252,7 +6235,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
- $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
--if test "${lt_cv_path_NM+set}" = set; then :
-+if ${lt_cv_path_NM+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$NM"; then
-@@ -6305,14 +6288,17 @@
-   NM="$lt_cv_path_NM"
- else
-   # Didn't find any BSD compatible name lister, look for dumpbin.
--  if test -n "$ac_tool_prefix"; then
--  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-+  if test -n "$DUMPBIN"; then :
-+    # Let the user override the test.
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in dumpbin "link -dump"
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-+if ${ac_cv_prog_DUMPBIN+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$DUMPBIN"; then
-@@ -6350,13 +6336,13 @@
- fi
- if test -z "$DUMPBIN"; then
-   ac_ct_DUMPBIN=$DUMPBIN
--  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-+  for ac_prog in dumpbin "link -dump"
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_DUMPBIN"; then
-@@ -6405,6 +6391,15 @@
-   fi
- fi
- 
-+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-+    *COFF*)
-+      DUMPBIN="$DUMPBIN -symbols"
-+      ;;
-+    *)
-+      DUMPBIN=:
-+      ;;
-+    esac
-+  fi
- 
-   if test "$DUMPBIN" != ":"; then
-     NM="$DUMPBIN"
-@@ -6419,18 +6414,18 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
- $as_echo_n "checking the name lister ($NM) interface... " >&6; }
--if test "${lt_cv_nm_interface+set}" = set; then :
-+if ${lt_cv_nm_interface+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:6427: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6430: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:6433: output\"" >&5)
-+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -6454,7 +6449,7 @@
- # find the maximum length of command line arguments
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
- $as_echo_n "checking the maximum length of command line arguments... " >&6; }
--if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-+if ${lt_cv_sys_max_cmd_len+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-     i=0
-@@ -6487,6 +6482,11 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-+  mint*)
-+    # On MiNT this can take a long time and run out of memory.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-   amigaos*)
-     # On AmigaOS with pdksh, this test takes hours, literally.
-     # So we just punt and use a minimum line length of 8192.
-@@ -6512,6 +6512,11 @@
-     lt_cv_sys_max_cmd_len=196608
-     ;;
- 
-+  os2*)
-+    # The test takes a long time on OS/2.
-+    lt_cv_sys_max_cmd_len=8192
-+    ;;
-+
-   osf*)
-     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-@@ -6551,8 +6556,8 @@
-       # If test is not a shell built-in, we'll probably end up computing a
-       # maximum length that is only half of the actual maximum length, but
-       # we can't tell.
--      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
--	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
- 	      test $i != 17 # 1/2 MB should be enough
-       do
-         i=`expr $i + 1`
-@@ -6594,8 +6599,8 @@
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
--  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
--      = c,a/b,, \
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,b/c, \
-     && eval 'test $(( 1 + 1 )) -eq 2 \
-     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-   && xsi_shell=yes
-@@ -6644,22 +6649,101 @@
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
--$as_echo_n "checking for $LD option to reload object files... " >&6; }
--if test "${lt_cv_ld_reload_flag+set}" = set; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-+if ${lt_cv_to_host_file_cmd+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  lt_cv_ld_reload_flag='-r'
-+  case $host in
-+  *-*-mingw* )
-+    case $build in
-+      *-*-mingw* ) # actually msys
-+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-+        ;;
-+      *-*-cygwin* )
-+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-+        ;;
-+      * ) # otherwise, assume *nix
-+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-+        ;;
-+    esac
-+    ;;
-+  *-*-cygwin* )
-+    case $build in
-+      *-*-mingw* ) # actually msys
-+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-+        ;;
-+      *-*-cygwin* )
-+        lt_cv_to_host_file_cmd=func_convert_file_noop
-+        ;;
-+      * ) # otherwise, assume *nix
-+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-+        ;;
-+    esac
-+    ;;
-+  * ) # unhandled hosts (and "normal" native builds)
-+    lt_cv_to_host_file_cmd=func_convert_file_noop
-+    ;;
-+esac
-+
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
--$as_echo "$lt_cv_ld_reload_flag" >&6; }
--reload_flag=$lt_cv_ld_reload_flag
-+
-+to_host_file_cmd=$lt_cv_to_host_file_cmd
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-+if ${lt_cv_to_tool_file_cmd+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  #assume ordinary cross tools, or native build.
-+lt_cv_to_tool_file_cmd=func_convert_file_noop
-+case $host in
-+  *-*-mingw* )
-+    case $build in
-+      *-*-mingw* ) # actually msys
-+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-+        ;;
-+    esac
-+    ;;
-+esac
-+
-+fi
-+
-+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-+$as_echo_n "checking for $LD option to reload object files... " >&6; }
-+if ${lt_cv_ld_reload_flag+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-+$as_echo "$lt_cv_ld_reload_flag" >&6; }
-+reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    if test "$GCC" != yes; then
-+      reload_cmds=false
-+    fi
-+    ;;
-   darwin*)
-     if test "$GCC" = yes; then
-       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -6682,7 +6766,7 @@
- set dummy ${ac_tool_prefix}objdump; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-+if ${ac_cv_prog_OBJDUMP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$OBJDUMP"; then
-@@ -6722,7 +6806,7 @@
- set dummy objdump; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_OBJDUMP"; then
-@@ -6781,7 +6865,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
- $as_echo_n "checking how to recognize dependent libraries... " >&6; }
--if test "${lt_cv_deplibs_check_method+set}" = set; then :
-+if ${lt_cv_deplibs_check_method+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -6823,16 +6907,18 @@
-   # Base MSYS/MinGW do not provide the 'file' command needed by
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
--  if ( file / ) >/dev/null 2>&1; then
-+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
--    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    # Keep this pattern in sync with the one in func_win32_libid.
-+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-     lt_cv_file_magic_cmd='$OBJDUMP -f'
-   fi
-   ;;
- 
--cegcc)
-+cegcc*)
-   # use the weaker test based on 'objdump'. See mingw*.
-   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-   lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -6862,6 +6948,10 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+haiku*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
-   case $host_cpu in
-@@ -6870,11 +6960,11 @@
-     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-     ;;
-   hppa*64*)
--    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-     ;;
-   *)
--    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-     lt_cv_file_magic_test_file=/usr/lib/libc.sl
-     ;;
-   esac
-@@ -6895,12 +6985,12 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd* | netbsdelf*-gnu)
-+netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -6977,6 +7067,21 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
-+
-+file_magic_glob=
-+want_nocaseglob=no
-+if test "$build" = "$host"; then
-+  case $host_os in
-+  mingw* | pw32*)
-+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-+      want_nocaseglob=yes
-+    else
-+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-+    fi
-+    ;;
-+  esac
-+fi
-+
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6992,12 +7097,165 @@
- 
- 
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_DLLTOOL+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DLLTOOL"; then
-+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DLLTOOL=$ac_cv_prog_DLLTOOL
-+if test -n "$DLLTOOL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-+$as_echo "$DLLTOOL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_DLLTOOL"; then
-+  ac_ct_DLLTOOL=$DLLTOOL
-+  # Extract the first word of "dlltool", so it can be a program name with args.
-+set dummy dlltool; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_DLLTOOL"; then
-+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-+if test -n "$ac_ct_DLLTOOL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-+$as_echo "$ac_ct_DLLTOOL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_DLLTOOL" = x; then
-+    DLLTOOL="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DLLTOOL=$ac_ct_DLLTOOL
-+  fi
-+else
-+  DLLTOOL="$ac_cv_prog_DLLTOOL"
-+fi
-+
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_sharedlib_from_linklib_cmd='unknown'
-+
-+case $host_os in
-+cygwin* | mingw* | pw32* | cegcc*)
-+  # two different shell functions defined in ltmain.sh
-+  # decide which to use based on capabilities of $DLLTOOL
-+  case `$DLLTOOL --help 2>&1` in
-+  *--identify-strict*)
-+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-+    ;;
-+  *)
-+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-+    ;;
-+  esac
-+  ;;
-+*)
-+  # fallback: assume linklib IS sharedlib
-+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-+  ;;
-+esac
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-+
-+
-+
-+
-+
-+
-+
- if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ar; ac_word=$2
-+  for ac_prog in ar
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_AR+set}" = set; then :
-+if ${ac_cv_prog_AR+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$AR"; then
-@@ -7010,7 +7268,7 @@
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_AR="${ac_tool_prefix}ar"
-+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
-@@ -7030,14 +7288,18 @@
- fi
- 
- 
-+    test -n "$AR" && break
-+  done
- fi
--if test -z "$ac_cv_prog_AR"; then
-+if test -z "$AR"; then
-   ac_ct_AR=$AR
--  # Extract the first word of "ar", so it can be a program name with args.
--set dummy ar; ac_word=$2
-+  for ac_prog in ar
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_AR+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_AR"; then
-@@ -7050,7 +7312,7 @@
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_ac_ct_AR="ar"
-+    ac_cv_prog_ac_ct_AR="$ac_prog"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
-@@ -7069,6 +7331,10 @@
- $as_echo "no" >&6; }
- fi
- 
-+
-+  test -n "$ac_ct_AR" && break
-+done
-+
-   if test "x$ac_ct_AR" = x; then
-     AR="false"
-   else
-@@ -7080,16 +7346,72 @@
- esac
-     AR=$ac_ct_AR
-   fi
--else
--  AR="$ac_cv_prog_AR"
- fi
- 
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
-+: ${AR=ar}
-+: ${AR_FLAGS=cru}
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-+$as_echo_n "checking for archiver @FILE support... " >&6; }
-+if ${lt_cv_ar_at_file+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ar_at_file=no
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
- 
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  echo conftest.$ac_objext > conftest.lst
-+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-+  (eval $lt_ar_try) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+      if test "$ac_status" -eq 0; then
-+	# Ensure the archiver fails upon bogus file names.
-+	rm -f conftest.$ac_objext libconftest.a
-+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-+  (eval $lt_ar_try) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+	if test "$ac_status" -ne 0; then
-+          lt_cv_ar_at_file=@
-+        fi
-+      fi
-+      rm -f conftest.* libconftest.a
- 
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-+$as_echo "$lt_cv_ar_at_file" >&6; }
- 
-+if test "x$lt_cv_ar_at_file" = xno; then
-+  archiver_list_spec=
-+else
-+  archiver_list_spec=$lt_cv_ar_at_file
-+fi
- 
- 
- 
-@@ -7102,7 +7424,7 @@
- set dummy ${ac_tool_prefix}strip; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then :
-+if ${ac_cv_prog_STRIP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-@@ -7142,7 +7464,7 @@
- set dummy strip; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_STRIP"; then
-@@ -7201,7 +7523,7 @@
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_RANLIB+set}" = set; then :
-+if ${ac_cv_prog_RANLIB+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$RANLIB"; then
-@@ -7241,7 +7563,7 @@
- set dummy ranlib; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_RANLIB"; then
-@@ -7303,15 +7625,27 @@
- if test -n "$RANLIB"; then
-   case $host_os in
-   openbsd*)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-     ;;
-   *)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-     ;;
-   esac
--  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
- fi
- 
-+case $host_os in
-+  darwin*)
-+    lock_old_archive_extraction=yes ;;
-+  *)
-+    lock_old_archive_extraction=no ;;
-+esac
-+
-+
-+
-+
-+
-+
- 
- 
- 
-@@ -7358,7 +7692,7 @@
- # Check for command to grab the raw symbol name followed by C symbol from nm.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
- $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
--if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -7419,8 +7753,8 @@
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- 
- # Transform an extracted symbol line into symbol name and symbol address
--lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
--lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
- 
- # Handle CRLF in mingw tool chain
- opt_cr=
-@@ -7444,6 +7778,7 @@
-     # which start with @ or ?.
-     lt_cv_sys_global_symbol_pipe="$AWK '"\
- "     {last_section=section; section=\$ 3};"\
-+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
- "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
- "     \$ 0!~/External *\|/{next};"\
- "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-@@ -7456,6 +7791,7 @@
-   else
-     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-   fi
-+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
- 
-   # Check to see that the pipe works correctly.
-   pipe_works=no
-@@ -7481,8 +7817,8 @@
-   test $ac_status = 0; }; then
-     # Now try to grab the symbols.
-     nlist=conftest.nm
--    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
--  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7497,6 +7833,18 @@
-       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- 	  cat <<_LT_EOF > conftest.$ac_ext
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-+# define LT_DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data.  */
-+# define LT_DLSYM_CONST
-+#else
-+# define LT_DLSYM_CONST const
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -7508,7 +7856,7 @@
- 	  cat <<_LT_EOF >> conftest.$ac_ext
- 
- /* The mapping between symbol names and symbols.  */
--const struct {
-+LT_DLSYM_CONST struct {
-   const char *name;
-   void       *address;
- }
-@@ -7534,8 +7882,8 @@
- _LT_EOF
- 	  # Now try linking the two files.
- 	  mv conftest.$ac_objext conftstm.$ac_objext
--	  lt_save_LIBS="$LIBS"
--	  lt_save_CFLAGS="$CFLAGS"
-+	  lt_globsym_save_LIBS=$LIBS
-+	  lt_globsym_save_CFLAGS=$CFLAGS
- 	  LIBS="conftstm.$ac_objext"
- 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -7545,8 +7893,8 @@
-   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- 	    pipe_works=yes
- 	  fi
--	  LIBS="$lt_save_LIBS"
--	  CFLAGS="$lt_save_CFLAGS"
-+	  LIBS=$lt_globsym_save_LIBS
-+	  CFLAGS=$lt_globsym_save_CFLAGS
- 	else
- 	  echo "cannot find nm_test_func in $nlist" >&5
- 	fi
-@@ -7583,6 +7931,20 @@
- $as_echo "ok" >&6; }
- fi
- 
-+# Response file support.
-+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+  nm_file_list_spec='@'
-+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-+  nm_file_list_spec='@'
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
- 
- 
- 
-@@ -7602,6 +7964,41 @@
- 
- 
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-+$as_echo_n "checking for sysroot... " >&6; }
-+
-+# Check whether --with-sysroot was given.
-+if test "${with_sysroot+set}" = set; then :
-+  withval=$with_sysroot;
-+else
-+  with_sysroot=no
-+fi
-+
-+
-+lt_sysroot=
-+case ${with_sysroot} in #(
-+ yes)
-+   if test "$GCC" = yes; then
-+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-+   fi
-+   ;; #(
-+ /*)
-+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-+   ;; #(
-+ no|'')
-+   ;; #(
-+ *)
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-+$as_echo "${with_sysroot}" >&6; }
-+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-+   ;;
-+esac
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-+$as_echo "${lt_sysroot:-no}" >&6; }
-+
-+
-+
- 
- 
- # Check whether --enable-libtool-lock was given.
-@@ -7635,7 +8032,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 7638 "configure"' > conftest.$ac_ext
-+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7729,7 +8126,7 @@
-   CFLAGS="$CFLAGS -belf"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
- $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
--if test "${lt_cv_cc_needs_belf+set}" = set; then :
-+if ${lt_cv_cc_needs_belf+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_ext=c
-@@ -7770,7 +8167,7 @@
-     CFLAGS="$SAVE_CFLAGS"
-   fi
-   ;;
--sparc*-*solaris*)
-+*-*solaris*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-@@ -7781,7 +8178,20 @@
-     case `/usr/bin/file conftest.o` in
-     *64-bit*)
-       case $lt_cv_prog_gnu_ld in
--      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      yes*)
-+        case $host in
-+        i?86-*-solaris*)
-+          LD="${LD-ld} -m elf_x86_64"
-+          ;;
-+        sparc*-*-solaris*)
-+          LD="${LD-ld} -m elf64_sparc"
-+          ;;
-+        esac
-+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-+          LD="${LD-ld}_sol2"
-+        fi
-+        ;;
-       *)
- 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- 	  LD="${LD-ld} -64"
-@@ -7797,19 +8207,16 @@
- 
- need_locks="$enable_libtool_lock"
- 
--
--  case $host_os in
--    rhapsody* | darwin*)
--    if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
--set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}mt; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test -n "$DSYMUTIL"; then
--  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+  if test -n "$MANIFEST_TOOL"; then
-+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -7818,7 +8225,7 @@
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
-@@ -7828,10 +8235,10 @@
- 
- fi
- fi
--DSYMUTIL=$ac_cv_prog_DSYMUTIL
--if test -n "$DSYMUTIL"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
--$as_echo "$DSYMUTIL" >&6; }
-+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-+if test -n "$MANIFEST_TOOL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-+$as_echo "$MANIFEST_TOOL" >&6; }
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -7839,13 +8246,133 @@
- 
- 
- fi
--if test -z "$ac_cv_prog_DSYMUTIL"; then
--  ac_ct_DSYMUTIL=$DSYMUTIL
--  # Extract the first word of "dsymutil", so it can be a program name with args.
--set dummy dsymutil; ac_word=$2
-+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-+  # Extract the first word of "mt", so it can be a program name with args.
-+set dummy mt; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_MANIFEST_TOOL"; then
-+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-+if test -n "$ac_ct_MANIFEST_TOOL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-+    MANIFEST_TOOL=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-+  fi
-+else
-+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-+fi
-+
-+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-+if ${lt_cv_path_mainfest_tool+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_path_mainfest_tool=no
-+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-+  cat conftest.err >&5
-+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-+    lt_cv_path_mainfest_tool=yes
-+  fi
-+  rm -f conftest*
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-+if test "x$lt_cv_path_mainfest_tool" != xyes; then
-+  MANIFEST_TOOL=:
-+fi
-+
-+
-+
-+
-+
-+
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_DSYMUTIL+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DSYMUTIL"; then
-+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-+$as_echo "$DSYMUTIL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+  ac_ct_DSYMUTIL=$DSYMUTIL
-+  # Extract the first word of "dsymutil", so it can be a program name with args.
-+set dummy dsymutil; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_DSYMUTIL"; then
-@@ -7897,7 +8424,7 @@
- set dummy ${ac_tool_prefix}nmedit; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-+if ${ac_cv_prog_NMEDIT+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$NMEDIT"; then
-@@ -7937,7 +8464,7 @@
- set dummy nmedit; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_NMEDIT"; then
-@@ -7989,7 +8516,7 @@
- set dummy ${ac_tool_prefix}lipo; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_LIPO+set}" = set; then :
-+if ${ac_cv_prog_LIPO+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$LIPO"; then
-@@ -8029,7 +8556,7 @@
- set dummy lipo; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_LIPO"; then
-@@ -8081,7 +8608,7 @@
- set dummy ${ac_tool_prefix}otool; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_OTOOL+set}" = set; then :
-+if ${ac_cv_prog_OTOOL+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$OTOOL"; then
-@@ -8121,7 +8648,7 @@
- set dummy otool; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_OTOOL"; then
-@@ -8173,7 +8700,7 @@
- set dummy ${ac_tool_prefix}otool64; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-+if ${ac_cv_prog_OTOOL64+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$OTOOL64"; then
-@@ -8213,7 +8740,7 @@
- set dummy otool64; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_OTOOL64"; then
-@@ -8288,7 +8815,7 @@
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
- $as_echo_n "checking for -single_module linker flag... " >&6; }
--if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-+if ${lt_cv_apple_cc_single_mod+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_apple_cc_single_mod=no
-@@ -8304,7 +8831,13 @@
- 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-         _lt_result=$?
--	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-+	# If there is a non-empty error log, and "single_module"
-+	# appears in it, assume the flag caused a linker warning
-+        if test -s conftest.err && $GREP single_module conftest.err; then
-+	  cat conftest.err >&5
-+	# Otherwise, if the output was created with a 0 exit code from
-+	# the compiler, it worked.
-+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
- 	  lt_cv_apple_cc_single_mod=yes
- 	else
- 	  cat conftest.err >&5
-@@ -8315,9 +8848,10 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
- $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-+
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
- $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
--if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-+if ${lt_cv_ld_exported_symbols_list+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_ld_exported_symbols_list=no
-@@ -8332,611 +8866,131 @@
- {
- 
-   ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  lt_cv_ld_exported_symbols_list=yes
--else
--  lt_cv_ld_exported_symbols_list=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--	LDFLAGS="$save_LDFLAGS"
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
--$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
--    case $host_os in
--    rhapsody* | darwin1.[012])
--      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
--    darwin1.*)
--      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
--    darwin*) # darwin 5.x on
--      # if running on 10.5 or later, the deployment target defaults
--      # to the OS version, if on x86, and 10.4, the deployment
--      # target defaults to 10.4. Don't you love it?
--      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
--	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
--	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--	10.[012]*)
--	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
--	10.*)
--	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--      esac
--    ;;
--  esac
--    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
--      _lt_dar_single_mod='$single_module'
--    fi
--    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
--      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
--    else
--      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    if test "$DSYMUTIL" != ":"; then
--      _lt_dsymutil='~$DSYMUTIL $lib || :'
--    else
--      _lt_dsymutil=
--    fi
--    ;;
--  esac
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
--"
--eval as_val=\$$as_ac_Header
--   if test "x$as_val" = x""yes; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--for ac_header in dlfcn.h
--do :
--  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
--"
--if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DLFCN_H 1
--_ACEOF
--
--fi
--
--done
--
--
--
--ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--if test -z "$CXX"; then
--  if test -n "$CCC"; then
--    CXX=$CCC
--  else
--    if test -n "$ac_tool_prefix"; then
--  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
--  do
--    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CXX+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$CXX"; then
--  ac_cv_prog_CXX="$CXX" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--CXX=$ac_cv_prog_CXX
--if test -n "$CXX"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
--$as_echo "$CXX" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--    test -n "$CXX" && break
--  done
--fi
--if test -z "$CXX"; then
--  ac_ct_CXX=$CXX
--  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$ac_ct_CXX"; then
--  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_ac_ct_CXX="$ac_prog"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
--if test -n "$ac_ct_CXX"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
--$as_echo "$ac_ct_CXX" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--  test -n "$ac_ct_CXX" && break
--done
--
--  if test "x$ac_ct_CXX" = x; then
--    CXX="g++"
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
--    CXX=$ac_ct_CXX
--  fi
--fi
--
--  fi
--fi
--# Provide some information about the compiler.
--$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
--set X $ac_compile
--ac_compiler=$2
--for ac_option in --version -v -V -qversion; do
--  { { ac_try="$ac_compiler $ac_option >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
--  ac_status=$?
--  if test -s conftest.err; then
--    sed '10a\
--... rest of stderr output deleted ...
--         10q' conftest.err >conftest.er1
--    cat conftest.er1 >&5
--    rm -f conftest.er1 conftest.err
--  fi
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }
--done
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
--$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
--if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--#ifndef __GNUC__
--       choke me
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_compile "$LINENO"; then :
--  ac_compiler_gnu=yes
--else
--  ac_compiler_gnu=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
--$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
--if test $ac_compiler_gnu = yes; then
--  GXX=yes
--else
--  GXX=
--fi
--ac_test_CXXFLAGS=${CXXFLAGS+set}
--ac_save_CXXFLAGS=$CXXFLAGS
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
--$as_echo_n "checking whether $CXX accepts -g... " >&6; }
--if test "${ac_cv_prog_cxx_g+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
--   ac_cxx_werror_flag=yes
--   ac_cv_prog_cxx_g=no
--   CXXFLAGS="-g"
--   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_compile "$LINENO"; then :
--  ac_cv_prog_cxx_g=yes
--else
--  CXXFLAGS=""
--      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_compile "$LINENO"; then :
--
--else
--  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
--	 CXXFLAGS="-g"
--	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_compile "$LINENO"; then :
--  ac_cv_prog_cxx_g=yes
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
--$as_echo "$ac_cv_prog_cxx_g" >&6; }
--if test "$ac_test_CXXFLAGS" = set; then
--  CXXFLAGS=$ac_save_CXXFLAGS
--elif test $ac_cv_prog_cxx_g = yes; then
--  if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
--  else
--    CXXFLAGS="-g"
--  fi
--else
--  if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
--  else
--    CXXFLAGS=
--  fi
--fi
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--depcc="$CXX"  am_compiler_list=
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
--$as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
--  # We make a subdir and do the tests there.  Otherwise we can end up
--  # making bogus files that we don't know about and never remove.  For
--  # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named `D' -- because `-MD' means `put the output
--  # in D'.
--  mkdir conftest.dir
--  # Copy depcomp to subdir because otherwise we won't find it if we're
--  # using a relative directory.
--  cp "$am_depcomp" conftest.dir
--  cd conftest.dir
--  # We will build objects and dependencies in a subdirectory because
--  # it helps to detect inapplicable dependency modes.  For instance
--  # both Tru64's cc and ICC support -MD to output dependencies as a
--  # side effect of compilation, but ICC will put the dependencies in
--  # the current directory while Tru64 will put them in the object
--  # directory.
--  mkdir sub
--
--  am_cv_CXX_dependencies_compiler_type=none
--  if test "$am_compiler_list" = ""; then
--     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
--  fi
--  am__universal=false
--  case " $depcc " in #(
--     *\ -arch\ *\ -arch\ *) am__universal=true ;;
--     esac
--
--  for depmode in $am_compiler_list; do
--    # Setup a source with many dependencies, because some compilers
--    # like to wrap large dependency lists on column 80 (with \), and
--    # we should not choose a depcomp mode which is confused by this.
--    #
--    # We need to recreate these files for each test, as the compiler may
--    # overwrite some of them when testing with obscure command lines.
--    # This happens at least with the AIX C compiler.
--    : > sub/conftest.c
--    for i in 1 2 3 4 5 6; do
--      echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
--      touch sub/conftst$i.h
--    done
--    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
--
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs
--    am__obj=sub/conftest.${OBJEXT-o}
--    am__minus_obj="-o $am__obj"
--    case $depmode in
--    gcc)
--      # This depmode causes a compiler race in universal mode.
--      test "$am__universal" = false || continue
--      ;;
--    nosideeffect)
--      # after this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested
--      if test "x$enable_dependency_tracking" = xyes; then
--	continue
--      else
--	break
--      fi
--      ;;
--    msvisualcpp | msvcmsys)
--      # This compiler won't grok `-c -o', but also, the minuso test has
--      # not run yet.  These depmodes are late enough in the game, and
--      # so weak that their functioning should not be impacted.
--      am__obj=conftest.${OBJEXT-o}
--      am__minus_obj=
--      ;;
--    none) break ;;
--    esac
--    if depmode=$depmode \
--       source=sub/conftest.c object=$am__obj \
--       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
--         >/dev/null 2>conftest.err &&
--       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
--       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      # icc doesn't choke on unknown options, it will just issue warnings
--      # or remarks (even with -Werror).  So we grep stderr for any message
--      # that says an option was ignored or not supported.
--      # When given -MP, icc 7.0 and 7.1 complain thusly:
--      #   icc: Command line warning: ignoring option '-M'; no argument required
--      # The diagnosis changed in icc 8.0:
--      #   icc: Command line remark: option '-MP' not supported
--      if (grep 'ignoring option' conftest.err ||
--          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
--        am_cv_CXX_dependencies_compiler_type=$depmode
--        break
--      fi
--    fi
--  done
--
--  cd ..
--  rm -rf conftest.dir
--else
--  am_cv_CXX_dependencies_compiler_type=none
--fi
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
--$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
--CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
--
-- if
--  test "x$enable_dependency_tracking" != xno \
--  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
--  am__fastdepCXX_TRUE=
--  am__fastdepCXX_FALSE='#'
--else
--  am__fastdepCXX_TRUE='#'
--  am__fastdepCXX_FALSE=
--fi
--
--
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
--    (test "X$CXX" != "Xg++"))) ; then
--  ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
--$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
--if test -z "$CXXCPP"; then
--  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--      # Double quotes because CXXCPP needs to be expanded
--    for CXXCPP in "$CXX -E" "/lib/cpp"
--    do
--      ac_preproc_ok=false
--for ac_cxx_preproc_warn_flag in '' yes
--do
--  # Use a header file that comes with gcc, so configuring glibc
--  # with a fresh cross-compiler works.
--  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> exists even on freestanding compilers.
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp. "Syntax error" is here to catch this case.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--		     Syntax error
--_ACEOF
--if ac_fn_cxx_try_cpp "$LINENO"; then :
--
--else
--  # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.$ac_ext
--
--  # OK, works on sane cases.  Now check whether nonexistent headers
--  # can be detected and how.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ac_nonexistent.h>
-+  return 0;
-+}
- _ACEOF
--if ac_fn_cxx_try_cpp "$LINENO"; then :
--  # Broken: success on invalid input.
--continue
-+if ac_fn_c_try_link "$LINENO"; then :
-+  lt_cv_ld_exported_symbols_list=yes
- else
--  # Passes both tests.
--ac_preproc_ok=:
--break
-+  lt_cv_ld_exported_symbols_list=no
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+	LDFLAGS="$save_LDFLAGS"
- 
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then :
--  break
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
- 
--    done
--    ac_cv_prog_CXXCPP=$CXXCPP
--
--fi
--  CXXCPP=$ac_cv_prog_CXXCPP
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-+$as_echo_n "checking for -force_load linker flag... " >&6; }
-+if ${lt_cv_ld_force_load+:} false; then :
-+  $as_echo_n "(cached) " >&6
- else
--  ac_cv_prog_CXXCPP=$CXXCPP
-+  lt_cv_ld_force_load=no
-+      cat > conftest.c << _LT_EOF
-+int forced_loaded() { return 2;}
-+_LT_EOF
-+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-+      echo "$AR cru libconftest.a conftest.o" >&5
-+      $AR cru libconftest.a conftest.o 2>&5
-+      echo "$RANLIB libconftest.a" >&5
-+      $RANLIB libconftest.a 2>&5
-+      cat > conftest.c << _LT_EOF
-+int main() { return 0;}
-+_LT_EOF
-+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-+      _lt_result=$?
-+      if test -s conftest.err && $GREP force_load conftest.err; then
-+	cat conftest.err >&5
-+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-+	lt_cv_ld_force_load=yes
-+      else
-+	cat conftest.err >&5
-+      fi
-+        rm -f conftest.err libconftest.a conftest conftest.c
-+        rm -rf conftest.dSYM
-+
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
--$as_echo "$CXXCPP" >&6; }
--ac_preproc_ok=false
--for ac_cxx_preproc_warn_flag in '' yes
--do
--  # Use a header file that comes with gcc, so configuring glibc
--  # with a fresh cross-compiler works.
--  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> exists even on freestanding compilers.
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp. "Syntax error" is here to catch this case.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--		     Syntax error
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-+$as_echo "$lt_cv_ld_force_load" >&6; }
-+    case $host_os in
-+    rhapsody* | darwin1.[012])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*) # darwin 5.x on
-+      # if running on 10.5 or later, the deployment target defaults
-+      # to the OS version, if on x86, and 10.4, the deployment
-+      # target defaults to 10.4. Don't you love it?
-+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+	10.[012]*)
-+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+	10.*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+      esac
-+    ;;
-+  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+      _lt_dar_single_mod='$single_module'
-+    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+    else
-+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
-+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-+      _lt_dsymutil='~$DSYMUTIL $lib || :'
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
--if ac_fn_cxx_try_cpp "$LINENO"; then :
- 
--else
--  # Broken: fails on valid input.
--continue
- fi
--rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether nonexistent headers
--  # can be detected and how.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ac_nonexistent.h>
-+done
-+
-+
-+for ac_header in dlfcn.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DLFCN_H 1
- _ACEOF
--if ac_fn_cxx_try_cpp "$LINENO"; then :
--  # Broken: success on invalid input.
--continue
--else
--  # Passes both tests.
--ac_preproc_ok=:
--break
-+
- fi
--rm -f conftest.err conftest.$ac_ext
- 
- done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then :
- 
--else
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--_lt_caught_CXX_error=yes; }
--fi
- 
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--else
--  _lt_caught_CXX_error=yes
--fi
-+
-+func_stripname_cnf ()
-+{
-+  case ${2} in
-+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+  esac
-+} # func_stripname_cnf
- 
- 
- 
-@@ -9017,7 +9071,22 @@
- 
- # Check whether --with-pic was given.
- if test "${with_pic+set}" = set; then :
--  withval=$with_pic; pic_mode="$withval"
-+  withval=$with_pic; lt_p=${PACKAGE-default}
-+    case $withval in
-+    yes|no) pic_mode=$withval ;;
-+    *)
-+      pic_mode=default
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for lt_pkg in $withval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$lt_pkg" = "X$lt_p"; then
-+	  pic_mode=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
- else
-   pic_mode=default
- fi
-@@ -9094,6 +9163,11 @@
- 
- 
- 
-+
-+
-+
-+
-+
- test -z "$LN_S" && LN_S="ln -s"
- 
- 
-@@ -9115,7 +9189,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
- $as_echo_n "checking for objdir... " >&6; }
--if test "${lt_cv_objdir+set}" = set; then :
-+if ${lt_cv_objdir+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   rm -f .libs 2>/dev/null
-@@ -9143,19 +9217,6 @@
- 
- 
- 
--
--
--
--
--
--
--
--
--
--
--
--
--
- case $host_os in
- aix3*)
-   # AIX sometimes has problems with the GCC collect2 program.  For some
-@@ -9168,23 +9229,6 @@
-   ;;
- esac
- 
--# Sed substitution that helps us do robust quoting.  It backslashifies
--# metacharacters that are still active within double-quoted strings.
--sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
--
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\(["`\\]\)/\\\1/g'
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to delay expansion of an escaped single quote.
--delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
--
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--
- # Global variables:
- ofile=libtool
- can_build_shared=yes
-@@ -9213,7 +9257,7 @@
-     *) break;;
-   esac
- done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
- 
- 
- # Only perform the check for file, if the check method requires it
-@@ -9223,7 +9267,7 @@
-   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
- $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
--if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+if ${lt_cv_path_MAGIC_CMD+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
-@@ -9289,7 +9333,7 @@
-   if test -n "$ac_tool_prefix"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
- $as_echo_n "checking for file... " >&6; }
--if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+if ${lt_cv_path_MAGIC_CMD+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
-@@ -9418,11 +9462,16 @@
- lt_prog_compiler_no_builtin_flag=
- 
- if test "$GCC" = yes; then
--  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-+  case $cc_basename in
-+  nvcc*)
-+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-+  *)
-+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-+  esac
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
- $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
--if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9438,15 +9487,15 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9441: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9445: \$? = $ac_status" >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -9475,8 +9524,6 @@
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl='-Wl,'
-@@ -9524,6 +9571,12 @@
-       lt_prog_compiler_pic='-fno-common'
-       ;;
- 
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static=
-+      ;;
-+
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -9566,6 +9619,15 @@
-       lt_prog_compiler_pic='-fPIC'
-       ;;
-     esac
-+
-+    case $cc_basename in
-+    nvcc*) # Cuda Compiler Driver 2.2
-+      lt_prog_compiler_wl='-Xlinker '
-+      if test -n "$lt_prog_compiler_pic"; then
-+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-+      fi
-+      ;;
-+    esac
-   else
-     # PORTME Check for flag to pass linker flags through the system compiler.
-     case $host_os in
-@@ -9607,7 +9669,7 @@
-       lt_prog_compiler_static='-non_shared'
-       ;;
- 
--    linux* | k*bsd*-gnu)
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-       case $cc_basename in
-       # old Intel for x86_64 which still supported -KPIC.
-       ecc*)
-@@ -9628,7 +9690,13 @@
- 	lt_prog_compiler_pic='--shared'
- 	lt_prog_compiler_static='--static'
- 	;;
--      pgcc* | pgf77* | pgf90* | pgf95*)
-+      nagfor*)
-+	# NAG Fortran compiler
-+	lt_prog_compiler_wl='-Wl,-Wl,,'
-+	lt_prog_compiler_pic='-PIC'
-+	lt_prog_compiler_static='-Bstatic'
-+	;;
-+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
- 	# which looks to be a dead project)
- 	lt_prog_compiler_wl='-Wl,'
-@@ -9640,25 +9708,40 @@
-         # All Alpha code is PIC.
-         lt_prog_compiler_static='-non_shared'
-         ;;
--      xl*)
--	# IBM XL C 8.0/Fortran 10.1 on PPC
-+      xl* | bgxl* | bgf* | mpixl*)
-+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
- 	lt_prog_compiler_wl='-Wl,'
- 	lt_prog_compiler_pic='-qpic'
- 	lt_prog_compiler_static='-qstaticlink'
- 	;;
-       *)
- 	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl=''
-+	  ;;
-+	*Sun\ F* | *Sun*Fortran*)
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl='-Qoption ld '
-+	  ;;
- 	*Sun\ C*)
- 	  # Sun C 5.9
- 	  lt_prog_compiler_pic='-KPIC'
- 	  lt_prog_compiler_static='-Bstatic'
- 	  lt_prog_compiler_wl='-Wl,'
- 	  ;;
--	*Sun\ F*)
--	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
--	  lt_prog_compiler_pic='-KPIC'
-+        *Intel*\ [CF]*Compiler*)
-+	  lt_prog_compiler_wl='-Wl,'
-+	  lt_prog_compiler_pic='-fPIC'
-+	  lt_prog_compiler_static='-static'
-+	  ;;
-+	*Portland\ Group*)
-+	  lt_prog_compiler_wl='-Wl,'
-+	  lt_prog_compiler_pic='-fpic'
- 	  lt_prog_compiler_static='-Bstatic'
--	  lt_prog_compiler_wl=''
- 	  ;;
- 	esac
- 	;;
-@@ -9690,7 +9773,7 @@
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-Bstatic'
-       case $cc_basename in
--      f77* | f90* | f95*)
-+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- 	lt_prog_compiler_wl='-Qoption ld ';;
-       *)
- 	lt_prog_compiler_wl='-Wl,';;
-@@ -9747,13 +9830,17 @@
-     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-     ;;
- esac
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
--$as_echo "$lt_prog_compiler_pic" >&6; }
--
--
--
--
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+if ${lt_cv_prog_compiler_pic+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
- 
- #
- # Check to make sure the PIC flag actually works.
-@@ -9761,7 +9848,7 @@
- if test -n "$lt_prog_compiler_pic"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
--if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-+if ${lt_cv_prog_compiler_pic_works+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works=no
-@@ -9777,15 +9864,15 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9780: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9784: \$? = $ac_status" >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_pic_works=yes
-@@ -9814,13 +9901,18 @@
- 
- 
- 
-+
-+
-+
-+
-+
- #
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
--if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-+if ${lt_cv_prog_compiler_static_works+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works=no
-@@ -9833,7 +9925,7 @@
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&5
--       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
-          lt_cv_prog_compiler_static_works=yes
-@@ -9863,7 +9955,7 @@
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+if ${lt_cv_prog_compiler_c_o+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-@@ -9882,16 +9974,16 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9885: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9889: \$? = $ac_status" >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o=yes
-@@ -9918,7 +10010,7 @@
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+if ${lt_cv_prog_compiler_c_o+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-@@ -9937,16 +10029,16 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9940: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9944: \$? = $ac_status" >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o=yes
-@@ -10012,7 +10104,6 @@
-   hardcode_direct=no
-   hardcode_direct_absolute=no
-   hardcode_libdir_flag_spec=
--  hardcode_libdir_flag_spec_ld=
-   hardcode_libdir_separator=
-   hardcode_minus_L=no
-   hardcode_shlibpath_var=unsupported
-@@ -10056,13 +10147,36 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
--  linux* | k*bsd*-gnu)
--    link_all_deplibs=no
--    ;;
-   esac
- 
-   ld_shlibs=yes
-+
-+  # On some targets, GNU ld is compatible enough with the native linker
-+  # that we're better off using the native interface for both.
-+  lt_use_gnu_ld_interface=no
-   if test "$with_gnu_ld" = yes; then
-+    case $host_os in
-+      aix*)
-+	# The AIX port of GNU ld has always aspired to compatibility
-+	# with the native linker.  However, as the warning in the GNU ld
-+	# block says, versions before 2.19.5* couldn't really create working
-+	# shared libraries, regardless of the interface used.
-+	case `$LD -v 2>&1` in
-+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-+	  *)
-+	    lt_use_gnu_ld_interface=yes
-+	    ;;
-+	esac
-+	;;
-+      *)
-+	lt_use_gnu_ld_interface=yes
-+	;;
-+    esac
-+  fi
-+
-+  if test "$lt_use_gnu_ld_interface" = yes; then
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
- 
-@@ -10080,6 +10194,7 @@
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10095,11 +10210,12 @@
- 	ld_shlibs=no
- 	cat <<_LT_EOF 1>&2
- 
--*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** Warning: the GNU linker, at least up to release 2.19, is reported
- *** to be unable to reliably create shared libraries on AIX.
- *** Therefore, libtool is disabling shared libraries support.  If you
--*** really care for shared libraries, you may want to modify your PATH
--*** so that a non-GNU linker is found, and then restart.
-+*** really care for shared libraries, you may want to install binutils
-+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-+*** You will then need to restart the configuration process.
- 
- _LT_EOF
-       fi
-@@ -10135,10 +10251,12 @@
-       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-       # as there is no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
-+      export_dynamic_flag_spec='${wl}--export-all-symbols'
-       allow_undefined_flag=unsupported
-       always_export_symbols=no
-       enable_shared_with_static_runtimes=yes
--      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
- 
-       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -10156,6 +10274,11 @@
-       fi
-       ;;
- 
-+    haiku*)
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      link_all_deplibs=yes
-+      ;;
-+
-     interix[3-9]*)
-       hardcode_direct=no
-       hardcode_shlibpath_var=no
-@@ -10171,7 +10294,7 @@
-       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    gnu* | linux* | tpf* | k*bsd*-gnu)
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-       tmp_diet=no
-       if test "$host_os" = linux-dietlibc; then
- 	case $cc_basename in
-@@ -10181,15 +10304,16 @@
-       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- 	 && test "$tmp_diet" = no
-       then
--	tmp_addflag=
-+	tmp_addflag=' $pic_flag'
- 	tmp_sharedflag='-shared'
- 	case $cc_basename,$host_cpu in
-         pgcc*)				# Portland Group C compiler
--	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag'
- 	  ;;
--	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
--	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	pgf77* | pgf90* | pgf95* | pgfortran*)
-+					# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag -Mnomain' ;;
- 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
- 	  tmp_addflag=' -i_dynamic' ;;
-@@ -10200,13 +10324,17 @@
- 	lf95*)				# Lahey Fortran 8.1
- 	  whole_archive_flag_spec=
- 	  tmp_sharedflag='--shared' ;;
--	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
- 	  tmp_sharedflag='-qmkshrobj'
- 	  tmp_addflag= ;;
-+	nvcc*)	# Cuda Compiler Driver 2.2
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  compiler_needs_object=yes
-+	  ;;
- 	esac
- 	case `$CC -V 2>&1 | sed 5q` in
- 	*Sun\ C*)			# Sun C 5.9
--	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  compiler_needs_object=yes
- 	  tmp_sharedflag='-G' ;;
- 	*Sun\ F*)			# Sun Fortran 8.3
-@@ -10222,17 +10350,16 @@
-         fi
- 
- 	case $cc_basename in
--	xlf*)
-+	xlf* | bgf* | bgxlf* | mpixlf*)
- 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
- 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
--	  hardcode_libdir_flag_spec=
--	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
--	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- 	  if test "x$supports_anon_versioning" = xyes; then
- 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- 	      echo "local: *; };" >> $output_objdir/$libname.ver~
--	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- 	  fi
- 	  ;;
- 	esac
-@@ -10241,13 +10368,13 @@
-       fi
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-       else
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       fi
-       ;;
- 
-@@ -10265,8 +10392,8 @@
- 
- _LT_EOF
-       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	ld_shlibs=no
-       fi
-@@ -10312,8 +10439,8 @@
- 
-     *)
-       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       else
- 	ld_shlibs=no
-       fi
-@@ -10353,8 +10480,10 @@
-       else
- 	# If we're using GNU nm, then we don't want the "-C" option.
- 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	# Also, AIX nm treats weak defined symbols like other global
-+	# defined symbols, whereas GNU nm marks them as "W".
- 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- 	else
- 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- 	fi
-@@ -10416,7 +10545,6 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
--	link_all_deplibs=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -10442,7 +10570,13 @@
- 	allow_undefined_flag='-berok'
-         # Determine the default libpath from the value encoded in an
-         # empty executable.
--        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+        if test "${lt_cv_aix_libpath+set}" = set; then
-+  aix_libpath=$lt_cv_aix_libpath
-+else
-+  if ${lt_cv_aix_libpath_+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -10455,25 +10589,32 @@
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- 
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--	/^0/ {
--	    s/^0  *\(.*\)$/\1/
--	    p
--	}
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi
-+  lt_aix_libpath_sed='
-+      /Import File Strings/,/^$/ {
-+	  /^0/ {
-+	      s/^0  *\([^ ]*\) *$/\1/
-+	      p
-+	  }
-+      }'
-+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  # Check for a 64-bit object if we didn't find anything.
-+  if test -z "$lt_cv_aix_libpath_"; then
-+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+  if test -z "$lt_cv_aix_libpath_"; then
-+    lt_cv_aix_libpath_="/usr/lib:/lib"
-+  fi
-+
-+fi
-+
-+  aix_libpath=$lt_cv_aix_libpath_
-+fi
- 
-         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
--        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
- 	if test "$host_cpu" = ia64; then
- 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -10482,7 +10623,13 @@
- 	else
- 	 # Determine the default libpath from the value encoded in an
- 	 # empty executable.
--	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+	 if test "${lt_cv_aix_libpath+set}" = set; then
-+  aix_libpath=$lt_cv_aix_libpath
-+else
-+  if ${lt_cv_aix_libpath_+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -10495,30 +10642,42 @@
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- 
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--	/^0/ {
--	    s/^0  *\(.*\)$/\1/
--	    p
--	}
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi
-+  lt_aix_libpath_sed='
-+      /Import File Strings/,/^$/ {
-+	  /^0/ {
-+	      s/^0  *\([^ ]*\) *$/\1/
-+	      p
-+	  }
-+      }'
-+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  # Check for a 64-bit object if we didn't find anything.
-+  if test -z "$lt_cv_aix_libpath_"; then
-+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+  if test -z "$lt_cv_aix_libpath_"; then
-+    lt_cv_aix_libpath_="/usr/lib:/lib"
-+  fi
-+
-+fi
-+
-+  aix_libpath=$lt_cv_aix_libpath_
-+fi
- 
- 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 	  # Warning - without using the other run time loading flags,
- 	  # -berok will link without error, but may produce a broken library.
- 	  no_undefined_flag=' ${wl}-bernotok'
- 	  allow_undefined_flag=' ${wl}-berok'
--	  # Exported symbols can be pulled into shared objects from archives
--	  whole_archive_flag_spec='$convenience'
-+	  if test "$with_gnu_ld" = yes; then
-+	    # We only use this code for GNU lds that support --whole-archive.
-+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	  else
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    whole_archive_flag_spec='$convenience'
-+	  fi
- 	  archive_cmds_need_lc=yes
- 	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -10550,20 +10709,64 @@
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
--      hardcode_libdir_flag_spec=' '
--      allow_undefined_flag=unsupported
--      # Tell ltmain to make .lib files, not .a files.
--      libext=lib
--      # Tell ltmain to make .dll files, not .so files.
--      shrext_cmds=".dll"
--      # FIXME: Setting linknames here is a bad hack.
--      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      old_archive_from_new_cmds='true'
--      # FIXME: Should let the user specify the lib program.
--      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
--      enable_shared_with_static_runtimes=yes
-+      case $cc_basename in
-+      cl*)
-+	# Native MSVC
-+	hardcode_libdir_flag_spec=' '
-+	allow_undefined_flag=unsupported
-+	always_export_symbols=yes
-+	file_list_spec='@'
-+	# Tell ltmain to make .lib files, not .a files.
-+	libext=lib
-+	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
-+	# FIXME: Setting linknames here is a bad hack.
-+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	  else
-+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	  fi~
-+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	  linknames='
-+	# The linker will not automatically build a static lib if we build a DLL.
-+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-+	enable_shared_with_static_runtimes=yes
-+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-+	# Don't use ranlib
-+	old_postinstall_cmds='chmod 644 $oldlib'
-+	postlink_cmds='lt_outputfile="@OUTPUT@"~
-+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	  case $lt_outputfile in
-+	    *.exe|*.EXE) ;;
-+	    *)
-+	      lt_outputfile="$lt_outputfile.exe"
-+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-+	      ;;
-+	  esac~
-+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	    $RM "$lt_outputfile.manifest";
-+	  fi'
-+	;;
-+      *)
-+	# Assume MSVC wrapper
-+	hardcode_libdir_flag_spec=' '
-+	allow_undefined_flag=unsupported
-+	# Tell ltmain to make .lib files, not .a files.
-+	libext=lib
-+	# Tell ltmain to make .dll files, not .so files.
-+	shrext_cmds=".dll"
-+	# FIXME: Setting linknames here is a bad hack.
-+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-+	# The linker will automatically build a .lib file if we build a DLL.
-+	old_archive_from_new_cmds='true'
-+	# FIXME: Should let the user specify the lib program.
-+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+	enable_shared_with_static_runtimes=yes
-+	;;
-+      esac
-       ;;
- 
-     darwin* | rhapsody*)
-@@ -10573,7 +10776,12 @@
-   hardcode_direct=no
-   hardcode_automatic=yes
-   hardcode_shlibpath_var=unsupported
--  whole_archive_flag_spec=''
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-+
-+  else
-+    whole_archive_flag_spec=''
-+  fi
-   link_all_deplibs=yes
-   allow_undefined_flag="$_lt_dar_allow_undefined"
-   case $cc_basename in
-@@ -10581,7 +10789,7 @@
-      *) _lt_dar_can_shared=$GCC ;;
-   esac
-   if test "$_lt_dar_can_shared" = "yes"; then
--    output_verbose_link_cmd=echo
-+    output_verbose_link_cmd=func_echo_all
-     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-     archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -10599,10 +10807,6 @@
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
--      ld_shlibs=no
--      ;;
--
-     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-     # support.  Future versions do this automatically, but an explicit c++rt0.o
-     # does not break anything, and helps significantly (at the cost of a little
-@@ -10615,7 +10819,7 @@
-       ;;
- 
-     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
-+    freebsd2.*)
-       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-       hardcode_direct=yes
-       hardcode_minus_L=yes
-@@ -10624,7 +10828,7 @@
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-     freebsd* | dragonfly*)
--      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-       hardcode_shlibpath_var=no
-@@ -10632,7 +10836,7 @@
- 
-     hpux9*)
-       if test "$GCC" = yes; then
--	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       else
- 	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-       fi
-@@ -10647,14 +10851,13 @@
-       ;;
- 
-     hpux10*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-       else
- 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-       fi
-       if test "$with_gnu_ld" = no; then
- 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--	hardcode_libdir_flag_spec_ld='+b $libdir'
- 	hardcode_libdir_separator=:
- 	hardcode_direct=yes
- 	hardcode_direct_absolute=yes
-@@ -10666,16 +10869,16 @@
-       ;;
- 
-     hpux11*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- 	case $host_cpu in
- 	hppa*64*)
- 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	ia64*)
--	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
-       else
-@@ -10687,7 +10890,46 @@
- 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+
-+	  # Older versions of the 11.00 compiler do not understand -b yet
-+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-+$as_echo_n "checking if $CC understands -b... " >&6; }
-+if ${lt_cv_prog_compiler__b+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler__b=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS -b"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler__b=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler__b=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-+$as_echo "$lt_cv_prog_compiler__b" >&6; }
-+
-+if test x"$lt_cv_prog_compiler__b" = xyes; then
-+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+else
-+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+fi
-+
- 	  ;;
- 	esac
-       fi
-@@ -10715,26 +10957,39 @@
- 
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	# Try to use the -exported_symbol ld option, if it does not
- 	# work, assume that -exports_file does not work either and
- 	# implicitly export all symbols.
--        save_LDFLAGS="$LDFLAGS"
--        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
--        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+	# This should be the same for all languages, so no per-tag cache variable.
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-+if ${lt_cv_irix_exported_symbol+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  save_LDFLAGS="$LDFLAGS"
-+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--int foo(void) {}
-+int foo (void) { return 0; }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
--
-+  lt_cv_irix_exported_symbol=yes
-+else
-+  lt_cv_irix_exported_symbol=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--        LDFLAGS="$save_LDFLAGS"
-+           LDFLAGS="$save_LDFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-+	if test "$lt_cv_irix_exported_symbol" = yes; then
-+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+	fi
-       else
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
--	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-       fi
-       archive_cmds_need_lc='no'
-       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10743,7 +10998,7 @@
-       link_all_deplibs=yes
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -10796,17 +11051,17 @@
-       hardcode_libdir_flag_spec='-L$libdir'
-       hardcode_minus_L=yes
-       allow_undefined_flag=unsupported
--      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-       old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
- 
-     osf3*)
-       if test "$GCC" = yes; then
- 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
- 	allow_undefined_flag=' -expect_unresolved \*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-       fi
-       archive_cmds_need_lc='no'
-       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10816,13 +11071,13 @@
-     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
- 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-       else
- 	allow_undefined_flag=' -expect_unresolved \*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
--	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10835,9 +11090,9 @@
-       no_undefined_flag=' -z defs'
-       if test "$GCC" = yes; then
- 	wlarc='${wl}'
--	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-       else
- 	case `$CC -V 2>&1` in
- 	*"Compilers 5.0"*)
-@@ -11025,44 +11280,50 @@
-       # to ld, don't add -lc before -lgcc.
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
- $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
--      $RM conftest*
--      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+if ${lt_cv_archive_cmds_need_lc+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  $RM conftest*
-+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; } 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$lt_prog_compiler_wl
--	pic_flag=$lt_prog_compiler_pic
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$allow_undefined_flag
--        allow_undefined_flag=
--        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+	  soname=conftest
-+	  lib=conftest
-+	  libobjs=conftest.$ac_objext
-+	  deplibs=
-+	  wl=$lt_prog_compiler_wl
-+	  pic_flag=$lt_prog_compiler_pic
-+	  compiler_flags=-v
-+	  linker_flags=-v
-+	  verstring=
-+	  output_objdir=.
-+	  libname=conftest
-+	  lt_save_allow_undefined_flag=$allow_undefined_flag
-+	  allow_undefined_flag=
-+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
--        then
--	  archive_cmds_need_lc=no
--        else
--	  archive_cmds_need_lc=yes
--        fi
--        allow_undefined_flag=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $RM conftest*
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
--$as_echo "$archive_cmds_need_lc" >&6; }
-+	  then
-+	    lt_cv_archive_cmds_need_lc=no
-+	  else
-+	    lt_cv_archive_cmds_need_lc=yes
-+	  fi
-+	  allow_undefined_flag=$lt_save_allow_undefined_flag
-+	else
-+	  cat conftest.err 1>&5
-+	fi
-+	$RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-       ;;
-     esac
-   fi
-@@ -11220,11 +11481,6 @@
- 
- 
- 
--
--
--
--
--
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
- $as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
-@@ -11233,16 +11489,23 @@
-     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-     *) lt_awk_arg="/^libraries:/" ;;
-   esac
--  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-+  case $host_os in
-+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-+    *) lt_sed_strip_eq="s,=/,/,g" ;;
-+  esac
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-+  case $lt_search_path_spec in
-+  *\;*)
-     # if the path contains ";" then we assume it to be the separator
-     # otherwise default to the standard path separator (i.e. ":") - it is
-     # assumed that no part of a normal pathname contains ";" but that should
-     # okay in the real world where ";" in dirpaths is itself problematic.
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
--  else
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
--  fi
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-+    ;;
-+  *)
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-+    ;;
-+  esac
-   # Ok, now we have the path, separated by spaces, we can step through it
-   # and add multilib dir if necessary.
-   lt_tmp_lt_search_path_spec=
-@@ -11255,7 +11518,7 @@
- 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-     fi
-   done
--  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
- BEGIN {RS=" "; FS="/|\n";} {
-   lt_foo="";
-   lt_count=0;
-@@ -11275,7 +11538,13 @@
-   if (lt_foo != "") { lt_freq[lt_foo]++; }
-   if (lt_freq[lt_foo] == 1) { print lt_foo; }
- }'`
--  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-+  # AWK program above erroneously prepends '/' to C:/dos/paths
-+  # for these hosts.
-+  case $host_os in
-+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-+  esac
-+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
- else
-   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-@@ -11301,7 +11570,7 @@
- 
- case $host_os in
- aix3*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-   shlibpath_var=LIBPATH
- 
-@@ -11310,7 +11579,7 @@
-   ;;
- 
- aix[4-9]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   hardcode_into_libs=yes
-@@ -11363,7 +11632,7 @@
-   m68k)
-     library_names_spec='$libname.ixlibrary $libname.a'
-     # Create ${libname}_ixlibrary.a entries in /sys/libs.
--    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-     ;;
-   esac
-   ;;
-@@ -11375,7 +11644,7 @@
-   ;;
- 
- bsdi[45]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11394,8 +11663,9 @@
-   need_version=no
-   need_lib_prefix=no
- 
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+  case $GCC,$cc_basename in
-+  yes,*)
-+    # gcc
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -11416,36 +11686,83 @@
-     cygwin*)
-       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+
-+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-       ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
--        # It is most probably a Windows format PATH printed by
--        # mingw gcc, but we are running on Cygwin. Gcc prints its search
--        # path with ; separators, and with drive letters. We can handle the
--        # drive letters (cygwin fileutils understands them), so leave them,
--        # especially as we might pass files found there to a mingw objdump,
--        # which wouldn't understand a cygwinified path. Ahh.
--        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
--      else
--        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
--      fi
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-+    dynamic_linker='Win32 ld.exe'
-+    ;;
-+
-+  *,cl*)
-+    # Native MSVC
-+    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
-+
-+    case $build_os in
-+    mingw*)
-+      sys_lib_search_path_spec=
-+      lt_save_ifs=$IFS
-+      IFS=';'
-+      for lt_path in $LIB
-+      do
-+        IFS=$lt_save_ifs
-+        # Let DOS variable expansion print the short 8.3 style file name.
-+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-+      done
-+      IFS=$lt_save_ifs
-+      # Convert to MSYS style.
-+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-+      ;;
-+    cygwin*)
-+      # Convert to unix form, then to dos form, then back to unix form
-+      # but this time dos style (no spaces!) so that the unix form looks
-+      # like /cygdrive/c/PROGRA~1:/cygdr...
-+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      ;;
-+    *)
-+      sys_lib_search_path_spec="$LIB"
-+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      # FIXME: find the short name or the path components, as spaces are
-+      # common. (e.g. "Program Files" -> "PROGRA~1")
-+      ;;
-+    esac
-+
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+    dynamic_linker='Win32 link.exe'
-     ;;
- 
-   *)
-+    # Assume MSVC wrapper
-     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    dynamic_linker='Win32 ld.exe'
-     ;;
-   esac
--  dynamic_linker='Win32 ld.exe'
-   # FIXME: first we should search . and the directory the executable is in
-   shlibpath_var=PATH
-   ;;
-@@ -11466,7 +11783,7 @@
-   ;;
- 
- dgux*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-@@ -11474,10 +11791,6 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -11485,7 +11798,7 @@
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[123]*) objformat=aout ;;
-+    freebsd[23].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -11503,7 +11816,7 @@
-   esac
-   shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in
--  freebsd2*)
-+  freebsd2.*)
-     shlibpath_overrides_runpath=yes
-     ;;
-   freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -11523,12 +11836,26 @@
-   ;;
- 
- gnu*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+haiku*)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-   hardcode_into_libs=yes
-   ;;
- 
-@@ -11574,12 +11901,14 @@
-     soname_spec='${libname}${release}${shared_ext}$major'
-     ;;
-   esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-   postinstall_cmds='chmod 555 $lib'
-+  # or fails outright, so override atomically:
-+  install_override_mode=555
-   ;;
- 
- interix[3-9]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-@@ -11595,7 +11924,7 @@
-     nonstopux*) version_type=nonstopux ;;
-     *)
- 	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
-+		version_type=linux # correct to gnu/linux during the next big refactor
- 	else
- 		version_type=irix
- 	fi ;;
-@@ -11632,9 +11961,9 @@
-   dynamic_linker=no
-   ;;
- 
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
--  version_type=linux
-+# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11642,12 +11971,17 @@
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-+
-   # Some binutils ld are patched to set DT_RUNPATH
--  save_LDFLAGS=$LDFLAGS
--  save_libdir=$libdir
--  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
--       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_shlibpath_overrides_runpath=no
-+    save_LDFLAGS=$LDFLAGS
-+    save_libdir=$libdir
-+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -11660,13 +11994,17 @@
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
--  shlibpath_overrides_runpath=yes
-+  lt_cv_shlibpath_overrides_runpath=yes
- fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--  LDFLAGS=$save_LDFLAGS
--  libdir=$save_libdir
-+    LDFLAGS=$save_LDFLAGS
-+    libdir=$save_libdir
-+
-+fi
-+
-+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
- 
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-@@ -11675,7 +12013,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -11688,18 +12026,6 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -11719,7 +12045,7 @@
-   ;;
- 
- newsos6)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
-@@ -11788,7 +12114,7 @@
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11813,7 +12139,7 @@
-   ;;
- 
- sysv4 | sysv4.3*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -11837,7 +12163,7 @@
- 
- sysv4*MP*)
-   if test -d /usr/nec ;then
--    version_type=linux
-+    version_type=linux # correct to gnu/linux during the next big refactor
-     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-     soname_spec='$libname${shared_ext}.$major'
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -11868,7 +12194,7 @@
- 
- tpf*)
-   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11878,7 +12204,7 @@
-   ;;
- 
- uts4*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -11990,6 +12316,11 @@
- 
- 
- 
-+
-+
-+
-+
-+
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
- $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action=
-@@ -12062,7 +12393,7 @@
-   # if libdl is installed we need to link against it
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+if ${ac_cv_lib_dl_dlopen+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -12096,7 +12427,7 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
- 
-@@ -12110,12 +12441,12 @@
- 
-   *)
-     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
--if test "x$ac_cv_func_shl_load" = x""yes; then :
-+if test "x$ac_cv_func_shl_load" = xyes; then :
-   lt_cv_dlopen="shl_load"
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
- $as_echo_n "checking for shl_load in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-+if ${ac_cv_lib_dld_shl_load+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -12149,16 +12480,16 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
- $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
--if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
--if test "x$ac_cv_func_dlopen" = x""yes; then :
-+if test "x$ac_cv_func_dlopen" = xyes; then :
-   lt_cv_dlopen="dlopen"
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+if ${ac_cv_lib_dl_dlopen+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -12192,12 +12523,12 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
- $as_echo_n "checking for dlopen in -lsvld... " >&6; }
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-+if ${ac_cv_lib_svld_dlopen+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -12231,12 +12562,12 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
- $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
--if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
- $as_echo_n "checking for dld_link in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-+if ${ac_cv_lib_dld_dld_link+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -12270,7 +12601,7 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
- $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
--if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
- 
-@@ -12311,7 +12642,7 @@
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
- $as_echo_n "checking whether a program can dlopen itself... " >&6; }
--if test "${lt_cv_dlopen_self+set}" = set; then :
-+if ${lt_cv_dlopen_self+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-@@ -12320,7 +12651,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 12323 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12361,7 +12692,13 @@
- #  endif
- #endif
- 
--void fnord() { int i=42;}
-+/* When -fvisbility=hidden is used, assume the code has been annotated
-+   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-+int fnord () __attribute__((visibility("default")));
-+#endif
-+
-+int fnord () { return 42; }
- int main ()
- {
-   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -12370,7 +12707,11 @@
-   if (self)
-     {
-       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      else
-+        {
-+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-+          else puts (dlerror ());
-+	}
-       /* dlclose (self); */
-     }
-   else
-@@ -12407,7 +12748,7 @@
-       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
- $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
--if test "${lt_cv_dlopen_self_static+set}" = set; then :
-+if ${lt_cv_dlopen_self_static+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-@@ -12416,7 +12757,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 12419 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12457,7 +12798,13 @@
- #  endif
- #endif
- 
--void fnord() { int i=42;}
-+/* When -fvisbility=hidden is used, assume the code has been annotated
-+   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-+int fnord () __attribute__((visibility("default")));
-+#endif
-+
-+int fnord () { return 42; }
- int main ()
- {
-   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -12466,7 +12813,11 @@
-   if (self)
-     {
-       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      else
-+        {
-+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-+          else puts (dlerror ());
-+	}
-       /* dlclose (self); */
-     }
-   else
-@@ -12584,45 +12935,184 @@
- $as_echo_n "checking whether to build shared libraries... " >&6; }
-   test "$can_build_shared" = "no" && enable_shared=no
- 
--  # On AIX, shared libraries and static libraries use the same namespace, and
--  # are all built from PIC.
--  case $host_os in
--  aix3*)
--    test "$enable_shared" = yes && enable_static=no
--    if test -n "$RANLIB"; then
--      archive_cmds="$archive_cmds~\$RANLIB \$lib"
--      postinstall_cmds='$RANLIB $lib'
--    fi
--    ;;
-+  # On AIX, shared libraries and static libraries use the same namespace, and
-+  # are all built from PIC.
-+  case $host_os in
-+  aix3*)
-+    test "$enable_shared" = yes && enable_static=no
-+    if test -n "$RANLIB"; then
-+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+      postinstall_cmds='$RANLIB $lib'
-+    fi
-+    ;;
-+
-+  aix[4-9]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-+$as_echo_n "checking whether to build static libraries... " >&6; }
-+  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
-+
-+
-+
-+
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-+if test -z "$CXXCPP"; then
-+  if ${ac_cv_prog_CXXCPP+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+      # Double quotes because CXXCPP needs to be expanded
-+    for CXXCPP in "$CXX -E" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-+
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  break
-+fi
- 
--  aix[4-9]*)
--    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--      test "$enable_shared" = yes && enable_static=no
--    fi
--    ;;
--  esac
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
--$as_echo "$enable_shared" >&6; }
-+    done
-+    ac_cv_prog_CXXCPP=$CXXCPP
- 
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
--$as_echo_n "checking whether to build static libraries... " >&6; }
--  # Make sure either enable_shared or enable_static is yes.
--  test "$enable_shared" = yes || enable_static=yes
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
--$as_echo "$enable_static" >&6; }
-+fi
-+  CXXCPP=$ac_cv_prog_CXXCPP
-+else
-+  ac_cv_prog_CXXCPP=$CXXCPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-+$as_echo "$CXXCPP" >&6; }
-+ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
- 
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
- 
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details" "$LINENO" 5; }
- fi
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--CC="$lt_save_CC"
--
-+else
-+  _lt_caught_CXX_error=yes
-+fi
- 
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -12639,7 +13129,6 @@
- hardcode_direct_CXX=no
- hardcode_direct_absolute_CXX=no
- hardcode_libdir_flag_spec_CXX=
--hardcode_libdir_flag_spec_ld_CXX=
- hardcode_libdir_separator_CXX=
- hardcode_minus_L_CXX=no
- hardcode_shlibpath_var_CXX=unsupported
-@@ -12649,6 +13138,8 @@
- module_expsym_cmds_CXX=
- link_all_deplibs_CXX=unknown
- old_archive_cmds_CXX=$old_archive_cmds
-+reload_flag_CXX=$reload_flag
-+reload_cmds_CXX=$reload_cmds
- no_undefined_flag_CXX=
- whole_archive_flag_spec_CXX=
- enable_shared_with_static_runtimes_CXX=no
-@@ -12704,6 +13195,7 @@
- 
-   # Allow CC to be a program name with arguments.
-   lt_save_CC=$CC
-+  lt_save_CFLAGS=$CFLAGS
-   lt_save_LD=$LD
-   lt_save_GCC=$GCC
-   GCC=$GXX
-@@ -12721,6 +13213,7 @@
-   fi
-   test -z "${LDCXX+set}" || LD=$LDCXX
-   CC=${CXX-"c++"}
-+  CFLAGS=$CXXFLAGS
-   compiler=$CC
-   compiler_CXX=$CC
-   for cc_temp in $compiler""; do
-@@ -12731,7 +13224,7 @@
-     *) break;;
-   esac
- done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
- 
- 
-   if test -n "$compiler"; then
-@@ -12794,7 +13287,7 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
- $as_echo_n "checking for non-GNU ld... " >&6; }
- fi
--if test "${lt_cv_path_LD+set}" = set; then :
-+if ${lt_cv_path_LD+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$LD"; then
-@@ -12831,10 +13324,10 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
--if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-+if ${lt_cv_prog_gnu_ld+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -12860,8 +13353,8 @@
-       # Check if GNU C++ uses GNU ld as the underlying linker, since the
-       # archiving commands below assume that GNU ld is being used.
-       if test "$with_gnu_ld" = yes; then
--        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 
-         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12893,7 +13386,7 @@
-       # Commands to make compiler produce verbose output that lists
-       # what "hidden" libraries, object files and flags are used when
-       # linking a shared library.
--      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 
-     else
-       GXX=no
-@@ -13003,7 +13496,13 @@
-           allow_undefined_flag_CXX='-berok'
-           # Determine the default libpath from the value encoded in an empty
-           # executable.
--          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+          if test "${lt_cv_aix_libpath+set}" = set; then
-+  aix_libpath=$lt_cv_aix_libpath
-+else
-+  if ${lt_cv_aix_libpath__CXX+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -13016,26 +13515,33 @@
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
- 
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--	/^0/ {
--	    s/^0  *\(.*\)$/\1/
--	    p
--	}
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi
-+  lt_aix_libpath_sed='
-+      /Import File Strings/,/^$/ {
-+	  /^0/ {
-+	      s/^0  *\([^ ]*\) *$/\1/
-+	      p
-+	  }
-+      }'
-+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  # Check for a 64-bit object if we didn't find anything.
-+  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-+  fi
-+
-+fi
-+
-+  aix_libpath=$lt_cv_aix_libpath__CXX
-+fi
- 
-           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
--          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-         else
-           if test "$host_cpu" = ia64; then
- 	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -13044,7 +13550,13 @@
-           else
- 	    # Determine the default libpath from the value encoded in an
- 	    # empty executable.
--	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+	    if test "${lt_cv_aix_libpath+set}" = set; then
-+  aix_libpath=$lt_cv_aix_libpath
-+else
-+  if ${lt_cv_aix_libpath__CXX+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -13057,30 +13569,42 @@
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
- 
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--	/^0/ {
--	    s/^0  *\(.*\)$/\1/
--	    p
--	}
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi
-+  lt_aix_libpath_sed='
-+      /Import File Strings/,/^$/ {
-+	  /^0/ {
-+	      s/^0  *\([^ ]*\) *$/\1/
-+	      p
-+	  }
-+      }'
-+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  # Check for a 64-bit object if we didn't find anything.
-+  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+  fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+  if test -z "$lt_cv_aix_libpath__CXX"; then
-+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-+  fi
-+
-+fi
-+
-+  aix_libpath=$lt_cv_aix_libpath__CXX
-+fi
- 
- 	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- 	    # Warning - without using the other run time loading flags,
- 	    # -berok will link without error, but may produce a broken library.
- 	    no_undefined_flag_CXX=' ${wl}-bernotok'
- 	    allow_undefined_flag_CXX=' ${wl}-berok'
--	    # Exported symbols can be pulled into shared objects from archives
--	    whole_archive_flag_spec_CXX='$convenience'
-+	    if test "$with_gnu_ld" = yes; then
-+	      # We only use this code for GNU lds that support --whole-archive.
-+	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	    else
-+	      # Exported symbols can be pulled into shared objects from archives
-+	      whole_archive_flag_spec_CXX='$convenience'
-+	    fi
- 	    archive_cmds_need_lc_CXX=yes
- 	    # This is similar to how AIX traditionally builds its shared
- 	    # libraries.
-@@ -13110,28 +13634,75 @@
-         ;;
- 
-       cygwin* | mingw* | pw32* | cegcc*)
--        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
--        # as there is no search path for DLLs.
--        hardcode_libdir_flag_spec_CXX='-L$libdir'
--        allow_undefined_flag_CXX=unsupported
--        always_export_symbols_CXX=no
--        enable_shared_with_static_runtimes_CXX=yes
--
--        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
--          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--          # If the export-symbols file already is a .def file (1st line
--          # is EXPORTS), use it as is; otherwise, prepend...
--          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--	    cp $export_symbols $output_objdir/$soname.def;
--          else
--	    echo EXPORTS > $output_objdir/$soname.def;
--	    cat $export_symbols >> $output_objdir/$soname.def;
--          fi~
--          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--        else
--          ld_shlibs_CXX=no
--        fi
--        ;;
-+	case $GXX,$cc_basename in
-+	,cl* | no,cl*)
-+	  # Native MSVC
-+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-+	  # no search path for DLLs.
-+	  hardcode_libdir_flag_spec_CXX=' '
-+	  allow_undefined_flag_CXX=unsupported
-+	  always_export_symbols_CXX=yes
-+	  file_list_spec_CXX='@'
-+	  # Tell ltmain to make .lib files, not .a files.
-+	  libext=lib
-+	  # Tell ltmain to make .dll files, not .so files.
-+	  shrext_cmds=".dll"
-+	  # FIXME: Setting linknames here is a bad hack.
-+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-+	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+	    else
-+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+	    fi~
-+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-+	    linknames='
-+	  # The linker will not automatically build a static lib if we build a DLL.
-+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
-+	  enable_shared_with_static_runtimes_CXX=yes
-+	  # Don't use ranlib
-+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
-+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
-+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-+	    case $lt_outputfile in
-+	      *.exe|*.EXE) ;;
-+	      *)
-+		lt_outputfile="$lt_outputfile.exe"
-+		lt_tool_outputfile="$lt_tool_outputfile.exe"
-+		;;
-+	    esac~
-+	    func_to_tool_file "$lt_outputfile"~
-+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-+	      $RM "$lt_outputfile.manifest";
-+	    fi'
-+	  ;;
-+	*)
-+	  # g++
-+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-+	  # as there is no search path for DLLs.
-+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-+	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
-+	  allow_undefined_flag_CXX=unsupported
-+	  always_export_symbols_CXX=no
-+	  enable_shared_with_static_runtimes_CXX=yes
-+
-+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	    # If the export-symbols file already is a .def file (1st line
-+	    # is EXPORTS), use it as is; otherwise, prepend...
-+	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	      cp $export_symbols $output_objdir/$soname.def;
-+	    else
-+	      echo EXPORTS > $output_objdir/$soname.def;
-+	      cat $export_symbols >> $output_objdir/$soname.def;
-+	    fi~
-+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	  else
-+	    ld_shlibs_CXX=no
-+	  fi
-+	  ;;
-+	esac
-+	;;
-       darwin* | rhapsody*)
- 
- 
-@@ -13139,7 +13710,12 @@
-   hardcode_direct_CXX=no
-   hardcode_automatic_CXX=yes
-   hardcode_shlibpath_var_CXX=unsupported
--  whole_archive_flag_spec_CXX=''
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-+
-+  else
-+    whole_archive_flag_spec_CXX=''
-+  fi
-   link_all_deplibs_CXX=yes
-   allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-   case $cc_basename in
-@@ -13147,7 +13723,7 @@
-      *) _lt_dar_can_shared=$GCC ;;
-   esac
-   if test "$_lt_dar_can_shared" = "yes"; then
--    output_verbose_link_cmd=echo
-+    output_verbose_link_cmd=func_echo_all
-     archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-     module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-     archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -13181,7 +13757,7 @@
-         esac
-         ;;
- 
--      freebsd[12]*)
-+      freebsd2.*)
-         # C++ shared libraries reported to be fairly broken before
- 	# switch to ELF
-         ld_shlibs_CXX=no
-@@ -13200,6 +13776,11 @@
-       gnu*)
-         ;;
- 
-+      haiku*)
-+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        link_all_deplibs_CXX=yes
-+        ;;
-+
-       hpux9*)
-         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-         hardcode_libdir_separator_CXX=:
-@@ -13224,11 +13805,11 @@
-             # explicitly linking system object files so we need to strip them
-             # from the output so that they don't get included in the library
-             # dependencies.
--            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-             ;;
-           *)
-             if test "$GXX" = yes; then
--              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-             else
-               # FIXME: insert proper C++ library support
-               ld_shlibs_CXX=no
-@@ -13289,7 +13870,7 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- 	    ;;
-           *)
- 	    if test "$GXX" = yes; then
-@@ -13299,10 +13880,10 @@
- 	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	            ;;
- 	          ia64*)
--	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	            ;;
- 	          *)
--	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	            ;;
- 	        esac
- 	      fi
-@@ -13332,7 +13913,7 @@
-         case $cc_basename in
-           CC*)
- 	    # SGI C++
--	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 
- 	    # Archives containing C++ object files must be created using
- 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13343,9 +13924,9 @@
-           *)
- 	    if test "$GXX" = yes; then
- 	      if test "$with_gnu_ld" = no; then
--	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	      else
--	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
- 	      fi
- 	    fi
- 	    link_all_deplibs_CXX=yes
-@@ -13356,7 +13937,7 @@
-         inherit_rpath_CXX=yes
-         ;;
- 
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-         case $cc_basename in
-           KCC*)
- 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13374,7 +13955,7 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- 
- 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -13411,26 +13992,26 @@
-           pgCC* | pgcpp*)
-             # Portland Group C++ compiler
- 	    case `$CC -V` in
--	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
-+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
- 	      prelink_cmds_CXX='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
- 	      old_archive_cmds_CXX='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- 		$RANLIB $oldlib'
- 	      archive_cmds_CXX='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- 	      archive_expsym_cmds_CXX='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- 	      ;;
--	    *) # Version 6 will use weak symbols
-+	    *) # Version 6 and above use weak symbols
- 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- 	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- 	      ;;
-@@ -13438,7 +14019,7 @@
- 
- 	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
- 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
--	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-             ;;
- 	  cxx*)
- 	    # Compaq C++
-@@ -13457,9 +14038,9 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
- 	    ;;
--	  xl*)
-+	  xl* | mpixl* | bgxl*)
- 	    # IBM XL 8.0 on PPC, with GNU ld
- 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -13479,13 +14060,13 @@
- 	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
- 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
--	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- 	      compiler_needs_object_CXX=yes
- 
- 	      # Not sure whether something based on
- 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
- 	      # would be better.
--	      output_verbose_link_cmd='echo'
-+	      output_verbose_link_cmd='func_echo_all'
- 
- 	      # Archives containing C++ object files must be created using
- 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13554,7 +14135,7 @@
- 	    export_dynamic_flag_spec_CXX='${wl}-E'
- 	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- 	  fi
--	  output_verbose_link_cmd=echo
-+	  output_verbose_link_cmd=func_echo_all
- 	else
- 	  ld_shlibs_CXX=no
- 	fi
-@@ -13589,15 +14170,15 @@
- 	    case $host in
- 	      osf3*)
- 	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- 		;;
- 	      *)
- 	        allow_undefined_flag_CXX=' -expect_unresolved \*'
--	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	          echo "-hidden">> $lib.exp~
--	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- 	          $RM $lib.exp'
- 	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
- 		;;
-@@ -13613,17 +14194,17 @@
- 	    # explicitly linking system object files so we need to strip them
- 	    # from the output so that they don't get included in the library
- 	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- 	    ;;
- 	  *)
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- 	      case $host in
- 	        osf3*)
--	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 		  ;;
- 	        *)
--	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 		  ;;
- 	      esac
- 
-@@ -13633,7 +14214,7 @@
- 	      # Commands to make compiler produce verbose output that lists
- 	      # what "hidden" libraries, object files and flags are used when
- 	      # linking a shared library.
--	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 
- 	    else
- 	      # FIXME: insert proper C++ library support
-@@ -13669,7 +14250,7 @@
- 
-       solaris*)
-         case $cc_basename in
--          CC*)
-+          CC* | sunCC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
-             archive_cmds_need_lc_CXX=yes
- 	    no_undefined_flag_CXX=' -zdefs'
-@@ -13690,7 +14271,7 @@
- 	    esac
- 	    link_all_deplibs_CXX=yes
- 
--	    output_verbose_link_cmd='echo'
-+	    output_verbose_link_cmd='func_echo_all'
- 
- 	    # Archives containing C++ object files must be created using
- 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13710,14 +14291,14 @@
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
- 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
--	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
- 
- 	        # Commands to make compiler produce verbose output that lists
- 	        # what "hidden" libraries, object files and flags are used when
- 	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 	      else
- 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
- 	        # platform.
-@@ -13728,7 +14309,7 @@
- 	        # Commands to make compiler produce verbose output that lists
- 	        # what "hidden" libraries, object files and flags are used when
- 	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 	      fi
- 
- 	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -13782,6 +14363,10 @@
-           CC*)
- 	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-+	      '"$old_archive_cmds_CXX"
-+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-+	      '"$reload_cmds_CXX"
- 	    ;;
- 	  *)
- 	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -13843,6 +14428,14 @@
- };
- _LT_EOF
- 
-+
-+_lt_libdeps_save_CFLAGS=$CFLAGS
-+case "$CC $CFLAGS " in #(
-+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-+esac
-+
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -13856,7 +14449,7 @@
-   pre_test_object_deps_done=no
- 
-   for p in `eval "$output_verbose_link_cmd"`; do
--    case $p in
-+    case ${prev}${p} in
- 
-     -L* | -R* | -l*)
-        # Some compilers place space between "-{L,R}" and the path.
-@@ -13865,13 +14458,22 @@
-           test $p = "-R"; then
- 	 prev=$p
- 	 continue
--       else
--	 prev=
-        fi
- 
-+       # Expand the sysroot to ease extracting the directories later.
-+       if test -z "$prev"; then
-+         case $p in
-+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-+         esac
-+       fi
-+       case $p in
-+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-+       esac
-        if test "$pre_test_object_deps_done" = no; then
--	 case $p in
--	 -L* | -R*)
-+	 case ${prev} in
-+	 -L | -R)
- 	   # Internal compiler library paths should come after those
- 	   # provided the user.  The postdeps already come after the
- 	   # user supplied libs so there is no need to process them.
-@@ -13891,8 +14493,10 @@
- 	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
- 	 fi
-        fi
-+       prev=
-        ;;
- 
-+    *.lto.$objext) ;; # Ignore GCC LTO objects
-     *.$objext)
-        # This assumes that the test object file only shows up
-        # once in the compiler output.
-@@ -13928,6 +14532,7 @@
- fi
- 
- $RM -f confest.$objext
-+CFLAGS=$_lt_libdeps_save_CFLAGS
- 
- # PORTME: override above test on systems where it is broken
- case $host_os in
-@@ -13963,7 +14568,7 @@
- 
- solaris*)
-   case $cc_basename in
--  CC*)
-+  CC* | sunCC*)
-     # The more standards-conforming stlport4 library is
-     # incompatible with the Cstd library. Avoid specifying
-     # it if it's in CXXFLAGS. Ignore libCrun as
-@@ -14028,8 +14633,6 @@
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
--$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -14079,6 +14682,11 @@
-       # DJGPP does not support shared libraries at all
-       lt_prog_compiler_pic_CXX=
-       ;;
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static_CXX=
-+      ;;
-     interix[3-9]*)
-       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-       # Instead, we relocate shared libraries at runtime.
-@@ -14128,6 +14736,11 @@
- 	  ;;
- 	esac
- 	;;
-+      mingw* | cygwin* | os2* | pw32* | cegcc*)
-+	# This hack is so that the source file can tell whether it is being
-+	# built for inclusion in a dll (and should export symbols for example).
-+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-+	;;
-       dgux*)
- 	case $cc_basename in
- 	  ec++*)
-@@ -14184,7 +14797,7 @@
- 	    ;;
- 	esac
- 	;;
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
- 	case $cc_basename in
- 	  KCC*)
- 	    # KAI C++ Compiler
-@@ -14217,8 +14830,8 @@
- 	    lt_prog_compiler_pic_CXX=
- 	    lt_prog_compiler_static_CXX='-non_shared'
- 	    ;;
--	  xlc* | xlC*)
--	    # IBM XL 8.0 on PPC
-+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
-+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_pic_CXX='-qpic'
- 	    lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -14248,7 +14861,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd* | netbsdelf*-gnu)
-+      netbsd*)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -14280,7 +14893,7 @@
- 	;;
-       solaris*)
- 	case $cc_basename in
--	  CC*)
-+	  CC* | sunCC*)
- 	    # Sun C++ 4.2, 5.x and Centerline C++
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-Bstatic'
-@@ -14345,10 +14958,17 @@
-     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-     ;;
- esac
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
--$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
--
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
-+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
- 
- #
- # Check to make sure the PIC flag actually works.
-@@ -14356,7 +14976,7 @@
- if test -n "$lt_prog_compiler_pic_CXX"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
- $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
--if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
-+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works_CXX=no
-@@ -14372,15 +14992,15 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14375: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14379: \$? = $ac_status" >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_pic_works_CXX=yes
-@@ -14406,13 +15026,15 @@
- 
- 
- 
-+
-+
- #
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
--if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
-+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works_CXX=no
-@@ -14425,7 +15047,7 @@
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&5
--       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
-          lt_cv_prog_compiler_static_works_CXX=yes
-@@ -14452,7 +15074,7 @@
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_CXX=no
-@@ -14471,16 +15093,16 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14474: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14478: \$? = $ac_status" >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_CXX=yes
-@@ -14504,7 +15126,7 @@
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_CXX=no
-@@ -14523,16 +15145,16 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14526: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14530: \$? = $ac_status" >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-        lt_cv_prog_compiler_c_o_CXX=yes
-@@ -14583,30 +15205,37 @@
- $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- 
-   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-   case $host_os in
-   aix[4-9]*)
-     # If we're using GNU nm, then we don't want the "-C" option.
-     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    # Also, AIX nm treats weak defined symbols like other global defined
-+    # symbols, whereas GNU nm marks them as "W".
-     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-     else
-       export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-     fi
-     ;;
-   pw32*)
-     export_symbols_cmds_CXX="$ltdll_cmds"
--  ;;
-+    ;;
-   cygwin* | mingw* | cegcc*)
--    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
--  linux* | k*bsd*-gnu)
--    link_all_deplibs_CXX=no
--  ;;
-+    case $cc_basename in
-+    cl*)
-+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-+      ;;
-+    *)
-+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-+      ;;
-+    esac
-+    ;;
-   *)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
-+    ;;
-   esac
--  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
- $as_echo "$ld_shlibs_CXX" >&6; }
-@@ -14638,44 +15267,50 @@
-       # to ld, don't add -lc before -lgcc.
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
- $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
--      $RM conftest*
--      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  $RM conftest*
-+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; } 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$lt_prog_compiler_wl_CXX
--	pic_flag=$lt_prog_compiler_pic_CXX
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
--        allow_undefined_flag_CXX=
--        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+	  soname=conftest
-+	  lib=conftest
-+	  libobjs=conftest.$ac_objext
-+	  deplibs=
-+	  wl=$lt_prog_compiler_wl_CXX
-+	  pic_flag=$lt_prog_compiler_pic_CXX
-+	  compiler_flags=-v
-+	  linker_flags=-v
-+	  verstring=
-+	  output_objdir=.
-+	  libname=conftest
-+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-+	  allow_undefined_flag_CXX=
-+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
--        then
--	  archive_cmds_need_lc_CXX=no
--        else
--	  archive_cmds_need_lc_CXX=yes
--        fi
--        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $RM conftest*
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
--$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-+	  then
-+	    lt_cv_archive_cmds_need_lc_CXX=no
-+	  else
-+	    lt_cv_archive_cmds_need_lc_CXX=yes
-+	  fi
-+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-+	else
-+	  cat conftest.err 1>&5
-+	fi
-+	$RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
-+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
-       ;;
-     esac
-   fi
-@@ -14743,8 +15378,6 @@
- 
- 
- 
--
--
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
- $as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
-@@ -14770,7 +15403,7 @@
- 
- case $host_os in
- aix3*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-   shlibpath_var=LIBPATH
- 
-@@ -14779,7 +15412,7 @@
-   ;;
- 
- aix[4-9]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   hardcode_into_libs=yes
-@@ -14832,7 +15465,7 @@
-   m68k)
-     library_names_spec='$libname.ixlibrary $libname.a'
-     # Create ${libname}_ixlibrary.a entries in /sys/libs.
--    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-     ;;
-   esac
-   ;;
-@@ -14844,7 +15477,7 @@
-   ;;
- 
- bsdi[45]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14863,8 +15496,9 @@
-   need_version=no
-   need_lib_prefix=no
- 
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+  case $GCC,$cc_basename in
-+  yes,*)
-+    # gcc
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -14885,36 +15519,82 @@
-     cygwin*)
-       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+
-       ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
--        # It is most probably a Windows format PATH printed by
--        # mingw gcc, but we are running on Cygwin. Gcc prints its search
--        # path with ; separators, and with drive letters. We can handle the
--        # drive letters (cygwin fileutils understands them), so leave them,
--        # especially as we might pass files found there to a mingw objdump,
--        # which wouldn't understand a cygwinified path. Ahh.
--        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
--      else
--        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
--      fi
-       ;;
-     pw32*)
-       # pw32 DLLs use 'pw' prefix rather than 'lib'
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
-+    dynamic_linker='Win32 ld.exe'
-+    ;;
-+
-+  *,cl*)
-+    # Native MSVC
-+    libname_spec='$name'
-+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+    library_names_spec='${libname}.dll.lib'
-+
-+    case $build_os in
-+    mingw*)
-+      sys_lib_search_path_spec=
-+      lt_save_ifs=$IFS
-+      IFS=';'
-+      for lt_path in $LIB
-+      do
-+        IFS=$lt_save_ifs
-+        # Let DOS variable expansion print the short 8.3 style file name.
-+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-+      done
-+      IFS=$lt_save_ifs
-+      # Convert to MSYS style.
-+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-+      ;;
-+    cygwin*)
-+      # Convert to unix form, then to dos form, then back to unix form
-+      # but this time dos style (no spaces!) so that the unix form looks
-+      # like /cygdrive/c/PROGRA~1:/cygdr...
-+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      ;;
-+    *)
-+      sys_lib_search_path_spec="$LIB"
-+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      # FIXME: find the short name or the path components, as spaces are
-+      # common. (e.g. "Program Files" -> "PROGRA~1")
-+      ;;
-+    esac
-+
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+    dynamic_linker='Win32 link.exe'
-     ;;
- 
-   *)
-+    # Assume MSVC wrapper
-     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    dynamic_linker='Win32 ld.exe'
-     ;;
-   esac
--  dynamic_linker='Win32 ld.exe'
-   # FIXME: first we should search . and the directory the executable is in
-   shlibpath_var=PATH
-   ;;
-@@ -14934,7 +15614,7 @@
-   ;;
- 
- dgux*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-@@ -14942,10 +15622,6 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -14953,7 +15629,7 @@
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[123]*) objformat=aout ;;
-+    freebsd[23].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -14971,7 +15647,7 @@
-   esac
-   shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in
--  freebsd2*)
-+  freebsd2.*)
-     shlibpath_overrides_runpath=yes
-     ;;
-   freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -14991,12 +15667,26 @@
-   ;;
- 
- gnu*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+haiku*)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-   hardcode_into_libs=yes
-   ;;
- 
-@@ -15042,12 +15732,14 @@
-     soname_spec='${libname}${release}${shared_ext}$major'
-     ;;
-   esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-   postinstall_cmds='chmod 555 $lib'
-+  # or fails outright, so override atomically:
-+  install_override_mode=555
-   ;;
- 
- interix[3-9]*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-@@ -15063,7 +15755,7 @@
-     nonstopux*) version_type=nonstopux ;;
-     *)
- 	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
-+		version_type=linux # correct to gnu/linux during the next big refactor
- 	else
- 		version_type=irix
- 	fi ;;
-@@ -15100,9 +15792,9 @@
-   dynamic_linker=no
-   ;;
- 
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
--  version_type=linux
-+# This must be glibc/ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15110,12 +15802,17 @@
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-+
-   # Some binutils ld are patched to set DT_RUNPATH
--  save_LDFLAGS=$LDFLAGS
--  save_libdir=$libdir
--  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
--       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_shlibpath_overrides_runpath=no
-+    save_LDFLAGS=$LDFLAGS
-+    save_libdir=$libdir
-+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -15128,13 +15825,17 @@
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
-   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
--  shlibpath_overrides_runpath=yes
-+  lt_cv_shlibpath_overrides_runpath=yes
- fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--  LDFLAGS=$save_LDFLAGS
--  libdir=$save_libdir
-+    LDFLAGS=$save_LDFLAGS
-+    libdir=$save_libdir
-+
-+fi
-+
-+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
- 
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-@@ -15143,7 +15844,7 @@
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-@@ -15156,18 +15857,6 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -15187,7 +15876,7 @@
-   ;;
- 
- newsos6)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
-@@ -15256,7 +15945,7 @@
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15281,7 +15970,7 @@
-   ;;
- 
- sysv4 | sysv4.3*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -15305,7 +15994,7 @@
- 
- sysv4*MP*)
-   if test -d /usr/nec ;then
--    version_type=linux
-+    version_type=linux # correct to gnu/linux during the next big refactor
-     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-     soname_spec='$libname${shared_ext}.$major'
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -15336,7 +16025,7 @@
- 
- tpf*)
-   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15346,7 +16035,7 @@
-   ;;
- 
- uts4*)
--  version_type=linux
-+  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -15407,6 +16096,8 @@
- 
- 
- 
-+
-+
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
- $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action_CXX=
-@@ -15454,6 +16145,7 @@
-   fi # test -n "$compiler"
- 
-   CC=$lt_save_CC
-+  CFLAGS=$lt_save_CFLAGS
-   LDCXX=$LD
-   LD=$lt_save_LD
-   GCC=$lt_save_GCC
-@@ -15482,6 +16174,8 @@
- 
- 
- 
-+
-+
-         ac_config_commands="$ac_config_commands libtool"
- 
- 
-@@ -15494,7 +16188,7 @@
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
-@@ -15502,7 +16196,7 @@
- all:
- 	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
-   *@@@%%%=?*=@@@%%%*)
-     eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -15541,7 +16235,7 @@
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
- $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
--if test "${ac_cv_sys_largefile_CC+set}" = set; then :
-+if ${ac_cv_sys_largefile_CC+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_sys_largefile_CC=no
-@@ -15592,7 +16286,7 @@
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
--if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
-+if ${ac_cv_sys_file_offset_bits+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   while :; do
-@@ -15661,7 +16355,7 @@
-   if test $ac_cv_sys_file_offset_bits = unknown; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
- $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
--if test "${ac_cv_sys_large_files+set}" = set; then :
-+if ${ac_cv_sys_large_files+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   while :; do
-@@ -15732,13 +16426,18 @@
- 
- 
- 
-+
-+
-+
-+
-+
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- 	if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -15781,7 +16480,7 @@
- set dummy pkg-config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $ac_pt_PKG_CONFIG in
-@@ -15844,15 +16543,13 @@
- $as_echo "no" >&6; }
- 		PKG_CONFIG=""
- 	fi
--
- fi
- 
- for ac_header in sys/ioccom.h sys/inotify.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--eval as_val=\$$as_ac_Header
--   if test "x$as_val" = x""yes; then :
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -15953,11 +16650,11 @@
-        as_ac_File=`$as_echo "ac_cv_file_$dir/pci.ids" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/pci.ids" >&5
- $as_echo_n "checking for $dir/pci.ids... " >&6; }
--if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${$as_ac_File+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   test "$cross_compiling" = yes &&
--  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
-+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
- if test -r "$dir/pci.ids"; then
-   eval "$as_ac_File=yes"
- else
-@@ -15967,14 +16664,13 @@
- eval ac_res=\$$as_ac_File
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--eval as_val=\$$as_ac_File
--   if test "x$as_val" = x""yes; then :
-+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-   PCI_IDS_DIR=$dir
- fi
- 
-      done
-      if test -z "$PCI_IDS_DIR"; then
--       as_fn_error "cannot find pci.ids. Use --with-pci-ids to specify location" "$LINENO" 5
-+       as_fn_error $? "cannot find pci.ids. Use --with-pci-ids to specify location" "$LINENO" 5
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: autodetected pci.ids in $PCI_IDS_DIR" >&5
- $as_echo "$as_me: WARNING: autodetected pci.ids in $PCI_IDS_DIR" >&2;}
-@@ -15994,11 +16690,11 @@
-        as_ac_File=`$as_echo "ac_cv_file_$dir/usb.ids" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/usb.ids" >&5
- $as_echo_n "checking for $dir/usb.ids... " >&6; }
--if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval \${$as_ac_File+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   test "$cross_compiling" = yes &&
--  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
-+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
- if test -r "$dir/usb.ids"; then
-   eval "$as_ac_File=yes"
- else
-@@ -16008,14 +16704,13 @@
- eval ac_res=\$$as_ac_File
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--eval as_val=\$$as_ac_File
--   if test "x$as_val" = x""yes; then :
-+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
-   USB_IDS_DIR=$dir
- fi
- 
-      done
-      if test -z "$USB_IDS_DIR"; then
--       as_fn_error "cannot find usb.ids. Use --with-usb-ids to specify location" "$LINENO" 5
-+       as_fn_error $? "cannot find usb.ids. Use --with-usb-ids to specify location" "$LINENO" 5
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: autodetected usb.ids in $USB_IDS_DIR" >&5
- $as_echo "$as_me: WARNING: autodetected usb.ids in $USB_IDS_DIR" >&2;}
-@@ -16165,7 +16860,7 @@
- set dummy pkg-config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -16352,7 +17047,7 @@
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
- $as_echo_n "checking for uuid_generate in -luuid... " >&6; }
--if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
-+if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -16386,7 +17081,7 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
- $as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
--if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then :
-+if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBUUID 1
- _ACEOF
-@@ -16394,12 +17089,12 @@
-   LIBS="-luuid $LIBS"
- 
- else
--  as_fn_error "*** uuid library (libuuid) not found" "$LINENO" 5
-+  as_fn_error $? "*** uuid library (libuuid) not found" "$LINENO" 5
- fi
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+if ${ac_cv_lib_dl_dlopen+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -16433,7 +17128,7 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDL 1
- _ACEOF
-@@ -16441,7 +17136,7 @@
-   LIBS="-ldl $LIBS"
- 
- else
--  as_fn_error "*** dl library (libdl) not found" "$LINENO" 5
-+  as_fn_error $? "*** dl library (libdl) not found" "$LINENO" 5
- fi
- 
- 
-@@ -16452,8 +17147,8 @@
-     if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "cannot run test program while cross compiling
-+See \`config.log' for more details" "$LINENO" 5; }
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -16481,7 +17176,7 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
- $as_echo "" >&6; }
- else
--  as_fn_error "*** Requires libparted == 1.7.1 or >= 1.8.0" "$LINENO" 5
-+  as_fn_error $? "*** Requires libparted == 1.7.1 or >= 1.8.0" "$LINENO" 5
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
-@@ -16496,46 +17191,46 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PARTED" >&5
- $as_echo_n "checking for PARTED... " >&6; }
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$PARTED_CFLAGS"; then
--        pkg_cv_PARTED_CFLAGS="$PARTED_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$PARTED_CFLAGS"; then
-+    pkg_cv_PARTED_CFLAGS="$PARTED_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libparted\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "libparted") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_PARTED_CFLAGS=`$PKG_CONFIG --cflags "libparted" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$PARTED_LIBS"; then
--        pkg_cv_PARTED_LIBS="$PARTED_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$PARTED_LIBS"; then
-+    pkg_cv_PARTED_LIBS="$PARTED_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libparted\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "libparted") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_PARTED_LIBS=`$PKG_CONFIG --libs "libparted" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
- 
- 
- 
- if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 
- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-         _pkg_short_errors_supported=yes
-@@ -16543,14 +17238,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        PARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libparted"`
-+	        PARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libparted" 2>&1`
-         else
--	        PARTED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libparted"`
-+	        PARTED_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libparted" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$PARTED_PKG_ERRORS" >&5
- 
--	as_fn_error "Package requirements (libparted) were not met:
-+	as_fn_error $? "Package requirements (libparted) were not met:
- 
- $PARTED_PKG_ERRORS
- 
-@@ -16559,12 +17254,13 @@
- 
- Alternatively, you may set the environment variables PARTED_CFLAGS
- and PARTED_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" "$LINENO" 5
-+See the pkg-config man page for more details." "$LINENO" 5
- elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
-+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -16573,13 +17269,13 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- 	PARTED_CFLAGS=$pkg_cv_PARTED_CFLAGS
- 	PARTED_LIBS=$pkg_cv_PARTED_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--	:
-+
- fi
-   fi
- 
-@@ -16677,7 +17373,7 @@
-   fi
-   else
-   if test x$enable_gcov = xyes; then
--    as_fn_error "--enable-gcov can only be used with gcc" "$LINENO" 5
-+    as_fn_error $? "--enable-gcov can only be used with gcc" "$LINENO" 5
-   fi
- fi
- 
-@@ -16703,21 +17399,21 @@
- for ac_header in expat.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
--if test "x$ac_cv_header_expat_h" = x""yes; then :
-+if test "x$ac_cv_header_expat_h" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_EXPAT_H 1
- _ACEOF
-  $as_echo "#define HAVE_EXPAT_H 1" >>confdefs.h
- 
- else
--  as_fn_error "Can't find expat.h. Please install expat." "$LINENO" 5
-+  as_fn_error $? "Can't find expat.h. Please install expat." "$LINENO" 5
- fi
- 
- done
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
- $as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
--if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
-+if ${ac_cv_lib_expat_XML_ParserCreate+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -16751,10 +17447,10 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
- $as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
--if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
-+if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes; then :
-   EXPAT_LIB="-lexpat"
- else
--  as_fn_error "Can't find expat library. Please install expat." "$LINENO" 5
-+  as_fn_error $? "Can't find expat library. Please install expat." "$LINENO" 5
- fi
- 
- 
-@@ -16770,7 +17466,7 @@
- 	for ac_header in usb.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
--if test "x$ac_cv_header_usb_h" = x""yes; then :
-+if test "x$ac_cv_header_usb_h" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_USB_H 1
- _ACEOF
-@@ -16784,7 +17480,7 @@
- 	if test "x$USE_LIBUSB" = "xyes"; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_find_devices in -lusb" >&5
- $as_echo_n "checking for usb_find_devices in -lusb... " >&6; }
--if test "${ac_cv_lib_usb_usb_find_devices+set}" = set; then :
-+if ${ac_cv_lib_usb_usb_find_devices+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -16818,7 +17514,7 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_find_devices" >&5
- $as_echo "$ac_cv_lib_usb_usb_find_devices" >&6; }
--if test "x$ac_cv_lib_usb_usb_find_devices" = x""yes; then :
-+if test "x$ac_cv_lib_usb_usb_find_devices" = xyes; then :
-   USE_LIBUSB=yes
- else
-   USE_LIBUSB=no
-@@ -16853,7 +17549,7 @@
- 
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMBIOSFreeMemory in -lsmbios" >&5
- $as_echo_n "checking for SMBIOSFreeMemory in -lsmbios... " >&6; }
--if test "${ac_cv_lib_smbios_SMBIOSFreeMemory+set}" = set; then :
-+if ${ac_cv_lib_smbios_SMBIOSFreeMemory+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -16887,7 +17583,7 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smbios_SMBIOSFreeMemory" >&5
- $as_echo "$ac_cv_lib_smbios_SMBIOSFreeMemory" >&6; }
--if test "x$ac_cv_lib_smbios_SMBIOSFreeMemory" = x""yes; then :
-+if test "x$ac_cv_lib_smbios_SMBIOSFreeMemory" = xyes; then :
-   LIB_SMBIOS=yes
- else
-   LIB_SMBIOS=no
-@@ -16906,8 +17602,8 @@
-    		if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "cannot run test program while cross compiling
-+See \`config.log' for more details" "$LINENO" 5; }
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -16972,8 +17668,8 @@
-    		if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
-+as_fn_error $? "cannot run test program while cross compiling
-+See \`config.log' for more details" "$LINENO" 5; }
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -17036,13 +17732,13 @@
-     for ac_header in pci/pci.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "pci/pci.h" "ac_cv_header_pci_pci_h" "$ac_includes_default"
--if test "x$ac_cv_header_pci_pci_h" = x""yes; then :
-+if test "x$ac_cv_header_pci_pci_h" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_PCI_PCI_H 1
- _ACEOF
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pci_init in -lpci" >&5
- $as_echo_n "checking for pci_init in -lpci... " >&6; }
--if test "${ac_cv_lib_pci_pci_init+set}" = set; then :
-+if ${ac_cv_lib_pci_pci_init+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -17076,7 +17772,7 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pci_pci_init" >&5
- $as_echo "$ac_cv_lib_pci_pci_init" >&6; }
--if test "x$ac_cv_lib_pci_pci_init" = x""yes; then :
-+if test "x$ac_cv_lib_pci_pci_init" = xyes; then :
-   USE_LIBPCI="yes"
- fi
- 
-@@ -17094,9 +17790,6 @@
- fi
- 
- 
--USE_LIBUSB20=no
--USE_LIBUSB=no
--LIBUSB20_LIBS=""
- 
- # Check whether --with-backend was given.
- if test "${with_backend+set}" = set; then :
-@@ -17155,9 +17848,12 @@
- 
- 
- if test "x$HALD_BACKEND" = "xfreebsd"; then
-+    USE_BSDLIBUSB20=no
-+    USE_BSDLIBUSB=no
-+    LIBUSB20_LIBS=""
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb20" >&5
- $as_echo_n "checking for libusb20_dev_get_info in -lusb20... " >&6; }
--if test "${ac_cv_lib_usb20_libusb20_dev_get_info+set}" = set; then :
-+if ${ac_cv_lib_usb20_libusb20_dev_get_info+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -17191,17 +17887,16 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5
- $as_echo "$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; }
--if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = x""yes; then :
--  USE_LIBUSB20=yes
-+if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = xyes; then :
-+  USE_BSDLIBUSB20=yes
- else
--  USE_LIBUSB20=no
-+  USE_BSDLIBUSB20=no
- fi
- 
--fi
--if test "x$USE_LIBUSB20" = "xno"; then
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb" >&5
-+    if test "x$USE_BSDLIBUSB20" = "xno"; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb" >&5
- $as_echo_n "checking for libusb20_dev_get_info in -lusb... " >&6; }
--if test "${ac_cv_lib_usb_libusb20_dev_get_info+set}" = set; then :
-+if ${ac_cv_lib_usb_libusb20_dev_get_info+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -17235,22 +17930,14 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_libusb20_dev_get_info" >&5
- $as_echo "$ac_cv_lib_usb_libusb20_dev_get_info" >&6; }
--if test "x$ac_cv_lib_usb_libusb20_dev_get_info" = x""yes; then :
--  USE_LIBUSB=yes
--else
--  USE_LIBUSB=no
--fi
--
--fi
-- if test "x$USE_LIBUSB20" = "xyes"; then
--  HAVE_LIBUSB20_TRUE=
--  HAVE_LIBUSB20_FALSE='#'
-+if test "x$ac_cv_lib_usb_libusb20_dev_get_info" = xyes; then :
-+  USE_BSDLIBUSB=yes
- else
--  HAVE_LIBUSB20_TRUE='#'
--  HAVE_LIBUSB20_FALSE=
-+  USE_BSDLIBUSB=no
- fi
- 
-- if test "x$USE_LIBUSB" = "xyes"; then
-+    fi
-+     if test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"; then
-   HAVE_LIBUSB20_TRUE=
-   HAVE_LIBUSB20_FALSE='#'
- else
-@@ -17258,18 +17945,28 @@
-   HAVE_LIBUSB20_FALSE=
- fi
- 
--if test "x$USE_LIBUSB20" = "xyes"; then
-+    if test "x$USE_BSDLIBUSB20" = "xyes"; then
- 
- $as_echo "#define HAVE_LIBUSB20 1" >>confdefs.h
- 
--    LIBUSB20_LIBS="-lusb20"
--elif test "x$USE_LIBUSB" = "xyes"; then
-+        LIBUSB20_LIBS="-lusb20"
-+    elif test "x$USE_BSDLIBUSB" = "xyes"; then
- 
- $as_echo "#define HAVE_LIBUSB20 1" >>confdefs.h
- 
--    LIBUSB20_LIBS="-lusb"
-+        LIBUSB20_LIBS="-lusb"
-+    fi
-+
-+else
-+     if false; then
-+  HAVE_LIBUSB20_TRUE=
-+  HAVE_LIBUSB20_FALSE='#'
-+else
-+  HAVE_LIBUSB20_TRUE='#'
-+  HAVE_LIBUSB20_FALSE=
- fi
- 
-+fi
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -17335,7 +18032,7 @@
- set dummy gperf; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GPERF+set}" = set; then :
-+if ${ac_cv_path_GPERF+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $GPERF in
-@@ -17443,53 +18140,53 @@
- msg_polkit=no
- if test "x$enable_policy_kit" != "xno"; then
-    if test "x$enable_console_kit" = "xno"; then
--      as_fn_error "PolicyKit support requires building with ConsoleKit support too" "$LINENO" 5
-+      as_fn_error $? "PolicyKit support requires building with ConsoleKit support too" "$LINENO" 5
-    fi
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5
- $as_echo_n "checking for POLKIT... " >&6; }
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$POLKIT_CFLAGS"; then
--        pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$POLKIT_CFLAGS"; then
-+    pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$polkit_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$polkit_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "$polkit_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$POLKIT_LIBS"; then
--        pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$POLKIT_LIBS"; then
-+    pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$polkit_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$polkit_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "$polkit_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
- 
- 
- 
- if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 
- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-         _pkg_short_errors_supported=yes
-@@ -17497,16 +18194,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$polkit_module"`
-+	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$polkit_module" 2>&1`
-         else
--	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$polkit_module"`
-+	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$polkit_module" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$POLKIT_PKG_ERRORS" >&5
- 
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--                 if false; then
-+	 if false; then
-   HAVE_POLKIT_TRUE=
-   HAVE_POLKIT_FALSE='#'
- else
-@@ -17515,6 +18210,8 @@
- fi
- 
- elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 	 if false; then
-   HAVE_POLKIT_TRUE=
-   HAVE_POLKIT_FALSE='#'
-@@ -17544,14 +18241,14 @@
- 
- 
-    if test "x$msg_polkit" != "xyes"; then
--      as_fn_error "PolicyKit not explicitly disabled and no PolicyKit found" "$LINENO" 5
-+      as_fn_error $? "PolicyKit not explicitly disabled and no PolicyKit found" "$LINENO" 5
-    fi
- 
-    # Extract the first word of "polkit-policy-file-validate", so it can be a program name with args.
- set dummy polkit-policy-file-validate; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE+set}" = set; then :
-+if ${ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$POLKIT_POLICY_FILE_VALIDATE"; then
-@@ -17585,7 +18282,7 @@
- 
- 
-    if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
--      as_fn_error "polkit-policy-file-validate not found" "$LINENO" 5
-+      as_fn_error $? "polkit-policy-file-validate not found" "$LINENO" 5
-    fi
- fi
- 
-@@ -17608,7 +18305,7 @@
- msg_aclmgmt=no
- if test "x$enable_acl_management" != "xno"; then
-    if test "x$enable_policy_kit" = "xno"; then
--      as_fn_error "ACL management support requires building with PolicyKit support" "$LINENO" 5
-+      as_fn_error $? "ACL management support requires building with PolicyKit support" "$LINENO" 5
-    fi
-     if true; then
-   HAVE_ACLMGMT_TRUE=
-@@ -17758,46 +18455,46 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
- $as_echo_n "checking for DBUS... " >&6; }
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$DBUS_CFLAGS"; then
--        pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$DBUS_CFLAGS"; then
-+    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$dbus_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$dbus_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "$dbus_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$DBUS_LIBS"; then
--        pkg_cv_DBUS_LIBS="$DBUS_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$DBUS_LIBS"; then
-+    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$dbus_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$dbus_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "$dbus_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
- 
- 
- 
- if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 
- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-         _pkg_short_errors_supported=yes
-@@ -17805,14 +18502,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$dbus_module"`
-+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$dbus_module" 2>&1`
-         else
--	        DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$dbus_module"`
-+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$dbus_module" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DBUS_PKG_ERRORS" >&5
- 
--	as_fn_error "Package requirements ($dbus_module) were not met:
-+	as_fn_error $? "Package requirements ($dbus_module) were not met:
- 
- $DBUS_PKG_ERRORS
- 
-@@ -17821,12 +18518,13 @@
- 
- Alternatively, you may set the environment variables DBUS_CFLAGS
- and DBUS_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" "$LINENO" 5
-+See the pkg-config man page for more details." "$LINENO" 5
- elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
-+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -17835,13 +18533,13 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
- 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--	:
-+
- fi
- 
- 
-@@ -17852,46 +18550,46 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
- $as_echo_n "checking for GLIB... " >&6; }
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$GLIB_CFLAGS"; then
--        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$GLIB_CFLAGS"; then
-+    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$glib_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$glib_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$glib_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$GLIB_LIBS"; then
--        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$GLIB_LIBS"; then
-+    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$glib_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$glib_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$glib_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
- 
- 
- 
- if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 
- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-         _pkg_short_errors_supported=yes
-@@ -17899,14 +18597,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$glib_module"`
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$glib_module" 2>&1`
-         else
--	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$glib_module"`
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$glib_module" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GLIB_PKG_ERRORS" >&5
- 
--	as_fn_error "Package requirements ($glib_module) were not met:
-+	as_fn_error $? "Package requirements ($glib_module) were not met:
- 
- $GLIB_PKG_ERRORS
- 
-@@ -17915,12 +18613,13 @@
- 
- Alternatively, you may set the environment variables GLIB_CFLAGS
- and GLIB_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" "$LINENO" 5
-+See the pkg-config man page for more details." "$LINENO" 5
- elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
-+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -17929,13 +18628,13 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- 	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
- 	GLIB_LIBS=$pkg_cv_GLIB_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--	:
-+
- fi
- 
- 
-@@ -17960,46 +18659,46 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VOLUME_ID" >&5
- $as_echo_n "checking for VOLUME_ID... " >&6; }
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$VOLUME_ID_CFLAGS"; then
--        pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$VOLUME_ID_CFLAGS"; then
-+    pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_VOLUME_ID_CFLAGS=`$PKG_CONFIG --cflags "$volume_id_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$VOLUME_ID_LIBS"; then
--        pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$VOLUME_ID_LIBS"; then
-+    pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_VOLUME_ID_LIBS=`$PKG_CONFIG --libs "$volume_id_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
- 
- 
- 
- if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 
- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-         _pkg_short_errors_supported=yes
-@@ -18007,14 +18706,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$volume_id_module"`
-+	        VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$volume_id_module" 2>&1`
-         else
--	        VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$volume_id_module"`
-+	        VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$volume_id_module" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$VOLUME_ID_PKG_ERRORS" >&5
- 
--	as_fn_error "Package requirements ($volume_id_module) were not met:
-+	as_fn_error $? "Package requirements ($volume_id_module) were not met:
- 
- $VOLUME_ID_PKG_ERRORS
- 
-@@ -18023,12 +18722,13 @@
- 
- Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
- and VOLUME_ID_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" "$LINENO" 5
-+See the pkg-config man page for more details." "$LINENO" 5
- elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
-+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -18037,13 +18737,13 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- 	VOLUME_ID_CFLAGS=$pkg_cv_VOLUME_ID_CFLAGS
- 	VOLUME_ID_LIBS=$pkg_cv_VOLUME_ID_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--	:
-+
- fi
- 
- 
-@@ -18064,46 +18764,46 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5
- $as_echo_n "checking for BLKID... " >&6; }
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$BLKID_CFLAGS"; then
--        pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$BLKID_CFLAGS"; then
-+    pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$blkid_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$blkid_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "$blkid_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$BLKID_LIBS"; then
--        pkg_cv_BLKID_LIBS="$BLKID_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
-+if test -n "$BLKID_LIBS"; then
-+    pkg_cv_BLKID_LIBS="$BLKID_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$blkid_module\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$blkid_module") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "$blkid_module" 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
- fi
--    fi
--else
--	pkg_failed=untried
-+ else
-+    pkg_failed=untried
- fi
- 
- 
- 
- if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 
- if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-         _pkg_short_errors_supported=yes
-@@ -18111,14 +18811,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$blkid_module"`
-+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$blkid_module" 2>&1`
-         else
--	        BLKID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$blkid_module"`
-+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$blkid_module" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$BLKID_PKG_ERRORS" >&5
- 
--	as_fn_error "Package requirements ($blkid_module) were not met:
-+	as_fn_error $? "Package requirements ($blkid_module) were not met:
- 
- $BLKID_PKG_ERRORS
- 
-@@ -18127,12 +18827,13 @@
- 
- Alternatively, you may set the environment variables BLKID_CFLAGS
- and BLKID_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" "$LINENO" 5
-+See the pkg-config man page for more details." "$LINENO" 5
- elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
-+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -18141,13 +18842,13 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- 	BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
- 	BLKID_LIBS=$pkg_cv_BLKID_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--	:
-+
- fi
- 
- 
-@@ -18164,7 +18865,7 @@
- # Check for BLKGETSIZE64
- ac_fn_c_check_type "$LINENO" "pgoff_t" "ac_cv_type_pgoff_t" "/usr/include/sys/types.h
- "
--if test "x$ac_cv_type_pgoff_t" = x""yes; then :
-+if test "x$ac_cv_type_pgoff_t" = xyes; then :
- 
- else
- 
-@@ -18193,7 +18894,7 @@
- if test x$have_size64 = xno; then
-   case "$host" in
-         *-*-linux*)
--	     as_fn_error "BLKGETSIZE64 is not defined" "$LINENO" 5
-+	     as_fn_error $? "BLKGETSIZE64 is not defined" "$LINENO" 5
- 		;;
-         *)
- 		;;
-@@ -18203,7 +18904,7 @@
- for ac_func in getgrouplist
- do :
-   ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist"
--if test "x$ac_cv_func_getgrouplist" = x""yes; then :
-+if test "x$ac_cv_func_getgrouplist" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_GETGROUPLIST 1
- _ACEOF
-@@ -18214,7 +18915,7 @@
- for ac_func in asprintf
- do :
-   ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
--if test "x$ac_cv_func_asprintf" = x""yes; then :
-+if test "x$ac_cv_func_asprintf" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_ASPRINTF 1
- _ACEOF
-@@ -18225,7 +18926,7 @@
- for ac_func in mallopt
- do :
-   ac_fn_c_check_func "$LINENO" "mallopt" "ac_cv_func_mallopt"
--if test "x$ac_cv_func_mallopt" = x""yes; then :
-+if test "x$ac_cv_func_mallopt" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_MALLOPT 1
- _ACEOF
-@@ -18236,7 +18937,7 @@
- for ac_func in strndup
- do :
-   ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
--if test "x$ac_cv_func_strndup" = x""yes; then :
-+if test "x$ac_cv_func_strndup" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_STRNDUP 1
- _ACEOF
-@@ -18251,7 +18952,7 @@
- set dummy xmlto; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XMLTO+set}" = set; then :
-+if ${ac_cv_path_XMLTO+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $XMLTO in
-@@ -18301,7 +19002,7 @@
- set dummy xmllint; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XMLLINT+set}" = set; then :
-+if ${ac_cv_path_XMLLINT+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $XMLLINT in
-@@ -18355,10 +19056,10 @@
- 
- if test x$enable_docbook_docs = xyes; then
-     if test x$have_xmlto = xno; then
--        as_fn_error "Building DocBook docs explicitly required, but xmlto not found" "$LINENO" 5
-+        as_fn_error $? "Building DocBook docs explicitly required, but xmlto not found" "$LINENO" 5
-     fi
-     if test x$ve_xmllint = xno; then
--        as_fn_error "Building DocBook docs explicitly required, but xmllint not found" "$LINENO" 5
-+        as_fn_error $? "Building DocBook docs explicitly required, but xmllint not found" "$LINENO" 5
-     fi
- fi
- 
-@@ -18671,7 +19372,7 @@
-   enableval=$enable_sonypic; case "${enableval}" in
- 	       yes) ENABLE_SONYPIC=yes ;;
- 	       no) ENABLE_SONYPIC=no ;;
--	       *) as_fn_error "bad value ${enableval} for --enable-sonypic" "$LINENO" 5 ;;
-+	       *) as_fn_error $? "bad value ${enableval} for --enable-sonypic" "$LINENO" 5 ;;
- 	       esac
- 
- else
-@@ -18699,7 +19400,7 @@
- $as_echo "$have_sonypic" >&6; }
- 
- 	if test "x$ENABLE_SONYPIC" = "xyes" && test "x$have_sonypic" != "xyes" ; then
--		as_fn_error "Sony PIC support explicitly requested but no support found" "$LINENO" 5
-+		as_fn_error $? "Sony PIC support explicitly requested but no support found" "$LINENO" 5
- 	fi
- fi
- if test x"$have_sonypic" = "xyes" ; then
-@@ -18806,10 +19507,21 @@
-      :end' >>confcache
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
--    test "x$cache_file" != "x/dev/null" &&
-+    if test "x$cache_file" != "x/dev/null"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
- $as_echo "$as_me: updating cache $cache_file" >&6;}
--    cat confcache >$cache_file
-+      if test ! -f "$cache_file" || test -h "$cache_file"; then
-+	cat confcache >"$cache_file"
-+      else
-+        case $cache_file in #(
-+        */* | ?:*)
-+	  mv -f confcache "$cache_file"$$ &&
-+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-+        *)
-+	  mv -f confcache "$cache_file" ;;
-+	esac
-+      fi
-+    fi
-   else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
- $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-@@ -18825,6 +19537,7 @@
- 
- ac_libobjs=
- ac_ltlibobjs=
-+U=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -18848,223 +19561,219 @@
- fi
- 
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
--  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
--  as_fn_error "conditional \"AMDEP\" was never defined.
-+  as_fn_error $? "conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  as_fn_error "conditional \"am__fastdepCC\" was never defined.
--Usually this means the macro was only invoked conditionally." "$LINENO" 5
--fi
--if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
--  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
-+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
--  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
-+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${MAN_PAGES_ENABLED_TRUE}" && test -z "${MAN_PAGES_ENABLED_FALSE}"; then
--  as_fn_error "conditional \"MAN_PAGES_ENABLED\" was never defined.
-+  as_fn_error $? "conditional \"MAN_PAGES_ENABLED\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
--  as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
-+  as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
--  as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-+  as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ACPI_ACPID_TRUE}" && test -z "${ACPI_ACPID_FALSE}"; then
--  as_fn_error "conditional \"ACPI_ACPID\" was never defined.
-+  as_fn_error $? "conditional \"ACPI_ACPID\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ACPI_PROC_TRUE}" && test -z "${ACPI_PROC_FALSE}"; then
--  as_fn_error "conditional \"ACPI_PROC\" was never defined.
-+  as_fn_error $? "conditional \"ACPI_PROC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_ACPI_IBM_TRUE}" && test -z "${BUILD_ACPI_IBM_FALSE}"; then
--  as_fn_error "conditional \"BUILD_ACPI_IBM\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_ACPI_IBM\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_ACPI_TOSHIBA_TRUE}" && test -z "${BUILD_ACPI_TOSHIBA_FALSE}"; then
--  as_fn_error "conditional \"BUILD_ACPI_TOSHIBA\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_ACPI_TOSHIBA\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${USE_PARTED_TRUE}" && test -z "${USE_PARTED_FALSE}"; then
--  as_fn_error "conditional \"USE_PARTED\" was never defined.
-+  as_fn_error $? "conditional \"USE_PARTED\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${GCOV_TRUE}" && test -z "${GCOV_FALSE}"; then
--  as_fn_error "conditional \"GCOV\" was never defined.
-+  as_fn_error $? "conditional \"GCOV\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_LIBUSB_TRUE}" && test -z "${HAVE_LIBUSB_FALSE}"; then
--  as_fn_error "conditional \"HAVE_LIBUSB\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_LIBUSB\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then
--  as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then
--  as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then
--  as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then
--  as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_LIBPCI_TRUE}" && test -z "${HAVE_LIBPCI_FALSE}"; then
--  as_fn_error "conditional \"HAVE_LIBPCI\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_LIBPCI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HALD_COMPILE_DUMMY_TRUE}" && test -z "${HALD_COMPILE_DUMMY_FALSE}"; then
--  as_fn_error "conditional \"HALD_COMPILE_DUMMY\" was never defined.
-+  as_fn_error $? "conditional \"HALD_COMPILE_DUMMY\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HALD_COMPILE_LINUX_TRUE}" && test -z "${HALD_COMPILE_LINUX_FALSE}"; then
--  as_fn_error "conditional \"HALD_COMPILE_LINUX\" was never defined.
-+  as_fn_error $? "conditional \"HALD_COMPILE_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HALD_COMPILE_FREEBSD_TRUE}" && test -z "${HALD_COMPILE_FREEBSD_FALSE}"; then
--  as_fn_error "conditional \"HALD_COMPILE_FREEBSD\" was never defined.
-+  as_fn_error $? "conditional \"HALD_COMPILE_FREEBSD\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HALD_COMPILE_SOLARIS_TRUE}" && test -z "${HALD_COMPILE_SOLARIS_FALSE}"; then
--  as_fn_error "conditional \"HALD_COMPILE_SOLARIS\" was never defined.
-+  as_fn_error $? "conditional \"HALD_COMPILE_SOLARIS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then
--  as_fn_error "conditional \"HAVE_LIBUSB20\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_LIBUSB20\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then
--  as_fn_error "conditional \"HAVE_LIBUSB20\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_LIBUSB20\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then
--  as_fn_error "conditional \"HAVE_CONKIT\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_CONKIT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then
--  as_fn_error "conditional \"HAVE_CONKIT\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_CONKIT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_GPERF_TRUE}" && test -z "${HAVE_GPERF_FALSE}"; then
--  as_fn_error "conditional \"HAVE_GPERF\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_GPERF\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_KEYMAPS_TRUE}" && test -z "${BUILD_KEYMAPS_FALSE}"; then
--  as_fn_error "conditional \"BUILD_KEYMAPS\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_KEYMAPS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then
--  as_fn_error "conditional \"HAVE_POLKIT\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then
--  as_fn_error "conditional \"HAVE_POLKIT\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then
--  as_fn_error "conditional \"HAVE_POLKIT\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then
--  as_fn_error "conditional \"HAVE_POLKIT\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_ACLMGMT_TRUE}" && test -z "${HAVE_ACLMGMT_FALSE}"; then
--  as_fn_error "conditional \"HAVE_ACLMGMT\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_ACLMGMT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_ACLMGMT_TRUE}" && test -z "${HAVE_ACLMGMT_FALSE}"; then
--  as_fn_error "conditional \"HAVE_ACLMGMT\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_ACLMGMT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_UMOUNT_HAL_TRUE}" && test -z "${HAVE_UMOUNT_HAL_FALSE}"; then
--  as_fn_error "conditional \"HAVE_UMOUNT_HAL\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_UMOUNT_HAL\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_UMOUNT_HAL_TRUE}" && test -z "${HAVE_UMOUNT_HAL_FALSE}"; then
--  as_fn_error "conditional \"HAVE_UMOUNT_HAL\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_UMOUNT_HAL\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_ACPI_TRUE}" && test -z "${HAVE_ACPI_FALSE}"; then
--  as_fn_error "conditional \"HAVE_ACPI\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_ACPI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_APM_TRUE}" && test -z "${HAVE_APM_FALSE}"; then
--  as_fn_error "conditional \"HAVE_APM\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_APM\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_PMU_TRUE}" && test -z "${HAVE_PMU_FALSE}"; then
--  as_fn_error "conditional \"HAVE_PMU\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_PMU\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_DEPRECATED_KEYS_TRUE}" && test -z "${BUILD_DEPRECATED_KEYS_FALSE}"; then
--  as_fn_error "conditional \"BUILD_DEPRECATED_KEYS\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_DEPRECATED_KEYS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${DOCBOOK_DOCS_ENABLED_TRUE}" && test -z "${DOCBOOK_DOCS_ENABLED_FALSE}"; then
--  as_fn_error "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.
-+  as_fn_error $? "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${OS_TYPE_UNKNOWN_TRUE}" && test -z "${OS_TYPE_UNKNOWN_FALSE}"; then
--  as_fn_error "conditional \"OS_TYPE_UNKNOWN\" was never defined.
-+  as_fn_error $? "conditional \"OS_TYPE_UNKNOWN\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${OS_TYPE_RED_HAT_TRUE}" && test -z "${OS_TYPE_RED_HAT_FALSE}"; then
--  as_fn_error "conditional \"OS_TYPE_RED_HAT\" was never defined.
-+  as_fn_error $? "conditional \"OS_TYPE_RED_HAT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_MACBOOKPRO_TRUE}" && test -z "${BUILD_MACBOOKPRO_FALSE}"; then
--  as_fn_error "conditional \"BUILD_MACBOOKPRO\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_MACBOOKPRO\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_MACBOOK_TRUE}" && test -z "${BUILD_MACBOOK_FALSE}"; then
--  as_fn_error "conditional \"BUILD_MACBOOK\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_MACBOOK\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_IMAC_TRUE}" && test -z "${BUILD_IMAC_FALSE}"; then
--  as_fn_error "conditional \"BUILD_IMAC\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_IMAC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_OMAP_TRUE}" && test -z "${BUILD_OMAP_FALSE}"; then
--  as_fn_error "conditional \"BUILD_OMAP\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_OMAP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_CPUFREQ_TRUE}" && test -z "${BUILD_CPUFREQ_FALSE}"; then
--  as_fn_error "conditional \"BUILD_CPUFREQ\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_CPUFREQ\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_USBCSR_TRUE}" && test -z "${BUILD_USBCSR_FALSE}"; then
--  as_fn_error "conditional \"BUILD_USBCSR\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_USBCSR\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_DELL_TRUE}" && test -z "${BUILD_DELL_FALSE}"; then
--  as_fn_error "conditional \"BUILD_DELL\" was never defined.
-+  as_fn_error $? "conditional \"BUILD_DELL\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_SONYPIC_TRUE}" && test -z "${HAVE_SONYPIC_FALSE}"; then
--  as_fn_error "conditional \"HAVE_SONYPIC\" was never defined.
-+  as_fn_error $? "conditional \"HAVE_SONYPIC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- 
--: ${CONFIG_STATUS=./config.status}
-+: "${CONFIG_STATUS=./config.status}"
- ac_write_fail=0
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-@@ -19165,6 +19874,7 @@
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
-+as_myself=
- case $0 in #((
-   *[\\/]* ) as_myself=$0 ;;
-   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -19210,19 +19920,19 @@
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- 
--# as_fn_error ERROR [LINENO LOG_FD]
--# ---------------------------------
-+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-+# ----------------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with status $?, using 1 if that was 0.
-+# script with STATUS, using 1 if that was 0.
- as_fn_error ()
- {
--  as_status=$?; test $as_status -eq 0 && as_status=1
--  if test "$3"; then
--    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  as_status=$1; test $as_status -eq 0 && as_status=1
-+  if test "$4"; then
-+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-   fi
--  $as_echo "$as_me: error: $1" >&2
-+  $as_echo "$as_me: error: $2" >&2
-   as_fn_exit $as_status
- } # as_fn_error
- 
-@@ -19418,7 +20128,7 @@
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
- 
- 
- } # as_fn_mkdir_p
-@@ -19472,7 +20182,7 @@
- # values after options handling.
- ac_log="
- This file was extended by hal $as_me 0.5.14, which was
--generated by GNU Autoconf 2.64.  Invocation command line was
-+generated by GNU Autoconf 2.68.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -19512,6 +20222,7 @@
- 
-   -h, --help       print this help, then exit
-   -V, --version    print version number and configuration settings, then exit
-+      --config     print configuration, then exit
-   -q, --quiet, --silent
-                    do not print progress messages
-   -d, --debug      don't remove temporary files
-@@ -19534,12 +20245,13 @@
- 
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- hal config.status 0.5.14
--configured by $0, generated by GNU Autoconf 2.64,
--  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.68,
-+  with options \\"\$ac_cs_config\\"
- 
--Copyright (C) 2009 Free Software Foundation, Inc.
-+Copyright (C) 2010 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -19557,11 +20269,16 @@
- while test $# != 0
- do
-   case $1 in
--  --*=*)
-+  --*=?*)
-     ac_option=`expr "X$1" : 'X\([^=]*\)='`
-     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
-+  --*=)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=
-+    ac_shift=:
-+    ;;
-   *)
-     ac_option=$1
-     ac_optarg=$2
-@@ -19575,12 +20292,15 @@
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;
-+  --config | --confi | --conf | --con | --co | --c )
-+    $as_echo "$ac_cs_config"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
-     case $ac_optarg in
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    '') as_fn_error $? "missing file argument" ;;
-     esac
-     as_fn_append CONFIG_FILES " '$ac_optarg'"
-     ac_need_defaults=false;;
-@@ -19593,7 +20313,7 @@
-     ac_need_defaults=false;;
-   --he | --h)
-     # Conflict between --help and --header
--    as_fn_error "ambiguous option: \`$1'
-+    as_fn_error $? "ambiguous option: \`$1'
- Try \`$0 --help' for more information.";;
-   --help | --hel | -h )
-     $as_echo "$ac_cs_usage"; exit ;;
-@@ -19602,7 +20322,7 @@
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) as_fn_error "unrecognized option: \`$1'
-+  -*) as_fn_error $? "unrecognized option: \`$1'
- Try \`$0 --help' for more information." ;;
- 
-   *) as_fn_append ac_config_targets " $1"
-@@ -19656,184 +20376,208 @@
- sed_quote_subst='$sed_quote_subst'
- double_quote_subst='$double_quote_subst'
- delay_variable_subst='$delay_variable_subst'
--macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
--macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
--enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
--enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
--pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
--enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
--host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
--host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
--host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
--build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
--build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
--build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
--SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
--Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
--GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
--EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
--FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
--LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
--NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
--LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
--max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
--ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
--exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
--lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
--lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
--lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
--reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
--reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
--deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
--file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
--AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
--AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
--STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
--RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
--old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
--CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
--compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
--GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
--lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
--lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
--lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
--lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
--objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
--SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
--ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
--MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
--lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
--lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
--lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
--lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
--lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
--need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
--DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
--NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
--LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
--OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
--OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
--libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
--shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
--enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
--export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
--whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
--compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
--old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
--allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
--no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
--inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
--link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
--fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
--always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
--export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
--include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
--prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
--variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
--need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
--need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
--version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
--runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
--shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
--shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
--libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
--library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
--soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
--postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
--finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
--sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
--sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
--enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
--enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
--enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
--old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
--striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
--compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
--predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
--postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
--predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
--postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
--compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
--LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
--compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
- 
- LTCC='$LTCC'
- LTCFLAGS='$LTCFLAGS'
- compiler='$compiler_DEFAULT'
- 
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+  eval 'cat <<_LTECHO_EOF
-+\$1
-+_LTECHO_EOF'
-+}
-+
- # Quote evaled strings.
--for var in SED \
-+for var in SHELL \
-+ECHO \
-+PATH_SEPARATOR \
-+SED \
- GREP \
- EGREP \
- FGREP \
-@@ -19846,8 +20590,13 @@
- OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
-+file_magic_glob \
-+want_nocaseglob \
-+DLLTOOL \
-+sharedlib_from_linklib_cmd \
- AR \
- AR_FLAGS \
-+archiver_list_spec \
- STRIP \
- RANLIB \
- CC \
-@@ -19857,14 +20606,14 @@
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
--SHELL \
--ECHO \
-+nm_file_list_spec \
- lt_prog_compiler_no_builtin_flag \
--lt_prog_compiler_wl \
- lt_prog_compiler_pic \
-+lt_prog_compiler_wl \
- lt_prog_compiler_static \
- lt_cv_prog_compiler_c_o \
- need_locks \
-+MANIFEST_TOOL \
- DSYMUTIL \
- NMEDIT \
- LIPO \
-@@ -19878,9 +20627,7 @@
- allow_undefined_flag \
- no_undefined_flag \
- hardcode_libdir_flag_spec \
--hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
--fix_srcfile_path \
- exclude_expsyms \
- include_expsyms \
- file_list_spec \
-@@ -19888,6 +20635,7 @@
- libname_spec \
- library_names_spec \
- soname_spec \
-+install_override_mode \
- finish_eval \
- old_striplib \
- striplib \
-@@ -19898,10 +20646,11 @@
- postdeps \
- compiler_lib_search_path \
- LD_CXX \
-+reload_flag_CXX \
- compiler_CXX \
- lt_prog_compiler_no_builtin_flag_CXX \
--lt_prog_compiler_wl_CXX \
- lt_prog_compiler_pic_CXX \
-+lt_prog_compiler_wl_CXX \
- lt_prog_compiler_static_CXX \
- lt_cv_prog_compiler_c_o_CXX \
- export_dynamic_flag_spec_CXX \
-@@ -19911,9 +20660,7 @@
- allow_undefined_flag_CXX \
- no_undefined_flag_CXX \
- hardcode_libdir_flag_spec_CXX \
--hardcode_libdir_flag_spec_ld_CXX \
- hardcode_libdir_separator_CXX \
--fix_srcfile_path_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX \
- file_list_spec_CXX \
-@@ -19923,9 +20670,9 @@
- predeps_CXX \
- postdeps_CXX \
- compiler_lib_search_path_CXX; do
--    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-     *[\\\\\\\`\\"\\\$]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-       ;;
-     *)
-       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -19947,11 +20694,13 @@
- module_expsym_cmds \
- export_symbols_cmds \
- prelink_cmds \
-+postlink_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- finish_cmds \
- sys_lib_search_path_spec \
- sys_lib_dlsearch_path_spec \
-+reload_cmds_CXX \
- old_archive_cmds_CXX \
- old_archive_from_new_cmds_CXX \
- old_archive_from_expsyms_cmds_CXX \
-@@ -19960,10 +20709,11 @@
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- export_symbols_cmds_CXX \
--prelink_cmds_CXX; do
--    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+prelink_cmds_CXX \
-+postlink_cmds_CXX; do
-+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-     *[\\\\\\\`\\"\\\$]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-       ;;
-     *)
-       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -19971,12 +20721,6 @@
-     esac
- done
- 
--# Fix-up fallback echo if it was mangled by the above quoting rules.
--case \$lt_ECHO in
--*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
--  ;;
--esac
--
- ac_aux_dir='$ac_aux_dir'
- xsi_shell='$xsi_shell'
- lt_shell_append='$lt_shell_append'
-@@ -20054,7 +20798,7 @@
-     "doc/spec/hal-spec.xml.in") CONFIG_FILES="$CONFIG_FILES doc/spec/hal-spec.xml.in" ;;
-     "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
- 
--  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-   esac
- done
- 
-@@ -20077,9 +20821,10 @@
- # after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
--  tmp=
-+  tmp= ac_tmp=
-   trap 'exit_status=$?
--  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+  : "${ac_tmp:=$tmp}"
-+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
- ' 0
-   trap 'as_fn_exit 1' 1 2 13 15
- }
-@@ -20087,12 +20832,13 @@
- 
- {
-   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
--  test -n "$tmp" && test -d "$tmp"
-+  test -d "$tmp"
- }  ||
- {
-   tmp=./conf$$-$RANDOM
-   (umask 077 && mkdir "$tmp")
--} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-+ac_tmp=$tmp
- 
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
-@@ -20109,12 +20855,12 @@
- fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
--  ac_cs_awk_cr='\r'
-+  ac_cs_awk_cr='\\r'
- else
-   ac_cs_awk_cr=$ac_cr
- fi
- 
--echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
- _ACEOF
- 
- 
-@@ -20123,18 +20869,18 @@
-   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-   echo "_ACEOF"
- } >conf$$subs.sh ||
--  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
--ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   . ./conf$$subs.sh ||
--    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- 
-   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-   if test $ac_delim_n = $ac_delim_num; then
-     break
-   elif $ac_last_try; then
--    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -20142,7 +20888,7 @@
- rm -f conf$$subs.sh
- 
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
- _ACEOF
- sed -n '
- h
-@@ -20156,7 +20902,7 @@
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -20170,7 +20916,7 @@
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-@@ -20190,7 +20936,7 @@
- rm -f conf$$subs.awk
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- _ACAWK
--cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-   for (key in S) S_is_set[key] = 1
-   FS = ""
- 
-@@ -20222,21 +20968,29 @@
-   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
- else
-   cat
--fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
--  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
- _ACEOF
- 
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
--  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
--s/:*\$(srcdir):*/:/
--s/:*\${srcdir}:*/:/
--s/:*@srcdir@:*/:/
--s/^\([^=]*=[	 ]*\):*/\1/
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-+h
-+s///
-+s/^/:/
-+s/[	 ]*$/:/
-+s/:\$(srcdir):/:/g
-+s/:\${srcdir}:/:/g
-+s/:@srcdir@:/:/g
-+s/^:*//
- s/:*$//
-+x
-+s/\(=[	 ]*\).*/\1/
-+G
-+s/\n//
- s/^[^=]*=[	 ]*$//
- }'
- fi
-@@ -20248,7 +21002,7 @@
- # No need to generate them if there are no CONFIG_HEADERS.
- # This happens for instance with `./config.status Makefile'.
- if test -n "$CONFIG_HEADERS"; then
--cat >"$tmp/defines.awk" <<\_ACAWK ||
-+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
- BEGIN {
- _ACEOF
- 
-@@ -20260,11 +21014,11 @@
- # handling of long lines.
- ac_delim='%!_!# '
- for ac_last_try in false false :; do
--  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
--  if test -z "$ac_t"; then
-+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_tt"; then
-     break
-   elif $ac_last_try; then
--    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -20349,7 +21103,7 @@
- _ACAWK
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
- fi # test -n "$CONFIG_HEADERS"
- 
- 
-@@ -20362,7 +21116,7 @@
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-@@ -20381,7 +21135,7 @@
-     for ac_f
-     do
-       case $ac_f in
--      -) ac_f="$tmp/stdin";;
-+      -) ac_f="$ac_tmp/stdin";;
-       *) # Look for the file first in the build tree, then in the source tree
- 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
- 	 # because $ac_f cannot contain `:'.
-@@ -20390,7 +21144,7 @@
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-       esac
-       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       as_fn_append ac_file_inputs " '$ac_f'"
-@@ -20416,8 +21170,8 @@
-     esac
- 
-     case $ac_tag in
--    *:-:* | *:-) cat >"$tmp/stdin" \
--      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-     esac
-     ;;
-   esac
-@@ -20553,23 +21307,24 @@
- s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
- "
--eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
--  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
--  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
--  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined.  Please make sure it is defined." >&5
-+which seems to be undefined.  Please make sure it is defined" >&5
- $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined.  Please make sure it is defined." >&2;}
-+which seems to be undefined.  Please make sure it is defined" >&2;}
- 
--  rm -f "$tmp/stdin"
-+  rm -f "$ac_tmp/stdin"
-   case $ac_file in
--  -) cat "$tmp/out" && rm -f "$tmp/out";;
--  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-   esac \
--  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-  ;;
-   :H)
-   #
-@@ -20578,21 +21333,21 @@
-   if test x"$ac_file" != x-; then
-     {
-       $as_echo "/* $configure_input  */" \
--      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
--    } >"$tmp/config.h" \
--      || as_fn_error "could not create $ac_file" "$LINENO" 5
--    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$ac_tmp/config.h" \
-+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       rm -f "$ac_file"
--      mv "$tmp/config.h" "$ac_file" \
--	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-+      mv "$ac_tmp/config.h" "$ac_file" \
-+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-     fi
-   else
-     $as_echo "/* $configure_input  */" \
--      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
--      || as_fn_error "could not create -" "$LINENO" 5
-+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-+      || as_fn_error $? "could not create -" "$LINENO" 5
-   fi
- # Compute "$ac_file"'s index in $config_headers.
- _am_arg="$ac_file"
-@@ -20753,7 +21508,8 @@
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-+#                 Foundation, Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- #   This file is part of GNU Libtool.
-@@ -20801,6 +21557,15 @@
- # Whether or not to optimize for fast installation.
- fast_install=$enable_fast_install
- 
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# An echo program that protects backslashes.
-+ECHO=$lt_ECHO
-+
-+# The PATH separator for the build system.
-+PATH_SEPARATOR=$lt_PATH_SEPARATOR
-+
- # The host system.
- host_alias=$host_alias
- host=$host
-@@ -20850,9 +21615,11 @@
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
- 
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
-+# convert \$build file names to \$host format.
-+to_host_file_cmd=$lt_cv_to_host_file_cmd
-+
-+# convert \$build files to toolchain format.
-+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- 
- # An object symbol dumper.
- OBJDUMP=$lt_OBJDUMP
-@@ -20860,13 +21627,30 @@
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
- 
--# Command to use when deplibs_check_method == "file_magic".
-+# Command to use when deplibs_check_method = "file_magic".
- file_magic_cmd=$lt_file_magic_cmd
- 
-+# How to find potential files when deplibs_check_method = "file_magic".
-+file_magic_glob=$lt_file_magic_glob
-+
-+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-+want_nocaseglob=$lt_want_nocaseglob
-+
-+# DLL creation program.
-+DLLTOOL=$lt_DLLTOOL
-+
-+# Command to associate shared and link libraries.
-+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-+
- # The archiver.
- AR=$lt_AR
-+
-+# Flags to create an archive.
- AR_FLAGS=$lt_AR_FLAGS
- 
-+# How to feed a file listing to the archiver.
-+archiver_list_spec=$lt_archiver_list_spec
-+
- # A symbol stripping program.
- STRIP=$lt_STRIP
- 
-@@ -20875,6 +21659,9 @@
- old_postinstall_cmds=$lt_old_postinstall_cmds
- old_postuninstall_cmds=$lt_old_postuninstall_cmds
- 
-+# Whether to use a lock for old archive extraction.
-+lock_old_archive_extraction=$lock_old_archive_extraction
-+
- # A C compiler.
- LTCC=$lt_CC
- 
-@@ -20893,14 +21680,14 @@
- # Transform the output of nm in a C name address pair when lib prefix is needed.
- global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
- 
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+# Specify filename containing input files for \$NM.
-+nm_file_list_spec=$lt_nm_file_list_spec
- 
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
-+# The root where to search for dependent libraries,and in which our libraries should be installed.
-+lt_sysroot=$lt_sysroot
- 
--# An echo program that does not interpret backslashes.
--ECHO=$lt_ECHO
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
- 
- # Used to examine libraries when file_magic_cmd begins with "file".
- MAGIC_CMD=$MAGIC_CMD
-@@ -20908,6 +21695,9 @@
- # Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
-+# Manifest tool.
-+MANIFEST_TOOL=$lt_MANIFEST_TOOL
-+
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
- DSYMUTIL=$lt_DSYMUTIL
- 
-@@ -20964,6 +21754,9 @@
- # The coded name of the library, if different from the real name.
- soname_spec=$lt_soname_spec
- 
-+# Permission mode override for installation of shared libraries.
-+install_override_mode=$lt_install_override_mode
-+
- # Command to use after installation of a shared archive.
- postinstall_cmds=$lt_postinstall_cmds
- 
-@@ -21003,6 +21796,10 @@
- # The linker used to build libraries.
- LD=$lt_LD
- 
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
- # Commands used to build an old-style archive.
- old_archive_cmds=$lt_old_archive_cmds
- 
-@@ -21015,12 +21812,12 @@
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
- 
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl
--
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic
- 
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl
-+
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static
- 
-@@ -21070,10 +21867,6 @@
- # This must work even if \$libdir does not exist
- hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
- 
--# If ld is used when linking, flag to hardcode \$libdir into a binary
--# during linking.  This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
--
- # Whether we need a single "-rpath" flag with a separated argument.
- hardcode_libdir_separator=$lt_hardcode_libdir_separator
- 
-@@ -21107,9 +21900,6 @@
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path=$lt_fix_srcfile_path
--
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols
- 
-@@ -21125,6 +21915,9 @@
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds
- 
-+# Commands necessary for finishing linking programs.
-+postlink_cmds=$lt_postlink_cmds
-+
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec
- 
-@@ -21171,212 +21964,169 @@
-   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-   # text mode, it properly converts lines to CR/LF.  This bash problem
-   # is reportedly fixed, but why not run on old versions too?
--  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
--
--  case $xsi_shell in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--}
--
--# func_basename file
--func_basename ()
--{
--  func_basename_result="${1##*/}"
--}
--
--# func_dirname_and_basename file append nondir_replacement
--# perform func_basename and func_dirname in a single function
--# call:
--#   dirname:  Compute the dirname of FILE.  If nonempty,
--#             add APPEND to the result, otherwise set result
--#             to NONDIR_REPLACEMENT.
--#             value returned in "$func_dirname_result"
--#   basename: Compute filename of FILE.
--#             value retuned in "$func_basename_result"
--# Implementation must be kept synchronized with func_dirname
--# and func_basename. For efficiency, we do not delegate to
--# those functions but instead duplicate the functionality here.
--func_dirname_and_basename ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--  func_basename_result="${1##*/}"
--}
--
--# func_stripname prefix suffix name
--# strip PREFIX and SUFFIX off of NAME.
--# PREFIX and SUFFIX must not contain globbing or regex special
--# characters, hashes, percent signs, but SUFFIX may contain a leading
--# dot (in which case that matches only a dot).
--func_stripname ()
--{
--  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
--  # positional parameters, so assign one to ordinary parameter first.
--  func_stripname_result=${3}
--  func_stripname_result=${func_stripname_result#"${1}"}
--  func_stripname_result=${func_stripname_result%"${2}"}
--}
--
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=${1%%=*}
--  func_opt_split_arg=${1#*=}
--}
--
--# func_lo2o object
--func_lo2o ()
--{
--  case ${1} in
--    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
--    *)    func_lo2o_result=${1} ;;
--  esac
--}
--
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=${1%.*}.lo
--}
--
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=$(( $* ))
--}
--
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=${#1}
--}
--
--_LT_EOF
--    ;;
--  *) # Bourne compatible functions.
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
--  # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
--  if test "X$func_dirname_result" = "X${1}"; then
--    func_dirname_result="${3}"
--  else
--    func_dirname_result="$func_dirname_result${2}"
--  fi
--}
--
--# func_basename file
--func_basename ()
--{
--  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
--}
--
--
--# func_stripname prefix suffix name
--# strip PREFIX and SUFFIX off of NAME.
--# PREFIX and SUFFIX must not contain globbing or regex special
--# characters, hashes, percent signs, but SUFFIX may contain a leading
--# dot (in which case that matches only a dot).
--# func_strip_suffix prefix name
--func_stripname ()
--{
--  case ${2} in
--    .*) func_stripname_result=`$ECHO "X${3}" \
--           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
--    *)  func_stripname_result=`$ECHO "X${3}" \
--           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
--  esac
--}
--
--# sed scripts:
--my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
--my_sed_long_arg='1s/^-[^=]*=//'
--
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
--  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
--}
--
--# func_lo2o object
--func_lo2o ()
--{
--  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
--}
--
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
--}
--
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=`expr "$@"`
--}
--
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
--}
--
--_LT_EOF
--esac
--
--case $lt_shell_append in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$1+=\$2"
--}
--_LT_EOF
--    ;;
--  *)
--    cat << \_LT_EOF >> "$cfgfile"
--
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$1=\$$1\$2"
--}
--
--_LT_EOF
--    ;;
--  esac
-+  sed '$q' "$ltmain" >> "$cfgfile" \
-+     || (rm -f "$cfgfile"; exit 1)
- 
-+  if test x"$xsi_shell" = xyes; then
-+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-+func_dirname ()\
-+{\
-+\    case ${1} in\
-+\      */*) func_dirname_result="${1%/*}${2}" ;;\
-+\      *  ) func_dirname_result="${3}" ;;\
-+\    esac\
-+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-+func_basename ()\
-+{\
-+\    func_basename_result="${1##*/}"\
-+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-+func_dirname_and_basename ()\
-+{\
-+\    case ${1} in\
-+\      */*) func_dirname_result="${1%/*}${2}" ;;\
-+\      *  ) func_dirname_result="${3}" ;;\
-+\    esac\
-+\    func_basename_result="${1##*/}"\
-+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-+func_stripname ()\
-+{\
-+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-+\    # positional parameters, so assign one to ordinary parameter first.\
-+\    func_stripname_result=${3}\
-+\    func_stripname_result=${func_stripname_result#"${1}"}\
-+\    func_stripname_result=${func_stripname_result%"${2}"}\
-+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-+func_split_long_opt ()\
-+{\
-+\    func_split_long_opt_name=${1%%=*}\
-+\    func_split_long_opt_arg=${1#*=}\
-+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-+func_split_short_opt ()\
-+{\
-+\    func_split_short_opt_arg=${1#??}\
-+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-+func_lo2o ()\
-+{\
-+\    case ${1} in\
-+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-+\      *)    func_lo2o_result=${1} ;;\
-+\    esac\
-+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-+func_xform ()\
-+{\
-+    func_xform_result=${1%.*}.lo\
-+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-+func_arith ()\
-+{\
-+    func_arith_result=$(( $* ))\
-+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_len ()$/,/^} # func_len /c\
-+func_len ()\
-+{\
-+    func_len_result=${#1}\
-+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+fi
-+
-+if test x"$lt_shell_append" = xyes; then
-+  sed -e '/^func_append ()$/,/^} # func_append /c\
-+func_append ()\
-+{\
-+    eval "${1}+=\\${2}"\
-+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-+func_append_quoted ()\
-+{\
-+\    func_quote_for_eval "${2}"\
-+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-+  && mv -f "$cfgfile.tmp" "$cfgfile" \
-+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+test 0 -eq $? || _lt_function_replace_fail=:
-+
-+
-+  # Save a `func_append' function call where possible by direct use of '+='
-+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+else
-+  # Save a `func_append' function call even when '+=' is not available
-+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-+    && mv -f "$cfgfile.tmp" "$cfgfile" \
-+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-+  test 0 -eq $? || _lt_function_replace_fail=:
-+fi
-+
-+if test x"$_lt_function_replace_fail" = x":"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-+fi
- 
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
- 
--  mv -f "$cfgfile" "$ofile" ||
-+   mv -f "$cfgfile" "$ofile" ||
-     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-   chmod +x "$ofile"
- 
-@@ -21388,6 +22138,10 @@
- # The linker used to build libraries.
- LD=$lt_LD_CXX
- 
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag_CXX
-+reload_cmds=$lt_reload_cmds_CXX
-+
- # Commands used to build an old-style archive.
- old_archive_cmds=$lt_old_archive_cmds_CXX
- 
-@@ -21400,12 +22154,12 @@
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
- 
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_CXX
--
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic_CXX
- 
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-+
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static_CXX
- 
-@@ -21455,10 +22209,6 @@
- # This must work even if \$libdir does not exist
- hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
- 
--# If ld is used when linking, flag to hardcode \$libdir into a binary
--# during linking.  This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
--
- # Whether we need a single "-rpath" flag with a separated argument.
- hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
- 
-@@ -21492,9 +22242,6 @@
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs_CXX
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path=$lt_fix_srcfile_path_CXX
--
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols_CXX
- 
-@@ -21510,6 +22257,9 @@
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds_CXX
- 
-+# Commands necessary for finishing linking programs.
-+postlink_cmds=$lt_postlink_cmds_CXX
-+
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec_CXX
- 
-@@ -21544,7 +22294,7 @@
- ac_clean_files=$ac_clean_files_save
- 
- test $ac_write_fail = 0 ||
--  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
- 
- 
- # configure is writing to config.log, and then calls config.status.
-@@ -21565,7 +22315,7 @@
-   exec 5>>config.log
-   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-   # would make configure fail if this is the last instruction.
--  $ac_cs_success || as_fn_exit $?
-+  $ac_cs_success || as_fn_exit 1
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-diff -u -r hal-0.5.14/configure.in src/hal-0.5.14/configure.in
---- hal-0.5.14/configure.in	2009-08-24 14:42:29.000000000 +0200
-+++ src/hal-0.5.14/configure.in	2011-12-19 20:39:54.000000000 +0100
-@@ -479,9 +479,6 @@
- fi 
- AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
- 
--USE_LIBUSB20=no
--USE_LIBUSB=no
--LIBUSB20_LIBS=""
- AC_ARG_WITH([backend],
- 	    AS_HELP_STRING([--with-backend=<name>],
- 	                   [backend to use (linux/solaris/freebsd/dummy)]),
-@@ -510,21 +507,25 @@
- AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
- AC_SUBST(HALD_BACKEND)
- if test "x$HALD_BACKEND" = "xfreebsd"; then
--    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
--fi
--if test "x$USE_LIBUSB20" = "xno"; then
--    AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])
--fi
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])
--if test "x$USE_LIBUSB20" = "xyes"; then
--    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
--    LIBUSB20_LIBS="-lusb20"
--elif test "x$USE_LIBUSB" = "xyes"; then
--    AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
--    LIBUSB20_LIBS="-lusb"
-+    USE_BSDLIBUSB20=no
-+    USE_BSDLIBUSB=no
-+    LIBUSB20_LIBS=""
-+    AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no])
-+    if test "x$USE_BSDLIBUSB20" = "xno"; then
-+        AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no])
-+    fi
-+    AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"])
-+    if test "x$USE_BSDLIBUSB20" = "xyes"; then
-+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
-+        LIBUSB20_LIBS="-lusb20"
-+    elif test "x$USE_BSDLIBUSB" = "xyes"; then
-+        AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
-+        LIBUSB20_LIBS="-lusb"
-+    fi
-+    AC_SUBST(LIBUSB20_LIBS)
-+else
-+    AM_CONDITIONAL([HAVE_LIBUSB20], [false])
- fi
--AC_SUBST(LIBUSB20_LIBS)
- 
- dnl DBUS API is subject to changes
- AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
-Only in src/hal-0.5.14/doc/api/libhal: Makefile
-diff -u -r hal-0.5.14/doc/api/libhal/Makefile.in src/hal-0.5.14/doc/api/libhal/Makefile.in
---- hal-0.5.14/doc/api/libhal/Makefile.in	2009-11-30 23:22:36.000000000 +0100
-+++ src/hal-0.5.14/doc/api/libhal/Makefile.in	2011-12-19 20:40:15.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -89,6 +89,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -131,6 +132,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -151,6 +153,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -173,6 +177,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -206,7 +211,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/doc/api/libhal-storage: Makefile
-diff -u -r hal-0.5.14/doc/api/libhal-storage/Makefile.in src/hal-0.5.14/doc/api/libhal-storage/Makefile.in
---- hal-0.5.14/doc/api/libhal-storage/Makefile.in	2009-11-30 23:22:36.000000000 +0100
-+++ src/hal-0.5.14/doc/api/libhal-storage/Makefile.in	2011-12-19 20:40:15.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -89,6 +89,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -131,6 +132,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -151,6 +153,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -173,6 +177,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -206,7 +211,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/doc/api: Makefile
-diff -u -r hal-0.5.14/doc/api/Makefile.in src/hal-0.5.14/doc/api/Makefile.in
---- hal-0.5.14/doc/api/Makefile.in	2009-11-30 23:22:36.000000000 +0100
-+++ src/hal-0.5.14/doc/api/Makefile.in	2011-12-19 20:40:15.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -122,6 +122,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -164,6 +165,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -184,6 +186,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -206,6 +210,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -239,7 +244,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -309,7 +313,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -334,7 +338,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-Only in src/hal-0.5.14/doc: Makefile
-diff -u -r hal-0.5.14/doc/Makefile.in src/hal-0.5.14/doc/Makefile.in
---- hal-0.5.14/doc/Makefile.in	2009-11-30 23:22:35.000000000 +0100
-+++ src/hal-0.5.14/doc/Makefile.in	2011-12-19 20:40:15.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -122,6 +122,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -164,6 +165,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -184,6 +186,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -206,6 +210,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -239,7 +244,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -309,7 +313,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -334,7 +338,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-Only in src/hal-0.5.14/doc/man: Makefile
-diff -u -r hal-0.5.14/doc/man/Makefile.in src/hal-0.5.14/doc/man/Makefile.in
---- hal-0.5.14/doc/man/Makefile.in	2009-11-30 23:22:36.000000000 +0100
-+++ src/hal-0.5.14/doc/man/Makefile.in	2011-12-19 20:40:16.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -109,6 +109,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -171,6 +173,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -193,6 +197,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +231,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/doc/spec: Makefile
-diff -u -r hal-0.5.14/doc/spec/Makefile.in src/hal-0.5.14/doc/spec/Makefile.in
---- hal-0.5.14/doc/spec/Makefile.in	2009-11-30 23:22:36.000000000 +0100
-+++ src/hal-0.5.14/doc/spec/Makefile.in	2011-12-19 20:40:16.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -107,6 +107,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -149,6 +150,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -169,6 +171,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -191,6 +195,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +229,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/fdi/information/10freedesktop: Makefile
-diff -u -r hal-0.5.14/fdi/information/10freedesktop/Makefile.in src/hal-0.5.14/fdi/information/10freedesktop/Makefile.in
---- hal-0.5.14/fdi/information/10freedesktop/Makefile.in	2009-11-30 23:22:36.000000000 +0100
-+++ src/hal-0.5.14/fdi/information/10freedesktop/Makefile.in	2011-12-19 20:40:16.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -109,6 +109,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -151,6 +152,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -171,6 +173,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -193,6 +197,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -226,7 +231,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/fdi/information/20thirdparty: Makefile
-diff -u -r hal-0.5.14/fdi/information/20thirdparty/Makefile.in src/hal-0.5.14/fdi/information/20thirdparty/Makefile.in
---- hal-0.5.14/fdi/information/20thirdparty/Makefile.in	2009-11-30 23:22:37.000000000 +0100
-+++ src/hal-0.5.14/fdi/information/20thirdparty/Makefile.in	2011-12-19 20:40:16.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -107,6 +107,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -149,6 +150,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -169,6 +171,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -191,6 +195,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +229,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/fdi/information: Makefile
-diff -u -r hal-0.5.14/fdi/information/Makefile.in src/hal-0.5.14/fdi/information/Makefile.in
---- hal-0.5.14/fdi/information/Makefile.in	2009-11-30 23:22:37.000000000 +0100
-+++ src/hal-0.5.14/fdi/information/Makefile.in	2011-12-19 20:40:16.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -147,6 +147,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -189,6 +190,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -209,6 +211,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -231,6 +235,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -264,7 +269,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -351,7 +355,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -376,7 +380,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-Only in src/hal-0.5.14/fdi: Makefile
-diff -u -r hal-0.5.14/fdi/Makefile.in src/hal-0.5.14/fdi/Makefile.in
---- hal-0.5.14/fdi/Makefile.in	2009-11-30 23:22:36.000000000 +0100
-+++ src/hal-0.5.14/fdi/Makefile.in	2011-12-19 20:40:16.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -147,6 +147,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -189,6 +190,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -209,6 +211,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -231,6 +235,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -264,7 +269,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -352,7 +356,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -377,7 +381,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -u -r hal-0.5.14/fdi/policy/10osvendor/10-x11-input.fdi src/hal-0.5.14/fdi/policy/10osvendor/10-x11-input.fdi
---- hal-0.5.14/fdi/policy/10osvendor/10-x11-input.fdi	2009-06-26 09:28:39.000000000 +0200
-+++ src/hal-0.5.14/fdi/policy/10osvendor/10-x11-input.fdi	2011-12-19 20:39:54.000000000 +0100
-@@ -2,6 +2,12 @@
- <deviceinfo version="0.2">
-   <device>
- 
-+    <!-- This KVMS has abs x/y and buttons. It only has inputInfo.joystick
-+         set by hal and doesn't get picked up by default -->
-+    <match key="input.product" contains="American Megatrends Inc. Virtual Keyboard and Mouse">
-+       <merge key="input.x11_driver" type="string">evdev</merge>
-+    </match>
-+
-     <!-- KVM emulates a USB graphics tablet which works in absolute coordinate mode -->
-     <match key="input.product" contains="QEMU USB Tablet">
-        <merge key="input.x11_driver" type="string">evdev</merge>
-@@ -16,6 +22,14 @@
-       </match>
-     </match>
- 
-+    <match key="info.capabilities" contains="input.touchpad">
-+      <merge key="input.x11_driver" type="string">mouse</merge>
-+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-+             string="Linux">
-+        <merge key="input.x11_driver" type="string">evdev</merge>
-+      </match>
-+    </match>
-+
-     <match key="info.capabilities" contains="input.tablet">
-       <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-              string="Linux">
-@@ -32,5 +46,18 @@
-         <merge key="input.x11_driver" type="string">evdev</merge>
-       </match>
-     </match>
-+
-+    <!-- http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-+         Posts accel data through ABS_X/ABS_Y, makes X unusable -->
-+    <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
-+        <remove key="input.x11_driver" />
-+    </match>
-+
-+    <!-- https://bugzilla.redhat.com/show_bug.cgi?id=523914
-+         Mouse does not move in PV Xen guest -->
-+    <match key="info.product" contains="Xen Virtual Pointer">
-+      <merge key="input.x11_options.IgnoreAbsoluteAxes" type="string">false</merge>
-+      <merge key="input.x11_options.IgnoreRelativeAxes" type="string">false</merge>
-+    </match>
-   </device>
- </deviceinfo>
-Only in src/hal-0.5.14/fdi/policy/10osvendor: 10-x11-input.fdi.orig
-diff -u -r hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi src/hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi
---- hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi	2009-11-05 15:09:01.000000000 +0100
-+++ src/hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi	2011-12-19 20:39:54.000000000 +0100
-@@ -99,6 +99,11 @@
-         </match>
-       </match>
- 
-+      <!-- Hide partitions marked as Compaq Diagnostics -->
-+      <match key="volume.partition.type" string="0x12">
-+        <merge key="volume.ignore" type="bool">true</merge>
-+      </match>
-+
-       <!-- EFI firmware partitions -->
-       <match key="volume.fstype" string="vfat">
- 	<match key="volume.label" string="EFI">
-Only in src/hal-0.5.14/fdi/policy/10osvendor: 20-storage-methods.fdi.orig
-Only in src/hal-0.5.14/fdi/policy/10osvendor: Makefile
-diff -u -r hal-0.5.14/fdi/policy/10osvendor/Makefile.in src/hal-0.5.14/fdi/policy/10osvendor/Makefile.in
---- hal-0.5.14/fdi/policy/10osvendor/Makefile.in	2009-11-30 23:22:37.000000000 +0100
-+++ src/hal-0.5.14/fdi/policy/10osvendor/Makefile.in	2011-12-19 20:40:17.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -127,6 +127,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -169,6 +170,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -189,6 +191,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -211,6 +215,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -244,7 +249,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/fdi/policy/20thirdparty: Makefile
-diff -u -r hal-0.5.14/fdi/policy/20thirdparty/Makefile.in src/hal-0.5.14/fdi/policy/20thirdparty/Makefile.in
---- hal-0.5.14/fdi/policy/20thirdparty/Makefile.in	2009-11-30 23:22:37.000000000 +0100
-+++ src/hal-0.5.14/fdi/policy/20thirdparty/Makefile.in	2011-12-19 20:40:17.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -107,6 +107,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -149,6 +150,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -169,6 +171,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -191,6 +195,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +229,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/fdi/policy: Makefile
-diff -u -r hal-0.5.14/fdi/policy/Makefile.in src/hal-0.5.14/fdi/policy/Makefile.in
---- hal-0.5.14/fdi/policy/Makefile.in	2009-11-30 23:22:37.000000000 +0100
-+++ src/hal-0.5.14/fdi/policy/Makefile.in	2011-12-19 20:40:17.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -147,6 +147,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -189,6 +190,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -209,6 +211,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -231,6 +235,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -264,7 +269,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -351,7 +355,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -376,7 +380,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-Only in src/hal-0.5.14/fdi/preprobe/10freedesktop: Makefile
-diff -u -r hal-0.5.14/fdi/preprobe/10freedesktop/Makefile.in src/hal-0.5.14/fdi/preprobe/10freedesktop/Makefile.in
---- hal-0.5.14/fdi/preprobe/10freedesktop/Makefile.in	2009-11-30 23:22:37.000000000 +0100
-+++ src/hal-0.5.14/fdi/preprobe/10freedesktop/Makefile.in	2011-12-19 20:40:17.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -107,6 +107,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -149,6 +150,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -169,6 +171,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -191,6 +195,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +229,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/fdi/preprobe/20thirdparty: Makefile
-diff -u -r hal-0.5.14/fdi/preprobe/20thirdparty/Makefile.in src/hal-0.5.14/fdi/preprobe/20thirdparty/Makefile.in
---- hal-0.5.14/fdi/preprobe/20thirdparty/Makefile.in	2009-11-30 23:22:37.000000000 +0100
-+++ src/hal-0.5.14/fdi/preprobe/20thirdparty/Makefile.in	2011-12-19 20:40:17.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -107,6 +107,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -149,6 +150,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -169,6 +171,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -191,6 +195,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -224,7 +229,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/fdi/preprobe: Makefile
-diff -u -r hal-0.5.14/fdi/preprobe/Makefile.in src/hal-0.5.14/fdi/preprobe/Makefile.in
---- hal-0.5.14/fdi/preprobe/Makefile.in	2009-11-30 23:22:38.000000000 +0100
-+++ src/hal-0.5.14/fdi/preprobe/Makefile.in	2011-12-19 20:40:17.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -147,6 +147,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -189,6 +190,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -209,6 +211,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -231,6 +235,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -264,7 +269,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -351,7 +355,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -376,7 +380,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -u -r hal-0.5.14/hal.conf src/hal-0.5.14/hal.conf
---- hal-0.5.14/hal.conf	2009-11-30 23:24:16.000000000 +0100
-+++ src/hal-0.5.14/hal.conf	2011-12-19 20:41:06.000000000 +0100
-@@ -6,8 +6,8 @@
-   <!-- This configuration file specifies the required security policies
-        for the HAL to work. -->
- 
--  <!-- Only root or user haldaemon can own the HAL service -->
--  <policy user="haldaemon">
-+  <!-- Only root or user hal can own the HAL service -->
-+  <policy user="hal">
-     <allow own="org.freedesktop.Hal"/>
-   </policy>
-   <policy user="root">
-@@ -25,7 +25,41 @@
-            send_interface="org.freedesktop.Hal.Device"/>
-     <allow send_destination="org.freedesktop.Hal"
-            send_interface="org.freedesktop.Hal.Manager"/>
-+  </policy>
- 
-+  <!-- Only allow users at the local console to manipulate devices -->
-+  <policy at_console="true">
-+    <allow send_destination="org.freedesktop.Hal"
-+           send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.DockStation"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Leds"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.LightSensor"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Storage"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Volume"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
-+
-+  </policy>
-+
-+  <!-- well,...and root too -->
-+  <policy user="root">
-     <allow send_destination="org.freedesktop.Hal"
-            send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
-     <allow send_destination="org.freedesktop.Hal"
-diff -u -r hal-0.5.14/hal.conf.in src/hal-0.5.14/hal.conf.in
---- hal-0.5.14/hal.conf.in	2009-02-04 23:07:23.000000000 +0100
-+++ src/hal-0.5.14/hal.conf.in	2011-12-19 20:39:54.000000000 +0100
-@@ -25,7 +25,41 @@
-            send_interface="org.freedesktop.Hal.Device"/>
-     <allow send_destination="org.freedesktop.Hal"
-            send_interface="org.freedesktop.Hal.Manager"/>
-+  </policy>
- 
-+  <!-- Only allow users at the local console to manipulate devices -->
-+  <policy at_console="true">
-+    <allow send_destination="org.freedesktop.Hal"
-+           send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.DockStation"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Leds"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.LightSensor"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Storage"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Volume"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-+    <allow send_destination="org.freedesktop.Hal"
-+    	   send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
-+
-+  </policy>
-+
-+  <!-- well,...and root too -->
-+  <policy user="root">
-     <allow send_destination="org.freedesktop.Hal"
-            send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
-     <allow send_destination="org.freedesktop.Hal"
-Only in src/hal-0.5.14/hald: .deps
-Only in src/hal-0.5.14/hald/dummy: .deps
-Only in src/hal-0.5.14/hald/dummy: libhald_dummy.la
-Only in src/hal-0.5.14/hald/dummy: .libs
-Only in src/hal-0.5.14/hald/dummy: Makefile
-diff -u -r hal-0.5.14/hald/dummy/Makefile.in src/hal-0.5.14/hald/dummy/Makefile.in
---- hal-0.5.14/hald/dummy/Makefile.in	2009-11-30 23:22:38.000000000 +0100
-+++ src/hal-0.5.14/hald/dummy/Makefile.in	2011-12-19 20:40:18.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -112,6 +112,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -174,6 +176,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -196,6 +200,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +234,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/hald/dummy: osspec.lo
-Only in src/hal-0.5.14/hald/freebsd/addons: .deps
-Only in src/hal-0.5.14/hald/freebsd/addons: Makefile
-diff -u -r hal-0.5.14/hald/freebsd/addons/Makefile.in src/hal-0.5.14/hald/freebsd/addons/Makefile.in
---- hal-0.5.14/hald/freebsd/addons/Makefile.in	2009-11-30 23:22:39.000000000 +0100
-+++ src/hal-0.5.14/hald/freebsd/addons/Makefile.in	2011-12-19 20:40:19.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -127,6 +127,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -169,6 +170,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -189,6 +191,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -211,6 +215,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -244,7 +249,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/hald/freebsd: .deps
-Only in src/hal-0.5.14/hald/freebsd/libprobe: .deps
-Only in src/hal-0.5.14/hald/freebsd/libprobe: Makefile
-diff -u -r hal-0.5.14/hald/freebsd/libprobe/Makefile.in src/hal-0.5.14/hald/freebsd/libprobe/Makefile.in
---- hal-0.5.14/hald/freebsd/libprobe/Makefile.in	2009-11-30 23:22:39.000000000 +0100
-+++ src/hal-0.5.14/hald/freebsd/libprobe/Makefile.in	2011-12-19 20:40:19.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -118,6 +118,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -160,6 +161,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -180,6 +182,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -202,6 +206,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -235,7 +240,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/hald/freebsd: Makefile
-diff -u -r hal-0.5.14/hald/freebsd/Makefile.in src/hal-0.5.14/hald/freebsd/Makefile.in
---- hal-0.5.14/hald/freebsd/Makefile.in	2009-11-30 23:22:38.000000000 +0100
-+++ src/hal-0.5.14/hald/freebsd/Makefile.in	2011-12-19 20:40:18.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -173,6 +173,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -215,6 +216,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -235,6 +237,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -257,6 +261,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -290,7 +295,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -438,7 +442,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -463,7 +467,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-Only in src/hal-0.5.14/hald/freebsd/probing: .deps
-Only in src/hal-0.5.14/hald/freebsd/probing: Makefile
-diff -u -r hal-0.5.14/hald/freebsd/probing/Makefile.in src/hal-0.5.14/hald/freebsd/probing/Makefile.in
---- hal-0.5.14/hald/freebsd/probing/Makefile.in	2009-11-30 23:22:39.000000000 +0100
-+++ src/hal-0.5.14/hald/freebsd/probing/Makefile.in	2011-12-19 20:40:19.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -167,6 +167,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -209,6 +210,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -229,6 +231,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -251,6 +255,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -284,7 +289,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-diff -u -r hal-0.5.14/hald/linux/addons/addon-imac-backlight.c src/hal-0.5.14/hald/linux/addons/addon-imac-backlight.c
---- hal-0.5.14/hald/linux/addons/addon-imac-backlight.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/addons/addon-imac-backlight.c	2011-12-19 20:39:54.000000000 +0100
-@@ -158,7 +158,8 @@
- 		goto out;
- 	}
- 
--	if (ioperm(0xB2, 0xB3, 1) < 0)
-+	/* Allow access to ports 0xB2 and 0xB3 */
-+	if (ioperm(0xB2, 2, 1) < 0)
- 	{
- 		HAL_ERROR (("ioperm failed (you should be root)."));
- 		exit(1);
-diff -u -r hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c src/hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c
---- hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c	2011-12-19 20:39:54.000000000 +0100
-@@ -507,7 +507,8 @@
-  	state = INREG(0x7ae4);
-  	OUTREG(0x7ae4, state);
- 
--	if (ioperm (0x300, 0x304, 1) < 0) {
-+	/* Allow access to porta 0x300 through 0x304 */
-+	if (ioperm (0x300, 5, 1) < 0) {
- 		HAL_ERROR (("ioperm failed (you should be root)."));
- 		exit(1);
- 	}
-Only in src/hal-0.5.14/hald/linux/addons: .deps
-Only in src/hal-0.5.14/hald/linux/addons: Makefile
-diff -u -r hal-0.5.14/hald/linux/addons/Makefile.in src/hal-0.5.14/hald/linux/addons/Makefile.in
---- hal-0.5.14/hald/linux/addons/Makefile.in	2009-11-30 23:22:39.000000000 +0100
-+++ src/hal-0.5.14/hald/linux/addons/Makefile.in	2011-12-19 20:40:20.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -311,6 +311,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -353,6 +354,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -373,6 +375,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -395,6 +399,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -428,7 +433,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/hald/linux: .deps
-Only in src/hal-0.5.14/hald/linux: Makefile
-diff -u -r hal-0.5.14/hald/linux/Makefile.in src/hal-0.5.14/hald/linux/Makefile.in
---- hal-0.5.14/hald/linux/Makefile.in	2009-11-30 23:22:39.000000000 +0100
-+++ src/hal-0.5.14/hald/linux/Makefile.in	2011-12-19 20:40:19.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -169,6 +169,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -211,6 +212,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -231,6 +233,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -253,6 +257,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -286,7 +291,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -418,7 +422,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -443,7 +447,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -u -r hal-0.5.14/hald/linux/osspec.c src/hal-0.5.14/hald/linux/osspec.c
---- hal-0.5.14/hald/linux/osspec.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/osspec.c	2011-12-19 20:39:54.000000000 +0100
-@@ -215,6 +215,11 @@
- 				g_free (str);
- 			}
- 			g_free (dstr);
-+		} else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
-+			if (strtoul(&key[33], NULL, 10) == 1) {
-+				HAL_INFO (("ignoring device requested by DM udev rules"));
-+				goto invalid;
-+			}
- 		}
- 	}
- 
-Only in src/hal-0.5.14/hald/linux/probing: .deps
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-hiddev
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-ieee1394-unit
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-input
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-net-bluetooth
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-pc-floppy
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-printer
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-serial
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-smbios
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-storage
-Only in src/hal-0.5.14/hald/linux/probing: hald-probe-volume
-Only in src/hal-0.5.14/hald/linux/probing: .libs
-Only in src/hal-0.5.14/hald/linux/probing: linux_dvd_rw_utils.o
-Only in src/hal-0.5.14/hald/linux/probing: logger.o
-Only in src/hal-0.5.14/hald/linux/probing: Makefile
-diff -u -r hal-0.5.14/hald/linux/probing/Makefile.in src/hal-0.5.14/hald/linux/probing/Makefile.in
---- hal-0.5.14/hald/linux/probing/Makefile.in	2009-11-30 23:22:40.000000000 +0100
-+++ src/hal-0.5.14/hald/linux/probing/Makefile.in	2011-12-19 20:40:20.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -183,6 +183,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -225,6 +226,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -245,6 +247,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -267,6 +271,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -300,7 +305,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-diff -u -r hal-0.5.14/hald/linux/probing/probe-hiddev.c src/hal-0.5.14/hald/linux/probing/probe-hiddev.c
---- hal-0.5.14/hald/linux/probing/probe-hiddev.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/probing/probe-hiddev.c	2011-12-19 20:39:54.000000000 +0100
-@@ -57,11 +57,12 @@
- 	/* assume failure */
- 	ret = 1;
- 
-+	dbus_error_init (&error);
-+
- 	udi = getenv ("UDI");
- 	if (udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-Only in src/hal-0.5.14/hald/linux/probing: probe-hiddev.o
-diff -u -r hal-0.5.14/hald/linux/probing/probe-ieee1394-unit.c src/hal-0.5.14/hald/linux/probing/probe-ieee1394-unit.c
---- hal-0.5.14/hald/linux/probing/probe-ieee1394-unit.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/probing/probe-ieee1394-unit.c	2011-12-19 20:39:54.000000000 +0100
-@@ -388,6 +388,8 @@
- 
- 	setup_logger ();
- 
-+	dbus_error_init (&error);
-+
- 	udi = getenv ("UDI");
- 	if (udi == NULL)
- 		goto out;
-@@ -396,7 +398,6 @@
- 	if (ieee1394_udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-Only in src/hal-0.5.14/hald/linux/probing: probe-ieee1394-unit.o
-diff -u -r hal-0.5.14/hald/linux/probing/probe-input.c src/hal-0.5.14/hald/linux/probing/probe-input.c
---- hal-0.5.14/hald/linux/probing/probe-input.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/probing/probe-input.c	2011-12-19 20:39:54.000000000 +0100
-@@ -70,6 +70,7 @@
- 	fd = -1;
- 
- 	setup_logger ();
-+	dbus_error_init (&error);
- 
- 	button_type = getenv ("HAL_PROP_BUTTON_TYPE");
- 	if (button_type == NULL)
-@@ -96,7 +97,6 @@
- 	if (udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-Only in src/hal-0.5.14/hald/linux/probing: probe-input.o
-diff -u -r hal-0.5.14/hald/linux/probing/probe-net-bluetooth.c src/hal-0.5.14/hald/linux/probing/probe-net-bluetooth.c
---- hal-0.5.14/hald/linux/probing/probe-net-bluetooth.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/probing/probe-net-bluetooth.c	2011-12-19 20:39:54.000000000 +0100
-@@ -141,6 +141,8 @@
- 	DBusMessage *reply = NULL;
- 	DBusError error;
- 
-+	dbus_error_init (&error);
-+
- 	udi = getenv ("UDI");
- 	if (udi == NULL)
- 		goto out;
-@@ -151,8 +153,6 @@
- 
- 	HAL_INFO (("Investigating '%s'", iface));
- 
--	dbus_error_init (&error);
--
- 	if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
- 		goto out;
- 
-Only in src/hal-0.5.14/hald/linux/probing: probe-net-bluetooth.o
-Only in src/hal-0.5.14/hald/linux/probing: probe-pc-floppy.o
-diff -u -r hal-0.5.14/hald/linux/probing/probe-printer.c src/hal-0.5.14/hald/linux/probing/probe-printer.c
---- hal-0.5.14/hald/linux/probing/probe-printer.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/probing/probe-printer.c	2011-12-19 20:39:54.000000000 +0100
-@@ -66,6 +66,8 @@
- 	ret = 1;
- 
- 	setup_logger ();
-+
-+	dbus_error_init (&error);
- 	
- 	udi = getenv ("UDI");
- 	if (udi == NULL) {
-@@ -73,7 +75,6 @@
- 		goto out;
- 	}
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- 		HAL_ERROR (("ctx init failed"));
- 		goto out;
-Only in src/hal-0.5.14/hald/linux/probing: probe-printer.o
-Only in src/hal-0.5.14/hald/linux/probing: probe-serial.o
-diff -u -r hal-0.5.14/hald/linux/probing/probe-smbios.c src/hal-0.5.14/hald/linux/probing/probe-smbios.c
---- hal-0.5.14/hald/linux/probing/probe-smbios.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/probing/probe-smbios.c	2011-12-19 20:39:54.000000000 +0100
-@@ -129,6 +129,8 @@
- 	ret = 1;
- 
- 	setup_logger ();
-+
-+	dbus_error_init (&error);
- 	
- 	udi = getenv ("UDI");
- 	if (udi == NULL) {
-@@ -136,7 +138,6 @@
- 		goto out;
- 	}
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- 		HAL_ERROR (("ctx init failed"));
- 		goto out;
-Only in src/hal-0.5.14/hald/linux/probing: probe-smbios.o
-diff -u -r hal-0.5.14/hald/linux/probing/probe-storage.c src/hal-0.5.14/hald/linux/probing/probe-storage.c
---- hal-0.5.14/hald/linux/probing/probe-storage.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/probing/probe-storage.c	2011-12-19 20:39:54.000000000 +0100
-@@ -109,6 +109,8 @@
- 	/* assume failure */
- 	ret = 1;
- 
-+	dbus_error_init (&error);
-+
- 	if ((udi = getenv ("UDI")) == NULL)
- 		goto out;
- 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -127,7 +129,6 @@
- 	else
- 		only_check_for_fs = FALSE;
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-Only in src/hal-0.5.14/hald/linux/probing: probe-storage.o
-diff -u -r hal-0.5.14/hald/linux/probing/probe-video4linux.c src/hal-0.5.14/hald/linux/probing/probe-video4linux.c
---- hal-0.5.14/hald/linux/probing/probe-video4linux.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/probing/probe-video4linux.c	2011-12-19 20:44:20.000000000 +0100
-@@ -30,7 +30,7 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/ioctl.h>
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <linux/videodev2.h>
- #include <errno.h>
- #include <fcntl.h>
-@@ -58,6 +58,8 @@
- 
- 	setup_logger ();
- 
-+	dbus_error_init (&error);
-+
- 	device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");
- 	if (device_file == NULL)
- 		goto out;
-@@ -66,7 +68,6 @@
- 	if (udi == NULL)
- 		goto out;
- 
--	dbus_error_init (&error);
- 	ctx = libhal_ctx_init_direct (&error);
- 	if (ctx == NULL)
- 		goto out;
-diff -u -r hal-0.5.14/hald/linux/probing/probe-volume.c src/hal-0.5.14/hald/linux/probing/probe-volume.c
---- hal-0.5.14/hald/linux/probing/probe-volume.c	2009-08-24 14:42:30.000000000 +0200
-+++ src/hal-0.5.14/hald/linux/probing/probe-volume.c	2011-12-19 20:39:54.000000000 +0100
-@@ -318,6 +318,8 @@
- 	/* assume failure */
- 	ret = 1;
- 
-+	dbus_error_init (&error);
-+
- 	if ((udi = getenv ("UDI")) == NULL)
- 		goto out;
- 	if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -346,7 +348,6 @@
- 
- 	fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");
- 
--	dbus_error_init (&error);
- 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- 		goto out;
- 
-Only in src/hal-0.5.14/hald/linux/probing: probe-volume.o
-Only in src/hal-0.5.14/hald/linux/probing: util_helper.o
-Only in src/hal-0.5.14/hald: Makefile
-diff -u -r hal-0.5.14/hald/Makefile.in src/hal-0.5.14/hald/Makefile.in
---- hal-0.5.14/hald/Makefile.in	2009-11-30 23:22:38.000000000 +0100
-+++ src/hal-0.5.14/hald/Makefile.in	2011-12-19 20:40:18.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -205,6 +205,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -247,6 +248,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -267,6 +269,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -289,6 +293,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -322,7 +327,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -642,7 +646,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -667,7 +671,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-Only in src/hal-0.5.14/hald/solaris/addons: .deps
-Only in src/hal-0.5.14/hald/solaris/addons: Makefile
-diff -u -r hal-0.5.14/hald/solaris/addons/Makefile.in src/hal-0.5.14/hald/solaris/addons/Makefile.in
---- hal-0.5.14/hald/solaris/addons/Makefile.in	2009-11-30 23:22:40.000000000 +0100
-+++ src/hal-0.5.14/hald/solaris/addons/Makefile.in	2011-12-19 20:40:20.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -116,6 +116,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -158,6 +159,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -178,6 +180,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -200,6 +204,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -233,7 +238,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/hald/solaris: .deps
-Only in src/hal-0.5.14/hald/solaris: Makefile
-diff -u -r hal-0.5.14/hald/solaris/Makefile.in src/hal-0.5.14/hald/solaris/Makefile.in
---- hal-0.5.14/hald/solaris/Makefile.in	2009-11-30 23:22:40.000000000 +0100
-+++ src/hal-0.5.14/hald/solaris/Makefile.in	2011-12-19 20:40:20.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -153,6 +153,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -195,6 +196,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -215,6 +217,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -237,6 +241,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -270,7 +275,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -401,7 +405,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -426,7 +430,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-Only in src/hal-0.5.14/hald/solaris/probing: .deps
-Only in src/hal-0.5.14/hald/solaris/probing: Makefile
-diff -u -r hal-0.5.14/hald/solaris/probing/Makefile.in src/hal-0.5.14/hald/solaris/probing/Makefile.in
---- hal-0.5.14/hald/solaris/probing/Makefile.in	2009-11-30 23:22:40.000000000 +0100
-+++ src/hal-0.5.14/hald/solaris/probing/Makefile.in	2011-12-19 20:40:21.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -136,6 +136,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -178,6 +179,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -198,6 +200,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -220,6 +224,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -253,7 +258,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-diff -u -r hal-0.5.14/hald/util.h src/hal-0.5.14/hald/util.h
---- hal-0.5.14/hald/util.h	2009-04-03 16:31:34.000000000 +0200
-+++ src/hal-0.5.14/hald/util.h	2011-12-19 20:39:54.000000000 +0100
-@@ -38,7 +38,7 @@
- #endif
- 
- #define HAL_NAME_MAX 256
--#define HAL_PATH_MAX 512
-+#define HAL_PATH_MAX 4096
- 
- gboolean hal_util_remove_trailing_slash (gchar *path);
- 
-Only in src/hal-0.5.14/hald-runner: .deps
-Only in src/hal-0.5.14/hald-runner: Makefile
-diff -u -r hal-0.5.14/hald-runner/Makefile.in src/hal-0.5.14/hald-runner/Makefile.in
---- hal-0.5.14/hald-runner/Makefile.in	2009-11-30 23:22:38.000000000 +0100
-+++ src/hal-0.5.14/hald-runner/Makefile.in	2011-12-19 20:40:18.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -115,6 +115,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -177,6 +179,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -199,6 +203,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -232,7 +237,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14: hal.pc
-Only in src/hal-0.5.14: hal-storage.pc
-Only in src/hal-0.5.14/libhal: .deps
-Only in src/hal-0.5.14/libhal: libhal.la
-Only in src/hal-0.5.14/libhal: libhal.lo
-Only in src/hal-0.5.14/libhal: .libs
-Only in src/hal-0.5.14/libhal: Makefile
-diff -u -r hal-0.5.14/libhal/Makefile.in src/hal-0.5.14/libhal/Makefile.in
---- hal-0.5.14/libhal/Makefile.in	2009-11-30 23:22:41.000000000 +0100
-+++ src/hal-0.5.14/libhal/Makefile.in	2011-12-19 20:40:21.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -142,6 +142,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -184,6 +185,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -204,6 +206,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -226,6 +230,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -259,7 +264,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/libhal-storage: .deps
-Only in src/hal-0.5.14/libhal-storage: libhal-storage.la
-Only in src/hal-0.5.14/libhal-storage: libhal-storage.lo
-Only in src/hal-0.5.14/libhal-storage: .libs
-Only in src/hal-0.5.14/libhal-storage: Makefile
-diff -u -r hal-0.5.14/libhal-storage/Makefile.in src/hal-0.5.14/libhal-storage/Makefile.in
---- hal-0.5.14/libhal-storage/Makefile.in	2009-11-30 23:22:41.000000000 +0100
-+++ src/hal-0.5.14/libhal-storage/Makefile.in	2011-12-19 20:40:21.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -142,6 +142,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -184,6 +185,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -204,6 +206,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -226,6 +230,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -259,7 +264,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14: libtool
-diff -u -r hal-0.5.14/ltmain.sh src/hal-0.5.14/ltmain.sh
---- hal-0.5.14/ltmain.sh	2009-11-30 23:22:27.000000000 +0100
-+++ src/hal-0.5.14/ltmain.sh	2011-10-28 03:25:54.000000000 +0200
-@@ -1,9 +1,9 @@
--# Generated from ltmain.m4sh.
- 
--# ltmain.sh (GNU libtool) 2.2.6
-+# libtool (GNU libtool) 2.4.2
- # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
- # This is free software; see the source for copying conditions.  There is NO
- # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
-@@ -32,50 +32,57 @@
- #
- # Provide generalized library-building support services.
- #
--#     --config             show all configuration variables
--#     --debug              enable verbose shell tracing
--# -n, --dry-run            display commands without modifying any files
--#     --features           display basic configuration information and exit
--#     --mode=MODE          use operation mode MODE
--#     --preserve-dup-deps  don't remove duplicate dependency libraries
--#     --quiet, --silent    don't print informational messages
--#     --tag=TAG            use configuration variables from tag TAG
--# -v, --verbose            print informational messages (default)
--#     --version            print version information
--# -h, --help               print short or long help message
-+#       --config             show all configuration variables
-+#       --debug              enable verbose shell tracing
-+#   -n, --dry-run            display commands without modifying any files
-+#       --features           display basic configuration information and exit
-+#       --mode=MODE          use operation mode MODE
-+#       --preserve-dup-deps  don't remove duplicate dependency libraries
-+#       --quiet, --silent    don't print informational messages
-+#       --no-quiet, --no-silent
-+#                            print informational messages (default)
-+#       --no-warn            don't display warning messages
-+#       --tag=TAG            use configuration variables from tag TAG
-+#   -v, --verbose            print more informational messages than default
-+#       --no-verbose         don't print the extra informational messages
-+#       --version            print version information
-+#   -h, --help, --help-all   print short, long, or detailed help message
- #
- # MODE must be one of the following:
- #
--#       clean              remove files from the build directory
--#       compile            compile a source file into a libtool object
--#       execute            automatically set library path, then run a program
--#       finish             complete the installation of libtool libraries
--#       install            install libraries or executables
--#       link               create a library or an executable
--#       uninstall          remove libraries from an installed directory
-+#         clean              remove files from the build directory
-+#         compile            compile a source file into a libtool object
-+#         execute            automatically set library path, then run a program
-+#         finish             complete the installation of libtool libraries
-+#         install            install libraries or executables
-+#         link               create a library or an executable
-+#         uninstall          remove libraries from an installed directory
- #
--# MODE-ARGS vary depending on the MODE.
-+# MODE-ARGS vary depending on the MODE.  When passed as first option,
-+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
- # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
- #
- # When reporting a bug, please describe a test case to reproduce it and
- # include the following information:
- #
--#       host-triplet:	$host
--#       shell:		$SHELL
--#       compiler:		$LTCC
--#       compiler flags:		$LTCFLAGS
--#       linker:		$LD (gnu? $with_gnu_ld)
--#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
--#       automake:		$automake_version
--#       autoconf:		$autoconf_version
-+#         host-triplet:	$host
-+#         shell:		$SHELL
-+#         compiler:		$LTCC
-+#         compiler flags:		$LTCFLAGS
-+#         linker:		$LD (gnu? $with_gnu_ld)
-+#         $progname:	(GNU libtool) 2.4.2
-+#         automake:	$automake_version
-+#         autoconf:	$autoconf_version
- #
- # Report bugs to <bug-libtool@gnu.org>.
-+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-+# General help using GNU software: <http://www.gnu.org/gethelp/>.
- 
--PROGRAM=ltmain.sh
-+PROGRAM=libtool
- PACKAGE=libtool
--VERSION="2.2.6 Debian-2.2.6a-4"
-+VERSION=2.4.2
- TIMESTAMP=""
--package_revision=1.3012
-+package_revision=1.3337
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -91,10 +98,15 @@
- BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+  eval 'cat <<_LTECHO_EOF
-+$1
-+_LTECHO_EOF'
-+}
-+
- # NLS nuisances: We save the old values to restore during execute mode.
--# Only set LANG and LC_ALL to C if already set.
--# These must not be set unconditionally because not all systems understand
--# e.g. LANG=C (notably SCO).
- lt_user_locale=
- lt_safe_locale=
- for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -107,24 +119,28 @@
- 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
- 	fi"
- done
-+LC_ALL=C
-+LANGUAGE=C
-+export LANGUAGE LC_ALL
- 
- $lt_unset CDPATH
- 
- 
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
- 
- 
- 
- : ${CP="cp -f"}
--: ${ECHO="echo"}
--: ${EGREP="/bin/grep -E"}
--: ${FGREP="/bin/grep -F"}
--: ${GREP="/bin/grep"}
--: ${LN_S="ln -s"}
-+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
- : ${MAKE="make"}
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
--: ${SED="/bin/sed"}
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- : ${Xsed="$SED -e 1s/^X//"}
- 
-@@ -144,6 +160,27 @@
- dirname="s,/[^/]*$,,"
- basename="s,^.*/,,"
- 
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-+    if test "X$func_dirname_result" = "X${1}"; then
-+      func_dirname_result="${3}"
-+    else
-+      func_dirname_result="$func_dirname_result${2}"
-+    fi
-+} # func_dirname may be replaced by extended shell implementation
-+
-+
-+# func_basename file
-+func_basename ()
-+{
-+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-+} # func_basename may be replaced by extended shell implementation
-+
-+
- # func_dirname_and_basename file append nondir_replacement
- # perform func_basename and func_dirname in a single function
- # call:
-@@ -158,33 +195,183 @@
- # those functions but instead duplicate the functionality here.
- func_dirname_and_basename ()
- {
--  # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
--  if test "X$func_dirname_result" = "X${1}"; then
--    func_dirname_result="${3}"
--  else
--    func_dirname_result="$func_dirname_result${2}"
--  fi
--  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+    # Extract subdirectory from the argument.
-+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-+    if test "X$func_dirname_result" = "X${1}"; then
-+      func_dirname_result="${3}"
-+    else
-+      func_dirname_result="$func_dirname_result${2}"
-+    fi
-+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-+} # func_dirname_and_basename may be replaced by extended shell implementation
-+
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+    case ${2} in
-+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+    esac
-+} # func_stripname may be replaced by extended shell implementation
-+
-+
-+# These SED scripts presuppose an absolute path with a trailing slash.
-+pathcar='s,^/\([^/]*\).*$,\1,'
-+pathcdr='s,^/[^/]*,,'
-+removedotparts=':dotsl
-+		s@/\./@/@g
-+		t dotsl
-+		s,/\.$,/,'
-+collapseslashes='s@/\{1,\}@/@g'
-+finalslash='s,/*$,/,'
-+
-+# func_normal_abspath PATH
-+# Remove doubled-up and trailing slashes, "." path components,
-+# and cancel out any ".." path components in PATH after making
-+# it an absolute path.
-+#             value returned in "$func_normal_abspath_result"
-+func_normal_abspath ()
-+{
-+  # Start from root dir and reassemble the path.
-+  func_normal_abspath_result=
-+  func_normal_abspath_tpath=$1
-+  func_normal_abspath_altnamespace=
-+  case $func_normal_abspath_tpath in
-+    "")
-+      # Empty path, that just means $cwd.
-+      func_stripname '' '/' "`pwd`"
-+      func_normal_abspath_result=$func_stripname_result
-+      return
-+    ;;
-+    # The next three entries are used to spot a run of precisely
-+    # two leading slashes without using negated character classes;
-+    # we take advantage of case's first-match behaviour.
-+    ///*)
-+      # Unusual form of absolute path, do nothing.
-+    ;;
-+    //*)
-+      # Not necessarily an ordinary path; POSIX reserves leading '//'
-+      # and for example Cygwin uses it to access remote file shares
-+      # over CIFS/SMB, so we conserve a leading double slash if found.
-+      func_normal_abspath_altnamespace=/
-+    ;;
-+    /*)
-+      # Absolute path, do nothing.
-+    ;;
-+    *)
-+      # Relative path, prepend $cwd.
-+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-+    ;;
-+  esac
-+  # Cancel out all the simple stuff to save iterations.  We also want
-+  # the path to end with a slash for ease of parsing, so make sure
-+  # there is one (and only one) here.
-+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-+  while :; do
-+    # Processed it all yet?
-+    if test "$func_normal_abspath_tpath" = / ; then
-+      # If we ascended to the root using ".." the result may be empty now.
-+      if test -z "$func_normal_abspath_result" ; then
-+        func_normal_abspath_result=/
-+      fi
-+      break
-+    fi
-+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-+        -e "$pathcar"`
-+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-+        -e "$pathcdr"`
-+    # Figure out what to do with it
-+    case $func_normal_abspath_tcomponent in
-+      "")
-+        # Trailing empty path component, ignore it.
-+      ;;
-+      ..)
-+        # Parent dir; strip last assembled component from result.
-+        func_dirname "$func_normal_abspath_result"
-+        func_normal_abspath_result=$func_dirname_result
-+      ;;
-+      *)
-+        # Actual path component, append it.
-+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-+      ;;
-+    esac
-+  done
-+  # Restore leading double-slash if one was found on entry.
-+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
- }
- 
--# Generated shell functions inserted here.
-+# func_relative_path SRCDIR DSTDIR
-+# generates a relative path from SRCDIR to DSTDIR, with a trailing
-+# slash if non-empty, suitable for immediately appending a filename
-+# without needing to append a separator.
-+#             value returned in "$func_relative_path_result"
-+func_relative_path ()
-+{
-+  func_relative_path_result=
-+  func_normal_abspath "$1"
-+  func_relative_path_tlibdir=$func_normal_abspath_result
-+  func_normal_abspath "$2"
-+  func_relative_path_tbindir=$func_normal_abspath_result
-+
-+  # Ascend the tree starting from libdir
-+  while :; do
-+    # check if we have found a prefix of bindir
-+    case $func_relative_path_tbindir in
-+      $func_relative_path_tlibdir)
-+        # found an exact match
-+        func_relative_path_tcancelled=
-+        break
-+        ;;
-+      $func_relative_path_tlibdir*)
-+        # found a matching prefix
-+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-+        func_relative_path_tcancelled=$func_stripname_result
-+        if test -z "$func_relative_path_result"; then
-+          func_relative_path_result=.
-+        fi
-+        break
-+        ;;
-+      *)
-+        func_dirname $func_relative_path_tlibdir
-+        func_relative_path_tlibdir=${func_dirname_result}
-+        if test "x$func_relative_path_tlibdir" = x ; then
-+          # Have to descend all the way to the root!
-+          func_relative_path_result=../$func_relative_path_result
-+          func_relative_path_tcancelled=$func_relative_path_tbindir
-+          break
-+        fi
-+        func_relative_path_result=../$func_relative_path_result
-+        ;;
-+    esac
-+  done
-+
-+  # Now calculate path; take care to avoid doubling-up slashes.
-+  func_stripname '' '/' "$func_relative_path_result"
-+  func_relative_path_result=$func_stripname_result
-+  func_stripname '/' '/' "$func_relative_path_tcancelled"
-+  if test "x$func_stripname_result" != x ; then
-+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-+  fi
- 
--# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
--# is ksh but when the shell is invoked as "sh" and the current value of
--# the _XPG environment variable is not equal to 1 (one), the special
--# positional parameter $0, within a function call, is the name of the
--# function.
--progpath="$0"
-+  # Normalisation. If bindir is libdir, return empty string,
-+  # else relative path ending with a slash; either way, target
-+  # file name can be directly appended.
-+  if test ! -z "$func_relative_path_result"; then
-+    func_stripname './' '' "$func_relative_path_result/"
-+    func_relative_path_result=$func_stripname_result
-+  fi
-+}
- 
- # The name of this program:
--# In the unlikely event $progname began with a '-', it would play havoc with
--# func_echo (imagine progname=-n), so we prepend ./ in that case:
- func_dirname_and_basename "$progpath"
- progname=$func_basename_result
--case $progname in
--  -*) progname=./$progname ;;
--esac
- 
- # Make sure we have an absolute path for reexecution:
- case $progpath in
-@@ -196,7 +383,7 @@
-      ;;
-   *)
-      save_IFS="$IFS"
--     IFS=:
-+     IFS=${PATH_SEPARATOR-:}
-      for progdir in $PATH; do
-        IFS="$save_IFS"
-        test -x "$progdir/$progname" && break
-@@ -215,6 +402,15 @@
- # Same as above, but do not quote variable references.
- double_quote_subst='s/\(["`\\]\)/\\\1/g'
- 
-+# Sed substitution that turns a string into a regex matching for the
-+# string literally.
-+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-+
-+# Sed substitution that converts a w32 file name or path
-+# which contains forward slashes, into one that contains
-+# (escaped) backslashes.  A very naive implementation.
-+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-+
- # Re-`\' parameter expansions in output of double_quote_subst that were
- # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
- # in input to double_quote_subst, that '$' was protected from expansion.
-@@ -243,7 +439,7 @@
- # name if it has been set yet.
- func_echo ()
- {
--    $ECHO "$progname${mode+: }$mode: $*"
-+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
- }
- 
- # func_verbose arg...
-@@ -258,18 +454,25 @@
-     :
- }
- 
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
-+{
-+    $ECHO "$*"
-+}
-+
- # func_error arg...
- # Echo program name prefixed message to standard error.
- func_error ()
- {
--    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
- }
- 
- # func_warning arg...
- # Echo program name prefixed warning message to standard error.
- func_warning ()
- {
--    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
- 
-     # bash bug again:
-     :
-@@ -326,9 +529,9 @@
-         case $my_directory_path in */*) ;; *) break ;; esac
- 
-         # ...otherwise throw away the child directory and loop
--        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-       done
--      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
-+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
- 
-       save_mkdir_p_IFS="$IFS"; IFS=':'
-       for my_dir in $my_dir_list; do
-@@ -378,7 +581,7 @@
-         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-     fi
- 
--    $ECHO "X$my_tmpdir" | $Xsed
-+    $ECHO "$my_tmpdir"
- }
- 
- 
-@@ -392,7 +595,7 @@
- {
-     case $1 in
-       *[\\\`\"\$]*)
--	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-       *)
-         func_quote_for_eval_unquoted_result="$1" ;;
-     esac
-@@ -419,7 +622,7 @@
- {
-     case $1 in
-       *[\\\`\"]*)
--	my_arg=`$ECHO "X$1" | $Xsed \
-+	my_arg=`$ECHO "$1" | $SED \
- 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-       *)
-         my_arg="$1" ;;
-@@ -488,15 +691,39 @@
-     fi
- }
- 
--
--
-+# func_tr_sh
-+# Turn $1 into a string suitable for a shell variable name.
-+# Result is stored in $func_tr_sh_result.  All characters
-+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-+# if $1 begins with a digit, a '_' is prepended as well.
-+func_tr_sh ()
-+{
-+  case $1 in
-+  [0-9]* | *[!a-zA-Z0-9_]*)
-+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-+    ;;
-+  * )
-+    func_tr_sh_result=$1
-+    ;;
-+  esac
-+}
- 
- 
- # func_version
- # Echo version message to standard output and exit.
- func_version ()
- {
--    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-+    $opt_debug
-+
-+    $SED -n '/(C)/!b go
-+	:more
-+	/\./!{
-+	  N
-+	  s/\n# / /
-+	  b more
-+	}
-+	:go
-+	/^# '$PROGRAM' (GNU /,/# warranty; / {
-         s/^# //
- 	s/^# *$//
-         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -509,22 +736,28 @@
- # Echo short help message to standard output and exit.
- func_usage ()
- {
--    $SED -n '/^# Usage:/,/# -h/ {
-+    $opt_debug
-+
-+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-         s/^# //
- 	s/^# *$//
- 	s/\$progname/'$progname'/
- 	p
-     }' < "$progpath"
--    $ECHO
-+    echo
-     $ECHO "run \`$progname --help | more' for full usage"
-     exit $?
- }
- 
--# func_help
--# Echo long help message to standard output and exit.
-+# func_help [NOEXIT]
-+# Echo long help message to standard output and exit,
-+# unless 'noexit' is passed as argument.
- func_help ()
- {
-+    $opt_debug
-+
-     $SED -n '/^# Usage:/,/# Report bugs to/ {
-+	:print
-         s/^# //
- 	s/^# *$//
- 	s*\$progname*'$progname'*
-@@ -534,11 +767,18 @@
- 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
- 	s*\$LD*'"$LD"'*
- 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
--	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
--	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
- 	p
--     }' < "$progpath"
--    exit $?
-+	d
-+     }
-+     /^# .* home page:/b print
-+     /^# General help using/b print
-+     ' < "$progpath"
-+    ret=$?
-+    if test -z "$1"; then
-+      exit $ret
-+    fi
- }
- 
- # func_missing_arg argname
-@@ -546,63 +786,106 @@
- # exit_cmd.
- func_missing_arg ()
- {
--    func_error "missing argument for $1"
-+    $opt_debug
-+
-+    func_error "missing argument for $1."
-     exit_cmd=exit
- }
- 
--exit_cmd=:
- 
-+# func_split_short_opt shortopt
-+# Set func_split_short_opt_name and func_split_short_opt_arg shell
-+# variables after splitting SHORTOPT after the 2nd character.
-+func_split_short_opt ()
-+{
-+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-+
-+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-+} # func_split_short_opt may be replaced by extended shell implementation
-+
-+
-+# func_split_long_opt longopt
-+# Set func_split_long_opt_name and func_split_long_opt_arg shell
-+# variables after splitting LONGOPT at the `=' sign.
-+func_split_long_opt ()
-+{
-+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-+    my_sed_long_arg='1s/^--[^=]*=//'
-+
-+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-+} # func_split_long_opt may be replaced by extended shell implementation
- 
-+exit_cmd=:
- 
- 
- 
--# Check that we have a working $ECHO.
--if test "X$1" = X--no-reexec; then
--  # Discard the --no-reexec flag, and continue.
--  shift
--elif test "X$1" = X--fallback-echo; then
--  # Avoid inline document here, it may be left over
--  :
--elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
--  # Yippee, $ECHO works!
--  :
--else
--  # Restart under the correct shell, and then maybe $ECHO will work.
--  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
--fi
- 
--if test "X$1" = X--fallback-echo; then
--  # used as fallback echo
--  shift
--  cat <<EOF
--$*
--EOF
--  exit $EXIT_SUCCESS
--fi
- 
- magic="%%%MAGIC variable%%%"
- magic_exe="%%%MAGIC EXE variable%%%"
- 
- # Global variables.
--# $mode is unset
- nonopt=
--execute_dlfiles=
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
- extracted_archives=
- extracted_serial=0
- 
--opt_dry_run=false
--opt_duplicate_deps=false
--opt_silent=false
--opt_debug=:
--
- # If this variable is set in any of the actions, the command in it
- # will be execed at the end.  This prevents here-documents from being
- # left over by shells.
- exec_cmd=
- 
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+    eval "${1}=\$${1}\${2}"
-+} # func_append may be replaced by extended shell implementation
-+
-+# func_append_quoted var value
-+# Quote VALUE and append to the end of shell variable VAR, separated
-+# by a space.
-+func_append_quoted ()
-+{
-+    func_quote_for_eval "${2}"
-+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-+} # func_append_quoted may be replaced by extended shell implementation
-+
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+    func_arith_result=`expr "${@}"`
-+} # func_arith may be replaced by extended shell implementation
-+
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-+} # func_len may be replaced by extended shell implementation
-+
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-+} # func_lo2o may be replaced by extended shell implementation
-+
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-+} # func_xform may be replaced by extended shell implementation
-+
-+
- # func_fatal_configuration arg...
- # Echo program name prefixed message to standard error, followed by
- # a configuration failure hint, and exit.
-@@ -636,16 +919,16 @@
- # Display the features supported by this script.
- func_features ()
- {
--    $ECHO "host: $host"
-+    echo "host: $host"
-     if test "$build_libtool_libs" = yes; then
--      $ECHO "enable shared libraries"
-+      echo "enable shared libraries"
-     else
--      $ECHO "disable shared libraries"
-+      echo "disable shared libraries"
-     fi
-     if test "$build_old_libs" = yes; then
--      $ECHO "enable static libraries"
-+      echo "enable static libraries"
-     else
--      $ECHO "disable static libraries"
-+      echo "disable static libraries"
-     fi
- 
-     exit $?
-@@ -692,117 +975,209 @@
-   esac
- }
- 
--# Parse options once, thoroughly.  This comes as soon as possible in
--# the script to make things like `libtool --version' happen quickly.
-+# func_check_version_match
-+# Ensure that we are using m4 macros, and libtool script from the same
-+# release of libtool.
-+func_check_version_match ()
- {
-+  if test "$package_revision" != "$macro_revision"; then
-+    if test "$VERSION" != "$macro_version"; then
-+      if test -z "$macro_version"; then
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from an older release.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      else
-+        cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-+$progname: and run autoconf again.
-+_LT_EOF
-+      fi
-+    else
-+      cat >&2 <<_LT_EOF
-+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-+$progname: of $PACKAGE $VERSION and run autoconf again.
-+_LT_EOF
-+    fi
-+
-+    exit $EXIT_MISMATCH
-+  fi
-+}
-+
-+
-+# Shorthand for --mode=foo, only valid as the first argument
-+case $1 in
-+clean|clea|cle|cl)
-+  shift; set dummy --mode clean ${1+"$@"}; shift
-+  ;;
-+compile|compil|compi|comp|com|co|c)
-+  shift; set dummy --mode compile ${1+"$@"}; shift
-+  ;;
-+execute|execut|execu|exec|exe|ex|e)
-+  shift; set dummy --mode execute ${1+"$@"}; shift
-+  ;;
-+finish|finis|fini|fin|fi|f)
-+  shift; set dummy --mode finish ${1+"$@"}; shift
-+  ;;
-+install|instal|insta|inst|ins|in|i)
-+  shift; set dummy --mode install ${1+"$@"}; shift
-+  ;;
-+link|lin|li|l)
-+  shift; set dummy --mode link ${1+"$@"}; shift
-+  ;;
-+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-+  shift; set dummy --mode uninstall ${1+"$@"}; shift
-+  ;;
-+esac
- 
--  # Shorthand for --mode=foo, only valid as the first argument
--  case $1 in
--  clean|clea|cle|cl)
--    shift; set dummy --mode clean ${1+"$@"}; shift
--    ;;
--  compile|compil|compi|comp|com|co|c)
--    shift; set dummy --mode compile ${1+"$@"}; shift
--    ;;
--  execute|execut|execu|exec|exe|ex|e)
--    shift; set dummy --mode execute ${1+"$@"}; shift
--    ;;
--  finish|finis|fini|fin|fi|f)
--    shift; set dummy --mode finish ${1+"$@"}; shift
--    ;;
--  install|instal|insta|inst|ins|in|i)
--    shift; set dummy --mode install ${1+"$@"}; shift
--    ;;
--  link|lin|li|l)
--    shift; set dummy --mode link ${1+"$@"}; shift
--    ;;
--  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
--    shift; set dummy --mode uninstall ${1+"$@"}; shift
--    ;;
--  esac
- 
--  # Parse non-mode specific arguments:
--  while test "$#" -gt 0; do
-+
-+# Option defaults:
-+opt_debug=:
-+opt_dry_run=false
-+opt_config=false
-+opt_preserve_dup_deps=false
-+opt_features=false
-+opt_finish=false
-+opt_help=false
-+opt_help_all=false
-+opt_silent=:
-+opt_warning=:
-+opt_verbose=:
-+opt_silent=false
-+opt_verbose=false
-+
-+
-+# Parse options once, thoroughly.  This comes as soon as possible in the
-+# script to make things like `--version' happen as quickly as we can.
-+{
-+  # this just eases exit handling
-+  while test $# -gt 0; do
-     opt="$1"
-     shift
--
-     case $opt in
--      --config)		func_config					;;
--
--      --debug)		preserve_args="$preserve_args $opt"
-+      --debug|-x)	opt_debug='set -x'
- 			func_echo "enabling shell trace mode"
--			opt_debug='set -x'
- 			$opt_debug
- 			;;
--
--      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
--			execute_dlfiles="$execute_dlfiles $1"
--			shift
-+      --dry-run|--dryrun|-n)
-+			opt_dry_run=:
- 			;;
--
--      --dry-run | -n)	opt_dry_run=:					;;
--      --features)       func_features					;;
--      --finish)		mode="finish"					;;
--
--      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
--			case $1 in
--			  # Valid mode arguments:
--			  clean)	;;
--			  compile)	;;
--			  execute)	;;
--			  finish)	;;
--			  install)	;;
--			  link)		;;
--			  relink)	;;
--			  uninstall)	;;
--
--			  # Catch anything else as an error
--			  *) func_error "invalid argument for $opt"
--			     exit_cmd=exit
--			     break
--			     ;;
--		        esac
--
--			mode="$1"
-+      --config)
-+			opt_config=:
-+func_config
-+			;;
-+      --dlopen|-dlopen)
-+			optarg="$1"
-+			opt_dlopen="${opt_dlopen+$opt_dlopen
-+}$optarg"
- 			shift
- 			;;
--
-       --preserve-dup-deps)
--			opt_duplicate_deps=:				;;
--
--      --quiet|--silent)	preserve_args="$preserve_args $opt"
--			opt_silent=:
-+			opt_preserve_dup_deps=:
- 			;;
--
--      --verbose| -v)	preserve_args="$preserve_args $opt"
-+      --features)
-+			opt_features=:
-+func_features
-+			;;
-+      --finish)
-+			opt_finish=:
-+set dummy --mode finish ${1+"$@"}; shift
-+			;;
-+      --help)
-+			opt_help=:
-+			;;
-+      --help-all)
-+			opt_help_all=:
-+opt_help=': help-all'
-+			;;
-+      --mode)
-+			test $# = 0 && func_missing_arg $opt && break
-+			optarg="$1"
-+			opt_mode="$optarg"
-+case $optarg in
-+  # Valid mode arguments:
-+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-+
-+  # Catch anything else as an error
-+  *) func_error "invalid argument for $opt"
-+     exit_cmd=exit
-+     break
-+     ;;
-+esac
-+			shift
-+			;;
-+      --no-silent|--no-quiet)
- 			opt_silent=false
-+func_append preserve_args " $opt"
- 			;;
--
--      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
--			preserve_args="$preserve_args $opt $1"
--			func_enable_tag "$1"	# tagname is set here
-+      --no-warning|--no-warn)
-+			opt_warning=false
-+func_append preserve_args " $opt"
-+			;;
-+      --no-verbose)
-+			opt_verbose=false
-+func_append preserve_args " $opt"
-+			;;
-+      --silent|--quiet)
-+			opt_silent=:
-+func_append preserve_args " $opt"
-+        opt_verbose=false
-+			;;
-+      --verbose|-v)
-+			opt_verbose=:
-+func_append preserve_args " $opt"
-+opt_silent=false
-+			;;
-+      --tag)
-+			test $# = 0 && func_missing_arg $opt && break
-+			optarg="$1"
-+			opt_tag="$optarg"
-+func_append preserve_args " $opt $optarg"
-+func_enable_tag "$optarg"
- 			shift
- 			;;
- 
-+      -\?|-h)		func_usage				;;
-+      --help)		func_help				;;
-+      --version)	func_version				;;
-+
-       # Separate optargs to long options:
--      -dlopen=*|--mode=*|--tag=*)
--			func_opt_split "$opt"
--			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-+      --*=*)
-+			func_split_long_opt "$opt"
-+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- 			shift
- 			;;
- 
--      -\?|-h)		func_usage					;;
--      --help)		opt_help=:					;;
--      --version)	func_version					;;
--
--      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
--
--      *)		nonopt="$opt"
--			break
-+      # Separate non-argument short options:
-+      -\?*|-h*|-n*|-v*)
-+			func_split_short_opt "$opt"
-+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-+			shift
- 			;;
-+
-+      --)		break					;;
-+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-     esac
-   done
- 
-+  # Validate options:
-+
-+  # save first non-option argument
-+  if test "$#" -gt 0; then
-+    nonopt="$opt"
-+    shift
-+  fi
-+
-+  # preserve --debug
-+  test "$opt_debug" = : || func_append preserve_args " --debug"
- 
-   case $host in
-     *cygwin* | *mingw* | *pw32* | *cegcc*)
-@@ -810,82 +1185,44 @@
-       opt_duplicate_compiler_generated_deps=:
-       ;;
-     *)
--      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-       ;;
-   esac
- 
--  # Having warned about all mis-specified options, bail out if
--  # anything was wrong.
--  $exit_cmd $EXIT_FAILURE
--}
-+  $opt_help || {
-+    # Sanity checks first:
-+    func_check_version_match
- 
--# func_check_version_match
--# Ensure that we are using m4 macros, and libtool script from the same
--# release of libtool.
--func_check_version_match ()
--{
--  if test "$package_revision" != "$macro_revision"; then
--    if test "$VERSION" != "$macro_version"; then
--      if test -z "$macro_version"; then
--        cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from an older release.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
--      else
--        cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
--$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
--$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
--$progname: and run autoconf again.
--_LT_EOF
--      fi
--    else
--      cat >&2 <<_LT_EOF
--$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
--$progname: but the definition of this LT_INIT comes from revision $macro_revision.
--$progname: You should recreate aclocal.m4 with macros from revision $package_revision
--$progname: of $PACKAGE $VERSION and run autoconf again.
--_LT_EOF
-+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+      func_fatal_configuration "not configured to build any kind of library"
-     fi
- 
--    exit $EXIT_MISMATCH
--  fi
--}
--
-+    # Darwin sucks
-+    eval std_shrext=\"$shrext_cmds\"
- 
--## ----------- ##
--##    Main.    ##
--## ----------- ##
--
--$opt_help || {
--  # Sanity checks first:
--  func_check_version_match
--
--  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
--    func_fatal_configuration "not configured to build any kind of library"
--  fi
-+    # Only execute mode is allowed to have -dlopen flags.
-+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-+      func_error "unrecognized option \`-dlopen'"
-+      $ECHO "$help" 1>&2
-+      exit $EXIT_FAILURE
-+    fi
- 
--  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-+    # Change the help message to a mode-specific one.
-+    generic_help="$help"
-+    help="Try \`$progname --help --mode=$opt_mode' for more information."
-+  }
- 
- 
--  # Darwin sucks
--  eval std_shrext=\"$shrext_cmds\"
-+  # Bail if the options were screwed
-+  $exit_cmd $EXIT_FAILURE
-+}
- 
- 
--  # Only execute mode is allowed to have -dlopen flags.
--  if test -n "$execute_dlfiles" && test "$mode" != execute; then
--    func_error "unrecognized option \`-dlopen'"
--    $ECHO "$help" 1>&2
--    exit $EXIT_FAILURE
--  fi
- 
--  # Change the help message to a mode-specific one.
--  generic_help="$help"
--  help="Try \`$progname --help --mode=$mode' for more information."
--}
- 
-+## ----------- ##
-+##    Main.    ##
-+## ----------- ##
- 
- # func_lalib_p file
- # True iff FILE is a libtool `.la' library or `.lo' object file.
-@@ -950,12 +1287,9 @@
- # temporary ltwrapper_script.
- func_ltwrapper_scriptname ()
- {
--    func_ltwrapper_scriptname_result=""
--    if func_ltwrapper_executable_p "$1"; then
--	func_dirname_and_basename "$1" "" "."
--	func_stripname '' '.exe' "$func_basename_result"
--	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
--    fi
-+    func_dirname_and_basename "$1" "" "."
-+    func_stripname '' '.exe' "$func_basename_result"
-+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- }
- 
- # func_ltwrapper_p file
-@@ -1001,6 +1335,37 @@
- }
- 
- 
-+# func_resolve_sysroot PATH
-+# Replace a leading = in PATH with a sysroot.  Store the result into
-+# func_resolve_sysroot_result
-+func_resolve_sysroot ()
-+{
-+  func_resolve_sysroot_result=$1
-+  case $func_resolve_sysroot_result in
-+  =*)
-+    func_stripname '=' '' "$func_resolve_sysroot_result"
-+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-+    ;;
-+  esac
-+}
-+
-+# func_replace_sysroot PATH
-+# If PATH begins with the sysroot, replace it with = and
-+# store the result into func_replace_sysroot_result.
-+func_replace_sysroot ()
-+{
-+  case "$lt_sysroot:$1" in
-+  ?*:"$lt_sysroot"*)
-+    func_stripname "$lt_sysroot" '' "$1"
-+    func_replace_sysroot_result="=$func_stripname_result"
-+    ;;
-+  *)
-+    # Including no sysroot.
-+    func_replace_sysroot_result=$1
-+    ;;
-+  esac
-+}
-+
- # func_infer_tag arg
- # Infer tagged configuration to use if any are available and
- # if one wasn't chosen via the "--tag" command line option.
-@@ -1013,13 +1378,15 @@
-     if test -n "$available_tags" && test -z "$tagname"; then
-       CC_quoted=
-       for arg in $CC; do
--        func_quote_for_eval "$arg"
--	CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+	func_append_quoted CC_quoted "$arg"
-       done
-+      CC_expanded=`func_echo_all $CC`
-+      CC_quoted_expanded=`func_echo_all $CC_quoted`
-       case $@ in
-       # Blanks in the command may have been stripped by the calling shell,
-       # but not from the CC environment variable when configure was run.
--      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-       # Blanks at the start of $base_compile will cause this to fail
-       # if we don't check for them as well.
-       *)
-@@ -1030,11 +1397,13 @@
- 	    CC_quoted=
- 	    for arg in $CC; do
- 	      # Double-quote args containing other shell metacharacters.
--	      func_quote_for_eval "$arg"
--	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
-+	      func_append_quoted CC_quoted "$arg"
- 	    done
-+	    CC_expanded=`func_echo_all $CC`
-+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
- 	    case "$@ " in
--	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
-+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
- 	      # The compiler in the base compile command matches
- 	      # the one in the tagged configuration.
- 	      # Assume this is the tagged configuration we want.
-@@ -1097,6 +1466,486 @@
-     }
- }
- 
-+
-+##################################################
-+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-+##################################################
-+
-+# func_convert_core_file_wine_to_w32 ARG
-+# Helper function used by file name conversion functions when $build is *nix,
-+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-+# correctly configured wine environment available, with the winepath program
-+# in $build's $PATH.
-+#
-+# ARG is the $build file name to be converted to w32 format.
-+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-+# be empty on error (or when ARG is empty)
-+func_convert_core_file_wine_to_w32 ()
-+{
-+  $opt_debug
-+  func_convert_core_file_wine_to_w32_result="$1"
-+  if test -n "$1"; then
-+    # Unfortunately, winepath does not exit with a non-zero error code, so we
-+    # are forced to check the contents of stdout. On the other hand, if the
-+    # command is not found, the shell will set an exit code of 127 and print
-+    # *an error message* to stdout. So we must check for both error code of
-+    # zero AND non-empty stdout, which explains the odd construction:
-+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-+        $SED -e "$lt_sed_naive_backslashify"`
-+    else
-+      func_convert_core_file_wine_to_w32_result=
-+    fi
-+  fi
-+}
-+# end: func_convert_core_file_wine_to_w32
-+
-+
-+# func_convert_core_path_wine_to_w32 ARG
-+# Helper function used by path conversion functions when $build is *nix, and
-+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-+# configured wine environment available, with the winepath program in $build's
-+# $PATH. Assumes ARG has no leading or trailing path separator characters.
-+#
-+# ARG is path to be converted from $build format to win32.
-+# Result is available in $func_convert_core_path_wine_to_w32_result.
-+# Unconvertible file (directory) names in ARG are skipped; if no directory names
-+# are convertible, then the result may be empty.
-+func_convert_core_path_wine_to_w32 ()
-+{
-+  $opt_debug
-+  # unfortunately, winepath doesn't convert paths, only file names
-+  func_convert_core_path_wine_to_w32_result=""
-+  if test -n "$1"; then
-+    oldIFS=$IFS
-+    IFS=:
-+    for func_convert_core_path_wine_to_w32_f in $1; do
-+      IFS=$oldIFS
-+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-+        else
-+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-+        fi
-+      fi
-+    done
-+    IFS=$oldIFS
-+  fi
-+}
-+# end: func_convert_core_path_wine_to_w32
-+
-+
-+# func_cygpath ARGS...
-+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-+# (2), returns the Cygwin file name or path in func_cygpath_result (input
-+# file name or path is assumed to be in w32 format, as previously converted
-+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-+# or path in func_cygpath_result (input file name or path is assumed to be in
-+# Cygwin format). Returns an empty string on error.
-+#
-+# ARGS are passed to cygpath, with the last one being the file name or path to
-+# be converted.
-+#
-+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-+# environment variable; do not put it in $PATH.
-+func_cygpath ()
-+{
-+  $opt_debug
-+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-+    if test "$?" -ne 0; then
-+      # on failure, ensure result is empty
-+      func_cygpath_result=
-+    fi
-+  else
-+    func_cygpath_result=
-+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-+  fi
-+}
-+#end: func_cygpath
-+
-+
-+# func_convert_core_msys_to_w32 ARG
-+# Convert file name or path ARG from MSYS format to w32 format.  Return
-+# result in func_convert_core_msys_to_w32_result.
-+func_convert_core_msys_to_w32 ()
-+{
-+  $opt_debug
-+  # awkward: cmd appends spaces to result
-+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-+}
-+#end: func_convert_core_msys_to_w32
-+
-+
-+# func_convert_file_check ARG1 ARG2
-+# Verify that ARG1 (a file name in $build format) was converted to $host
-+# format in ARG2. Otherwise, emit an error message, but continue (resetting
-+# func_to_host_file_result to ARG1).
-+func_convert_file_check ()
-+{
-+  $opt_debug
-+  if test -z "$2" && test -n "$1" ; then
-+    func_error "Could not determine host file name corresponding to"
-+    func_error "  \`$1'"
-+    func_error "Continuing, but uninstalled executables may not work."
-+    # Fallback:
-+    func_to_host_file_result="$1"
-+  fi
-+}
-+# end func_convert_file_check
-+
-+
-+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-+# Verify that FROM_PATH (a path in $build format) was converted to $host
-+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-+# func_to_host_file_result to a simplistic fallback value (see below).
-+func_convert_path_check ()
-+{
-+  $opt_debug
-+  if test -z "$4" && test -n "$3"; then
-+    func_error "Could not determine the host path corresponding to"
-+    func_error "  \`$3'"
-+    func_error "Continuing, but uninstalled executables may not work."
-+    # Fallback.  This is a deliberately simplistic "conversion" and
-+    # should not be "improved".  See libtool.info.
-+    if test "x$1" != "x$2"; then
-+      lt_replace_pathsep_chars="s|$1|$2|g"
-+      func_to_host_path_result=`echo "$3" |
-+        $SED -e "$lt_replace_pathsep_chars"`
-+    else
-+      func_to_host_path_result="$3"
-+    fi
-+  fi
-+}
-+# end func_convert_path_check
-+
-+
-+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-+# and appending REPL if ORIG matches BACKPAT.
-+func_convert_path_front_back_pathsep ()
-+{
-+  $opt_debug
-+  case $4 in
-+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-+    ;;
-+  esac
-+  case $4 in
-+  $2 ) func_append func_to_host_path_result "$3"
-+    ;;
-+  esac
-+}
-+# end func_convert_path_front_back_pathsep
-+
-+
-+##################################################
-+# $build to $host FILE NAME CONVERSION FUNCTIONS #
-+##################################################
-+# invoked via `$to_host_file_cmd ARG'
-+#
-+# In each case, ARG is the path to be converted from $build to $host format.
-+# Result will be available in $func_to_host_file_result.
-+
-+
-+# func_to_host_file ARG
-+# Converts the file name ARG from $build format to $host format. Return result
-+# in func_to_host_file_result.
-+func_to_host_file ()
-+{
-+  $opt_debug
-+  $to_host_file_cmd "$1"
-+}
-+# end func_to_host_file
-+
-+
-+# func_to_tool_file ARG LAZY
-+# converts the file name ARG from $build format to toolchain format. Return
-+# result in func_to_tool_file_result.  If the conversion in use is listed
-+# in (the comma separated) LAZY, no conversion takes place.
-+func_to_tool_file ()
-+{
-+  $opt_debug
-+  case ,$2, in
-+    *,"$to_tool_file_cmd",*)
-+      func_to_tool_file_result=$1
-+      ;;
-+    *)
-+      $to_tool_file_cmd "$1"
-+      func_to_tool_file_result=$func_to_host_file_result
-+      ;;
-+  esac
-+}
-+# end func_to_tool_file
-+
-+
-+# func_convert_file_noop ARG
-+# Copy ARG to func_to_host_file_result.
-+func_convert_file_noop ()
-+{
-+  func_to_host_file_result="$1"
-+}
-+# end func_convert_file_noop
-+
-+
-+# func_convert_file_msys_to_w32 ARG
-+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-+# conversion to w32 is not available inside the cwrapper.  Returns result in
-+# func_to_host_file_result.
-+func_convert_file_msys_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    func_convert_core_msys_to_w32 "$1"
-+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_msys_to_w32
-+
-+
-+# func_convert_file_cygwin_to_w32 ARG
-+# Convert file name ARG from Cygwin to w32 format.  Returns result in
-+# func_to_host_file_result.
-+func_convert_file_cygwin_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-+    # LT_CYGPATH in this case.
-+    func_to_host_file_result=`cygpath -m "$1"`
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_cygwin_to_w32
-+
-+
-+# func_convert_file_nix_to_w32 ARG
-+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-+# and a working winepath. Returns result in func_to_host_file_result.
-+func_convert_file_nix_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    func_convert_core_file_wine_to_w32 "$1"
-+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_nix_to_w32
-+
-+
-+# func_convert_file_msys_to_cygwin ARG
-+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-+# Returns result in func_to_host_file_result.
-+func_convert_file_msys_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    func_convert_core_msys_to_w32 "$1"
-+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-+    func_to_host_file_result="$func_cygpath_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_msys_to_cygwin
-+
-+
-+# func_convert_file_nix_to_cygwin ARG
-+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-+# in func_to_host_file_result.
-+func_convert_file_nix_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_file_result="$1"
-+  if test -n "$1"; then
-+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-+    func_convert_core_file_wine_to_w32 "$1"
-+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-+    func_to_host_file_result="$func_cygpath_result"
-+  fi
-+  func_convert_file_check "$1" "$func_to_host_file_result"
-+}
-+# end func_convert_file_nix_to_cygwin
-+
-+
-+#############################################
-+# $build to $host PATH CONVERSION FUNCTIONS #
-+#############################################
-+# invoked via `$to_host_path_cmd ARG'
-+#
-+# In each case, ARG is the path to be converted from $build to $host format.
-+# The result will be available in $func_to_host_path_result.
-+#
-+# Path separators are also converted from $build format to $host format.  If
-+# ARG begins or ends with a path separator character, it is preserved (but
-+# converted to $host format) on output.
-+#
-+# All path conversion functions are named using the following convention:
-+#   file name conversion function    : func_convert_file_X_to_Y ()
-+#   path conversion function         : func_convert_path_X_to_Y ()
-+# where, for any given $build/$host combination the 'X_to_Y' value is the
-+# same.  If conversion functions are added for new $build/$host combinations,
-+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-+# will break.
-+
-+
-+# func_init_to_host_path_cmd
-+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-+# appropriate value, based on the value of $to_host_file_cmd.
-+to_host_path_cmd=
-+func_init_to_host_path_cmd ()
-+{
-+  $opt_debug
-+  if test -z "$to_host_path_cmd"; then
-+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-+  fi
-+}
-+
-+
-+# func_to_host_path ARG
-+# Converts the path ARG from $build format to $host format. Return result
-+# in func_to_host_path_result.
-+func_to_host_path ()
-+{
-+  $opt_debug
-+  func_init_to_host_path_cmd
-+  $to_host_path_cmd "$1"
-+}
-+# end func_to_host_path
-+
-+
-+# func_convert_path_noop ARG
-+# Copy ARG to func_to_host_path_result.
-+func_convert_path_noop ()
-+{
-+  func_to_host_path_result="$1"
-+}
-+# end func_convert_path_noop
-+
-+
-+# func_convert_path_msys_to_w32 ARG
-+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-+# conversion to w32 is not available inside the cwrapper.  Returns result in
-+# func_to_host_path_result.
-+func_convert_path_msys_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # Remove leading and trailing path separator characters from ARG.  MSYS
-+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-+    # and winepath ignores them completely.
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-+    func_convert_path_check : ";" \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-+  fi
-+}
-+# end func_convert_path_msys_to_w32
-+
-+
-+# func_convert_path_cygwin_to_w32 ARG
-+# Convert path ARG from Cygwin to w32 format.  Returns result in
-+# func_to_host_file_result.
-+func_convert_path_cygwin_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # See func_convert_path_msys_to_w32:
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-+    func_convert_path_check : ";" \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-+  fi
-+}
-+# end func_convert_path_cygwin_to_w32
-+
-+
-+# func_convert_path_nix_to_w32 ARG
-+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-+# a working winepath.  Returns result in func_to_host_file_result.
-+func_convert_path_nix_to_w32 ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # See func_convert_path_msys_to_w32:
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-+    func_convert_path_check : ";" \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-+  fi
-+}
-+# end func_convert_path_nix_to_w32
-+
-+
-+# func_convert_path_msys_to_cygwin ARG
-+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-+# Returns result in func_to_host_file_result.
-+func_convert_path_msys_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # See func_convert_path_msys_to_w32:
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-+    func_to_host_path_result="$func_cygpath_result"
-+    func_convert_path_check : : \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-+  fi
-+}
-+# end func_convert_path_msys_to_cygwin
-+
-+
-+# func_convert_path_nix_to_cygwin ARG
-+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-+# func_to_host_file_result.
-+func_convert_path_nix_to_cygwin ()
-+{
-+  $opt_debug
-+  func_to_host_path_result="$1"
-+  if test -n "$1"; then
-+    # Remove leading and trailing path separator characters from
-+    # ARG. msys behavior is inconsistent here, cygpath turns them
-+    # into '.;' and ';.', and winepath ignores them completely.
-+    func_stripname : : "$1"
-+    func_to_host_path_tmp1=$func_stripname_result
-+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-+    func_to_host_path_result="$func_cygpath_result"
-+    func_convert_path_check : : \
-+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-+  fi
-+}
-+# end func_convert_path_nix_to_cygwin
-+
-+
- # func_mode_compile arg...
- func_mode_compile ()
- {
-@@ -1137,12 +1986,12 @@
- 	  ;;
- 
- 	-pie | -fpie | -fPIE)
--          pie_flag="$pie_flag $arg"
-+          func_append pie_flag " $arg"
- 	  continue
- 	  ;;
- 
- 	-shared | -static | -prefer-pic | -prefer-non-pic)
--	  later="$later $arg"
-+	  func_append later " $arg"
- 	  continue
- 	  ;;
- 
-@@ -1163,15 +2012,14 @@
- 	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
- 	    IFS="$save_ifs"
--	    func_quote_for_eval "$arg"
--	    lastarg="$lastarg $func_quote_for_eval_result"
-+	    func_append_quoted lastarg "$arg"
- 	  done
- 	  IFS="$save_ifs"
- 	  func_stripname ' ' '' "$lastarg"
- 	  lastarg=$func_stripname_result
- 
- 	  # Add the arguments to base_compile.
--	  base_compile="$base_compile $lastarg"
-+	  func_append base_compile " $lastarg"
- 	  continue
- 	  ;;
- 
-@@ -1187,8 +2035,7 @@
-       esac    #  case $arg_mode
- 
-       # Aesthetically quote the previous argument.
--      func_quote_for_eval "$lastarg"
--      base_compile="$base_compile $func_quote_for_eval_result"
-+      func_append_quoted base_compile "$lastarg"
-     done # for arg
- 
-     case $arg_mode in
-@@ -1213,7 +2060,7 @@
-     *.[cCFSifmso] | \
-     *.ada | *.adb | *.ads | *.asm | \
-     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
--    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-       func_xform "$libobj"
-       libobj=$func_xform_result
-       ;;
-@@ -1288,7 +2135,7 @@
-     # Calculate the filename of the output object if compiler does
-     # not support -o with -c
-     if test "$compiler_c_o" = no; then
--      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
-     else
-       output_obj=
-@@ -1319,17 +2166,16 @@
- 	$opt_dry_run || $RM $removelist
- 	exit $EXIT_FAILURE
-       fi
--      removelist="$removelist $output_obj"
-+      func_append removelist " $output_obj"
-       $ECHO "$srcfile" > "$lockfile"
-     fi
- 
-     $opt_dry_run || $RM $removelist
--    removelist="$removelist $lockfile"
-+    func_append removelist " $lockfile"
-     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- 
--    if test -n "$fix_srcfile_path"; then
--      eval srcfile=\"$fix_srcfile_path\"
--    fi
-+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-+    srcfile=$func_to_tool_file_result
-     func_quote_for_eval "$srcfile"
-     qsrcfile=$func_quote_for_eval_result
- 
-@@ -1349,7 +2195,7 @@
- 
-       if test -z "$output_obj"; then
- 	# Place PIC objects in $objdir
--	command="$command -o $lobj"
-+	func_append command " -o $lobj"
-       fi
- 
-       func_show_eval_locale "$command"	\
-@@ -1396,11 +2242,11 @@
- 	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
--	command="$command -o $obj"
-+	func_append command " -o $obj"
-       fi
- 
-       # Suppress compiler output if we already did a PIC compilation.
--      command="$command$suppress_output"
-+      func_append command "$suppress_output"
-       func_show_eval_locale "$command" \
-         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- 
-@@ -1445,13 +2291,13 @@
- }
- 
- $opt_help || {
--test "$mode" = compile && func_mode_compile ${1+"$@"}
-+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
- }
- 
- func_mode_help ()
- {
-     # We need to display help for each of the modes.
--    case $mode in
-+    case $opt_mode in
-       "")
-         # Generic help is extracted from the usage comments
-         # at the start of this file.
-@@ -1482,10 +2328,11 @@
- 
-   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-   -no-suppress      do not suppress compiler output for multiple passes
--  -prefer-pic       try to building PIC objects only
--  -prefer-non-pic   try to building non-PIC objects only
-+  -prefer-pic       try to build PIC objects only
-+  -prefer-non-pic   try to build non-PIC objects only
-   -shared           do not build a \`.o' file suitable for static linking
-   -static           only build a \`.o' file suitable for static linking
-+  -Wc,FLAG          pass FLAG directly to the compiler
- 
- COMPILE-COMMAND is a command to be used in creating a \`standard' object file
- from the given SOURCEFILE.
-@@ -1538,7 +2385,7 @@
- 
- The following components of INSTALL-COMMAND are treated specially:
- 
--  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
- 
- The rest of the components are interpreted as arguments to that command (only
- BSD-compatible install options are recognized)."
-@@ -1558,6 +2405,8 @@
- 
-   -all-static       do not do any dynamic linking at all
-   -avoid-version    do not add a version suffix if possible
-+  -bindir BINDIR    specify path to binaries directory (for systems where
-+                    libraries must be found in the PATH setting at runtime)
-   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-@@ -1586,6 +2435,11 @@
-   -version-info CURRENT[:REVISION[:AGE]]
-                     specify library version info [each variable defaults to 0]
-   -weak LIBNAME     declare that the target provides the LIBNAME interface
-+  -Wc,FLAG
-+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-+  -Wl,FLAG
-+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
- 
- All other options (arguments beginning with \`-') are ignored.
- 
-@@ -1619,18 +2473,44 @@
-         ;;
- 
-       *)
--        func_fatal_help "invalid operation mode \`$mode'"
-+        func_fatal_help "invalid operation mode \`$opt_mode'"
-         ;;
-     esac
- 
--    $ECHO
-+    echo
-     $ECHO "Try \`$progname --help' for more information about other modes."
--
--    exit $?
- }
- 
--  # Now that we've collected a possible --mode arg, show help if necessary
--  $opt_help && func_mode_help
-+# Now that we've collected a possible --mode arg, show help if necessary
-+if $opt_help; then
-+  if test "$opt_help" = :; then
-+    func_mode_help
-+  else
-+    {
-+      func_help noexit
-+      for opt_mode in compile link execute install finish uninstall clean; do
-+	func_mode_help
-+      done
-+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-+    {
-+      func_help noexit
-+      for opt_mode in compile link execute install finish uninstall clean; do
-+	echo
-+	func_mode_help
-+      done
-+    } |
-+    sed '1d
-+      /^When reporting/,/^Report/{
-+	H
-+	d
-+      }
-+      $x
-+      /information about other modes/d
-+      /more detailed .*MODE/d
-+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-+  fi
-+  exit $?
-+fi
- 
- 
- # func_mode_execute arg...
-@@ -1643,13 +2523,16 @@
-       func_fatal_help "you must specify a COMMAND"
- 
-     # Handle -dlopen flags immediately.
--    for file in $execute_dlfiles; do
-+    for file in $opt_dlopen; do
-       test -f "$file" \
- 	|| func_fatal_help "\`$file' is not a file"
- 
-       dir=
-       case $file in
-       *.la)
-+	func_resolve_sysroot "$file"
-+	file=$func_resolve_sysroot_result
-+
- 	# Check to see that this really is a libtool archive.
- 	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-@@ -1671,7 +2554,7 @@
- 	dir="$func_dirname_result"
- 
- 	if test -f "$dir/$objdir/$dlname"; then
--	  dir="$dir/$objdir"
-+	  func_append dir "/$objdir"
- 	else
- 	  if test ! -f "$dir/$dlname"; then
- 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-@@ -1712,7 +2595,7 @@
-     for file
-     do
-       case $file in
--      -*) ;;
-+      -* | *.la | *.lo ) ;;
-       *)
- 	# Do a test to see if this is really a libtool program.
- 	if func_ltwrapper_script_p "$file"; then
-@@ -1728,8 +2611,7 @@
- 	;;
-       esac
-       # Quote arguments (to preserve shell metacharacters).
--      func_quote_for_eval "$file"
--      args="$args $func_quote_for_eval_result"
-+      func_append_quoted args "$file"
-     done
- 
-     if test "X$opt_dry_run" = Xfalse; then
-@@ -1754,29 +2636,66 @@
-       # Display what would be done.
-       if test -n "$shlibpath_var"; then
- 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
--	$ECHO "export $shlibpath_var"
-+	echo "export $shlibpath_var"
-       fi
-       $ECHO "$cmd$args"
-       exit $EXIT_SUCCESS
-     fi
- }
- 
--test "$mode" = execute && func_mode_execute ${1+"$@"}
-+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
- 
- 
- # func_mode_finish arg...
- func_mode_finish ()
- {
-     $opt_debug
--    libdirs="$nonopt"
-+    libs=
-+    libdirs=
-     admincmds=
- 
--    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
--      for dir
--      do
--	libdirs="$libdirs $dir"
--      done
-+    for opt in "$nonopt" ${1+"$@"}
-+    do
-+      if test -d "$opt"; then
-+	func_append libdirs " $opt"
- 
-+      elif test -f "$opt"; then
-+	if func_lalib_unsafe_p "$opt"; then
-+	  func_append libs " $opt"
-+	else
-+	  func_warning "\`$opt' is not a valid libtool archive"
-+	fi
-+
-+      else
-+	func_fatal_error "invalid argument \`$opt'"
-+      fi
-+    done
-+
-+    if test -n "$libs"; then
-+      if test -n "$lt_sysroot"; then
-+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-+      else
-+        sysroot_cmd=
-+      fi
-+
-+      # Remove sysroot references
-+      if $opt_dry_run; then
-+        for lib in $libs; do
-+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-+        done
-+      else
-+        tmpdir=`func_mktempdir`
-+        for lib in $libs; do
-+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-+	    > $tmpdir/tmp-la
-+	  mv -f $tmpdir/tmp-la $lib
-+	done
-+        ${RM}r "$tmpdir"
-+      fi
-+    fi
-+
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-       for libdir in $libdirs; do
- 	if test -n "$finish_cmds"; then
- 	  # Do each command in the finish commands.
-@@ -1786,7 +2705,7 @@
- 	if test -n "$finish_eval"; then
- 	  # Do the single finish_eval.
- 	  eval cmds=\"$finish_eval\"
--	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-        $cmds"
- 	fi
-       done
-@@ -1795,53 +2714,55 @@
-     # Exit here if they wanted silent mode.
-     $opt_silent && exit $EXIT_SUCCESS
- 
--    $ECHO "X----------------------------------------------------------------------" | $Xsed
--    $ECHO "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      $ECHO "   $libdir"
--    done
--    $ECHO
--    $ECHO "If you ever happen to want to link against installed libraries"
--    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
--    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    $ECHO "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      $ECHO "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
--      $ECHO "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      echo "----------------------------------------------------------------------"
-+      echo "Libraries have been installed in:"
-+      for libdir in $libdirs; do
-+	$ECHO "   $libdir"
-+      done
-+      echo
-+      echo "If you ever happen to want to link against installed libraries"
-+      echo "in a given directory, LIBDIR, you must either use libtool, and"
-+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+      echo "flag during linking and do at least one of the following:"
-+      if test -n "$shlibpath_var"; then
-+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+	echo "     during execution"
-+      fi
-+      if test -n "$runpath_var"; then
-+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-+	echo "     during linking"
-+      fi
-+      if test -n "$hardcode_libdir_flag_spec"; then
-+	libdir=LIBDIR
-+	eval flag=\"$hardcode_libdir_flag_spec\"
- 
--      $ECHO "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      $ECHO "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    $ECHO
-+	$ECHO "   - use the \`$flag' linker flag"
-+      fi
-+      if test -n "$admincmds"; then
-+	$ECHO "   - have your system administrator run these commands:$admincmds"
-+      fi
-+      if test -f /etc/ld.so.conf; then
-+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+      fi
-+      echo
- 
--    $ECHO "See any operating system documentation about shared libraries for"
--    case $host in
--      solaris2.[6789]|solaris2.1[0-9])
--        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
--	$ECHO "pages."
--	;;
--      *)
--        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
--        ;;
--    esac
--    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+      echo "See any operating system documentation about shared libraries for"
-+      case $host in
-+	solaris2.[6789]|solaris2.1[0-9])
-+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-+	  echo "pages."
-+	  ;;
-+	*)
-+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-+	  ;;
-+      esac
-+      echo "----------------------------------------------------------------------"
-+    fi
-     exit $EXIT_SUCCESS
- }
- 
--test "$mode" = finish && func_mode_finish ${1+"$@"}
-+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
- 
- 
- # func_mode_install arg...
-@@ -1852,7 +2773,7 @@
-     # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-        # Allow the use of GNU shtool's install command.
--       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-+       case $nonopt in *shtool*) :;; *) false;; esac; then
-       # Aesthetically quote it.
-       func_quote_for_eval "$nonopt"
-       install_prog="$func_quote_for_eval_result "
-@@ -1866,7 +2787,12 @@
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     func_quote_for_eval "$arg"
--    install_prog="$install_prog$func_quote_for_eval_result"
-+    func_append install_prog "$func_quote_for_eval_result"
-+    install_shared_prog=$install_prog
-+    case " $install_prog " in
-+      *[\\\ /]cp\ *) install_cp=: ;;
-+      *) install_cp=false ;;
-+    esac
- 
-     # We need to accept at least all the BSD install flags.
-     dest=
-@@ -1876,10 +2802,12 @@
-     install_type=
-     isdir=no
-     stripme=
-+    no_mode=:
-     for arg
-     do
-+      arg2=
-       if test -n "$dest"; then
--	files="$files $dest"
-+	func_append files " $dest"
- 	dest=$arg
- 	continue
-       fi
-@@ -1887,10 +2815,9 @@
-       case $arg in
-       -d) isdir=yes ;;
-       -f)
--	case " $install_prog " in
--	*[\\\ /]cp\ *) ;;
--	*) prev=$arg ;;
--	esac
-+	if $install_cp; then :; else
-+	  prev=$arg
-+	fi
- 	;;
-       -g | -m | -o)
- 	prev=$arg
-@@ -1904,6 +2831,10 @@
-       *)
- 	# If the previous option needed an argument, then skip it.
- 	if test -n "$prev"; then
-+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
-+	    arg2=$install_override_mode
-+	    no_mode=false
-+	  fi
- 	  prev=
- 	else
- 	  dest=$arg
-@@ -1914,7 +2845,11 @@
- 
-       # Aesthetically quote the argument.
-       func_quote_for_eval "$arg"
--      install_prog="$install_prog $func_quote_for_eval_result"
-+      func_append install_prog " $func_quote_for_eval_result"
-+      if test -n "$arg2"; then
-+	func_quote_for_eval "$arg2"
-+      fi
-+      func_append install_shared_prog " $func_quote_for_eval_result"
-     done
- 
-     test -z "$install_prog" && \
-@@ -1923,6 +2858,13 @@
-     test -n "$prev" && \
-       func_fatal_help "the \`$prev' option requires an argument"
- 
-+    if test -n "$install_override_mode" && $no_mode; then
-+      if $install_cp; then :; else
-+	func_quote_for_eval "$install_override_mode"
-+	func_append install_shared_prog " -m $func_quote_for_eval_result"
-+      fi
-+    fi
-+
-     if test -z "$files"; then
-       if test -z "$dest"; then
- 	func_fatal_help "no file or destination specified"
-@@ -1977,10 +2919,13 @@
-       case $file in
-       *.$libext)
- 	# Do the static libraries later.
--	staticlibs="$staticlibs $file"
-+	func_append staticlibs " $file"
- 	;;
- 
-       *.la)
-+	func_resolve_sysroot "$file"
-+	file=$func_resolve_sysroot_result
-+
- 	# Check to see that this really is a libtool archive.
- 	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "\`$file' is not a valid libtool archive"
-@@ -1994,23 +2939,23 @@
- 	if test "X$destdir" = "X$libdir"; then
- 	  case "$current_libdirs " in
- 	  *" $libdir "*) ;;
--	  *) current_libdirs="$current_libdirs $libdir" ;;
-+	  *) func_append current_libdirs " $libdir" ;;
- 	  esac
- 	else
- 	  # Note the libdir as a future libdir.
- 	  case "$future_libdirs " in
- 	  *" $libdir "*) ;;
--	  *) future_libdirs="$future_libdirs $libdir" ;;
-+	  *) func_append future_libdirs " $libdir" ;;
- 	  esac
- 	fi
- 
- 	func_dirname "$file" "/" ""
- 	dir="$func_dirname_result"
--	dir="$dir$objdir"
-+	func_append dir "$objdir"
- 
- 	if test -n "$relink_command"; then
- 	  # Determine the prefix the user has applied to our future dir.
--	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
- 
- 	  # Don't allow the user to place us outside of our expected
- 	  # location b/c this prevents finding dependent libraries that
-@@ -2023,9 +2968,9 @@
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.
--	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
- 	  else
--	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
- 	  fi
- 
- 	  func_warning "relinking \`$file'"
-@@ -2043,7 +2988,7 @@
- 	  test -n "$relink_command" && srcname="$realname"T
- 
- 	  # Install the shared library and build the symlinks.
--	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
- 	      'exit $?'
- 	  tstripme="$stripme"
- 	  case $host_os in
-@@ -2083,7 +3028,7 @@
- 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
- 
- 	# Maybe install the static library, too.
--	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
- 	;;
- 
-       *.lo)
-@@ -2183,7 +3128,7 @@
- 	    if test -f "$lib"; then
- 	      func_source "$lib"
- 	    fi
--	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
- 	      func_warning "\`$lib' has not been installed in \`$libdir'"
- 	      finalize=no
-@@ -2202,7 +3147,7 @@
- 		file="$func_basename_result"
- 	        outputname="$tmpdir/$file"
- 	        # Replace the output file specification.
--	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- 
- 	        $opt_silent || {
- 	          func_quote_for_expand "$relink_command"
-@@ -2221,7 +3166,7 @@
- 	    }
- 	  else
- 	    # Install the binary that we compiled earlier.
--	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
- 	  fi
- 	fi
- 
-@@ -2257,11 +3202,13 @@
- 
-       # Set up the ranlib parameters.
-       oldlib="$destdir/$name"
-+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-+      tool_oldlib=$func_to_tool_file_result
- 
-       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
- 
-       if test -n "$stripme" && test -n "$old_striplib"; then
--	func_show_eval "$old_striplib $oldlib" 'exit $?'
-+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-       fi
- 
-       # Do each command in the postinstall commands.
-@@ -2280,7 +3227,7 @@
-     fi
- }
- 
--test "$mode" = install && func_mode_install ${1+"$@"}
-+test "$opt_mode" = install && func_mode_install ${1+"$@"}
- 
- 
- # func_generate_dlsyms outputname originator pic_p
-@@ -2323,6 +3270,22 @@
- extern \"C\" {
- #endif
- 
-+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-+#endif
-+
-+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-+/* DATA imports from DLLs on WIN32 con't be const, because runtime
-+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-+# define LT_DLSYM_CONST
-+#elif defined(__osf__)
-+/* This system does not cope well with relocations in const data.  */
-+# define LT_DLSYM_CONST
-+#else
-+# define LT_DLSYM_CONST const
-+#endif
-+
- /* External symbol declarations for the compiler. */\
- "
- 
-@@ -2332,10 +3295,11 @@
- 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
- 
- 	  # Add our own program objects to the symbol list.
--	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
- 	  for progfile in $progfiles; do
--	    func_verbose "extracting global C symbols from \`$progfile'"
--	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
- 	  done
- 
- 	  if test -n "$exclude_expsyms"; then
-@@ -2371,7 +3335,7 @@
- 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- 	      eval '$MV "$nlist"T "$nlist"'
- 	      case $host in
--	        *cygwin | *mingw* | *cegcc* )
-+	        *cygwin* | *mingw* | *cegcc* )
- 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- 	          ;;
-@@ -2384,10 +3348,52 @@
- 	  func_verbose "extracting global C symbols from \`$dlprefile'"
- 	  func_basename "$dlprefile"
- 	  name="$func_basename_result"
--	  $opt_dry_run || {
--	    eval '$ECHO ": $name " >> "$nlist"'
--	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
--	  }
-+          case $host in
-+	    *cygwin* | *mingw* | *cegcc* )
-+	      # if an import library, we need to obtain dlname
-+	      if func_win32_import_lib_p "$dlprefile"; then
-+	        func_tr_sh "$dlprefile"
-+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-+	        dlprefile_dlbasename=""
-+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-+	          # Use subshell, to avoid clobbering current variable values
-+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-+	          if test -n "$dlprefile_dlname" ; then
-+	            func_basename "$dlprefile_dlname"
-+	            dlprefile_dlbasename="$func_basename_result"
-+	          else
-+	            # no lafile. user explicitly requested -dlpreopen <import library>.
-+	            $sharedlib_from_linklib_cmd "$dlprefile"
-+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-+	          fi
-+	        fi
-+	        $opt_dry_run || {
-+	          if test -n "$dlprefile_dlbasename" ; then
-+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-+	          else
-+	            func_warning "Could not compute DLL name from $name"
-+	            eval '$ECHO ": $name " >> "$nlist"'
-+	          fi
-+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-+	        }
-+	      else # not an import lib
-+	        $opt_dry_run || {
-+	          eval '$ECHO ": $name " >> "$nlist"'
-+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+	        }
-+	      fi
-+	    ;;
-+	    *)
-+	      $opt_dry_run || {
-+	        eval '$ECHO ": $name " >> "$nlist"'
-+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-+	      }
-+	    ;;
-+          esac
- 	done
- 
- 	$opt_dry_run || {
-@@ -2415,36 +3421,19 @@
- 	  if test -f "$nlist"S; then
- 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
- 	  else
--	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
- 	  fi
- 
--	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+	  echo >> "$output_objdir/$my_dlsyms" "\
- 
- /* The mapping between symbol names and symbols.  */
- typedef struct {
-   const char *name;
-   void *address;
- } lt_dlsymlist;
--"
--	  case $host in
--	  *cygwin* | *mingw* | *cegcc* )
--	    $ECHO >> "$output_objdir/$my_dlsyms" "\
--/* DATA imports from DLLs on WIN32 con't be const, because
--   runtime relocations are performed -- see ld's documentation
--   on pseudo-relocs.  */"
--	    lt_dlsym_const= ;;
--	  *osf5*)
--	    echo >> "$output_objdir/$my_dlsyms" "\
--/* This system does not cope well with relocations in const data */"
--	    lt_dlsym_const= ;;
--	  *)
--	    lt_dlsym_const=const ;;
--	  esac
--
--	  $ECHO >> "$output_objdir/$my_dlsyms" "\
--extern $lt_dlsym_const lt_dlsymlist
-+extern LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[];
--$lt_dlsym_const lt_dlsymlist
-+LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[] =
- {\
-   { \"$my_originator\", (void *) 0 },"
-@@ -2457,7 +3446,7 @@
- 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
- 	    ;;
- 	  esac
--	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+	  echo >> "$output_objdir/$my_dlsyms" "\
-   {0, (void *) 0}
- };
- 
-@@ -2484,7 +3473,7 @@
- 	  # linked before any other PIC object.  But we must not use
- 	  # pic_flag when linking with -static.  The problem exists in
- 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
--	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
- 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
- 	  *-*-hpux*)
- 	    pic_flag_for_symtable=" $pic_flag"  ;;
-@@ -2500,7 +3489,7 @@
- 	for arg in $LTCFLAGS; do
- 	  case $arg in
- 	  -pie | -fpie | -fPIE) ;;
--	  *) symtab_cflags="$symtab_cflags $arg" ;;
-+	  *) func_append symtab_cflags " $arg" ;;
- 	  esac
- 	done
- 
-@@ -2515,16 +3504,16 @@
- 	case $host in
- 	*cygwin* | *mingw* | *cegcc* )
- 	  if test -f "$output_objdir/$my_outputname.def"; then
--	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
--	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- 	  else
--	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
--	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- 	  fi
- 	  ;;
- 	*)
--	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
--	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
- 	  ;;
- 	esac
- 	;;
-@@ -2538,8 +3527,8 @@
-       # really was required.
- 
-       # Nullify the symbol file.
--      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
--      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-     fi
- }
- 
-@@ -2549,6 +3538,7 @@
- # Need a lot of goo to handle *both* DLLs and import libs
- # Has to be a shell function in order to 'eat' the argument
- # that is supplied when $file_magic_command is called.
-+# Despite the name, also deal with 64 bit binaries.
- func_win32_libid ()
- {
-   $opt_debug
-@@ -2559,9 +3549,11 @@
-     win32_libid_type="x86 archive import"
-     ;;
-   *ar\ archive*) # could be an import, or static
-+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
--       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
--      win32_nmres=`eval $NM -f posix -A $1 |
-+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-+      func_to_tool_file "$1" func_convert_file_msys_to_w32
-+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- 	$SED -n -e '
- 	    1,100{
- 		/ I /{
-@@ -2590,6 +3582,131 @@
-   $ECHO "$win32_libid_type"
- }
- 
-+# func_cygming_dll_for_implib ARG
-+#
-+# Platform-specific function to extract the
-+# name of the DLL associated with the specified
-+# import library ARG.
-+# Invoked by eval'ing the libtool variable
-+#    $sharedlib_from_linklib_cmd
-+# Result is available in the variable
-+#    $sharedlib_from_linklib_result
-+func_cygming_dll_for_implib ()
-+{
-+  $opt_debug
-+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-+}
-+
-+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-+#
-+# The is the core of a fallback implementation of a
-+# platform-specific function to extract the name of the
-+# DLL associated with the specified import library LIBNAME.
-+#
-+# SECTION_NAME is either .idata$6 or .idata$7, depending
-+# on the platform and compiler that created the implib.
-+#
-+# Echos the name of the DLL associated with the
-+# specified import library.
-+func_cygming_dll_for_implib_fallback_core ()
-+{
-+  $opt_debug
-+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-+    $SED '/^Contents of section '"$match_literal"':/{
-+      # Place marker at beginning of archive member dllname section
-+      s/.*/====MARK====/
-+      p
-+      d
-+    }
-+    # These lines can sometimes be longer than 43 characters, but
-+    # are always uninteresting
-+    /:[	 ]*file format pe[i]\{,1\}-/d
-+    /^In archive [^:]*:/d
-+    # Ensure marker is printed
-+    /^====MARK====/p
-+    # Remove all lines with less than 43 characters
-+    /^.\{43\}/!d
-+    # From remaining lines, remove first 43 characters
-+    s/^.\{43\}//' |
-+    $SED -n '
-+      # Join marker and all lines until next marker into a single line
-+      /^====MARK====/ b para
-+      H
-+      $ b para
-+      b
-+      :para
-+      x
-+      s/\n//g
-+      # Remove the marker
-+      s/^====MARK====//
-+      # Remove trailing dots and whitespace
-+      s/[\. \t]*$//
-+      # Print
-+      /./p' |
-+    # we now have a list, one entry per line, of the stringified
-+    # contents of the appropriate section of all members of the
-+    # archive which possess that section. Heuristic: eliminate
-+    # all those which have a first or second character that is
-+    # a '.' (that is, objdump's representation of an unprintable
-+    # character.) This should work for all archives with less than
-+    # 0x302f exports -- but will fail for DLLs whose name actually
-+    # begins with a literal '.' or a single character followed by
-+    # a '.'.
-+    #
-+    # Of those that remain, print the first one.
-+    $SED -e '/^\./d;/^.\./d;q'
-+}
-+
-+# func_cygming_gnu_implib_p ARG
-+# This predicate returns with zero status (TRUE) if
-+# ARG is a GNU/binutils-style import library. Returns
-+# with nonzero status (FALSE) otherwise.
-+func_cygming_gnu_implib_p ()
-+{
-+  $opt_debug
-+  func_to_tool_file "$1" func_convert_file_msys_to_w32
-+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-+  test -n "$func_cygming_gnu_implib_tmp"
-+}
-+
-+# func_cygming_ms_implib_p ARG
-+# This predicate returns with zero status (TRUE) if
-+# ARG is an MS-style import library. Returns
-+# with nonzero status (FALSE) otherwise.
-+func_cygming_ms_implib_p ()
-+{
-+  $opt_debug
-+  func_to_tool_file "$1" func_convert_file_msys_to_w32
-+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-+  test -n "$func_cygming_ms_implib_tmp"
-+}
-+
-+# func_cygming_dll_for_implib_fallback ARG
-+# Platform-specific function to extract the
-+# name of the DLL associated with the specified
-+# import library ARG.
-+#
-+# This fallback implementation is for use when $DLLTOOL
-+# does not support the --identify-strict option.
-+# Invoked by eval'ing the libtool variable
-+#    $sharedlib_from_linklib_cmd
-+# Result is available in the variable
-+#    $sharedlib_from_linklib_result
-+func_cygming_dll_for_implib_fallback ()
-+{
-+  $opt_debug
-+  if func_cygming_gnu_implib_p "$1" ; then
-+    # binutils import library
-+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-+  elif func_cygming_ms_implib_p "$1" ; then
-+    # ms-generated import library
-+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-+  else
-+    # unknown
-+    sharedlib_from_linklib_result=""
-+  fi
-+}
- 
- 
- # func_extract_an_archive dir oldlib
-@@ -2598,7 +3715,18 @@
-     $opt_debug
-     f_ex_an_ar_dir="$1"; shift
-     f_ex_an_ar_oldlib="$1"
--    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-+    if test "$lock_old_archive_extraction" = yes; then
-+      lockfile=$f_ex_an_ar_oldlib.lock
-+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-+	func_echo "Waiting for $lockfile to be removed"
-+	sleep 2
-+      done
-+    fi
-+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-+		   'stat=$?; rm -f "$lockfile"; exit $stat'
-+    if test "$lock_old_archive_extraction" = yes; then
-+      $opt_dry_run || rm -f "$lockfile"
-+    fi
-     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-      :
-     else
-@@ -2669,7 +3797,7 @@
- 	    darwin_file=
- 	    darwin_files=
- 	    for darwin_file in $darwin_filelist; do
--	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
- 	      $LIPO -create -output "$darwin_file" $darwin_files
- 	    done # $darwin_filelist
- 	    $RM -rf unfat-$$
-@@ -2684,25 +3812,30 @@
-         func_extract_an_archive "$my_xdir" "$my_xabs"
- 	;;
-       esac
--      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-     done
- 
-     func_extract_archives_result="$my_oldobjs"
- }
- 
- 
--
--# func_emit_wrapper_part1 [arg=no]
-+# func_emit_wrapper [arg=no]
- #
--# Emit the first part of a libtool wrapper script on stdout.
--# For more information, see the description associated with
--# func_emit_wrapper(), below.
--func_emit_wrapper_part1 ()
--{
--	func_emit_wrapper_part1_arg1=no
--	if test -n "$1" ; then
--	  func_emit_wrapper_part1_arg1=$1
--	fi
-+# Emit a libtool wrapper script on stdout.
-+# Don't directly open a file because we may want to
-+# incorporate the script contents within a cygwin/mingw
-+# wrapper executable.  Must ONLY be called from within
-+# func_mode_link because it depends on a number of variables
-+# set therein.
-+#
-+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-+# variable will take.  If 'yes', then the emitted script
-+# will assume that the directory in which it is stored is
-+# the $objdir directory.  This is a cygwin/mingw-specific
-+# behavior.
-+func_emit_wrapper ()
-+{
-+	func_emit_wrapper_arg1=${1-no}
- 
- 	$ECHO "\
- #! $SHELL
-@@ -2718,7 +3851,6 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
- 
- # Be Bourne compatible
-@@ -2749,31 +3881,135 @@
- else
-   # When we are sourced in execute mode, \$file and \$ECHO are already set.
-   if test \"\$libtool_execute_magic\" != \"$magic\"; then
--    ECHO=\"$qecho\"
--    file=\"\$0\"
--    # Make sure echo works.
--    if test \"X\$1\" = X--no-reexec; then
--      # Discard the --no-reexec flag, and continue.
--      shift
--    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
--      # Yippee, \$ECHO works!
--      :
--    else
--      # Restart under the correct shell, and then maybe \$ECHO will work.
--      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
--    fi
--  fi\
-+    file=\"\$0\""
-+
-+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-+    $ECHO "\
-+
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+  eval 'cat <<_LTECHO_EOF
-+\$1
-+_LTECHO_EOF'
-+}
-+    ECHO=\"$qECHO\"
-+  fi
-+
-+# Very basic option parsing. These options are (a) specific to
-+# the libtool wrapper, (b) are identical between the wrapper
-+# /script/ and the wrapper /executable/ which is used only on
-+# windows platforms, and (c) all begin with the string "--lt-"
-+# (application programs are unlikely to have options which match
-+# this pattern).
-+#
-+# There are only two supported options: --lt-debug and
-+# --lt-dump-script. There is, deliberately, no --lt-help.
-+#
-+# The first argument to this parsing function should be the
-+# script's $0 value, followed by "$@".
-+lt_option_debug=
-+func_parse_lt_options ()
-+{
-+  lt_script_arg0=\$0
-+  shift
-+  for lt_opt
-+  do
-+    case \"\$lt_opt\" in
-+    --lt-debug) lt_option_debug=1 ;;
-+    --lt-dump-script)
-+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-+        cat \"\$lt_dump_D/\$lt_dump_F\"
-+        exit 0
-+      ;;
-+    --lt-*)
-+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-+        exit 1
-+      ;;
-+    esac
-+  done
-+
-+  # Print the debug banner immediately:
-+  if test -n \"\$lt_option_debug\"; then
-+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-+  fi
-+}
-+
-+# Used when --lt-debug. Prints its arguments to stdout
-+# (redirection is the responsibility of the caller)
-+func_lt_dump_args ()
-+{
-+  lt_dump_args_N=1;
-+  for lt_arg
-+  do
-+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-+  done
-+}
-+
-+# Core function for launching the target application
-+func_exec_program_core ()
-+{
- "
--	$ECHO "\
-+  case $host in
-+  # Backslashes separate directories on plain windows
-+  *-*-mingw | *-*-os2* | *-cegcc*)
-+    $ECHO "\
-+      if test -n \"\$lt_option_debug\"; then
-+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-+        func_lt_dump_args \${1+\"\$@\"} 1>&2
-+      fi
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
-+    ;;
-+
-+  *)
-+    $ECHO "\
-+      if test -n \"\$lt_option_debug\"; then
-+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-+        func_lt_dump_args \${1+\"\$@\"} 1>&2
-+      fi
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
-+    ;;
-+  esac
-+  $ECHO "\
-+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-+      exit 1
-+}
-+
-+# A function to encapsulate launching the target application
-+# Strips options in the --lt-* namespace from \$@ and
-+# launches target application with the remaining arguments.
-+func_exec_program ()
-+{
-+  case \" \$* \" in
-+  *\\ --lt-*)
-+    for lt_wr_arg
-+    do
-+      case \$lt_wr_arg in
-+      --lt-*) ;;
-+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-+      esac
-+      shift
-+    done ;;
-+  esac
-+  func_exec_program_core \${1+\"\$@\"}
-+}
-+
-+  # Parse options
-+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
- 
-   # Find the directory that this script lives in.
--  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
- 
-   # Follow symbolic links until we get to the real thisdir.
--  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-   while test -n \"\$file\"; do
--    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
- 
-     # If there was a directory component, then change thisdir.
-     if test \"x\$destdir\" != \"x\$file\"; then
-@@ -2783,30 +4019,13 @@
-       esac
-     fi
- 
--    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
--    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-   done
--"
--}
--# end: func_emit_wrapper_part1
--
--# func_emit_wrapper_part2 [arg=no]
--#
--# Emit the second part of a libtool wrapper script on stdout.
--# For more information, see the description associated with
--# func_emit_wrapper(), below.
--func_emit_wrapper_part2 ()
--{
--	func_emit_wrapper_part2_arg1=no
--	if test -n "$1" ; then
--	  func_emit_wrapper_part2_arg1=$1
--	fi
--
--	$ECHO "\
- 
-   # Usually 'no', except on cygwin/mingw when embedded into
-   # the cwrapper.
--  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
-+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-     # special case for '.'
-     if test \"\$thisdir\" = \".\"; then
-@@ -2814,7 +4033,7 @@
-     fi
-     # remove .libs from thisdir
-     case \"\$thisdir\" in
--    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-     $objdir )   thisdir=. ;;
-     esac
-   fi
-@@ -2869,6 +4088,18 @@
- 
-   if test -f \"\$progdir/\$program\"; then"
- 
-+	# fixup the dll searchpath if we need to.
-+	#
-+	# Fix the DLL searchpath if we need to.  Do this before prepending
-+	# to shlibpath, because on Windows, both are PATH and uninstalled
-+	# libraries must come first.
-+	if test -n "$dllsearchpath"; then
-+	  $ECHO "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+	fi
-+
- 	# Export our shlibpath_var if we have one.
- 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- 	  $ECHO "\
-@@ -2877,253 +4108,28 @@
- 
-     # Some systems cannot cope with colon-terminated $shlibpath_var
-     # The second colon is a workaround for a bug in BeOS R4 sed
--    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
- 
-     export $shlibpath_var
- "
- 	fi
- 
--	# fixup the dll searchpath if we need to.
--	if test -n "$dllsearchpath"; then
--	  $ECHO "\
--    # Add the dll search path components to the executable PATH
--    PATH=$dllsearchpath:\$PATH
--"
--	fi
--
- 	$ECHO "\
-     if test \"\$libtool_execute_magic\" != \"$magic\"; then
-       # Run the actual program with our arguments.
--"
--	case $host in
--	# Backslashes separate directories on plain windows
--	*-*-mingw | *-*-os2* | *-cegcc*)
--	  $ECHO "\
--      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
--"
--	  ;;
--
--	*)
--	  $ECHO "\
--      exec \"\$progdir/\$program\" \${1+\"\$@\"}
--"
--	  ;;
--	esac
--	$ECHO "\
--      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
--      exit 1
-+      func_exec_program \${1+\"\$@\"}
-     fi
-   else
-     # The program doesn't exist.
-     \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
--    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-     exit 1
-   fi
- fi\
- "
- }
--# end: func_emit_wrapper_part2
--
--
--# func_emit_wrapper [arg=no]
--#
--# Emit a libtool wrapper script on stdout.
--# Don't directly open a file because we may want to
--# incorporate the script contents within a cygwin/mingw
--# wrapper executable.  Must ONLY be called from within
--# func_mode_link because it depends on a number of variables
--# set therein.
--#
--# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
--# variable will take.  If 'yes', then the emitted script
--# will assume that the directory in which it is stored is
--# the $objdir directory.  This is a cygwin/mingw-specific
--# behavior.
--func_emit_wrapper ()
--{
--	func_emit_wrapper_arg1=no
--	if test -n "$1" ; then
--	  func_emit_wrapper_arg1=$1
--	fi
--
--	# split this up so that func_emit_cwrapperexe_src
--	# can call each part independently.
--	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
--	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
--}
--
--
--# func_to_host_path arg
--#
--# Convert paths to host format when used with build tools.
--# Intended for use with "native" mingw (where libtool itself
--# is running under the msys shell), or in the following cross-
--# build environments:
--#    $build          $host
--#    mingw (msys)    mingw  [e.g. native]
--#    cygwin          mingw
--#    *nix + wine     mingw
--# where wine is equipped with the `winepath' executable.
--# In the native mingw case, the (msys) shell automatically
--# converts paths for any non-msys applications it launches,
--# but that facility isn't available from inside the cwrapper.
--# Similar accommodations are necessary for $host mingw and
--# $build cygwin.  Calling this function does no harm for other
--# $host/$build combinations not listed above.
--#
--# ARG is the path (on $build) that should be converted to
--# the proper representation for $host. The result is stored
--# in $func_to_host_path_result.
--func_to_host_path ()
--{
--  func_to_host_path_result="$1"
--  if test -n "$1" ; then
--    case $host in
--      *mingw* )
--        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
--        case $build in
--          *mingw* ) # actually, msys
--            # awkward: cmd appends spaces to result
--            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
--            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
--              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
--            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
--              $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          *cygwin* )
--            func_to_host_path_tmp1=`cygpath -w "$1"`
--            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
--              $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          * )
--            # Unfortunately, winepath does not exit with a non-zero
--            # error code, so we are forced to check the contents of
--            # stdout. On the other hand, if the command is not
--            # found, the shell will set an exit code of 127 and print
--            # *an error message* to stdout. So we must check for both
--            # error code of zero AND non-empty stdout, which explains
--            # the odd construction:
--            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
--            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
--              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
--                $SED -e "$lt_sed_naive_backslashify"`
--            else
--              # Allow warning below.
--              func_to_host_path_result=""
--            fi
--            ;;
--        esac
--        if test -z "$func_to_host_path_result" ; then
--          func_error "Could not determine host path corresponding to"
--          func_error "  '$1'"
--          func_error "Continuing, but uninstalled executables may not work."
--          # Fallback:
--          func_to_host_path_result="$1"
--        fi
--        ;;
--    esac
--  fi
--}
--# end: func_to_host_path
- 
--# func_to_host_pathlist arg
--#
--# Convert pathlists to host format when used with build tools.
--# See func_to_host_path(), above. This function supports the
--# following $build/$host combinations (but does no harm for
--# combinations not listed here):
--#    $build          $host
--#    mingw (msys)    mingw  [e.g. native]
--#    cygwin          mingw
--#    *nix + wine     mingw
--#
--# Path separators are also converted from $build format to
--# $host format. If ARG begins or ends with a path separator
--# character, it is preserved (but converted to $host format)
--# on output.
--#
--# ARG is a pathlist (on $build) that should be converted to
--# the proper representation on $host. The result is stored
--# in $func_to_host_pathlist_result.
--func_to_host_pathlist ()
--{
--  func_to_host_pathlist_result="$1"
--  if test -n "$1" ; then
--    case $host in
--      *mingw* )
--        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
--        # Remove leading and trailing path separator characters from
--        # ARG. msys behavior is inconsistent here, cygpath turns them
--        # into '.;' and ';.', and winepath ignores them completely.
--        func_to_host_pathlist_tmp2="$1"
--        # Once set for this call, this variable should not be
--        # reassigned. It is used in tha fallback case.
--        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
--          $SED -e 's|^:*||' -e 's|:*$||'`
--        case $build in
--          *mingw* ) # Actually, msys.
--            # Awkward: cmd appends spaces to result.
--            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
--            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
--              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
--            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
--              $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          *cygwin* )
--            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
--            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
--              $SED -e "$lt_sed_naive_backslashify"`
--            ;;
--          * )
--            # unfortunately, winepath doesn't convert pathlists
--            func_to_host_pathlist_result=""
--            func_to_host_pathlist_oldIFS=$IFS
--            IFS=:
--            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
--              IFS=$func_to_host_pathlist_oldIFS
--              if test -n "$func_to_host_pathlist_f" ; then
--                func_to_host_path "$func_to_host_pathlist_f"
--                if test -n "$func_to_host_path_result" ; then
--                  if test -z "$func_to_host_pathlist_result" ; then
--                    func_to_host_pathlist_result="$func_to_host_path_result"
--                  else
--                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
--                  fi
--                fi
--              fi
--              IFS=:
--            done
--            IFS=$func_to_host_pathlist_oldIFS
--            ;;
--        esac
--        if test -z "$func_to_host_pathlist_result" ; then
--          func_error "Could not determine the host path(s) corresponding to"
--          func_error "  '$1'"
--          func_error "Continuing, but uninstalled executables may not work."
--          # Fallback. This may break if $1 contains DOS-style drive
--          # specifications. The fix is not to complicate the expression
--          # below, but for the user to provide a working wine installation
--          # with winepath so that path translation in the cross-to-mingw
--          # case works properly.
--          lt_replace_pathsep_nix_to_dos="s|:|;|g"
--          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
--            $SED -e "$lt_replace_pathsep_nix_to_dos"`
--        fi
--        # Now, add the leading and trailing path separators back
--        case "$1" in
--          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
--            ;;
--        esac
--        case "$1" in
--          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
--            ;;
--        esac
--        ;;
--    esac
--  fi
--}
--# end: func_to_host_pathlist
- 
- # func_emit_cwrapperexe_src
- # emit the source code for a wrapper executable on stdout
-@@ -3141,41 +4147,71 @@
- 
-    This wrapper executable should never be moved out of the build directory.
-    If it is, it will not operate correctly.
--
--   Currently, it simply execs the wrapper *script* "$SHELL $output",
--   but could eventually absorb all of the scripts functionality and
--   exec $objdir/$outputname directly.
- */
- EOF
- 	    cat <<"EOF"
-+#ifdef _MSC_VER
-+# define _CRT_SECURE_NO_DEPRECATE 1
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef _MSC_VER
- # include <direct.h>
- # include <process.h>
- # include <io.h>
--# define setmode _setmode
- #else
- # include <unistd.h>
- # include <stdint.h>
- # ifdef __CYGWIN__
- #  include <io.h>
--#  define HAVE_SETENV
--#  ifdef __STRICT_ANSI__
-+# endif
-+#endif
-+#include <malloc.h>
-+#include <stdarg.h>
-+#include <assert.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+
-+/* declarations of non-ANSI functions */
-+#if defined(__MINGW32__)
-+# ifdef __STRICT_ANSI__
-+int _putenv (const char *);
-+# endif
-+#elif defined(__CYGWIN__)
-+# ifdef __STRICT_ANSI__
- char *realpath (const char *, char *);
- int putenv (char *);
- int setenv (const char *, const char *, int);
--#  endif
- # endif
-+/* #elif defined (other platforms) ... */
-+#endif
-+
-+/* portability defines, excluding path handling macros */
-+#if defined(_MSC_VER)
-+# define setmode _setmode
-+# define stat    _stat
-+# define chmod   _chmod
-+# define getcwd  _getcwd
-+# define putenv  _putenv
-+# define S_IXUSR _S_IEXEC
-+# ifndef _INTPTR_T_DEFINED
-+#  define _INTPTR_T_DEFINED
-+#  define intptr_t int
-+# endif
-+#elif defined(__MINGW32__)
-+# define setmode _setmode
-+# define stat    _stat
-+# define chmod   _chmod
-+# define getcwd  _getcwd
-+# define putenv  _putenv
-+#elif defined(__CYGWIN__)
-+# define HAVE_SETENV
-+# define FOPEN_WB "wb"
-+/* #elif defined (other platforms) ... */
- #endif
--#include <malloc.h>
--#include <stdarg.h>
--#include <assert.h>
--#include <string.h>
--#include <ctype.h>
--#include <errno.h>
--#include <fcntl.h>
--#include <sys/stat.h>
- 
- #if defined(PATH_MAX)
- # define LT_PATHMAX PATH_MAX
-@@ -3192,14 +4228,7 @@
- # define S_IXGRP 0
- #endif
- 
--#ifdef _MSC_VER
--# define S_IXUSR _S_IEXEC
--# define stat _stat
--# ifndef _INTPTR_T_DEFINED
--#  define intptr_t int
--# endif
--#endif
--
-+/* path handling portability macros */
- #ifndef DIR_SEPARATOR
- # define DIR_SEPARATOR '/'
- # define PATH_SEPARATOR ':'
-@@ -3230,10 +4259,6 @@
- # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
- #endif /* PATH_SEPARATOR_2 */
- 
--#ifdef __CYGWIN__
--# define FOPEN_WB "wb"
--#endif
--
- #ifndef FOPEN_WB
- # define FOPEN_WB "w"
- #endif
-@@ -3246,22 +4271,13 @@
-   if (stale) { free ((void *) stale); stale = 0; } \
- } while (0)
- 
--#undef LTWRAPPER_DEBUGPRINTF
--#if defined DEBUGWRAPPER
--# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
--static void
--ltwrapper_debugprintf (const char *fmt, ...)
--{
--    va_list args;
--    va_start (args, fmt);
--    (void) vfprintf (stderr, fmt, args);
--    va_end (args);
--}
-+#if defined(LT_DEBUGWRAPPER)
-+static int lt_debug = 1;
- #else
--# define LTWRAPPER_DEBUGPRINTF(args)
-+static int lt_debug = 0;
- #endif
- 
--const char *program_name = NULL;
-+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
- 
- void *xmalloc (size_t num);
- char *xstrdup (const char *string);
-@@ -3271,41 +4287,27 @@
- int make_executable (const char *path);
- int check_executable (const char *path);
- char *strendzap (char *str, const char *pat);
--void lt_fatal (const char *message, ...);
-+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-+void lt_fatal (const char *file, int line, const char *message, ...);
-+static const char *nonnull (const char *s);
-+static const char *nonempty (const char *s);
- void lt_setenv (const char *name, const char *value);
- char *lt_extend_str (const char *orig_value, const char *add, int to_end);
--void lt_opt_process_env_set (const char *arg);
--void lt_opt_process_env_prepend (const char *arg);
--void lt_opt_process_env_append (const char *arg);
--int lt_split_name_value (const char *arg, char** name, char** value);
- void lt_update_exe_path (const char *name, const char *value);
- void lt_update_lib_path (const char *name, const char *value);
--
--static const char *script_text_part1 =
--EOF
--
--	    func_emit_wrapper_part1 yes |
--	        $SED -e 's/\([\\"]\)/\\\1/g' \
--	             -e 's/^/  "/' -e 's/$/\\n"/'
--	    echo ";"
--	    cat <<EOF
--
--static const char *script_text_part2 =
-+char **prepare_spawn (char **argv);
-+void lt_dump_script (FILE *f);
- EOF
--	    func_emit_wrapper_part2 yes |
--	        $SED -e 's/\([\\"]\)/\\\1/g' \
--	             -e 's/^/  "/' -e 's/$/\\n"/'
--	    echo ";"
- 
- 	    cat <<EOF
--const char * MAGIC_EXE = "$magic_exe";
-+volatile const char * MAGIC_EXE = "$magic_exe";
- const char * LIB_PATH_VARNAME = "$shlibpath_var";
- EOF
- 
- 	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
--              func_to_host_pathlist "$temp_rpath"
-+              func_to_host_path "$temp_rpath"
- 	      cat <<EOF
--const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
-+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
- EOF
- 	    else
- 	      cat <<"EOF"
-@@ -3314,10 +4316,10 @@
- 	    fi
- 
- 	    if test -n "$dllsearchpath"; then
--              func_to_host_pathlist "$dllsearchpath:"
-+              func_to_host_path "$dllsearchpath:"
- 	      cat <<EOF
- const char * EXE_PATH_VARNAME = "PATH";
--const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
- EOF
- 	    else
- 	      cat <<"EOF"
-@@ -3340,24 +4342,10 @@
- 	    cat <<"EOF"
- 
- #define LTWRAPPER_OPTION_PREFIX         "--lt-"
--#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
- 
--static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
- static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
--
- static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
--
--static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
--static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
--  /* argument is putenv-style "foo=bar", value of foo is set to bar */
--
--static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
--static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
--  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
--
--static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
--static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
--  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
-+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
- 
- int
- main (int argc, char *argv[])
-@@ -3374,10 +4362,13 @@
-   int i;
- 
-   program_name = (char *) xstrdup (base_name (argv[0]));
--  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
--  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
-+  newargz = XMALLOC (char *, argc + 1);
- 
--  /* very simple arg parsing; don't want to rely on getopt */
-+  /* very simple arg parsing; don't want to rely on getopt
-+   * also, copy all non cwrapper options to newargz, except
-+   * argz[0], which is handled differently
-+   */
-+  newargc=0;
-   for (i = 1; i < argc; i++)
-     {
-       if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3391,25 +4382,57 @@
- 	      esac
- 
- 	    cat <<"EOF"
--	  printf ("%s", script_text_part1);
--	  printf ("%s", script_text_part2);
-+	  lt_dump_script (stdout);
- 	  return 0;
- 	}
-+      if (strcmp (argv[i], debug_opt) == 0)
-+	{
-+          lt_debug = 1;
-+          continue;
-+	}
-+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-+        {
-+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-+             namespace, but it is not one of the ones we know about and
-+             have already dealt with, above (inluding dump-script), then
-+             report an error. Otherwise, targets might begin to believe
-+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-+             namespace. The first time any user complains about this, we'll
-+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-+             or a configure.ac-settable value.
-+           */
-+          lt_fatal (__FILE__, __LINE__,
-+		    "unrecognized %s option: '%s'",
-+                    ltwrapper_option_prefix, argv[i]);
-+        }
-+      /* otherwise ... */
-+      newargz[++newargc] = xstrdup (argv[i]);
-     }
-+  newargz[++newargc] = NULL;
-+
-+EOF
-+	    cat <<EOF
-+  /* The GNU banner must be the first non-error debug message */
-+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-+EOF
-+	    cat <<"EOF"
-+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- 
--  newargz = XMALLOC (char *, argc + 1);
-   tmp_pathspec = find_executable (argv[0]);
-   if (tmp_pathspec == NULL)
--    lt_fatal ("Couldn't find %s", argv[0]);
--  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
--			  tmp_pathspec));
-+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-+  lt_debugprintf (__FILE__, __LINE__,
-+                  "(main) found exe (before symlink chase) at: %s\n",
-+		  tmp_pathspec);
- 
-   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
--  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
--			  actual_cwrapper_path));
-+  lt_debugprintf (__FILE__, __LINE__,
-+                  "(main) found exe (after symlink chase) at: %s\n",
-+		  actual_cwrapper_path);
-   XFREE (tmp_pathspec);
- 
--  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-   strendzap (actual_cwrapper_path, actual_cwrapper_name);
- 
-   /* wrapper name transforms */
-@@ -3427,8 +4450,9 @@
-   target_name = tmp_pathspec;
-   tmp_pathspec = 0;
- 
--  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
--			  target_name));
-+  lt_debugprintf (__FILE__, __LINE__,
-+		  "(main) libtool target name: %s\n",
-+		  target_name);
- EOF
- 
- 	    cat <<EOF
-@@ -3478,80 +4502,19 @@
- 
-   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
--  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-+     because on Windows, both *_VARNAMEs are PATH but uninstalled
-+     libraries must come first. */
-   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
- 
--  newargc=0;
--  for (i = 1; i < argc; i++)
--    {
--      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
--        {
--          if (argv[i][env_set_opt_len] == '=')
--            {
--              const char *p = argv[i] + env_set_opt_len + 1;
--              lt_opt_process_env_set (p);
--            }
--          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
--            {
--              lt_opt_process_env_set (argv[++i]); /* don't copy */
--            }
--          else
--            lt_fatal ("%s missing required argument", env_set_opt);
--          continue;
--        }
--      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
--        {
--          if (argv[i][env_prepend_opt_len] == '=')
--            {
--              const char *p = argv[i] + env_prepend_opt_len + 1;
--              lt_opt_process_env_prepend (p);
--            }
--          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
--            {
--              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
--            }
--          else
--            lt_fatal ("%s missing required argument", env_prepend_opt);
--          continue;
--        }
--      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
--        {
--          if (argv[i][env_append_opt_len] == '=')
--            {
--              const char *p = argv[i] + env_append_opt_len + 1;
--              lt_opt_process_env_append (p);
--            }
--          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
--            {
--              lt_opt_process_env_append (argv[++i]); /* don't copy */
--            }
--          else
--            lt_fatal ("%s missing required argument", env_append_opt);
--          continue;
--        }
--      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
--        {
--          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
--             namespace, but it is not one of the ones we know about and
--             have already dealt with, above (inluding dump-script), then
--             report an error. Otherwise, targets might begin to believe
--             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
--             namespace. The first time any user complains about this, we'll
--             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
--             or a configure.ac-settable value.
--           */
--          lt_fatal ("Unrecognized option in %s namespace: '%s'",
--                    ltwrapper_option_prefix, argv[i]);
--        }
--      /* otherwise ... */
--      newargz[++newargc] = xstrdup (argv[i]);
--    }
--  newargz[++newargc] = NULL;
--
--  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-+		  nonnull (lt_argv_zero));
-   for (i = 0; i < newargc; i++)
-     {
--      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-+		      i, nonnull (newargz[i]));
-     }
- 
- EOF
-@@ -3560,11 +4523,14 @@
- 	      mingw*)
- 		cat <<"EOF"
-   /* execv doesn't actually work on mingw as expected on unix */
-+  newargz = prepare_spawn (newargz);
-   rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-   if (rval == -1)
-     {
-       /* failed to start process */
--      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-+      lt_debugprintf (__FILE__, __LINE__,
-+		      "(main) failed to launch target \"%s\": %s\n",
-+		      lt_argv_zero, nonnull (strerror (errno)));
-       return 127;
-     }
-   return rval;
-@@ -3586,7 +4552,7 @@
- {
-   void *p = (void *) malloc (num);
-   if (!p)
--    lt_fatal ("Memory exhausted");
-+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
- 
-   return p;
- }
-@@ -3620,8 +4586,8 @@
- {
-   struct stat st;
- 
--  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
--			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-+                  nonempty (path));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -3638,8 +4604,8 @@
-   int rval = 0;
-   struct stat st;
- 
--  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
--			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-+                  nonempty (path));
-   if ((!path) || (!*path))
-     return 0;
- 
-@@ -3665,8 +4631,8 @@
-   int tmp_len;
-   char *concat_name;
- 
--  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
--			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
-+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-+                  nonempty (wrapper));
- 
-   if ((wrapper == NULL) || (*wrapper == '\0'))
-     return NULL;
-@@ -3719,7 +4685,8 @@
- 		{
- 		  /* empty path: current directory */
- 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
--		    lt_fatal ("getcwd failed");
-+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-+                              nonnull (strerror (errno)));
- 		  tmp_len = strlen (tmp);
- 		  concat_name =
- 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3744,7 +4711,8 @@
-     }
-   /* Relative path | not found in path: prepend cwd */
-   if (getcwd (tmp, LT_PATHMAX) == NULL)
--    lt_fatal ("getcwd failed");
-+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-+              nonnull (strerror (errno)));
-   tmp_len = strlen (tmp);
-   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-   memcpy (concat_name, tmp, tmp_len);
-@@ -3770,8 +4738,9 @@
-   int has_symlinks = 0;
-   while (strlen (tmp_pathspec) && !has_symlinks)
-     {
--      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
--			      tmp_pathspec));
-+      lt_debugprintf (__FILE__, __LINE__,
-+		      "checking path component for symlinks: %s\n",
-+		      tmp_pathspec);
-       if (lstat (tmp_pathspec, &s) == 0)
- 	{
- 	  if (S_ISLNK (s.st_mode) != 0)
-@@ -3793,8 +4762,9 @@
- 	}
-       else
- 	{
--	  char *errstr = strerror (errno);
--	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-+	  lt_fatal (__FILE__, __LINE__,
-+		    "error accessing file \"%s\": %s",
-+		    tmp_pathspec, nonnull (strerror (errno)));
- 	}
-     }
-   XFREE (tmp_pathspec);
-@@ -3807,7 +4777,8 @@
-   tmp_pathspec = realpath (pathspec, buf);
-   if (tmp_pathspec == 0)
-     {
--      lt_fatal ("Could not follow symlinks for %s", pathspec);
-+      lt_fatal (__FILE__, __LINE__,
-+		"could not follow symlinks for %s", pathspec);
-     }
-   return xstrdup (tmp_pathspec);
- #endif
-@@ -3833,11 +4804,25 @@
-   return str;
- }
- 
-+void
-+lt_debugprintf (const char *file, int line, const char *fmt, ...)
-+{
-+  va_list args;
-+  if (lt_debug)
-+    {
-+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-+      va_start (args, fmt);
-+      (void) vfprintf (stderr, fmt, args);
-+      va_end (args);
-+    }
-+}
-+
- static void
--lt_error_core (int exit_status, const char *mode,
-+lt_error_core (int exit_status, const char *file,
-+	       int line, const char *mode,
- 	       const char *message, va_list ap)
- {
--  fprintf (stderr, "%s: %s: ", program_name, mode);
-+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-   vfprintf (stderr, message, ap);
-   fprintf (stderr, ".\n");
- 
-@@ -3846,20 +4831,32 @@
- }
- 
- void
--lt_fatal (const char *message, ...)
-+lt_fatal (const char *file, int line, const char *message, ...)
- {
-   va_list ap;
-   va_start (ap, message);
--  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-   va_end (ap);
- }
- 
-+static const char *
-+nonnull (const char *s)
-+{
-+  return s ? s : "(null)";
-+}
-+
-+static const char *
-+nonempty (const char *s)
-+{
-+  return (s && !*s) ? "(empty)" : nonnull (s);
-+}
-+
- void
- lt_setenv (const char *name, const char *value)
- {
--  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
--                          (name ? name : "<NULL>"),
--                          (value ? value : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__,
-+		  "(lt_setenv) setting '%s' to '%s'\n",
-+                  nonnull (name), nonnull (value));
-   {
- #ifdef HAVE_SETENV
-     /* always make a copy, for consistency with !HAVE_SETENV */
-@@ -3904,95 +4901,12 @@
-   return new_value;
- }
- 
--int
--lt_split_name_value (const char *arg, char** name, char** value)
--{
--  const char *p;
--  int len;
--  if (!arg || !*arg)
--    return 1;
--
--  p = strchr (arg, (int)'=');
--
--  if (!p)
--    return 1;
--
--  *value = xstrdup (++p);
--
--  len = strlen (arg) - strlen (*value);
--  *name = XMALLOC (char, len);
--  strncpy (*name, arg, len-1);
--  (*name)[len - 1] = '\0';
--
--  return 0;
--}
--
--void
--lt_opt_process_env_set (const char *arg)
--{
--  char *name = NULL;
--  char *value = NULL;
--
--  if (lt_split_name_value (arg, &name, &value) != 0)
--    {
--      XFREE (name);
--      XFREE (value);
--      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
--    }
--
--  lt_setenv (name, value);
--  XFREE (name);
--  XFREE (value);
--}
--
--void
--lt_opt_process_env_prepend (const char *arg)
--{
--  char *name = NULL;
--  char *value = NULL;
--  char *new_value = NULL;
--
--  if (lt_split_name_value (arg, &name, &value) != 0)
--    {
--      XFREE (name);
--      XFREE (value);
--      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
--    }
--
--  new_value = lt_extend_str (getenv (name), value, 0);
--  lt_setenv (name, new_value);
--  XFREE (new_value);
--  XFREE (name);
--  XFREE (value);
--}
--
--void
--lt_opt_process_env_append (const char *arg)
--{
--  char *name = NULL;
--  char *value = NULL;
--  char *new_value = NULL;
--
--  if (lt_split_name_value (arg, &name, &value) != 0)
--    {
--      XFREE (name);
--      XFREE (value);
--      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
--    }
--
--  new_value = lt_extend_str (getenv (name), value, 1);
--  lt_setenv (name, new_value);
--  XFREE (new_value);
--  XFREE (name);
--  XFREE (value);
--}
--
- void
- lt_update_exe_path (const char *name, const char *value)
- {
--  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
--                          (name ? name : "<NULL>"),
--                          (value ? value : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__,
-+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-+                  nonnull (name), nonnull (value));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4011,9 +4925,9 @@
- void
- lt_update_lib_path (const char *name, const char *value)
- {
--  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
--                          (name ? name : "<NULL>"),
--                          (value ? value : "<NULL>")));
-+  lt_debugprintf (__FILE__, __LINE__,
-+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-+                  nonnull (name), nonnull (value));
- 
-   if (name && *name && value && *value)
-     {
-@@ -4023,11 +4937,158 @@
-     }
- }
- 
-+EOF
-+	    case $host_os in
-+	      mingw*)
-+		cat <<"EOF"
-+
-+/* Prepares an argument vector before calling spawn().
-+   Note that spawn() does not by itself call the command interpreter
-+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-+         GetVersionEx(&v);
-+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-+      }) ? "cmd.exe" : "command.com").
-+   Instead it simply concatenates the arguments, separated by ' ', and calls
-+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-+   special way:
-+   - Space and tab are interpreted as delimiters. They are not treated as
-+     delimiters if they are surrounded by double quotes: "...".
-+   - Unescaped double quotes are removed from the input. Their only effect is
-+     that within double quotes, space and tab are treated like normal
-+     characters.
-+   - Backslashes not followed by double quotes are not special.
-+   - But 2*n+1 backslashes followed by a double quote become
-+     n backslashes followed by a double quote (n >= 0):
-+       \" -> "
-+       \\\" -> \"
-+       \\\\\" -> \\"
-+ */
-+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-+char **
-+prepare_spawn (char **argv)
-+{
-+  size_t argc;
-+  char **new_argv;
-+  size_t i;
-+
-+  /* Count number of arguments.  */
-+  for (argc = 0; argv[argc] != NULL; argc++)
-+    ;
-+
-+  /* Allocate new argument vector.  */
-+  new_argv = XMALLOC (char *, argc + 1);
-+
-+  /* Put quoted arguments into the new argument vector.  */
-+  for (i = 0; i < argc; i++)
-+    {
-+      const char *string = argv[i];
-+
-+      if (string[0] == '\0')
-+	new_argv[i] = xstrdup ("\"\"");
-+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-+	{
-+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-+	  size_t length;
-+	  unsigned int backslashes;
-+	  const char *s;
-+	  char *quoted_string;
-+	  char *p;
-+
-+	  length = 0;
-+	  backslashes = 0;
-+	  if (quote_around)
-+	    length++;
-+	  for (s = string; *s != '\0'; s++)
-+	    {
-+	      char c = *s;
-+	      if (c == '"')
-+		length += backslashes + 1;
-+	      length++;
-+	      if (c == '\\')
-+		backslashes++;
-+	      else
-+		backslashes = 0;
-+	    }
-+	  if (quote_around)
-+	    length += backslashes + 1;
-+
-+	  quoted_string = XMALLOC (char, length + 1);
-+
-+	  p = quoted_string;
-+	  backslashes = 0;
-+	  if (quote_around)
-+	    *p++ = '"';
-+	  for (s = string; *s != '\0'; s++)
-+	    {
-+	      char c = *s;
-+	      if (c == '"')
-+		{
-+		  unsigned int j;
-+		  for (j = backslashes + 1; j > 0; j--)
-+		    *p++ = '\\';
-+		}
-+	      *p++ = c;
-+	      if (c == '\\')
-+		backslashes++;
-+	      else
-+		backslashes = 0;
-+	    }
-+	  if (quote_around)
-+	    {
-+	      unsigned int j;
-+	      for (j = backslashes; j > 0; j--)
-+		*p++ = '\\';
-+	      *p++ = '"';
-+	    }
-+	  *p = '\0';
-+
-+	  new_argv[i] = quoted_string;
-+	}
-+      else
-+	new_argv[i] = (char *) string;
-+    }
-+  new_argv[argc] = NULL;
-+
-+  return new_argv;
-+}
-+EOF
-+		;;
-+	    esac
- 
-+            cat <<"EOF"
-+void lt_dump_script (FILE* f)
-+{
-+EOF
-+	    func_emit_wrapper yes |
-+	      $SED -n -e '
-+s/^\(.\{79\}\)\(..*\)/\1\
-+\2/
-+h
-+s/\([\\"]\)/\\\1/g
-+s/$/\\n/
-+s/\([^\n]*\).*/  fputs ("\1", f);/p
-+g
-+D'
-+            cat <<"EOF"
-+}
- EOF
- }
- # end: func_emit_cwrapperexe_src
- 
-+# func_win32_import_lib_p ARG
-+# True if ARG is an import lib, as indicated by $file_magic_cmd
-+func_win32_import_lib_p ()
-+{
-+    $opt_debug
-+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-+    *import*) : ;;
-+    *) false ;;
-+    esac
-+}
-+
- # func_mode_link arg...
- func_mode_link ()
- {
-@@ -4072,6 +5133,7 @@
-     new_inherited_linker_flags=
- 
-     avoid_version=no
-+    bindir=
-     dlfiles=
-     dlprefiles=
-     dlself=no
-@@ -4164,6 +5226,11 @@
- 	esac
- 
- 	case $prev in
-+	bindir)
-+	  bindir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	dlfiles|dlprefiles)
- 	  if test "$preload" = no; then
- 	    # Add the symbol object into the linking commands.
-@@ -4195,9 +5262,9 @@
- 	    ;;
- 	  *)
- 	    if test "$prev" = dlfiles; then
--	      dlfiles="$dlfiles $arg"
-+	      func_append dlfiles " $arg"
- 	    else
--	      dlprefiles="$dlprefiles $arg"
-+	      func_append dlprefiles " $arg"
- 	    fi
- 	    prev=
- 	    continue
-@@ -4221,7 +5288,7 @@
- 	    *-*-darwin*)
- 	      case "$deplibs " in
- 		*" $qarg.ltframework "*) ;;
--		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
- 		   ;;
- 	      esac
- 	      ;;
-@@ -4240,7 +5307,7 @@
- 	    moreargs=
- 	    for fil in `cat "$save_arg"`
- 	    do
--#	      moreargs="$moreargs $fil"
-+#	      func_append moreargs " $fil"
- 	      arg=$fil
- 	      # A libtool-controlled object.
- 
-@@ -4269,7 +5336,7 @@
- 
- 		  if test "$prev" = dlfiles; then
- 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
--		      dlfiles="$dlfiles $pic_object"
-+		      func_append dlfiles " $pic_object"
- 		      prev=
- 		      continue
- 		    else
-@@ -4281,7 +5348,7 @@
- 		  # CHECK ME:  I think I busted this.  -Ossama
- 		  if test "$prev" = dlprefiles; then
- 		    # Preload the old-style object.
--		    dlprefiles="$dlprefiles $pic_object"
-+		    func_append dlprefiles " $pic_object"
- 		    prev=
- 		  fi
- 
-@@ -4351,12 +5418,12 @@
- 	  if test "$prev" = rpath; then
- 	    case "$rpath " in
- 	    *" $arg "*) ;;
--	    *) rpath="$rpath $arg" ;;
-+	    *) func_append rpath " $arg" ;;
- 	    esac
- 	  else
- 	    case "$xrpath " in
- 	    *" $arg "*) ;;
--	    *) xrpath="$xrpath $arg" ;;
-+	    *) func_append xrpath " $arg" ;;
- 	    esac
- 	  fi
- 	  prev=
-@@ -4368,28 +5435,28 @@
- 	  continue
- 	  ;;
- 	weak)
--	  weak_libs="$weak_libs $arg"
-+	  func_append weak_libs " $arg"
- 	  prev=
- 	  continue
- 	  ;;
- 	xcclinker)
--	  linker_flags="$linker_flags $qarg"
--	  compiler_flags="$compiler_flags $qarg"
-+	  func_append linker_flags " $qarg"
-+	  func_append compiler_flags " $qarg"
- 	  prev=
- 	  func_append compile_command " $qarg"
- 	  func_append finalize_command " $qarg"
- 	  continue
- 	  ;;
- 	xcompiler)
--	  compiler_flags="$compiler_flags $qarg"
-+	  func_append compiler_flags " $qarg"
- 	  prev=
- 	  func_append compile_command " $qarg"
- 	  func_append finalize_command " $qarg"
- 	  continue
- 	  ;;
- 	xlinker)
--	  linker_flags="$linker_flags $qarg"
--	  compiler_flags="$compiler_flags $wl$qarg"
-+	  func_append linker_flags " $qarg"
-+	  func_append compiler_flags " $wl$qarg"
- 	  prev=
- 	  func_append compile_command " $wl$qarg"
- 	  func_append finalize_command " $wl$qarg"
-@@ -4425,6 +5492,11 @@
- 	continue
- 	;;
- 
-+      -bindir)
-+	prev=bindir
-+	continue
-+	;;
-+
-       -dlopen)
- 	prev=dlfiles
- 	continue
-@@ -4475,15 +5547,16 @@
- 	;;
- 
-       -L*)
--	func_stripname '-L' '' "$arg"
--	dir=$func_stripname_result
--	if test -z "$dir"; then
-+	func_stripname "-L" '' "$arg"
-+	if test -z "$func_stripname_result"; then
- 	  if test "$#" -gt 0; then
- 	    func_fatal_error "require no space between \`-L' and \`$1'"
- 	  else
- 	    func_fatal_error "need path for \`-L' option"
- 	  fi
- 	fi
-+	func_resolve_sysroot "$func_stripname_result"
-+	dir=$func_resolve_sysroot_result
- 	# We need an absolute path.
- 	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -4495,24 +5568,30 @@
- 	  ;;
- 	esac
- 	case "$deplibs " in
--	*" -L$dir "*) ;;
-+	*" -L$dir "* | *" $arg "*)
-+	  # Will only happen for absolute or sysroot arguments
-+	  ;;
- 	*)
--	  deplibs="$deplibs -L$dir"
--	  lib_search_path="$lib_search_path $dir"
-+	  # Preserve sysroot, but never include relative directories
-+	  case $dir in
-+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-+	    *) func_append deplibs " -L$dir" ;;
-+	  esac
-+	  func_append lib_search_path " $dir"
- 	  ;;
- 	esac
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
--	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
- 	  case :$dllsearchpath: in
- 	  *":$dir:"*) ;;
- 	  ::) dllsearchpath=$dir;;
--	  *) dllsearchpath="$dllsearchpath:$dir";;
-+	  *) func_append dllsearchpath ":$dir";;
- 	  esac
- 	  case :$dllsearchpath: in
- 	  *":$testbindir:"*) ;;
- 	  ::) dllsearchpath=$testbindir;;
--	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  *) func_append dllsearchpath ":$testbindir";;
- 	  esac
- 	  ;;
- 	esac
-@@ -4522,7 +5601,7 @@
-       -l*)
- 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
-@@ -4536,7 +5615,7 @@
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C and math libraries are in the System framework
--	    deplibs="$deplibs System.ltframework"
-+	    func_append deplibs " System.ltframework"
- 	    continue
- 	    ;;
- 	  *-*-sco3.2v5* | *-*-sco5v6*)
-@@ -4556,7 +5635,7 @@
- 	   ;;
- 	 esac
- 	fi
--	deplibs="$deplibs $arg"
-+	func_append deplibs " $arg"
- 	continue
- 	;;
- 
-@@ -4568,21 +5647,22 @@
-       # Tru64 UNIX uses -model [arg] to determine the layout of C++
-       # classes, name mangling, and exception handling.
-       # Darwin uses the -arch flag to determine output architecture.
--      -model|-arch|-isysroot)
--	compiler_flags="$compiler_flags $arg"
-+      -model|-arch|-isysroot|--sysroot)
-+	func_append compiler_flags " $arg"
- 	func_append compile_command " $arg"
- 	func_append finalize_command " $arg"
- 	prev=xcompiler
- 	continue
- 	;;
- 
--      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
--	compiler_flags="$compiler_flags $arg"
-+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-+	func_append compiler_flags " $arg"
- 	func_append compile_command " $arg"
- 	func_append finalize_command " $arg"
- 	case "$new_inherited_linker_flags " in
- 	    *" $arg "*) ;;
--	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-+	    * ) func_append new_inherited_linker_flags " $arg" ;;
- 	esac
- 	continue
- 	;;
-@@ -4649,13 +5729,17 @@
- 	# We need an absolute path.
- 	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	=*)
-+	  func_stripname '=' '' "$dir"
-+	  dir=$lt_sysroot$func_stripname_result
-+	  ;;
- 	*)
- 	  func_fatal_error "only absolute run-paths are allowed"
- 	  ;;
- 	esac
- 	case "$xrpath " in
- 	*" $dir "*) ;;
--	*) xrpath="$xrpath $dir" ;;
-+	*) func_append xrpath " $dir" ;;
- 	esac
- 	continue
- 	;;
-@@ -4708,8 +5792,8 @@
- 	for flag in $args; do
- 	  IFS="$save_ifs"
-           func_quote_for_eval "$flag"
--	  arg="$arg $wl$func_quote_for_eval_result"
--	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
-+	  func_append arg " $func_quote_for_eval_result"
-+	  func_append compiler_flags " $func_quote_for_eval_result"
- 	done
- 	IFS="$save_ifs"
- 	func_stripname ' ' '' "$arg"
-@@ -4724,9 +5808,9 @@
- 	for flag in $args; do
- 	  IFS="$save_ifs"
-           func_quote_for_eval "$flag"
--	  arg="$arg $wl$func_quote_for_eval_result"
--	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
--	  linker_flags="$linker_flags $func_quote_for_eval_result"
-+	  func_append arg " $wl$func_quote_for_eval_result"
-+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-+	  func_append linker_flags " $func_quote_for_eval_result"
- 	done
- 	IFS="$save_ifs"
- 	func_stripname ' ' '' "$arg"
-@@ -4754,23 +5838,27 @@
- 	arg="$func_quote_for_eval_result"
- 	;;
- 
--      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
--      # -r[0-9][0-9]* specifies the processor on the SGI compiler
--      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
--      # +DA*, +DD* enable 64-bit mode on the HP compiler
--      # -q* pass through compiler args for the IBM compiler
--      # -m*, -t[45]*, -txscale* pass through architecture-specific
--      # compiler args for GCC
--      # -F/path gives path to uninstalled frameworks, gcc on darwin
--      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
--      # @file GCC response files
-+      # Flags to be passed through unchanged, with rationale:
-+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-+      # -r[0-9][0-9]*        specify processor for the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-+      # -q*                  compiler args for the IBM compiler
-+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-+      # -F/path              path to uninstalled frameworks, gcc on darwin
-+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-+      # @file                GCC response files
-+      # -tp=*                Portland pgcc target processor selection
-+      # --sysroot=*          for sysroot support
-+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-         func_append finalize_command " $arg"
--        compiler_flags="$compiler_flags $arg"
-+        func_append compiler_flags " $arg"
-         continue
-         ;;
- 
-@@ -4782,7 +5870,7 @@
- 
-       *.$objext)
- 	# A standard object.
--	objs="$objs $arg"
-+	func_append objs " $arg"
- 	;;
- 
-       *.lo)
-@@ -4813,7 +5901,7 @@
- 
- 	    if test "$prev" = dlfiles; then
- 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
--		dlfiles="$dlfiles $pic_object"
-+		func_append dlfiles " $pic_object"
- 		prev=
- 		continue
- 	      else
-@@ -4825,7 +5913,7 @@
- 	    # CHECK ME:  I think I busted this.  -Ossama
- 	    if test "$prev" = dlprefiles; then
- 	      # Preload the old-style object.
--	      dlprefiles="$dlprefiles $pic_object"
-+	      func_append dlprefiles " $pic_object"
- 	      prev=
- 	    fi
- 
-@@ -4870,24 +5958,25 @@
- 
-       *.$libext)
- 	# An archive.
--	deplibs="$deplibs $arg"
--	old_deplibs="$old_deplibs $arg"
-+	func_append deplibs " $arg"
-+	func_append old_deplibs " $arg"
- 	continue
- 	;;
- 
-       *.la)
- 	# A libtool-controlled library.
- 
-+	func_resolve_sysroot "$arg"
- 	if test "$prev" = dlfiles; then
- 	  # This library was specified with -dlopen.
--	  dlfiles="$dlfiles $arg"
-+	  func_append dlfiles " $func_resolve_sysroot_result"
- 	  prev=
- 	elif test "$prev" = dlprefiles; then
- 	  # The library was specified with -dlpreopen.
--	  dlprefiles="$dlprefiles $arg"
-+	  func_append dlprefiles " $func_resolve_sysroot_result"
- 	  prev=
- 	else
--	  deplibs="$deplibs $arg"
-+	  func_append deplibs " $func_resolve_sysroot_result"
- 	fi
- 	continue
- 	;;
-@@ -4925,7 +6014,7 @@
- 
-     if test -n "$shlibpath_var"; then
-       # get the directories listed in $shlibpath_var
--      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-     else
-       shlib_search_path=
-     fi
-@@ -4934,6 +6023,8 @@
- 
-     func_dirname "$output" "/" ""
-     output_objdir="$func_dirname_result$objdir"
-+    func_to_tool_file "$output_objdir/"
-+    tool_output_objdir=$func_to_tool_file_result
-     # Create the object directory.
-     func_mkdir_p "$output_objdir"
- 
-@@ -4954,12 +6045,12 @@
-     # Find all interdependent deplibs by searching for libraries
-     # that are linked more than once (e.g. -la -lb -la)
-     for deplib in $deplibs; do
--      if $opt_duplicate_deps ; then
-+      if $opt_preserve_dup_deps ; then
- 	case "$libs " in
--	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
- 	esac
-       fi
--      libs="$libs $deplib"
-+      func_append libs " $deplib"
-     done
- 
-     if test "$linkmode" = lib; then
-@@ -4972,9 +6063,9 @@
-       if $opt_duplicate_compiler_generated_deps; then
- 	for pre_post_dep in $predeps $postdeps; do
- 	  case "$pre_post_deps " in
--	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
- 	  esac
--	  pre_post_deps="$pre_post_deps $pre_post_dep"
-+	  func_append pre_post_deps " $pre_post_dep"
- 	done
-       fi
-       pre_post_deps=
-@@ -5033,10 +6124,7 @@
- 	case $pass in
- 	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
--	link)
--	  libs="$deplibs %DEPLIBS%"
--	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
--	  ;;
-+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
- 	esac
-       fi
-       if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5044,17 +6132,19 @@
- 	for lib in $dlprefiles; do
- 	  # Ignore non-libtool-libs
- 	  dependency_libs=
-+	  func_resolve_sysroot "$lib"
- 	  case $lib in
--	  *.la)	func_source "$lib" ;;
-+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
- 	  esac
- 
- 	  # Collect preopened libtool deplibs, except any this library
- 	  # has declared as weak libs
- 	  for deplib in $dependency_libs; do
--            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-+	    func_basename "$deplib"
-+            deplib_base=$func_basename_result
- 	    case " $weak_libs " in
- 	    *" $deplib_base "*) ;;
--	    *) deplibs="$deplibs $deplib" ;;
-+	    *) func_append deplibs " $deplib" ;;
- 	    esac
- 	  done
- 	done
-@@ -5070,16 +6160,17 @@
- 	lib=
- 	found=no
- 	case $deplib in
--	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
--	    compiler_flags="$compiler_flags $deplib"
-+	    func_append compiler_flags " $deplib"
- 	    if test "$linkmode" = lib ; then
- 		case "$new_inherited_linker_flags " in
- 		    *" $deplib "*) ;;
--		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
- 		esac
- 	    fi
- 	  fi
-@@ -5164,7 +6255,7 @@
- 	    if test "$linkmode" = lib ; then
- 		case "$new_inherited_linker_flags " in
- 		    *" $deplib "*) ;;
--		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
- 		esac
- 	    fi
- 	  fi
-@@ -5177,7 +6268,8 @@
- 	    test "$pass" = conv && continue
- 	    newdependency_libs="$deplib $newdependency_libs"
- 	    func_stripname '-L' '' "$deplib"
--	    newlib_search_path="$newlib_search_path $func_stripname_result"
-+	    func_resolve_sysroot "$func_stripname_result"
-+	    func_append newlib_search_path " $func_resolve_sysroot_result"
- 	    ;;
- 	  prog)
- 	    if test "$pass" = conv; then
-@@ -5191,7 +6283,8 @@
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
- 	    func_stripname '-L' '' "$deplib"
--	    newlib_search_path="$newlib_search_path $func_stripname_result"
-+	    func_resolve_sysroot "$func_stripname_result"
-+	    func_append newlib_search_path " $func_resolve_sysroot_result"
- 	    ;;
- 	  *)
- 	    func_warning "\`-L' is ignored for archives/objects"
-@@ -5202,17 +6295,21 @@
- 	-R*)
- 	  if test "$pass" = link; then
- 	    func_stripname '-R' '' "$deplib"
--	    dir=$func_stripname_result
-+	    func_resolve_sysroot "$func_stripname_result"
-+	    dir=$func_resolve_sysroot_result
- 	    # Make sure the xrpath contains only unique directories.
- 	    case "$xrpath " in
- 	    *" $dir "*) ;;
--	    *) xrpath="$xrpath $dir" ;;
-+	    *) func_append xrpath " $dir" ;;
- 	    esac
- 	  fi
- 	  deplibs="$deplib $deplibs"
- 	  continue
- 	  ;;
--	*.la) lib="$deplib" ;;
-+	*.la)
-+	  func_resolve_sysroot "$deplib"
-+	  lib=$func_resolve_sysroot_result
-+	  ;;
- 	*.$libext)
- 	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
-@@ -5230,7 +6327,7 @@
- 		match_pattern*)
- 		  set dummy $deplibs_check_method; shift
- 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
--		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
- 		    | $EGREP "$match_pattern_regex" > /dev/null; then
- 		    valid_a_lib=yes
- 		  fi
-@@ -5240,15 +6337,15 @@
- 		;;
- 	      esac
- 	      if test "$valid_a_lib" != yes; then
--		$ECHO
-+		echo
- 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
--		$ECHO "*** I have the capability to make that library automatically link in when"
--		$ECHO "*** you link to this library.  But I can only do this if you have a"
--		$ECHO "*** shared version of the library, which you do not appear to have"
--		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
--		$ECHO "*** that it is just a static archive that I should not use here."
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because the file extensions .$libext of this argument makes me believe"
-+		echo "*** that it is just a static archive that I should not use here."
- 	      else
--		$ECHO
-+		echo
- 		$ECHO "*** Warning: Linking the shared library $output against the"
- 		$ECHO "*** static library $deplib is not portable!"
- 		deplibs="$deplib $deplibs"
-@@ -5275,11 +6372,11 @@
- 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
- 	      # If there is no dlopen support or we're linking statically,
- 	      # we need to preload.
--	      newdlprefiles="$newdlprefiles $deplib"
-+	      func_append newdlprefiles " $deplib"
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    else
--	      newdlfiles="$newdlfiles $deplib"
-+	      func_append newdlfiles " $deplib"
- 	    fi
- 	  fi
- 	  continue
-@@ -5321,20 +6418,20 @@
- 
- 	# Convert "-framework foo" to "foo.ltframework"
- 	if test -n "$inherited_linker_flags"; then
--	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
-+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
- 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
- 	    case " $new_inherited_linker_flags " in
- 	      *" $tmp_inherited_linker_flag "*) ;;
--	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
- 	    esac
- 	  done
- 	fi
--	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
- 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
--	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
--	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
- 	fi
- 
- 	if test "$pass" = conv; then
-@@ -5345,30 +6442,36 @@
- 	      func_fatal_error "cannot find name of link library for \`$lib'"
- 	    fi
- 	    # It is a libtool convenience library, so add in its objects.
--	    convenience="$convenience $ladir/$objdir/$old_library"
--	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
--	    tmp_libs=
--	    for deplib in $dependency_libs; do
--	      deplibs="$deplib $deplibs"
--	      if $opt_duplicate_deps ; then
--		case "$tmp_libs " in
--		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--		esac
--	      fi
--	      tmp_libs="$tmp_libs $deplib"
--	    done
-+	    func_append convenience " $ladir/$objdir/$old_library"
-+	    func_append old_convenience " $ladir/$objdir/$old_library"
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    func_fatal_error "\`$lib' is not a convenience library"
- 	  fi
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    deplibs="$deplib $deplibs"
-+	    if $opt_preserve_dup_deps ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-+	      esac
-+	    fi
-+	    func_append tmp_libs " $deplib"
-+	  done
- 	  continue
- 	fi # $pass = conv
- 
- 
- 	# Get the name of the library we link against.
- 	linklib=
--	for l in $old_library $library_names; do
--	  linklib="$l"
--	done
-+	if test -n "$old_library" &&
-+	   { test "$prefer_static_libs" = yes ||
-+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
-+	  linklib=$old_library
-+	else
-+	  for l in $old_library $library_names; do
-+	    linklib="$l"
-+	  done
-+	fi
- 	if test -z "$linklib"; then
- 	  func_fatal_error "cannot find name of link library for \`$lib'"
- 	fi
-@@ -5385,9 +6488,9 @@
- 	    # statically, we need to preload.  We also need to preload any
- 	    # dependent libraries so libltdl's deplib preloader doesn't
- 	    # bomb out in the load deplibs phase.
--	    dlprefiles="$dlprefiles $lib $dependency_libs"
-+	    func_append dlprefiles " $lib $dependency_libs"
- 	  else
--	    newdlfiles="$newdlfiles $lib"
-+	    func_append newdlfiles " $lib"
- 	  fi
- 	  continue
- 	fi # $pass = dlopen
-@@ -5409,14 +6512,14 @@
- 
- 	# Find the relevant object directory and library name.
- 	if test "X$installed" = Xyes; then
--	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- 	    func_warning "library \`$lib' was moved."
- 	    dir="$ladir"
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+	    dir="$lt_sysroot$libdir"
-+	    absdir="$lt_sysroot$libdir"
- 	  fi
- 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- 	else
-@@ -5424,12 +6527,12 @@
- 	    dir="$ladir"
- 	    absdir="$abs_ladir"
- 	    # Remove this search path later
--	    notinst_path="$notinst_path $abs_ladir"
-+	    func_append notinst_path " $abs_ladir"
- 	  else
- 	    dir="$ladir/$objdir"
- 	    absdir="$abs_ladir/$objdir"
- 	    # Remove this search path later
--	    notinst_path="$notinst_path $abs_ladir"
-+	    func_append notinst_path " $abs_ladir"
- 	  fi
- 	fi # $installed = yes
- 	func_stripname 'lib' '.la' "$laname"
-@@ -5440,20 +6543,46 @@
- 	  if test -z "$libdir" && test "$linkmode" = prog; then
- 	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
- 	  fi
--	  # Prefer using a static library (so that no silly _DYNAMIC symbols
--	  # are required to link).
--	  if test -n "$old_library"; then
--	    newdlprefiles="$newdlprefiles $dir/$old_library"
--	    # Keep a list of preopened convenience libraries to check
--	    # that they are being used correctly in the link pass.
--	    test -z "$libdir" && \
--		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
--	  # Otherwise, use the dlname, so that lt_dlopen finds it.
--	  elif test -n "$dlname"; then
--	    newdlprefiles="$newdlprefiles $dir/$dlname"
--	  else
--	    newdlprefiles="$newdlprefiles $dir/$linklib"
--	  fi
-+	  case "$host" in
-+	    # special handling for platforms with PE-DLLs.
-+	    *cygwin* | *mingw* | *cegcc* )
-+	      # Linker will automatically link against shared library if both
-+	      # static and shared are present.  Therefore, ensure we extract
-+	      # symbols from the import library if a shared library is present
-+	      # (otherwise, the dlopen module name will be incorrect).  We do
-+	      # this by putting the import library name into $newdlprefiles.
-+	      # We recover the dlopen module name by 'saving' the la file
-+	      # name in a special purpose variable, and (later) extracting the
-+	      # dlname from the la file.
-+	      if test -n "$dlname"; then
-+	        func_tr_sh "$dir/$linklib"
-+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-+	        func_append newdlprefiles " $dir/$linklib"
-+	      else
-+	        func_append newdlprefiles " $dir/$old_library"
-+	        # Keep a list of preopened convenience libraries to check
-+	        # that they are being used correctly in the link pass.
-+	        test -z "$libdir" && \
-+	          func_append dlpreconveniencelibs " $dir/$old_library"
-+	      fi
-+	    ;;
-+	    * )
-+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-+	      # are required to link).
-+	      if test -n "$old_library"; then
-+	        func_append newdlprefiles " $dir/$old_library"
-+	        # Keep a list of preopened convenience libraries to check
-+	        # that they are being used correctly in the link pass.
-+	        test -z "$libdir" && \
-+	          func_append dlpreconveniencelibs " $dir/$old_library"
-+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-+	      elif test -n "$dlname"; then
-+	        func_append newdlprefiles " $dir/$dlname"
-+	      else
-+	        func_append newdlprefiles " $dir/$linklib"
-+	      fi
-+	    ;;
-+	  esac
- 	fi # $pass = dlpreopen
- 
- 	if test -z "$libdir"; then
-@@ -5471,7 +6600,7 @@
- 
- 
- 	if test "$linkmode" = prog && test "$pass" != link; then
--	  newlib_search_path="$newlib_search_path $ladir"
-+	  func_append newlib_search_path " $ladir"
- 	  deplibs="$lib $deplibs"
- 
- 	  linkalldeplibs=no
-@@ -5484,7 +6613,8 @@
- 	  for deplib in $dependency_libs; do
- 	    case $deplib in
- 	    -L*) func_stripname '-L' '' "$deplib"
--	         newlib_search_path="$newlib_search_path $func_stripname_result"
-+	         func_resolve_sysroot "$func_stripname_result"
-+	         func_append newlib_search_path " $func_resolve_sysroot_result"
- 		 ;;
- 	    esac
- 	    # Need to link against all dependency_libs?
-@@ -5495,12 +6625,12 @@
- 	      # or/and link against static libraries
- 	      newdependency_libs="$deplib $newdependency_libs"
- 	    fi
--	    if $opt_duplicate_deps ; then
-+	    if $opt_preserve_dup_deps ; then
- 	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- 	      esac
- 	    fi
--	    tmp_libs="$tmp_libs $deplib"
-+	    func_append tmp_libs " $deplib"
- 	  done # for deplib
- 	  continue
- 	fi # $linkmode = prog...
-@@ -5515,7 +6645,7 @@
- 	      # Make sure the rpath contains only unique directories.
- 	      case "$temp_rpath:" in
- 	      *"$absdir:"*) ;;
--	      *) temp_rpath="$temp_rpath$absdir:" ;;
-+	      *) func_append temp_rpath "$absdir:" ;;
- 	      esac
- 	    fi
- 
-@@ -5527,7 +6657,7 @@
- 	    *)
- 	      case "$compile_rpath " in
- 	      *" $absdir "*) ;;
--	      *) compile_rpath="$compile_rpath $absdir"
-+	      *) func_append compile_rpath " $absdir" ;;
- 	      esac
- 	      ;;
- 	    esac
-@@ -5536,7 +6666,7 @@
- 	    *)
- 	      case "$finalize_rpath " in
- 	      *" $libdir "*) ;;
--	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      *) func_append finalize_rpath " $libdir" ;;
- 	      esac
- 	      ;;
- 	    esac
-@@ -5561,12 +6691,12 @@
- 	  case $host in
- 	  *cygwin* | *mingw* | *cegcc*)
- 	      # No point in relinking DLLs because paths are not encoded
--	      notinst_deplibs="$notinst_deplibs $lib"
-+	      func_append notinst_deplibs " $lib"
- 	      need_relink=no
- 	    ;;
- 	  *)
- 	    if test "$installed" = no; then
--	      notinst_deplibs="$notinst_deplibs $lib"
-+	      func_append notinst_deplibs " $lib"
- 	      need_relink=yes
- 	    fi
- 	    ;;
-@@ -5583,7 +6713,7 @@
- 	    fi
- 	  done
- 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
--	    $ECHO
-+	    echo
- 	    if test "$linkmode" = prog; then
- 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
- 	    else
-@@ -5601,7 +6731,7 @@
- 	    *)
- 	      case "$compile_rpath " in
- 	      *" $absdir "*) ;;
--	      *) compile_rpath="$compile_rpath $absdir"
-+	      *) func_append compile_rpath " $absdir" ;;
- 	      esac
- 	      ;;
- 	    esac
-@@ -5610,7 +6740,7 @@
- 	    *)
- 	      case "$finalize_rpath " in
- 	      *" $libdir "*) ;;
--	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      *) func_append finalize_rpath " $libdir" ;;
- 	      esac
- 	      ;;
- 	    esac
-@@ -5664,7 +6794,7 @@
- 	    linklib=$newlib
- 	  fi # test -n "$old_archive_from_expsyms_cmds"
- 
--	  if test "$linkmode" = prog || test "$mode" != relink; then
-+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -5686,9 +6816,9 @@
- 		      if test "X$dlopenmodule" != "X$lib"; then
- 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- 			if test -z "$old_library" ; then
--			  $ECHO
--			  $ECHO "*** And there doesn't seem to be a static archive available"
--			  $ECHO "*** The link will probably fail, sorry"
-+			  echo
-+			  echo "*** And there doesn't seem to be a static archive available"
-+			  echo "*** The link will probably fail, sorry"
- 			else
- 			  add="$dir/$old_library"
- 			fi
-@@ -5715,12 +6845,12 @@
- 	         test "$hardcode_direct_absolute" = no; then
- 		add="$dir/$linklib"
- 	      elif test "$hardcode_minus_L" = yes; then
--		add_dir="-L$dir"
-+		add_dir="-L$absdir"
- 		# Try looking first in the location we're being installed to.
- 		if test -n "$inst_prefix_dir"; then
- 		  case $libdir in
- 		    [\\/]*)
--		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		      func_append add_dir " -L$inst_prefix_dir$libdir"
- 		      ;;
- 		  esac
- 		fi
-@@ -5742,7 +6872,7 @@
- 	    if test -n "$add_shlibpath"; then
- 	      case :$compile_shlibpath: in
- 	      *":$add_shlibpath:"*) ;;
--	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
- 	      esac
- 	    fi
- 	    if test "$linkmode" = prog; then
-@@ -5756,13 +6886,13 @@
- 		 test "$hardcode_shlibpath_var" = yes; then
- 		case :$finalize_shlibpath: in
- 		*":$libdir:"*) ;;
--		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+		*) func_append finalize_shlibpath "$libdir:" ;;
- 		esac
- 	      fi
- 	    fi
- 	  fi
- 
--	  if test "$linkmode" = prog || test "$mode" = relink; then
-+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -5776,7 +6906,7 @@
- 	    elif test "$hardcode_shlibpath_var" = yes; then
- 	      case :$finalize_shlibpath: in
- 	      *":$libdir:"*) ;;
--	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+	      *) func_append finalize_shlibpath "$libdir:" ;;
- 	      esac
- 	      add="-l$name"
- 	    elif test "$hardcode_automatic" = yes; then
-@@ -5793,7 +6923,7 @@
- 	      if test -n "$inst_prefix_dir"; then
- 		case $libdir in
- 		  [\\/]*)
--		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		    func_append add_dir " -L$inst_prefix_dir$libdir"
- 		    ;;
- 		esac
- 	      fi
-@@ -5828,21 +6958,21 @@
- 
- 	    # Just print a warning and add the library to dependency_libs so
- 	    # that the program can be linked against the static library.
--	    $ECHO
-+	    echo
- 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
--	    $ECHO "*** I have the capability to make that library automatically link in when"
--	    $ECHO "*** you link to this library.  But I can only do this if you have a"
--	    $ECHO "*** shared version of the library, which you do not appear to have."
-+	    echo "*** I have the capability to make that library automatically link in when"
-+	    echo "*** you link to this library.  But I can only do this if you have a"
-+	    echo "*** shared version of the library, which you do not appear to have."
- 	    if test "$module" = yes; then
--	      $ECHO "*** But as you try to build a module library, libtool will still create "
--	      $ECHO "*** a static module, that should work as long as the dlopening application"
--	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+	      echo "*** But as you try to build a module library, libtool will still create "
-+	      echo "*** a static module, that should work as long as the dlopening application"
-+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
- 	      if test -z "$global_symbol_pipe"; then
--		$ECHO
--		$ECHO "*** However, this would only work if libtool was able to extract symbol"
--		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
--		$ECHO "*** not find such a program.  So, this module is probably useless."
--		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-+		echo
-+		echo "*** However, this would only work if libtool was able to extract symbol"
-+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		echo "*** not find such a program.  So, this module is probably useless."
-+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	      fi
- 	      if test "$build_old_libs" = no; then
- 		build_libtool_libs=module
-@@ -5870,27 +7000,33 @@
- 	           temp_xrpath=$func_stripname_result
- 		   case " $xrpath " in
- 		   *" $temp_xrpath "*) ;;
--		   *) xrpath="$xrpath $temp_xrpath";;
-+		   *) func_append xrpath " $temp_xrpath";;
- 		   esac;;
--	      *) temp_deplibs="$temp_deplibs $libdir";;
-+	      *) func_append temp_deplibs " $libdir";;
- 	      esac
- 	    done
- 	    dependency_libs="$temp_deplibs"
- 	  fi
- 
--	  newlib_search_path="$newlib_search_path $absdir"
-+	  func_append newlib_search_path " $absdir"
- 	  # Link against this library
- 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
- 	  # ... and its dependency_libs
- 	  tmp_libs=
- 	  for deplib in $dependency_libs; do
- 	    newdependency_libs="$deplib $newdependency_libs"
--	    if $opt_duplicate_deps ; then
-+	    case $deplib in
-+              -L*) func_stripname '-L' '' "$deplib"
-+                   func_resolve_sysroot "$func_stripname_result";;
-+              *) func_resolve_sysroot "$deplib" ;;
-+            esac
-+	    if $opt_preserve_dup_deps ; then
- 	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      *" $func_resolve_sysroot_result "*)
-+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
- 	      esac
- 	    fi
--	    tmp_libs="$tmp_libs $deplib"
-+	    func_append tmp_libs " $func_resolve_sysroot_result"
- 	  done
- 
- 	  if test "$link_all_deplibs" != no; then
-@@ -5900,8 +7036,10 @@
- 	      case $deplib in
- 	      -L*) path="$deplib" ;;
- 	      *.la)
-+	        func_resolve_sysroot "$deplib"
-+	        deplib=$func_resolve_sysroot_result
- 	        func_dirname "$deplib" "" "."
--		dir="$func_dirname_result"
-+		dir=$func_dirname_result
- 		# We need an absolute path.
- 		case $dir in
- 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-@@ -5928,8 +7066,8 @@
-                       if test -z "$darwin_install_name"; then
-                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                       fi
--		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
--		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
- 		      path=
- 		    fi
- 		  fi
-@@ -5962,7 +7100,7 @@
- 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
- 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
- 	else
--	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	fi
-       fi
-       dependency_libs="$newdependency_libs"
-@@ -5979,7 +7117,7 @@
- 	  for dir in $newlib_search_path; do
- 	    case "$lib_search_path " in
- 	    *" $dir "*) ;;
--	    *) lib_search_path="$lib_search_path $dir" ;;
-+	    *) func_append lib_search_path " $dir" ;;
- 	    esac
- 	  done
- 	  newlib_search_path=
-@@ -6037,10 +7175,10 @@
- 	    -L*)
- 	      case " $tmp_libs " in
- 	      *" $deplib "*) ;;
--	      *) tmp_libs="$tmp_libs $deplib" ;;
-+	      *) func_append tmp_libs " $deplib" ;;
- 	      esac
- 	      ;;
--	    *) tmp_libs="$tmp_libs $deplib" ;;
-+	    *) func_append tmp_libs " $deplib" ;;
- 	    esac
- 	  done
- 	  eval $var=\"$tmp_libs\"
-@@ -6056,7 +7194,7 @@
- 	  ;;
- 	esac
- 	if test -n "$i" ; then
--	  tmp_libs="$tmp_libs $i"
-+	  func_append tmp_libs " $i"
- 	fi
-       done
-       dependency_libs=$tmp_libs
-@@ -6097,7 +7235,7 @@
-       # Now set the variables for building old libraries.
-       build_libtool_libs=no
-       oldlibs="$output"
--      objs="$objs$old_deplibs"
-+      func_append objs "$old_deplibs"
-       ;;
- 
-     lib)
-@@ -6130,10 +7268,10 @@
- 	if test "$deplibs_check_method" != pass_all; then
- 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
- 	else
--	  $ECHO
-+	  echo
- 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
- 	  $ECHO "*** objects $objs is not portable!"
--	  libobjs="$libobjs $objs"
-+	  func_append libobjs " $objs"
- 	fi
-       fi
- 
-@@ -6192,13 +7330,14 @@
- 	  # which has an extra 1 added just for fun
- 	  #
- 	  case $version_type in
-+	  # correct linux to gnu/linux during the next big refactor
- 	  darwin|linux|osf|windows|none)
- 	    func_arith $number_major + $number_minor
- 	    current=$func_arith_result
- 	    age="$number_minor"
- 	    revision="$number_revision"
- 	    ;;
--	  freebsd-aout|freebsd-elf|sunos)
-+	  freebsd-aout|freebsd-elf|qnx|sunos)
- 	    current="$number_major"
- 	    revision="$number_minor"
- 	    age="0"
-@@ -6210,9 +7349,6 @@
- 	    revision="$number_minor"
- 	    lt_irix_increment=no
- 	    ;;
--	  *)
--	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
--	    ;;
- 	  esac
- 	  ;;
- 	no)
-@@ -6311,7 +7447,7 @@
- 	  versuffix="$major.$revision"
- 	  ;;
- 
--	linux)
-+	linux) # correct to gnu/linux during the next big refactor
- 	  func_arith $current - $age
- 	  major=.$func_arith_result
- 	  versuffix="$major.$age.$revision"
-@@ -6334,7 +7470,7 @@
- 	  done
- 
- 	  # Make executables depend on our current version.
--	  verstring="$verstring:${current}.0"
-+	  func_append verstring ":${current}.0"
- 	  ;;
- 
- 	qnx)
-@@ -6402,10 +7538,10 @@
-       fi
- 
-       func_generate_dlsyms "$libname" "$libname" "yes"
--      libobjs="$libobjs $symfileobj"
-+      func_append libobjs " $symfileobj"
-       test "X$libobjs" = "X " && libobjs=
- 
--      if test "$mode" != relink; then
-+      if test "$opt_mode" != relink; then
- 	# Remove our outputs, but don't remove object files since they
- 	# may have been created when compiling PIC objects.
- 	removelist=
-@@ -6421,7 +7557,7 @@
- 		   continue
- 		 fi
- 	       fi
--	       removelist="$removelist $p"
-+	       func_append removelist " $p"
- 	       ;;
- 	    *) ;;
- 	  esac
-@@ -6432,27 +7568,28 @@
- 
-       # Now set the variables for building old libraries.
-       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
--	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+	func_append oldlibs " $output_objdir/$libname.$libext"
- 
- 	# Transform .lo files to .o files.
--	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-       fi
- 
-       # Eliminate all temporary directories.
-       #for path in $notinst_path; do
--      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
--      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
--      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-       #done
- 
-       if test -n "$xrpath"; then
- 	# If the user specified any rpath flags, then add them.
- 	temp_xrpath=
- 	for libdir in $xrpath; do
--	  temp_xrpath="$temp_xrpath -R$libdir"
-+	  func_replace_sysroot "$libdir"
-+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
- 	  case "$finalize_rpath " in
- 	  *" $libdir "*) ;;
--	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  *) func_append finalize_rpath " $libdir" ;;
- 	  esac
- 	done
- 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-@@ -6466,7 +7603,7 @@
-       for lib in $old_dlfiles; do
- 	case " $dlprefiles $dlfiles " in
- 	*" $lib "*) ;;
--	*) dlfiles="$dlfiles $lib" ;;
-+	*) func_append dlfiles " $lib" ;;
- 	esac
-       done
- 
-@@ -6476,19 +7613,19 @@
-       for lib in $old_dlprefiles; do
- 	case "$dlprefiles " in
- 	*" $lib "*) ;;
--	*) dlprefiles="$dlprefiles $lib" ;;
-+	*) func_append dlprefiles " $lib" ;;
- 	esac
-       done
- 
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C library is in the System framework
--	    deplibs="$deplibs System.ltframework"
-+	    func_append deplibs " System.ltframework"
- 	    ;;
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
-@@ -6505,7 +7642,7 @@
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
--	      deplibs="$deplibs -lc"
-+	      func_append deplibs " -lc"
- 	    fi
- 	    ;;
- 	  esac
-@@ -6554,7 +7691,7 @@
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		  case " $predeps $postdeps " in
- 		  *" $i "*)
--		    newdeplibs="$newdeplibs $i"
-+		    func_append newdeplibs " $i"
- 		    i=""
- 		    ;;
- 		  esac
-@@ -6565,21 +7702,21 @@
- 		  set dummy $deplib_matches; shift
- 		  deplib_match=$1
- 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		    newdeplibs="$newdeplibs $i"
-+		    func_append newdeplibs " $i"
- 		  else
- 		    droppeddeps=yes
--		    $ECHO
-+		    echo
- 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
--		    $ECHO "*** I have the capability to make that library automatically link in when"
--		    $ECHO "*** you link to this library.  But I can only do this if you have a"
--		    $ECHO "*** shared version of the library, which I believe you do not have"
--		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
--		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
-+		    echo "*** I have the capability to make that library automatically link in when"
-+		    echo "*** you link to this library.  But I can only do this if you have a"
-+		    echo "*** shared version of the library, which I believe you do not have"
-+		    echo "*** because a test_compile did reveal that the linker did not use it for"
-+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
- 		  fi
- 		fi
- 		;;
- 	      *)
--		newdeplibs="$newdeplibs $i"
-+		func_append newdeplibs " $i"
- 		;;
- 	      esac
- 	    done
-@@ -6597,7 +7734,7 @@
- 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		    case " $predeps $postdeps " in
- 		    *" $i "*)
--		      newdeplibs="$newdeplibs $i"
-+		      func_append newdeplibs " $i"
- 		      i=""
- 		      ;;
- 		    esac
-@@ -6608,29 +7745,29 @@
- 		    set dummy $deplib_matches; shift
- 		    deplib_match=$1
- 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		      newdeplibs="$newdeplibs $i"
-+		      func_append newdeplibs " $i"
- 		    else
- 		      droppeddeps=yes
--		      $ECHO
-+		      echo
- 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
--		      $ECHO "*** I have the capability to make that library automatically link in when"
--		      $ECHO "*** you link to this library.  But I can only do this if you have a"
--		      $ECHO "*** shared version of the library, which you do not appear to have"
--		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
--		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
-+		      echo "*** I have the capability to make that library automatically link in when"
-+		      echo "*** you link to this library.  But I can only do this if you have a"
-+		      echo "*** shared version of the library, which you do not appear to have"
-+		      echo "*** because a test_compile did reveal that the linker did not use this one"
-+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
- 		    fi
- 		  fi
- 		else
- 		  droppeddeps=yes
--		  $ECHO
-+		  echo
- 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
--		  $ECHO "*** make it link in!  You will probably need to install it or some"
--		  $ECHO "*** library that it depends on before this library will be fully"
--		  $ECHO "*** functional.  Installing it before continuing would be even better."
-+		  echo "*** make it link in!  You will probably need to install it or some"
-+		  echo "*** library that it depends on before this library will be fully"
-+		  echo "*** functional.  Installing it before continuing would be even better."
- 		fi
- 		;;
- 	      *)
--		newdeplibs="$newdeplibs $i"
-+		func_append newdeplibs " $i"
- 		;;
- 	      esac
- 	    done
-@@ -6647,15 +7784,27 @@
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		case " $predeps $postdeps " in
- 		*" $a_deplib "*)
--		  newdeplibs="$newdeplibs $a_deplib"
-+		  func_append newdeplibs " $a_deplib"
- 		  a_deplib=""
- 		  ;;
- 		esac
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		libname=`eval "\\$ECHO \"$libname_spec\""`
-+		if test -n "$file_magic_glob"; then
-+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-+		else
-+		  libnameglob=$libname
-+		fi
-+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
- 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
--		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		  if test "$want_nocaseglob" = yes; then
-+		    shopt -s nocaseglob
-+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-+		    $nocaseglob
-+		  else
-+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-+		  fi
- 		  for potent_lib in $potential_libs; do
- 		      # Follow soft links.
- 		      if ls -lLd "$potent_lib" 2>/dev/null |
-@@ -6672,13 +7821,13 @@
- 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
- 			case $potliblink in
- 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
--			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
- 			esac
- 		      done
- 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
- 			 $SED -e 10q |
- 			 $EGREP "$file_magic_regex" > /dev/null; then
--			newdeplibs="$newdeplibs $a_deplib"
-+			func_append newdeplibs " $a_deplib"
- 			a_deplib=""
- 			break 2
- 		      fi
-@@ -6687,12 +7836,12 @@
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		$ECHO
-+		echo
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
--		$ECHO "*** I have the capability to make that library automatically link in when"
--		$ECHO "*** you link to this library.  But I can only do this if you have a"
--		$ECHO "*** shared version of the library, which you do not appear to have"
--		$ECHO "*** because I did check the linker path looking for a file starting"
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
- 		else
-@@ -6703,7 +7852,7 @@
- 	      ;;
- 	    *)
- 	      # Add a -L argument.
--	      newdeplibs="$newdeplibs $a_deplib"
-+	      func_append newdeplibs " $a_deplib"
- 	      ;;
- 	    esac
- 	  done # Gone through all deplibs.
-@@ -6719,7 +7868,7 @@
- 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		case " $predeps $postdeps " in
- 		*" $a_deplib "*)
--		  newdeplibs="$newdeplibs $a_deplib"
-+		  func_append newdeplibs " $a_deplib"
- 		  a_deplib=""
- 		  ;;
- 		esac
-@@ -6730,9 +7879,9 @@
- 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- 		  for potent_lib in $potential_libs; do
- 		    potlib="$potent_lib" # see symlink-check above in file_magic test
--		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
- 		       $EGREP "$match_pattern_regex" > /dev/null; then
--		      newdeplibs="$newdeplibs $a_deplib"
-+		      func_append newdeplibs " $a_deplib"
- 		      a_deplib=""
- 		      break 2
- 		    fi
-@@ -6741,12 +7890,12 @@
- 	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		$ECHO
-+		echo
- 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
--		$ECHO "*** I have the capability to make that library automatically link in when"
--		$ECHO "*** you link to this library.  But I can only do this if you have a"
--		$ECHO "*** shared version of the library, which you do not appear to have"
--		$ECHO "*** because I did check the linker path looking for a file starting"
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib" ; then
- 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
- 		else
-@@ -6757,32 +7906,32 @@
- 	      ;;
- 	    *)
- 	      # Add a -L argument.
--	      newdeplibs="$newdeplibs $a_deplib"
-+	      func_append newdeplibs " $a_deplib"
- 	      ;;
- 	    esac
- 	  done # Gone through all deplibs.
- 	  ;;
- 	none | unknown | *)
- 	  newdeplibs=""
--	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
--	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 	    for i in $predeps $postdeps ; do
- 	      # can't use Xsed below, because $i might contain '/'
--	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
- 	    done
- 	  fi
--	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
--	     $GREP . >/dev/null; then
--	    $ECHO
-+	  case $tmp_deplibs in
-+	  *[!\	\ ]*)
-+	    echo
- 	    if test "X$deplibs_check_method" = "Xnone"; then
--	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
- 	    else
--	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-+	      echo "*** Warning: inter-library dependencies are not known to be supported."
- 	    fi
--	    $ECHO "*** All declared inter-library dependencies are being dropped."
-+	    echo "*** All declared inter-library dependencies are being dropped."
- 	    droppeddeps=yes
--	  fi
-+	    ;;
-+	  esac
- 	  ;;
- 	esac
- 	versuffix=$versuffix_save
-@@ -6794,23 +7943,23 @@
- 	case $host in
- 	*-*-rhapsody* | *-*-darwin1.[012])
- 	  # On Rhapsody replace the C library with the System framework
--	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
- 	  ;;
- 	esac
- 
- 	if test "$droppeddeps" = yes; then
- 	  if test "$module" = yes; then
--	    $ECHO
--	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-+	    echo
-+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
- 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
--	    $ECHO "*** a static module, that should work as long as the dlopening"
--	    $ECHO "*** application is linked with the -dlopen flag."
-+	    echo "*** a static module, that should work as long as the dlopening"
-+	    echo "*** application is linked with the -dlopen flag."
- 	    if test -z "$global_symbol_pipe"; then
--	      $ECHO
--	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
--	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
--	      $ECHO "*** not find such a program.  So, this module is probably useless."
--	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      echo
-+	      echo "*** However, this would only work if libtool was able to extract symbol"
-+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      echo "*** not find such a program.  So, this module is probably useless."
-+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
- 	      oldlibs="$output_objdir/$libname.$libext"
-@@ -6820,16 +7969,16 @@
- 	      build_libtool_libs=no
- 	    fi
- 	  else
--	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
--	    $ECHO "*** automatically added whenever a program is linked with this library"
--	    $ECHO "*** or is declared to -dlopen it."
-+	    echo "*** The inter-library dependencies that have been dropped here will be"
-+	    echo "*** automatically added whenever a program is linked with this library"
-+	    echo "*** or is declared to -dlopen it."
- 
- 	    if test "$allow_undefined" = no; then
--	      $ECHO
--	      $ECHO "*** Since this library must not contain undefined symbols,"
--	      $ECHO "*** because either the platform does not support them or"
--	      $ECHO "*** it was explicitly requested with -no-undefined,"
--	      $ECHO "*** libtool will only create a static version of it."
-+	      echo
-+	      echo "*** Since this library must not contain undefined symbols,"
-+	      echo "*** because either the platform does not support them or"
-+	      echo "*** it was explicitly requested with -no-undefined,"
-+	      echo "*** libtool will only create a static version of it."
- 	      if test "$build_old_libs" = no; then
- 		oldlibs="$output_objdir/$libname.$libext"
- 		build_libtool_libs=module
-@@ -6846,9 +7995,9 @@
-       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-       case $host in
- 	*-*-darwin*)
--	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	  ;;
-       esac
- 
-@@ -6861,7 +8010,7 @@
- 	*)
- 	  case " $deplibs " in
- 	  *" -L$path/$objdir "*)
--	    new_libs="$new_libs -L$path/$objdir" ;;
-+	    func_append new_libs " -L$path/$objdir" ;;
- 	  esac
- 	  ;;
- 	esac
-@@ -6871,10 +8020,10 @@
- 	-L*)
- 	  case " $new_libs " in
- 	  *" $deplib "*) ;;
--	  *) new_libs="$new_libs $deplib" ;;
-+	  *) func_append new_libs " $deplib" ;;
- 	  esac
- 	  ;;
--	*) new_libs="$new_libs $deplib" ;;
-+	*) func_append new_libs " $deplib" ;;
- 	esac
-       done
-       deplibs="$new_libs"
-@@ -6886,15 +8035,22 @@
- 
-       # Test again, we may have decided not to build it any more
-       if test "$build_libtool_libs" = yes; then
-+	# Remove ${wl} instances when linking with ld.
-+	# FIXME: should test the right _cmds variable.
-+	case $archive_cmds in
-+	  *\$LD\ *) wl= ;;
-+        esac
- 	if test "$hardcode_into_libs" = yes; then
- 	  # Hardcode the library paths
- 	  hardcode_libdirs=
- 	  dep_rpath=
- 	  rpath="$finalize_rpath"
--	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
- 	  for libdir in $rpath; do
- 	    if test -n "$hardcode_libdir_flag_spec"; then
- 	      if test -n "$hardcode_libdir_separator"; then
-+		func_replace_sysroot "$libdir"
-+		libdir=$func_replace_sysroot_result
- 		if test -z "$hardcode_libdirs"; then
- 		  hardcode_libdirs="$libdir"
- 		else
-@@ -6903,18 +8059,18 @@
- 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		    ;;
- 		  *)
--		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- 		    ;;
- 		  esac
- 		fi
- 	      else
- 		eval flag=\"$hardcode_libdir_flag_spec\"
--		dep_rpath="$dep_rpath $flag"
-+		func_append dep_rpath " $flag"
- 	      fi
- 	    elif test -n "$runpath_var"; then
- 	      case "$perm_rpath " in
- 	      *" $libdir "*) ;;
--	      *) perm_rpath="$perm_rpath $libdir" ;;
-+	      *) func_append perm_rpath " $libdir" ;;
- 	      esac
- 	    fi
- 	  done
-@@ -6922,17 +8078,13 @@
- 	  if test -n "$hardcode_libdir_separator" &&
- 	     test -n "$hardcode_libdirs"; then
- 	    libdir="$hardcode_libdirs"
--	    if test -n "$hardcode_libdir_flag_spec_ld"; then
--	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
--	    else
--	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
--	    fi
-+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
- 	  fi
- 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
- 	    # We should set the runpath_var.
- 	    rpath=
- 	    for dir in $perm_rpath; do
--	      rpath="$rpath$dir:"
-+	      func_append rpath "$dir:"
- 	    done
- 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
- 	  fi
-@@ -6940,7 +8092,7 @@
- 	fi
- 
- 	shlibpath="$finalize_shlibpath"
--	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
- 	if test -n "$shlibpath"; then
- 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
- 	fi
-@@ -6966,18 +8118,18 @@
- 	linknames=
- 	for link
- 	do
--	  linknames="$linknames $link"
-+	  func_append linknames " $link"
- 	done
- 
- 	# Use standard objects if they are pic
--	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
- 	test "X$libobjs" = "X " && libobjs=
- 
- 	delfiles=
- 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- 	  export_symbols="$output_objdir/$libname.uexp"
--	  delfiles="$delfiles $export_symbols"
-+	  func_append delfiles " $export_symbols"
- 	fi
- 
- 	orig_export_symbols=
-@@ -7008,13 +8160,45 @@
- 	    $opt_dry_run || $RM $export_symbols
- 	    cmds=$export_symbols_cmds
- 	    save_ifs="$IFS"; IFS='~'
--	    for cmd in $cmds; do
-+	    for cmd1 in $cmds; do
- 	      IFS="$save_ifs"
--	      eval cmd=\"$cmd\"
--	      func_len " $cmd"
--	      len=$func_len_result
--	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+	      # Take the normal branch if the nm_file_list_spec branch
-+	      # doesn't work or if tool conversion is not needed.
-+	      case $nm_file_list_spec~$to_tool_file_cmd in
-+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-+		  try_normal_branch=yes
-+		  eval cmd=\"$cmd1\"
-+		  func_len " $cmd"
-+		  len=$func_len_result
-+		  ;;
-+		*)
-+		  try_normal_branch=no
-+		  ;;
-+	      esac
-+	      if test "$try_normal_branch" = yes \
-+		 && { test "$len" -lt "$max_cmd_len" \
-+		      || test "$max_cmd_len" -le -1; }
-+	      then
-+		func_show_eval "$cmd" 'exit $?'
-+		skipped_export=false
-+	      elif test -n "$nm_file_list_spec"; then
-+		func_basename "$output"
-+		output_la=$func_basename_result
-+		save_libobjs=$libobjs
-+		save_output=$output
-+		output=${output_objdir}/${output_la}.nm
-+		func_to_tool_file "$output"
-+		libobjs=$nm_file_list_spec$func_to_tool_file_result
-+		func_append delfiles " $output"
-+		func_verbose "creating $NM input file list: $output"
-+		for obj in $save_libobjs; do
-+		  func_to_tool_file "$obj"
-+		  $ECHO "$func_to_tool_file_result"
-+		done > "$output"
-+		eval cmd=\"$cmd1\"
- 		func_show_eval "$cmd" 'exit $?'
-+		output=$save_output
-+		libobjs=$save_libobjs
- 		skipped_export=false
- 	      else
- 		# The command line is too long to execute in one step.
-@@ -7036,7 +8220,7 @@
- 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  tmp_export_symbols="$export_symbols"
- 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
- 	fi
- 
- 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7048,7 +8232,7 @@
- 	  # global variables. join(1) would be nice here, but unfortunately
- 	  # isn't a blessed tool.
- 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
--	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
- 	  export_symbols=$output_objdir/$libname.def
- 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- 	fi
-@@ -7058,7 +8242,7 @@
- 	  case " $convenience " in
- 	  *" $test_deplib "*) ;;
- 	  *)
--	    tmp_deplibs="$tmp_deplibs $test_deplib"
-+	    func_append tmp_deplibs " $test_deplib"
- 	    ;;
- 	  esac
- 	done
-@@ -7078,21 +8262,21 @@
- 	    test "X$libobjs" = "X " && libobjs=
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
--	    generated="$generated $gentop"
-+	    func_append generated " $gentop"
- 
- 	    func_extract_archives $gentop $convenience
--	    libobjs="$libobjs $func_extract_archives_result"
-+	    func_append libobjs " $func_extract_archives_result"
- 	    test "X$libobjs" = "X " && libobjs=
- 	  fi
- 	fi
- 
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
--	  linker_flags="$linker_flags $flag"
-+	  func_append linker_flags " $flag"
- 	fi
- 
- 	# Make a backup of the uninstalled library when relinking
--	if test "$mode" = relink; then
-+	if test "$opt_mode" = relink; then
- 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
- 	fi
- 
-@@ -7137,7 +8321,8 @@
- 	    save_libobjs=$libobjs
- 	  fi
- 	  save_output=$output
--	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
-+	  func_basename "$output"
-+	  output_la=$func_basename_result
- 
- 	  # Clear the reloadable object creation command queue and
- 	  # initialize k to one.
-@@ -7150,13 +8335,16 @@
- 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- 	    output=${output_objdir}/${output_la}.lnkscript
- 	    func_verbose "creating GNU ld script: $output"
--	    $ECHO 'INPUT (' > $output
-+	    echo 'INPUT (' > $output
- 	    for obj in $save_libobjs
- 	    do
--	      $ECHO "$obj" >> $output
-+	      func_to_tool_file "$obj"
-+	      $ECHO "$func_to_tool_file_result" >> $output
- 	    done
--	    $ECHO ')' >> $output
--	    delfiles="$delfiles $output"
-+	    echo ')' >> $output
-+	    func_append delfiles " $output"
-+	    func_to_tool_file "$output"
-+	    output=$func_to_tool_file_result
- 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- 	    output=${output_objdir}/${output_la}.lnk
- 	    func_verbose "creating linker input file list: $output"
-@@ -7170,10 +8358,12 @@
- 	    fi
- 	    for obj
- 	    do
--	      $ECHO "$obj" >> $output
-+	      func_to_tool_file "$obj"
-+	      $ECHO "$func_to_tool_file_result" >> $output
- 	    done
--	    delfiles="$delfiles $output"
--	    output=$firstobj\"$file_list_spec$output\"
-+	    func_append delfiles " $output"
-+	    func_to_tool_file "$output"
-+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
- 	  else
- 	    if test -n "$save_libobjs"; then
- 	      func_verbose "creating reloadable object files..."
-@@ -7197,17 +8387,19 @@
- 		  # command to the queue.
- 		  if test "$k" -eq 1 ; then
- 		    # The first file doesn't have a previous command to add.
--		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-+		    reload_objs=$objlist
-+		    eval concat_cmds=\"$reload_cmds\"
- 		  else
- 		    # All subsequent reloadable object files will link in
- 		    # the last one created.
--		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
-+		    reload_objs="$objlist $last_robj"
-+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
- 		  fi
- 		  last_robj=$output_objdir/$output_la-${k}.$objext
- 		  func_arith $k + 1
- 		  k=$func_arith_result
- 		  output=$output_objdir/$output_la-${k}.$objext
--		  objlist=$obj
-+		  objlist=" $obj"
- 		  func_len " $last_robj"
- 		  func_arith $len0 + $func_len_result
- 		  len=$func_arith_result
-@@ -7217,11 +8409,12 @@
- 	      # reloadable object file.  All subsequent reloadable object
- 	      # files will link in the last one created.
- 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
--	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-+	      reload_objs="$objlist $last_robj"
-+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
- 	      if test -n "$last_robj"; then
- 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
- 	      fi
--	      delfiles="$delfiles $output"
-+	      func_append delfiles " $output"
- 
- 	    else
- 	      output=
-@@ -7255,7 +8448,7 @@
- 		lt_exit=$?
- 
- 		# Restore the uninstalled library and exit
--		if test "$mode" = relink; then
-+		if test "$opt_mode" = relink; then
- 		  ( cd "$output_objdir" && \
- 		    $RM "${realname}T" && \
- 		    $MV "${realname}U" "$realname" )
-@@ -7276,7 +8469,7 @@
- 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	      tmp_export_symbols="$export_symbols"
- 	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
--	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
- 	    fi
- 
- 	    if test -n "$orig_export_symbols"; then
-@@ -7288,7 +8481,7 @@
- 	      # global variables. join(1) would be nice here, but unfortunately
- 	      # isn't a blessed tool.
- 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
--	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
- 	      export_symbols=$output_objdir/$libname.def
- 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- 	    fi
-@@ -7329,10 +8522,10 @@
- 	# Add any objects from preloaded convenience libraries
- 	if test -n "$dlprefiles"; then
- 	  gentop="$output_objdir/${outputname}x"
--	  generated="$generated $gentop"
-+	  func_append generated " $gentop"
- 
- 	  func_extract_archives $gentop $dlprefiles
--	  libobjs="$libobjs $func_extract_archives_result"
-+	  func_append libobjs " $func_extract_archives_result"
- 	  test "X$libobjs" = "X " && libobjs=
- 	fi
- 
-@@ -7348,7 +8541,7 @@
- 	    lt_exit=$?
- 
- 	    # Restore the uninstalled library and exit
--	    if test "$mode" = relink; then
-+	    if test "$opt_mode" = relink; then
- 	      ( cd "$output_objdir" && \
- 	        $RM "${realname}T" && \
- 		$MV "${realname}U" "$realname" )
-@@ -7360,7 +8553,7 @@
- 	IFS="$save_ifs"
- 
- 	# Restore the uninstalled library and exit
--	if test "$mode" = relink; then
-+	if test "$opt_mode" = relink; then
- 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
- 
- 	  if test -n "$convenience"; then
-@@ -7441,18 +8634,21 @@
-       if test -n "$convenience"; then
- 	if test -n "$whole_archive_flag_spec"; then
- 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
--	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
- 	else
- 	  gentop="$output_objdir/${obj}x"
--	  generated="$generated $gentop"
-+	  func_append generated " $gentop"
- 
- 	  func_extract_archives $gentop $convenience
- 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
-+      # If we're not building shared, we need to use non_pic_objs
-+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-+
-       # Create the old-style object.
--      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
- 
-       output="$obj"
-       func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -7512,8 +8708,8 @@
-       case $host in
-       *-*-rhapsody* | *-*-darwin1.[012])
- 	# On Rhapsody replace the C library is the System framework
--	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
--	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
- 	;;
-       esac
- 
-@@ -7524,14 +8720,14 @@
- 	if test "$tagname" = CXX ; then
- 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
- 	    10.[0123])
--	      compile_command="$compile_command ${wl}-bind_at_load"
--	      finalize_command="$finalize_command ${wl}-bind_at_load"
-+	      func_append compile_command " ${wl}-bind_at_load"
-+	      func_append finalize_command " ${wl}-bind_at_load"
- 	    ;;
- 	  esac
- 	fi
- 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
--	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	;;
-       esac
- 
-@@ -7545,7 +8741,7 @@
- 	*)
- 	  case " $compile_deplibs " in
- 	  *" -L$path/$objdir "*)
--	    new_libs="$new_libs -L$path/$objdir" ;;
-+	    func_append new_libs " -L$path/$objdir" ;;
- 	  esac
- 	  ;;
- 	esac
-@@ -7555,17 +8751,17 @@
- 	-L*)
- 	  case " $new_libs " in
- 	  *" $deplib "*) ;;
--	  *) new_libs="$new_libs $deplib" ;;
-+	  *) func_append new_libs " $deplib" ;;
- 	  esac
- 	  ;;
--	*) new_libs="$new_libs $deplib" ;;
-+	*) func_append new_libs " $deplib" ;;
- 	esac
-       done
-       compile_deplibs="$new_libs"
- 
- 
--      compile_command="$compile_command $compile_deplibs"
--      finalize_command="$finalize_command $finalize_deplibs"
-+      func_append compile_command " $compile_deplibs"
-+      func_append finalize_command " $finalize_deplibs"
- 
-       if test -n "$rpath$xrpath"; then
- 	# If the user specified any rpath flags, then add them.
-@@ -7573,7 +8769,7 @@
- 	  # This is the magic to use -rpath.
- 	  case "$finalize_rpath " in
- 	  *" $libdir "*) ;;
--	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  *) func_append finalize_rpath " $libdir" ;;
- 	  esac
- 	done
-       fi
-@@ -7592,18 +8788,18 @@
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
--		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- 		;;
- 	      esac
- 	    fi
- 	  else
- 	    eval flag=\"$hardcode_libdir_flag_spec\"
--	    rpath="$rpath $flag"
-+	    func_append rpath " $flag"
- 	  fi
- 	elif test -n "$runpath_var"; then
- 	  case "$perm_rpath " in
- 	  *" $libdir "*) ;;
--	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  *) func_append perm_rpath " $libdir" ;;
- 	  esac
- 	fi
- 	case $host in
-@@ -7612,12 +8808,12 @@
- 	  case :$dllsearchpath: in
- 	  *":$libdir:"*) ;;
- 	  ::) dllsearchpath=$libdir;;
--	  *) dllsearchpath="$dllsearchpath:$libdir";;
-+	  *) func_append dllsearchpath ":$libdir";;
- 	  esac
- 	  case :$dllsearchpath: in
- 	  *":$testbindir:"*) ;;
- 	  ::) dllsearchpath=$testbindir;;
--	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  *) func_append dllsearchpath ":$testbindir";;
- 	  esac
- 	  ;;
- 	esac
-@@ -7643,18 +8839,18 @@
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
--		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- 		;;
- 	      esac
- 	    fi
- 	  else
- 	    eval flag=\"$hardcode_libdir_flag_spec\"
--	    rpath="$rpath $flag"
-+	    func_append rpath " $flag"
- 	  fi
- 	elif test -n "$runpath_var"; then
- 	  case "$finalize_perm_rpath " in
- 	  *" $libdir "*) ;;
--	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  *) func_append finalize_perm_rpath " $libdir" ;;
- 	  esac
- 	fi
-       done
-@@ -7668,8 +8864,8 @@
- 
-       if test -n "$libobjs" && test "$build_old_libs" = yes; then
- 	# Transform all the library objects into standard objects.
--	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
--	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-       fi
- 
-       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -7681,15 +8877,15 @@
- 
-       wrappers_required=yes
-       case $host in
-+      *cegcc* | *mingw32ce*)
-+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-+        wrappers_required=no
-+        ;;
-       *cygwin* | *mingw* )
-         if test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-         fi
-         ;;
--      *cegcc)
--        # Disable wrappers for cegcc, we are cross compiling anyway.
--        wrappers_required=no
--        ;;
-       *)
-         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-@@ -7698,13 +8894,19 @@
-       esac
-       if test "$wrappers_required" = no; then
- 	# Replace the output file specification.
--	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- 	link_command="$compile_command$compile_rpath"
- 
- 	# We have no uninstalled library dependencies, so finalize right now.
- 	exit_status=0
- 	func_show_eval "$link_command" 'exit_status=$?'
- 
-+	if test -n "$postlink_cmds"; then
-+	  func_to_tool_file "$output"
-+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-+	  func_execute_cmds "$postlink_cmds" 'exit $?'
-+	fi
-+
- 	# Delete the generated files.
- 	if test -f "$output_objdir/${outputname}S.${objext}"; then
- 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-@@ -7727,7 +8929,7 @@
- 	  # We should set the runpath_var.
- 	  rpath=
- 	  for dir in $perm_rpath; do
--	    rpath="$rpath$dir:"
-+	    func_append rpath "$dir:"
- 	  done
- 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
- 	fi
-@@ -7735,7 +8937,7 @@
- 	  # We should set the runpath_var.
- 	  rpath=
- 	  for dir in $finalize_perm_rpath; do
--	    rpath="$rpath$dir:"
-+	    func_append rpath "$dir:"
- 	  done
- 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
- 	fi
-@@ -7745,11 +8947,18 @@
- 	# We don't need to create a wrapper script.
- 	link_command="$compile_var$compile_command$compile_rpath"
- 	# Replace the output file specification.
--	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- 	# Delete the old output file.
- 	$opt_dry_run || $RM $output
- 	# Link the executable and exit
- 	func_show_eval "$link_command" 'exit $?'
-+
-+	if test -n "$postlink_cmds"; then
-+	  func_to_tool_file "$output"
-+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-+	  func_execute_cmds "$postlink_cmds" 'exit $?'
-+	fi
-+
- 	exit $EXIT_SUCCESS
-       fi
- 
-@@ -7764,7 +8973,7 @@
- 	if test "$fast_install" != no; then
- 	  link_command="$finalize_var$compile_command$finalize_rpath"
- 	  if test "$fast_install" = yes; then
--	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
- 	  else
- 	    # fast_install is set to needless
- 	    relink_command=
-@@ -7776,13 +8985,19 @@
-       fi
- 
-       # Replace the output file specification.
--      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
- 
-       # Delete the old output files.
-       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
- 
-       func_show_eval "$link_command" 'exit $?'
- 
-+      if test -n "$postlink_cmds"; then
-+	func_to_tool_file "$output_objdir/$outputname"
-+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-+	func_execute_cmds "$postlink_cmds" 'exit $?'
-+      fi
-+
-       # Now create the wrapper script.
-       func_verbose "creating $output"
- 
-@@ -7800,18 +9015,7 @@
- 	  fi
- 	done
- 	relink_command="(cd `pwd`; $relink_command)"
--	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
--      fi
--
--      # Quote $ECHO for shipping.
--      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
--	case $progpath in
--	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
--	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
--	esac
--	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
--      else
--	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-       fi
- 
-       # Only actually do things if not in dry run mode.
-@@ -7891,7 +9095,7 @@
- 	else
- 	  oldobjs="$old_deplibs $non_pic_objects"
- 	  if test "$preload" = yes && test -f "$symfileobj"; then
--	    oldobjs="$oldobjs $symfileobj"
-+	    func_append oldobjs " $symfileobj"
- 	  fi
- 	fi
- 	addlibs="$old_convenience"
-@@ -7899,10 +9103,10 @@
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
--	generated="$generated $gentop"
-+	func_append generated " $gentop"
- 
- 	func_extract_archives $gentop $addlibs
--	oldobjs="$oldobjs $func_extract_archives_result"
-+	func_append oldobjs " $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-@@ -7913,10 +9117,10 @@
- 	# Add any objects from preloaded convenience libraries
- 	if test -n "$dlprefiles"; then
- 	  gentop="$output_objdir/${outputname}x"
--	  generated="$generated $gentop"
-+	  func_append generated " $gentop"
- 
- 	  func_extract_archives $gentop $dlprefiles
--	  oldobjs="$oldobjs $func_extract_archives_result"
-+	  func_append oldobjs " $func_extract_archives_result"
- 	fi
- 
- 	# POSIX demands no paths to be encoded in archives.  We have
-@@ -7932,9 +9136,9 @@
- 	    done | sort | sort -uc >/dev/null 2>&1); then
- 	  :
- 	else
--	  $ECHO "copying selected object files to avoid basename conflicts..."
-+	  echo "copying selected object files to avoid basename conflicts..."
- 	  gentop="$output_objdir/${outputname}x"
--	  generated="$generated $gentop"
-+	  func_append generated " $gentop"
- 	  func_mkdir_p "$gentop"
- 	  save_oldobjs=$oldobjs
- 	  oldobjs=
-@@ -7958,18 +9162,30 @@
- 		esac
- 	      done
- 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
--	      oldobjs="$oldobjs $gentop/$newobj"
-+	      func_append oldobjs " $gentop/$newobj"
- 	      ;;
--	    *) oldobjs="$oldobjs $obj" ;;
-+	    *) func_append oldobjs " $obj" ;;
- 	    esac
- 	  done
- 	fi
-+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-+	tool_oldlib=$func_to_tool_file_result
- 	eval cmds=\"$old_archive_cmds\"
- 
- 	func_len " $cmds"
- 	len=$func_len_result
- 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- 	  cmds=$old_archive_cmds
-+	elif test -n "$archiver_list_spec"; then
-+	  func_verbose "using command file archive linking..."
-+	  for obj in $oldobjs
-+	  do
-+	    func_to_tool_file "$obj"
-+	    $ECHO "$func_to_tool_file_result"
-+	  done > $output_objdir/$libname.libcmd
-+	  func_to_tool_file "$output_objdir/$libname.libcmd"
-+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-+	  cmds=$old_archive_cmds
- 	else
- 	  # the command line is too long to link in one step, link in parts
- 	  func_verbose "using piecewise archive linking..."
-@@ -8043,7 +9259,7 @@
-       done
-       # Quote the link command for shipping.
-       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
--      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-       if test "$hardcode_automatic" = yes ; then
- 	relink_command=
-       fi
-@@ -8063,12 +9279,23 @@
- 	      *.la)
- 		func_basename "$deplib"
- 		name="$func_basename_result"
--		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		func_resolve_sysroot "$deplib"
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
--		newdependency_libs="$newdependency_libs $libdir/$name"
-+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-+		;;
-+	      -L*)
-+		func_stripname -L '' "$deplib"
-+		func_replace_sysroot "$func_stripname_result"
-+		func_append newdependency_libs " -L$func_replace_sysroot_result"
- 		;;
--	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-+	      -R*)
-+		func_stripname -R '' "$deplib"
-+		func_replace_sysroot "$func_stripname_result"
-+		func_append newdependency_libs " -R$func_replace_sysroot_result"
-+		;;
-+	      *) func_append newdependency_libs " $deplib" ;;
- 	      esac
- 	    done
- 	    dependency_libs="$newdependency_libs"
-@@ -8082,9 +9309,9 @@
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$lib' is not a valid libtool archive"
--		newdlfiles="$newdlfiles $libdir/$name"
-+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
- 		;;
--	      *) newdlfiles="$newdlfiles $lib" ;;
-+	      *) func_append newdlfiles " $lib" ;;
- 	      esac
- 	    done
- 	    dlfiles="$newdlfiles"
-@@ -8101,7 +9328,7 @@
- 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- 		test -z "$libdir" && \
- 		  func_fatal_error "\`$lib' is not a valid libtool archive"
--		newdlprefiles="$newdlprefiles $libdir/$name"
-+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
- 		;;
- 	      esac
- 	    done
-@@ -8113,7 +9340,7 @@
- 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- 		*) abs=`pwd`"/$lib" ;;
- 	      esac
--	      newdlfiles="$newdlfiles $abs"
-+	      func_append newdlfiles " $abs"
- 	    done
- 	    dlfiles="$newdlfiles"
- 	    newdlprefiles=
-@@ -8122,15 +9349,33 @@
- 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- 		*) abs=`pwd`"/$lib" ;;
- 	      esac
--	      newdlprefiles="$newdlprefiles $abs"
-+	      func_append newdlprefiles " $abs"
- 	    done
- 	    dlprefiles="$newdlprefiles"
- 	  fi
- 	  $RM $output
- 	  # place dlname in correct position for cygwin
-+	  # In fact, it would be nice if we could use this code for all target
-+	  # systems that can't hard-code library paths into their executables
-+	  # and that have no shared library path variable independent of PATH,
-+	  # but it turns out we can't easily determine that from inspecting
-+	  # libtool variables, so we have to hard-code the OSs to which it
-+	  # applies here; at the moment, that means platforms that use the PE
-+	  # object format with DLL files.  See the long comment at the top of
-+	  # tests/bindir.at for full details.
- 	  tdlname=$dlname
- 	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-+	      # If a -bindir argument was supplied, place the dll there.
-+	      if test "x$bindir" != x ;
-+	      then
-+		func_relative_path "$install_libdir" "$bindir"
-+		tdlname=$func_relative_path_result$dlname
-+	      else
-+		# Otherwise fall back on heuristic.
-+		tdlname=../bin/$dlname
-+	      fi
-+	      ;;
- 	  esac
- 	  $ECHO > $output "\
- # $outputname - a libtool library file
-@@ -8189,7 +9434,7 @@
-     exit $EXIT_SUCCESS
- }
- 
--{ test "$mode" = link || test "$mode" = relink; } &&
-+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-     func_mode_link ${1+"$@"}
- 
- 
-@@ -8209,9 +9454,9 @@
-     for arg
-     do
-       case $arg in
--      -f) RM="$RM $arg"; rmforce=yes ;;
--      -*) RM="$RM $arg" ;;
--      *) files="$files $arg" ;;
-+      -f) func_append RM " $arg"; rmforce=yes ;;
-+      -*) func_append RM " $arg" ;;
-+      *) func_append files " $arg" ;;
-       esac
-     done
- 
-@@ -8220,24 +9465,23 @@
- 
-     rmdirs=
- 
--    origobjdir="$objdir"
-     for file in $files; do
-       func_dirname "$file" "" "."
-       dir="$func_dirname_result"
-       if test "X$dir" = X.; then
--	objdir="$origobjdir"
-+	odir="$objdir"
-       else
--	objdir="$dir/$origobjdir"
-+	odir="$dir/$objdir"
-       fi
-       func_basename "$file"
-       name="$func_basename_result"
--      test "$mode" = uninstall && objdir="$dir"
-+      test "$opt_mode" = uninstall && odir="$dir"
- 
--      # Remember objdir for removal later, being careful to avoid duplicates
--      if test "$mode" = clean; then
-+      # Remember odir for removal later, being careful to avoid duplicates
-+      if test "$opt_mode" = clean; then
- 	case " $rmdirs " in
--	  *" $objdir "*) ;;
--	  *) rmdirs="$rmdirs $objdir" ;;
-+	  *" $odir "*) ;;
-+	  *) func_append rmdirs " $odir" ;;
- 	esac
-       fi
- 
-@@ -8263,18 +9507,17 @@
- 
- 	  # Delete the libtool libraries and symlinks.
- 	  for n in $library_names; do
--	    rmfiles="$rmfiles $objdir/$n"
-+	    func_append rmfiles " $odir/$n"
- 	  done
--	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- 
--	  case "$mode" in
-+	  case "$opt_mode" in
- 	  clean)
--	    case "  $library_names " in
--	    # "  " in the beginning catches empty $dlname
-+	    case " $library_names " in
- 	    *" $dlname "*) ;;
--	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
- 	    esac
--	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
- 	    ;;
- 	  uninstall)
- 	    if test -n "$library_names"; then
-@@ -8302,19 +9545,19 @@
- 	  # Add PIC object to the list of files to remove.
- 	  if test -n "$pic_object" &&
- 	     test "$pic_object" != none; then
--	    rmfiles="$rmfiles $dir/$pic_object"
-+	    func_append rmfiles " $dir/$pic_object"
- 	  fi
- 
- 	  # Add non-PIC object to the list of files to remove.
- 	  if test -n "$non_pic_object" &&
- 	     test "$non_pic_object" != none; then
--	    rmfiles="$rmfiles $dir/$non_pic_object"
-+	    func_append rmfiles " $dir/$non_pic_object"
- 	  fi
- 	fi
- 	;;
- 
-       *)
--	if test "$mode" = clean ; then
-+	if test "$opt_mode" = clean ; then
- 	  noexename=$name
- 	  case $file in
- 	  *.exe)
-@@ -8324,7 +9567,7 @@
- 	    noexename=$func_stripname_result
- 	    # $file with .exe has already been added to rmfiles,
- 	    # add $file without .exe
--	    rmfiles="$rmfiles $file"
-+	    func_append rmfiles " $file"
- 	    ;;
- 	  esac
- 	  # Do a test to see if this is a libtool program.
-@@ -8333,7 +9576,7 @@
- 	      func_ltwrapper_scriptname "$file"
- 	      relink_command=
- 	      func_source $func_ltwrapper_scriptname_result
--	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
-+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
- 	    else
- 	      relink_command=
- 	      func_source $dir/$noexename
-@@ -8341,12 +9584,12 @@
- 
- 	    # note $name still contains .exe if it was in $file originally
- 	    # as does the version of $file that was added into $rmfiles
--	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- 	    if test "$fast_install" = yes && test -n "$relink_command"; then
--	      rmfiles="$rmfiles $objdir/lt-$name"
-+	      func_append rmfiles " $odir/lt-$name"
- 	    fi
- 	    if test "X$noexename" != "X$name" ; then
--	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-+	      func_append rmfiles " $odir/lt-${noexename}.c"
- 	    fi
- 	  fi
- 	fi
-@@ -8354,7 +9597,6 @@
-       esac
-       func_show_eval "$RM $rmfiles" 'exit_status=1'
-     done
--    objdir="$origobjdir"
- 
-     # Try to remove the ${objdir}s in the directories where we deleted files
-     for dir in $rmdirs; do
-@@ -8366,16 +9608,16 @@
-     exit $exit_status
- }
- 
--{ test "$mode" = uninstall || test "$mode" = clean; } &&
-+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-     func_mode_uninstall ${1+"$@"}
- 
--test -z "$mode" && {
-+test -z "$opt_mode" && {
-   help="$generic_help"
-   func_fatal_help "you must specify a MODE"
- }
- 
- test -z "$exec_cmd" && \
--  func_fatal_help "invalid operation mode \`$mode'"
-+  func_fatal_help "invalid operation mode \`$opt_mode'"
- 
- if test -n "$exec_cmd"; then
-   eval exec "$exec_cmd"
-Only in src/hal-0.5.14: Makefile
-diff -u -r hal-0.5.14/Makefile.in src/hal-0.5.14/Makefile.in
---- hal-0.5.14/Makefile.in	2009-11-30 23:22:42.000000000 +0100
-+++ src/hal-0.5.14/Makefile.in	2011-12-19 20:40:22.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -164,6 +164,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -206,6 +207,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -226,6 +228,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -248,6 +252,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -281,7 +286,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -426,7 +430,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -451,7 +455,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -615,7 +619,8 @@
- 	  fi; \
- 	done
- 	-test -n "$(am__skip_mode_fix)" \
--	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	|| find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -659,17 +664,17 @@
- distcheck: dist
- 	case '$(DIST_ARCHIVES)' in \
- 	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
--	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- 	*.tar.lzma*) \
--	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- 	*.tar.xz*) \
- 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
-Only in src/hal-0.5.14/partutil: .deps
-Only in src/hal-0.5.14/partutil: libpartutil.la
-Only in src/hal-0.5.14/partutil: .libs
-Only in src/hal-0.5.14/partutil: logger.lo
-Only in src/hal-0.5.14/partutil: Makefile
-diff -u -r hal-0.5.14/partutil/Makefile.in src/hal-0.5.14/partutil/Makefile.in
---- hal-0.5.14/partutil/Makefile.in	2009-11-30 23:22:41.000000000 +0100
-+++ src/hal-0.5.14/partutil/Makefile.in	2011-12-19 20:40:21.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -113,6 +113,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -155,6 +156,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -175,6 +177,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -197,6 +201,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -230,7 +235,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/partutil: partutil.lo
-Only in src/hal-0.5.14/policy: Makefile
-diff -u -r hal-0.5.14/policy/Makefile.in src/hal-0.5.14/policy/Makefile.in
---- hal-0.5.14/policy/Makefile.in	2009-11-30 23:22:41.000000000 +0100
-+++ src/hal-0.5.14/policy/Makefile.in	2011-12-19 20:40:21.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -115,6 +115,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -157,6 +158,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -177,6 +179,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -199,6 +203,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -232,7 +237,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14: stamp-h1
-Only in src/hal-0.5.14/tools: .deps
-Only in src/hal-0.5.14/tools/freebsd: Makefile
-diff -u -r hal-0.5.14/tools/freebsd/Makefile.in src/hal-0.5.14/tools/freebsd/Makefile.in
---- hal-0.5.14/tools/freebsd/Makefile.in	2009-11-30 23:22:42.000000000 +0100
-+++ src/hal-0.5.14/tools/freebsd/Makefile.in	2011-12-19 20:40:22.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -106,6 +106,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -148,6 +149,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -168,6 +170,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -190,6 +194,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -223,7 +228,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-diff -u -r hal-0.5.14/tools/linux/hal-system-killswitch-get-power-linux src/hal-0.5.14/tools/linux/hal-system-killswitch-get-power-linux
---- hal-0.5.14/tools/linux/hal-system-killswitch-get-power-linux	2008-11-10 11:14:12.000000000 +0100
-+++ src/hal-0.5.14/tools/linux/hal-system-killswitch-get-power-linux	2011-12-19 20:39:54.000000000 +0100
-@@ -8,11 +8,6 @@
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- 
--DELL_WCTL=/usr/bin/dellWirelessCtl
--if [ -x "/usr/sbin/dellWirelessCtl" ]; then
--  DELL_WCTL=/usr/sbin/dellWirelessCtl
--fi
--
- if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
-     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
- 	value="`hal-system-sonypic getbluetooth`"
-@@ -22,25 +17,6 @@
- 	    exit 1
- 	fi
- 	exit ${value}
--    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--	    # TODO: write our own binary that links with libsmbios?
--	    $DELL_WCTL --st_bt
--	    value=$?
--	    if [ "$value" = "0" ]; then
--	        exit 1
--	    elif [ "$value" = "1" ]; then
--	        exit 0
--	    else
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $value" >&2
--                exit 1
--	    fi
--        else
--	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--	    exit 1
--	fi
-     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
- 	read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null
- 	if [ $? -eq 0 ]; then
-@@ -53,56 +29,6 @@
-     else
- 	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
- 	echo "Access type not supported" >&2
--	exit 1
--    fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
-- 	    # TODO: write our own binary that links with libsmbios?
--	    $DELL_WCTL --st_wlan
--	    value=$?
--	    if [ "$value" = "0" ]; then
--	        exit 1
--	    elif [ "$value" = "1" ]; then
--	        exit 0
--	    else
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $value" >&2
--                exit 1
--	    fi
--	else 
--	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--	    exit 1
--	fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--   	    # TODO: write our own binary that links with libsmbios?
--	    $DELL_WCTL --st_wwan
--	    value=$?
--	    if [ "$value" = "0" ]; then
--	        exit 1
--	    elif [ "$value" = "1" ]; then
--	        exit 0
--	    else
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $value" >&2
--                exit 1
--	    fi
--	else 
--	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--	    exit 1
--	fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
- 	exit 1
-     fi
- else
-diff -u -r hal-0.5.14/tools/linux/hal-system-killswitch-set-power-linux src/hal-0.5.14/tools/linux/hal-system-killswitch-set-power-linux
---- hal-0.5.14/tools/linux/hal-system-killswitch-set-power-linux	2008-11-10 11:14:12.000000000 +0100
-+++ src/hal-0.5.14/tools/linux/hal-system-killswitch-set-power-linux	2011-12-19 20:39:54.000000000 +0100
-@@ -8,11 +8,6 @@
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- 
--DELL_WCTL=/usr/bin/dellWirelessCtl
--if [ -x "/usr/sbin/dellWirelessCtl" ]; then
--    DELL_WCTL=/usr/sbin/dellWirelessCtl
--fi
--
- if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
-     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
- 	hal-system-sonypic setbluetooth $value
-@@ -23,26 +18,6 @@
- 	    exit 1
- 	fi
- 	exit 0
--    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--	    # TODO: write our own binary that links with libsmbios?
--	    if [ "$value" = "true" ]; then
--	        $DELL_WCTL --bt 1
--	        ret=$?
--	    else
--	        $DELL_WCTL --bt 0
--	        ret=$?
--	    fi
--	    if [ "$ret" != "0" ]; then
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $ret" >&2
--	        exit 1
--	    fi
--        else
--            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--            exit 1
--        fi
-     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
-         if [ "$value" = "true" ]; then 
- 	    bit=1; 
-@@ -59,60 +34,6 @@
-     else
- 	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
- 	echo "Access type not supported" >&2
--	exit 1
--    fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
--	if [ -x "$DELL_WCTL" ]; then
--	    # As a side effect we disable the physical kill switch
--	    # TODO: write our own binary that links with libsmbios?
--	    if [ "$value" = "true" ]; then
--	        $DELL_WCTL --sw_wlan 0 --wlan 1
--	        ret=$?
--	    else
--	        $DELL_WCTL --sw_wlan 0 --wlan 0
--	        ret=$?
--	    fi
--	    if [ "$ret" != "0" ]; then
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $ret" >&2
--                exit 1
--	    fi
--        else
--            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--            exit 1
--        fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
--	exit 1
--    fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
--    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then 
--	if [ -x "$DELL_WCTL" ]; then
--	    # As a side effect we disable the physical kill switch
--	    # TODO: write our own binary that links with libsmbios?
--	    if [ "$value" = "true" ]; then
--	        $DELL_WCTL --sw_wwan 0 --wwan 1
--	        ret=$?
--	    else
--	        $DELL_WCTL --sw_wwan 0 --wwan 0
--	        ret=$?
--	    fi
--	    if [ "$ret" != "0" ]; then
--	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	        echo "dellWirelessCtl returned $ret" >&2
--                exit 1
--	    fi
--        else
--            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
--            exit 1
--        fi
--    else
--	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
--	echo "Access type not supported" >&2
- 	exit 1
-     fi
- else
-Only in src/hal-0.5.14/tools/linux: Makefile
-diff -u -r hal-0.5.14/tools/linux/Makefile.in src/hal-0.5.14/tools/linux/Makefile.in
---- hal-0.5.14/tools/linux/Makefile.in	2009-11-30 23:22:42.000000000 +0100
-+++ src/hal-0.5.14/tools/linux/Makefile.in	2011-12-19 20:40:22.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -112,6 +112,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -154,6 +155,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -174,6 +176,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -196,6 +200,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -229,7 +234,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-Only in src/hal-0.5.14/tools: Makefile
-diff -u -r hal-0.5.14/tools/Makefile.in src/hal-0.5.14/tools/Makefile.in
---- hal-0.5.14/tools/Makefile.in	2009-11-30 23:22:42.000000000 +0100
-+++ src/hal-0.5.14/tools/Makefile.in	2011-12-19 20:40:22.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -357,6 +357,7 @@
- DBUS_SYS_DIR = @DBUS_SYS_DIR@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
- DSYMUTIL = @DSYMUTIL@
- DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
-@@ -399,6 +400,7 @@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
-@@ -419,6 +421,8 @@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PCI_IDS_DIR = @PCI_IDS_DIR@
- PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- POLKIT_CFLAGS = @POLKIT_CFLAGS@
- POLKIT_LIBS = @POLKIT_LIBS@
- POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
-@@ -441,6 +445,7 @@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -474,7 +479,6 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -912,7 +916,7 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -937,7 +941,7 @@
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
diff --git a/arch/3.5.13/trinity-base/hal/hald b/arch/3.5.13/trinity-base/hal/hald
deleted file mode 100644
index 3d016edbd..000000000
--- a/arch/3.5.13/trinity-base/hal/hald
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-       #Check for running dbus, start when not running
-       ck_daemon dbus && /etc/rc.d/dbus start
-       if [ -x /etc/rc.d/acpid ]; then
-          ck_daemon acpid && /etc/rc.d/acpid start
-       fi
-       stat_busy "Starting Hardware Abstraction Layer"
-       if [ ! -x /var/cache/hald ] ; then
-          install -m755 -g 82 -o 82 -d /var/cache/hald
-       fi
-       if [ ! -x /var/run/hald ]; then
-          install -m755 -g 82 -o 82 -d /var/run/hald
-       fi
-       if [ ! -x /var/run/hald/hald-local ]; then
-          install -m755 -g 0 -o 0 -d /var/run/hald/hald-local
-       fi
-       if [ ! -x /var/run/hald/hald-runner ]; then
-          install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner
-       fi
-       /usr/sbin/hald
-       if [ $? -gt 0 ]; then
-          stat_fail
-       else
-          add_daemon hald
-          stat_done
-       fi
-       ;;
-    stop)
-       stat_busy "Stopping Hardware Abstraction Layer"
-       [ -f /var/run/hald.pid ] && kill `cat /var/run/hald.pid` &> /dev/null
-       if [ $? -gt 0 ]; then
-          stat_fail
-       else
-          rm_daemon hald
-          stat_done
-       fi
-       ;;
-    restart)
-       $0 stop
-       sleep 1
-       $0 start
-       ;;
-    *)
-       echo "usage: $0 {start|stop|restart}"
-       ;;
-esac
-exit 0
diff --git a/arch/3.5.13/trinity-base/hal/udev-update.patch b/arch/3.5.13/trinity-base/hal/udev-update.patch
deleted file mode 100644
index a5be64bc6..000000000
--- a/arch/3.5.13/trinity-base/hal/udev-update.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur hal-0.5.14_origin/hald/linux/blockdev.c hal-0.5.14/hald/linux/blockdev.c
---- hal-0.5.14_origin/hald/linux/blockdev.c	2012-02-15 01:44:51.000000000 +0100
-+++ hal-0.5.14/hald/linux/blockdev.c	2012-02-15 01:45:12.000000000 +0100
-@@ -1864,7 +1864,7 @@
-         char *ret;
-         char *u_stdout;
-         int u_exit_status;
--        const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
-+        const char *argv[] = {"/usr/bin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
-         GError *g_error;
- 
-         ret = NULL;
-diff -ur hal-0.5.14_origin/hald/linux/coldplug.c hal-0.5.14/hald/linux/coldplug.c
---- hal-0.5.14_origin/hald/linux/coldplug.c	2012-02-15 01:44:51.000000000 +0100
-+++ hal-0.5.14/hald/linux/coldplug.c	2012-02-15 01:45:08.000000000 +0100
-@@ -154,8 +154,8 @@
- static gboolean
- hal_util_init_sysfs_to_udev_map (void)
- {
--	char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
--	char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
-+	char *udevdb_export_argv[] = { "/usr/bin/udevadm", "info", "-e", NULL };
-+	char *udevroot_argv[] = { "/usr/bin/udevadm", "info", "-r", NULL };
- 	int udevinfo_exitcode;
- 	UdevInfo *info = NULL;
- 	char *p;
diff --git a/arch/3.5.13/trinity-base/mkpkg b/arch/3.5.13/trinity-base/mkpkg
deleted file mode 100755
index d3403b927..000000000
--- a/arch/3.5.13/trinity-base/mkpkg
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-#
-pkgarray="qt3 tqtinterface arts dbus-tqt kdelibs kdebase"
-arch=`uname -m`
-
-for i in $pkgarray; do
-   cd trinity-${i}
-   makepkg -sicf --noconfirm
-   cd ..
-done
-
-#mkdir binaires-$arch
-
-mv `find . -name *.tar.xz` binaries-$arch
diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
deleted file mode 100644
index 991f16eac..000000000
--- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-arts
-pkgver=3513
-pkgrel=4
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.com'
-license=('GPL')
-groups=('trinity-base')
-pkgdesc="Trinity ARTS Sound System and libraries"
-depends=('trinity-tqtinterface'
-         'audiofile' 'libmad' 'libvorbis'
-         'glib2')
-makedepends=('pkgconfig' 'cmake')
-conflicts=('kdemod3-arts' 'arts')
-options=('libtool' '!emptydirs')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz')
-md5sums=('109124dabb1aaa9d44eb32e43b549142')
-install='trinity-arts.install'
-
-build() {
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   # Source the QT and KDE profile
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   cd $srcdir
-   msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
-   cd build
-
-   msg "Starting cmake..."
-   cmake ${srcdir}/dependencies/arts/ \
-      -DCMAKE_INSTALL_PREFIX=${TDEDIR}
-
-   msg "Building $pkgname..."
-   make
-
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-
-   cd ${srcdir}/build
-   make DESTDIR="$pkgdir" install
-
-}
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD
deleted file mode 100644
index e84cb5aa3..000000000
--- a/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> 
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-dbus-1-qt3
-pkgver=0.9
-pkgrel=9
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-license=('GPL')
-groups=('trinity-base')
-pkgdesc="Trinity D-Bus/Qt3 bindings."
-depends=('trinity-qt3')
-provides=('trinity-dbus-1-qt3' 'dbus-1-qt3')
-conflicts=('dbus-1-qt3')
-replaces=('dbus-1-qt3')
-options=('libtool' '!strip')
-source=(http://people.freedesktop.org/~krake/dbus-1-qt3/${pkgname#*trinity-}-${pkgver}.tar.gz)
-md5sums=('8ca3d13c372126aa9b0e16beb0a9d82d')
-
-build() {
-   cd $srcdir/${pkgname#*trinity-}-$pkgver
-   msg "Setting enviroment variables..."
-   . /etc/profile.d/qt3.sh
-   msg "Starting configure..."
-   ./configure --prefix=$QTDIR
-   msg "Building ${pkgname}..."
-   make || return 1
-
-   # Libtool slay
-   #     find $pkgdir -name *.la -exec rm {} \;
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd $srcdir/${pkgname#*trinity-}-$pkgver
-   make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
deleted file mode 100644
index 7b64c3544..000000000
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-dbus-tqt-1
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-base')
-pkgdesc="Trinity D-Bus TQtInterface Wrapper"
-depends=('trinity-tqtinterface' 'dbus')
-provides=('trinity-dbus-tqt-1' 'dbus-tqt-1' 'dbus-1-tqt' 'trinity-dbus-1-tqt')
-makedepends=('pkgconfig' 'cmake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz)
-md5sums=('a7ba1071f4bf7b5930f805b4036f8a97')
-
-build() {
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
-   #export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:/usr/include/dbus-1.0:${_prefix}/include:${_prefix}/include/libkrandr
-   #export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-   #export PKG_CONFIG_PATH=:${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-   cd $srcdir
-   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
-   mkdir -p build
-   cd build
-
-   msg "Starting cmake..."
-   cmake ${srcdir}/dependencies/dbus-1-tqt \
-      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DCMAKE_VERBOSE_MAKEFILE=ON 
-
-   msg "Building - $pkgname..."
-   make
-
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-#   cd ${srcdir}/${_svnmod}
-   cd ${srcdir}/build
-   make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
deleted file mode 100644
index 3d7f01520..000000000
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-dbus-tqt
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-base')
-pkgdesc="Trinity TQt DBus wrapper"
-depends=('trinity-arts' 'dbus-core')
-makedepends=('pkgconfig' 'cmake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
-md5sums=('46ae165c068271485c827f6fc6687a9a')
-install='trinity-dbus-tqt.install'
-
-build() {
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   # Source the QT and TDE profile
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
-   #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${TDEDIR}/include:${TDEDIR}/include/libkrandr
-   #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH
-   #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-   cd $srcdir
-   msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
-   cd build
-
-   msg "Starting cmake..."
-   cmake ${srcdir}/dependencies/dbus-tqt \
-      -DCMAKE_INSTALL_PREFIX=$TDEDIR 
-
-   msg "Building - $pkgname..."
-   make
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd ${srcdir}/build
-   make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD
deleted file mode 100644
index bab5805d7..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD
+++ /dev/null
@@ -1,216 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-konsole' 'trinity-kate' 'trinity-konqueror')
-pkgver=3513
-pkgrel=6
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-base')
-pkgdesc="Trinity Desktop Enviroment base components"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient' 
-             'libraw1394' 'libxtst' 'libxkbfile' 'hal')
-confilicts=('kdemod3-kdebase')
-options=('libtool')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 
-        'patches.tar.bz2'
-        'xsession.patch'
-        'arch-kdeshutdown.png'
-        'kdm-default-face.png'
-        'agent-shutdown.sh'
-        'agent-startup.sh'
-        'kdm-trinity' 
-        'trinity.desktop')
-md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
-         '327e4d68bd1fc4d29bdb273e81f90415'
-         '895f5d7351aa73ba1f57b0ad27081d69'
-         'bb3004513d703d6b72ce70aa240af3a3'
-         'e6afdd7ca60c4c59b851135785347e75'
-         '18e8d01124b19f7df2937c06e177bf7f'
-         'c963ef6e37c9051119972a58c67f05fb'
-         '376d85d213cf3c04cb0912e5cccd68bd'
-         '1418e45fea5a9738544cbd264c36373b')
-
-build() {
-   cd $srcdir/kdebase
-
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   # Source the QT and TDE profile
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
-   #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr
-   #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${QTDIR}/lib:$LD_LIBRARY_PATH
-   #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH
-
-   msg "Patching..."
-   for patch in $srcdir/patches/*.patch; do
-      _p=`basename $patch`
-      msg "Applying patch $_p.."
-      patch -Np0 -i $patch
-   done
-
-   #Compatibility with kde3 and kde4
-   #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt
-
-   msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p ../build
-   cd ../build
-
-   msg "Starting cmake..."
-   cmake ${srcdir}/kdebase \
-      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DSYSCONF_INSTALL_DIR=/etc \
-      -DWITH_XFIXES=ON \
-      -DWITH_XCOMPOSITE=ON \
-      -DWITH_XCURSOR=ON \
-      -DWITH_XRANDR=ON \
-      -DWITH_XRENDER=ON \
-      -DWITH_XDAMAGE=ON \
-      -DWITH_SHADOW=ON \
-      -DWITH_XDMCP=ON \
-      -DWITH_XINERAMA=ON \
-      -DWITH_XEXT=ON \
-      -DWITH_PAM=ON \
-      -DWITH_HAL=ON \
-      -DWITH_ARTS=ON \
-      -DWITH_SASL=ON \
-      -DWITH_OPENEXR=ON \
-      -DWITH_SAMBA=ON \
-      -DWITH_LIBUSB=ON \
-      -DWITH_LDAP=ON \
-      -DWITH_LIBRAW1394=ON \
-      -DWITH_I8K=ON \
-      -DBUILD_ALL=ON 
-   make
-
-}
-
-package_trinity-kdebase() {
-   pkgname='trinity-kdebase'
-   pkgdesc='Trinity Desktop Enviroment'
-   depends=('trinity-dbus-tqt' 'hal'
-            'libxtst' 'libraw1394')
-            #'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 
-   optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
-               'pciutils: PCI bus configuration space access library and tools'
-               'xscreensaver: Screen saver and locker for the X Window System'
-               'xorg-fonts-75dpi: X.org 75dpi fonts collection'
-               'samba: file sharing over SMB')
-   install='trinity-kdebase.install'
-
-   msg "Packaging - $pkgname-$pkgver"
-   _splitfolders="applnk drkonqi kappfinder kcheckpass kcminit kcontrol 
-                  kdcop kdebugdialog kdeeject kdepasswd kdeprint kdesktop 
-                  kdesu kdialog kfind khelpcenter khotkeys kicker kioslave 
-                  klipper kmenuedit knetattach kpager kpersonalizer kreadconfig 
-                  krootbacking kscreensaver ksmserver ksplashml kstart ksysguard 
-                  ksystraycmd ktip kwin l10n kxkb nsplugins pics tqt3integration 
-                  tsak doc/faq doc/glossary doc/kcontrol doc/kdcop 
-                  doc/kdebugdialog doc/kdeprint doc/kdesu doc/kfind
-                  doc/khelpcenter doc/kicker doc/kinfocenter doc/kioslave 
-                  doc/klipper doc/kmenuedit doc/knetattach doc/kompmgr doc/kpager 
-                  doc/ksplashml doc/ksysguard doc/kxkb doc/quickstart 
-                  doc/userguide doc/visualdict"
-   for _dir in $_splitfolders; do
-      cd ${srcdir}/build/$_dir
-      make DESTDIR="$pkgdir" install
-   done
-
-   # install X11 session file
-   install -d -m755 ${pkgdir}/etc/X11/sessions
-   install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop
-
-   # create the starttrinity link
-   # do we need this? wouldn't be better to rename startkde script
-   # to starttrinity? Well, whathever. 
-   ln -sf $TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity
-
-   # install mkpamserv script, so we can auto-generate pam.d configs in post_install()
-   install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
-
-   # dbus config file. I don't know if we need this, since directory listed
-   # in the config file doens't exist. Maybe this should be provided by dbus bindings?
-   # No, after riconsidering I'm not gonna provide it unless it's required.
-
-   # Install nice arch logo to use in the shutdown dialog
-   install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png
-
-   # add startup/shutdown agents for ssh and gpg-agent
-   install -m644 -D $srcdir/agent-startup.sh ${pkgdir}$TDEDIR/env/agent-startup.sh
-   install -m755 -D $srcdir/agent-shutdown.sh ${pkgdir}$TDEDIR/shutdown/agent-shutdown.sh
-
-   # fix kde icons for gnome by creating symlinks
-   mkdir -p ${pkgdir}$TDEDIR/share/icons/gnome/{128x128,64x64,32x32,16x16,48x48,22x22,scalable}
-   mkdir -p ${pkgdir}$TDEDIR/share/icons/crystalsvg/{128x128/apps,64x64/apps,32x32/apps,16x16/apps,48x48/apps,22x22/apps,scalable/apps}
-   cd ${pkgdir}$TDEDIR/share/icons/gnome/
-   for i in *; do
-      cd $i
-      ln -sf ../../crystalsvg/$i/apps/ apps
-      cd ..
-   done
-
-}
-
-package_trinity-kdm() {
-   pkgname='trinity-kdm'
-   pkgdesc="Trinity Display Manager"
-
-   msg "Packaging - $pkgname-$pkgver"
-   _splitfolders="kdm kdmlib doc/kdm"
-   for _dir in $_splitfolders; do
-      cd ${srcdir}/build/$_dir
-      make DESTDIR="$pkgdir" install
-   done
-
-   # update the Xsession file, this resolves problem with kdm dropping back
-   # to the login screen
-   patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/xsession.patch
-   
-   # install kdm rc.d script. We need this to start kdm from rc.d
-   install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity	
-
-   # Add image for default user avatar. This removes kdm complains about missing
-   # default avatar from kdm.log
-   install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon
-   install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png
-}
-
-package_trinity-konsole() {
-   pkgname='trinity-konsole'
-   pkgdesc="Trinity - an X termnal emulator"
-
-   msg "Packaging - $pkgname-$pkgver"
-   _splitfolders="konsole doc/konsole"
-   for _dir in $_splitfolders; do
-      cd ${srcdir}/build/$_dir
-      make DESTDIR="$pkgdir" install
-   done
-}
-
-package_trinity-kate() {
-   pkgnmae='trinity-kate'
-   pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface"
-
-   msg "Packaging - $pkgname-$pkgver"
-   _splitfolders="kate doc/kate doc/kwrite"
-   for _dir in $_splitfolders; do
-      cd ${srcdir}/build/$_dir
-      make DESTDIR="$pkgdir" install
-   done
-}
-
-package_trinity-konqueror() {
-   pkgname='trinity-kate'
-   pkgdesc="Trinity Swiss Army file and web browser."
-
-   msg "Packaging - $pkgname-$pkgver"
-   _splitfolders="konqueror libkonq doc/konqueror"
-   for _dir in $_splitfolders; do
-      cd ${srcdir}/build/$_dir
-      make DESTDIR="$pkgdir" install
-   done
-}
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png b/arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png
deleted file mode 100644
index 30bc5ab77..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png
+++ /dev/null
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz
deleted file mode 100644
index cdb38cc56..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz
+++ /dev/null
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png
deleted file mode 100644
index 233e69475..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png
+++ /dev/null
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity
deleted file mode 100644
index 03209b456..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /opt/trinity/bin/kdm`
-case "$1" in
-   start)
-      #Check for running kdm, start when not running
-      stat_busy "Starting TDM Desktop Manager"
-      [ -z "$PID" ] && /opt/trinity/bin/kdm &> /dev/null
-	   if [ $? -gt 0 ]; then
-         stat_fail
-      else
-         echo $PID > /var/run/kdm.pid
-         add_daemon kdm-trinity
-         stat_done
-      fi
-      ;;
-   stop)
-      stat_busy "Stopping TDM Desktop Manager"
-      [ ! -z "$PID" ] && kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-         stat_fail
-      else
-         rm_daemon kdm-trinity
-         stat_done
-      fi
-      ;;
-   restart)
-      $0 stop
-      sleep 1
-      $0 start
-      ;;
-   *)
-      echo "usage: $0 {start|stop|restart}"
-      ;;
-esac
-exit 0
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2
deleted file mode 100644
index 0a0b90c54..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2
+++ /dev/null
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz
deleted file mode 100644
index c1c6e79a0..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz
+++ /dev/null
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install
deleted file mode 100644
index 82f34a0b0..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-   ldconfig &> /dev/null
-   mkpamserv trinity
-   echo "Please remember that you can change your kdesu backend from su to sudo"
-   echo "by adding following lines to your ~/.trinity/share/kdesurc or to the"
-   echo "$TDEDIR/share/config/kdesurc:"
-   echo "[super-user-command]"
-   echo "super-user-command=sudo"
-}
-
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   ldconfig &> /dev/null
-   rm /etc/pam.d/trinity
-}
-
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop
deleted file mode 100644
index 30c209f5d..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=/opt/trinity/bin/startkde
-TryExec=/opt/trinity/bin/startkde
-Name=Trinity
-Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment
-
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch b/arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch
deleted file mode 100644
index 164d6c811..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- /mnt/archlinux/opt/trinity/share/config/kdm/Xsession	2011-12-08 13:08:43.000000000 +0100
-+++ /opt/kde3/share/config/kdm/Xsession	2011-09-24 14:52:28.000000000 +0200
-@@ -43,4 +43,24 @@
-     ;;
- esac
- # invoke global X session script
--. /etc/X11/Xsession
-+ 
-+ 
-+	case $session in
-+	  "")
-+	    exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
-+	    ;;
-+	  failsafe)
-+	    exec ck-launch-session xterm -geometry 80x24-0-0
-+	    ;;
-+	  custom)
-+	    exec ck-launch-session $HOME/.xsession
-+	    ;;
-+	  default)
-+	    exec ck-launch-session /opt/trinity/bin/startkde
-+	    ;;
-+	  *)
-+	    eval exec ck-launch-session "$session"
-+	    ;;
-+	esac
-+	exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
-+	
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
deleted file mode 100644
index 10fd8260f..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ /dev/null
@@ -1,151 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname='trinity-kdebase'
-pkgver=3513
-pkgrel=7
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-base')
-pkgdesc="Trinity Desktop Enviroment base components"
-depends=('trinity-kdelibs' 'trinity-dbus-tqt' 'hal'
-         'libxtst' 'libraw1394')
-         #'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 
-makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient' 
-             'libxkbfile')
-confilicts=('kdemod3-kdebase')
-options=('libtool')
-optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
-            'pciutils: PCI bus configuration space access library and tools'
-            'xscreensaver: Screen saver and locker for the X Window System'
-            'xorg-fonts-75dpi: X.org 75dpi fonts collection'
-            'samba: file sharing over SMB')
-install='trinity-kdebase.install'
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 
-        'patches.tar.bz2'
-        'xsession.patch'
-        'arch-kdeshutdown.png'
-        'kdm-default-face.png'
-        'agent-shutdown.sh'
-        'agent-startup.sh'
-        'kdm-trinity' 
-        'trinity.desktop')
-md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
-         '327e4d68bd1fc4d29bdb273e81f90415'
-         '895f5d7351aa73ba1f57b0ad27081d69'
-         'bb3004513d703d6b72ce70aa240af3a3'
-         'e6afdd7ca60c4c59b851135785347e75'
-         '18e8d01124b19f7df2937c06e177bf7f'
-         'c963ef6e37c9051119972a58c67f05fb'
-         '376d85d213cf3c04cb0912e5cccd68bd'
-         '1418e45fea5a9738544cbd264c36373b')
-
-build() {
-   cd $srcdir/kdebase
-
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   # Source the QT and TDE profile
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
-   #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr
-   #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${QTDIR}/lib:$LD_LIBRARY_PATH
-   #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH
-
-   msg "Patching..."
-   for patch in $srcdir/patches/*.patch; do
-      _p=`basename $patch`
-      msg "Applying patch $_p.."
-      patch -Np0 -i $patch
-   done
-
-   #Compatibility with kde3 and kde4
-   #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt
-
-   msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p ../build
-   cd ../build
-
-   msg "Starting cmake..."
-   cmake ${srcdir}/kdebase \
-      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DSYSCONF_INSTALL_DIR=/etc \
-      -DWITH_XFIXES=ON \
-      -DWITH_XCOMPOSITE=ON \
-      -DWITH_XCURSOR=ON \
-      -DWITH_XRANDR=ON \
-      -DWITH_XRENDER=ON \
-      -DWITH_XDAMAGE=ON \
-      -DWITH_SHADOW=ON \
-      -DWITH_XDMCP=ON \
-      -DWITH_XINERAMA=ON \
-      -DWITH_XEXT=ON \
-      -DWITH_PAM=ON \
-      -DWITH_HAL=ON \
-      -DWITH_ARTS=ON \
-      -DWITH_SASL=ON \
-      -DWITH_OPENEXR=ON \
-      -DWITH_SAMBA=ON \
-      -DWITH_LIBUSB=ON \
-      -DWITH_LDAP=ON \
-      -DWITH_LIBRAW1394=ON \
-      -DWITH_I8K=ON \
-      -DBUILD_ALL=ON 
-   make
-
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd $srcdir/build
-   make DESTDIR="$pkgdir" install
-
-   # install X11 session file
-   install -d -m755 ${pkgdir}/etc/X11/sessions
-   install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop
-   
-   # update the Xsession file, this resolves problem with kdm dropping back
-   # to the login screen
-   patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/xsession.patch
-   
-   # install kdm rc.d script. We need this to start kdm from rc.d
-   install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity	
-
-   # Add image for default user avatar. This removes kdm complains about missing
-   # default avatar from kdm.log
-   install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon
-   install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png
-
-   # create the starttrinity link
-   # do we need this? wouldn't be better to rename startkde script
-   # to starttrinity? Well, whathever. 
-   ln -sf $TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity
-
-   # install mkpamserv script, so we can auto-generate pam.d configs in post_install()
-   install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
-
-   # dbus config file. I don't know if we need this, since directory listed
-   # in the config file doens't exist. Maybe this should be provided by dbus bindings?
-   # No, after riconsidering I'm not gonna provide it unless it's required.
-
-   # Install nice arch logo to use in the shutdown dialog
-   install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png
-
-   # add startup/shutdown agents for ssh and gpg-agent
-   install -m644 -D $srcdir/agent-startup.sh ${pkgdir}$TDEDIR/env/agent-startup.sh
-   install -m755 -D $srcdir/agent-shutdown.sh ${pkgdir}$TDEDIR/shutdown/agent-shutdown.sh
-
-   # fix kde icons for gnome by creating symlinks
-   mkdir -p ${pkgdir}$TDEDIR/share/icons/gnome/{128x128,64x64,32x32,16x16,48x48,22x22,scalable}
-   mkdir -p ${pkgdir}$TDEDIR/share/icons/crystalsvg/{128x128/apps,64x64/apps,32x32/apps,16x16/apps,48x48/apps,22x22/apps,scalable/apps}
-   cd ${pkgdir}$TDEDIR/share/icons/gnome/
-   for i in *; do
-      cd $i
-      ln -sf ../../crystalsvg/$i/apps/ apps
-      cd ..
-   done
-
-
-}
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/agent-shutdown.sh b/arch/3.5.13/trinity-base/trinity-kdebase/agent-shutdown.sh
deleted file mode 100644
index 71b056af3..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/agent-shutdown.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# This file is executed at kde shutdown.
-# Uncomment the following lines to kill the agents
-# that were started at session startup.
-
-if [ "${GPG_AGENT_INFO}" ]; then
-  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
-fi
-#
-if [ "${SSH_AGENT_PID}" ]; then
-  ssh-agent -k
-fi
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/agent-startup.sh b/arch/3.5.13/trinity-base/trinity-kdebase/agent-startup.sh
deleted file mode 100644
index 88d1373a1..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/agent-startup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# Agents startup file
-#
-# This file is sourced at kde startup, so that
-# the environment variables set here are available
-# throughout the session.
-
-# Uncomment the following lines to start gpg-agent
-# and/or ssh-agent at kde startup.
-# If you do so, do not forget to uncomment the respective
-# lines in KDEDIR/shutdown/agent-shutdown.sh to
-# properly kill the agents when the session ends.
-
-if [ -x /usr/bin/gpg-agent ]; then
-  eval "$(/usr/bin/gpg-agent --daemon)"
-fi 
-#
-if [ -x /usr/bin/ssh-agent ]; then
-  eval "$(/usr/bin/ssh-agent -s)"
-fi
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/arch-kdeshutdown.png b/arch/3.5.13/trinity-base/trinity-kdebase/arch-kdeshutdown.png
deleted file mode 100644
index 30bc5ab77..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/arch-kdeshutdown.png
+++ /dev/null
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-default-face.png b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-default-face.png
deleted file mode 100644
index 233e69475..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-default-face.png
+++ /dev/null
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity
deleted file mode 100644
index 03209b456..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /opt/trinity/bin/kdm`
-case "$1" in
-   start)
-      #Check for running kdm, start when not running
-      stat_busy "Starting TDM Desktop Manager"
-      [ -z "$PID" ] && /opt/trinity/bin/kdm &> /dev/null
-	   if [ $? -gt 0 ]; then
-         stat_fail
-      else
-         echo $PID > /var/run/kdm.pid
-         add_daemon kdm-trinity
-         stat_done
-      fi
-      ;;
-   stop)
-      stat_busy "Stopping TDM Desktop Manager"
-      [ ! -z "$PID" ] && kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-         stat_fail
-      else
-         rm_daemon kdm-trinity
-         stat_done
-      fi
-      ;;
-   restart)
-      $0 stop
-      sleep 1
-      $0 start
-      ;;
-   *)
-      echo "usage: $0 {start|stop|restart}"
-      ;;
-esac
-exit 0
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2
deleted file mode 100644
index 0a0b90c54..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2
+++ /dev/null
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install b/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install
deleted file mode 100644
index 82f34a0b0..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-   ldconfig &> /dev/null
-   mkpamserv trinity
-   echo "Please remember that you can change your kdesu backend from su to sudo"
-   echo "by adding following lines to your ~/.trinity/share/kdesurc or to the"
-   echo "$TDEDIR/share/config/kdesurc:"
-   echo "[super-user-command]"
-   echo "super-user-command=sudo"
-}
-
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   ldconfig &> /dev/null
-   rm /etc/pam.d/trinity
-}
-
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/trinity.desktop b/arch/3.5.13/trinity-base/trinity-kdebase/trinity.desktop
deleted file mode 100644
index 30c209f5d..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/trinity.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=/opt/trinity/bin/startkde
-TryExec=/opt/trinity/bin/startkde
-Name=Trinity
-Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment
-
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch b/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch
deleted file mode 100644
index 164d6c811..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- /mnt/archlinux/opt/trinity/share/config/kdm/Xsession	2011-12-08 13:08:43.000000000 +0100
-+++ /opt/kde3/share/config/kdm/Xsession	2011-09-24 14:52:28.000000000 +0200
-@@ -43,4 +43,24 @@
-     ;;
- esac
- # invoke global X session script
--. /etc/X11/Xsession
-+ 
-+ 
-+	case $session in
-+	  "")
-+	    exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
-+	    ;;
-+	  failsafe)
-+	    exec ck-launch-session xterm -geometry 80x24-0-0
-+	    ;;
-+	  custom)
-+	    exec ck-launch-session $HOME/.xsession
-+	    ;;
-+	  default)
-+	    exec ck-launch-session /opt/trinity/bin/startkde
-+	    ;;
-+	  *)
-+	    eval exec ck-launch-session "$session"
-+	    ;;
-+	esac
-+	exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
-+	
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
deleted file mode 100644
index be5a03bfc..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdelibs
-pkgver=3513
-pkgrel=6
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-base')
-pkgdesc="Trinity DE core libraries"
-depends=('trinity-arts' 'xorg-iceauth'
-         'libxslt' 'libidn' 'libart-lgpl' 'jasper' 
-         'libxcomposite' 'libcups' 'libutempter'
-         'openexr' 'aspell' 'hspell') 
-         # taglib openssl libtiff avahi libltdl pam-krb5 libical
-         # libutempter - needs to be installed from aur
-makedepends=('pkgconfig' 'cmake')
-provides=('kdelibs3')
-conflicts=('kdemod3-kdelibs' 'kdelibs3')
-replaces=('trinity-kdelibs')
-options=('libtool' '!makeflags')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz' 'docpath.patch')
-md5sums=('f62eefb63b4ba2141b4c576f859806dd'
-         'd20badec5a1a7f01f0c957db8b9b8def')
-
-install='trinity-kdelibs.install'
-
-build() {
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   # Source the QT and TDE profile
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   # compiles without exporting this, since we have profiles
-   #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
-   #export PATH=$PATH:${TDEDIR}/bin
-   #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0
-   #export LD_LIBRARY_PATH=${TDEDIR}/lib:${QTDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH
-
-   msg "Patching..."
-   patch -N -d ${srcdir} -p0 < ${srcdir}/docpath.patch
-
-   cd $srcdir
-   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
-   mkdir -p build
-   cd build
-
-   msg "Starting cmake..."
-   cmake ${srcdir}/kdelibs \
-    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-    -DCMAKE_VERBOSE_MAKEFILE=OFF \
-    -DWITH_ARTS=ON \
-    -DWITH_ALSA=ON \
-    -DWITH_LIBART=ON \
-    -DWITH_LIBIDN=ON \
-    -DWITH_SSL=ON \
-    -DWITH_CUPS=ON \
-    -DWITH_LUA=OFF \
-    -DWITH_TIFF=ON \
-    -DWITH_JASPER=ON \
-    -DWITH_OPENEXR=ON \
-    -DWITH_UTEMPTER=ON \
-    -DWITH_AVAHI=ON \
-    -DWITH_ASPELL=ON \
-    -DWITH_HSPELL=ON
-
-   msg "Building - $pkgname..."
-   make
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd ${srcdir}/build
-
-   make DESTDIR="$pkgdir" install
-}
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch b/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch
deleted file mode 100644
index aeb5e95f1..000000000
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -r -u kdelibs/admin/debianrules src/kdelibs/admin/debianrules
---- kdelibs/admin/debianrules	2011-08-21 06:15:36.000000000 +0200
-+++ src/kdelibs/admin/debianrules	2012-01-04 15:28:20.000000000 +0100
-@@ -16,7 +16,7 @@
- 
- $kde_cgidir	=	"$kde_prefix/lib/cgi-bin";
- $kde_confdir	=	"$sysconfdir/trinity";
--$kde_htmldir	=	"$kde_prefix/share/doc/kde/HTML";
-+$kde_htmldir	=	"$kde_prefix/share/doc/HTML";
- 
- if (defined $ENV{DEB_BUILD_OPTIONS} &&
-     $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) {
-diff -r -u kdelibs/cmake/modules/TDESetupPaths.cmake src/kdelibs/cmake/modules/TDESetupPaths.cmake
---- kdelibs/cmake/modules/TDESetupPaths.cmake	2011-08-21 06:15:37.000000000 +0200
-+++ src/kdelibs/cmake/modules/TDESetupPaths.cmake	2012-01-04 15:28:49.000000000 +0100
-@@ -41,7 +41,7 @@
-   _tde_internal_setup_path( PLUGIN_INSTALL_DIR        "${LIB_INSTALL_DIR}/trinity"                     "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" )
-   _tde_internal_setup_path( CONFIG_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/config"              "The config file install dir" )
-   _tde_internal_setup_path( DATA_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/apps"                "The parent directory where applications can install their data" )
--  _tde_internal_setup_path( HTML_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/doc/kde/HTML"        "The HTML install dir for documentation" )
-+  _tde_internal_setup_path( HTML_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/doc/HTML"        "The HTML install dir for documentation" )
-   _tde_internal_setup_path( ICON_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/icons"               "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" )
-   _tde_internal_setup_path( KCFG_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/config.kcfg"         "The install dir for kconfig files" )
-   _tde_internal_setup_path( LOCALE_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/locale"              "The install dir for translations" )
-diff -r -u kdelibs/kdecore/kstandarddirs.cpp src/kdelibs/kdecore/kstandarddirs.cpp
---- kdelibs/kdecore/kstandarddirs.cpp	2011-08-21 06:15:32.000000000 +0200
-+++ src/kdelibs/kdecore/kstandarddirs.cpp	2012-01-04 15:30:24.000000000 +0100
-@@ -1030,7 +1030,7 @@
-     if (!strcmp(type, "html-bundle"))
- 	return "share/doc-bundle/HTML/";
-     if (!strcmp(type, "html"))
--	return "share/doc/kde/HTML/";
-+	return "share/doc/HTML/";
-     if (!strcmp(type, "icon"))
- 	return "share/icons/";
-     if (!strcmp(type, "config"))
diff --git a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
deleted file mode 100644
index 3dbcc58ef..000000000
--- a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-pyqt3
-pkgver=3.18.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/pyqt/intro"
-license=('GPL')
-groups=('trinity-base')
-pkgdesc="Trinity set of Python bindings for the Qt3 toolkit"
-depends=('python2-sip' 'qscintilla-qt3' 'trinity-qt3')
-#makedepends=()
-#optdepends=()
-provides=('trinity-pyqt3' 'pyqt3')
-conflicts=('pyqt3')
-replaces=('trinity-pyqt3')
-#options=()
-source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
-
-build() {
-   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   msg "Starting configure..."
-
-   export QMAKESPEC="/opt/qt/mkspecs/default"
-
-   echo yes | python2.7 configure.py -q ${QTDIR}
-
-   msg "Building ${pkgname}..."
-   make
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-   make DESTDIR=${pkgdir} install
-}
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
deleted file mode 100644
index 3d98aa5ee..000000000
--- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
+++ /dev/null
@@ -1,192 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <MutantTurkey@gmail.com>
-
-pkgname=trinity-qt3
-pkgver=3.8.8.d
-pkgrel=5
-pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
-arch=('i686' 'x86_64')
-url="http://trinitydesktop.org"
-license=('GPL')
-groups=('trinity-base')
-depends=('libpng' 'libjpeg' 'libxmu' 'libmng' 'postgresql-libs'
-         'libxcursor' 'libxinerama' 'mesa' 'libxft' 'libxrandr'
-         'libmysqlclient')
-makedepends=('libxi' 'postgresql' 'unixodbc' 'libcups')
-             #'mysql' 'postgresql' 'sqlite3' 'unixodbc' 'libxi' 'cups')
-             # cups - add for cups support
-             # cups is enabled by default in ./configure
-             # remove -no-cups if you want cups support in qt3
-optdepends=('cups: The CUPS Printing System - for printing support'
-            'postgresql: A sophisticated object-relational DBMS - databse support'
-            'unixodbc: ODBC API for linux - databse support'
-            'mysql: A fast SQL database server - databse support')
-             #'libmysqlclient' 'postgresql-libs' 'unixodbc' 'cups')
-provides=('qt3' 'qt3-enhanced')
-replaces=('qt3-enhanced' 'qt3')
-options=('libtool' '!emptydirs')
-install='qt3.install'
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz' 
-        'qt-patches.tar.bz2')
-md5sums=('78dc675e84aed595375449818cbb589a'
-         '71d5f647da82d2a6f5e0e13549f1e865')
-
-_prefix="/opt/qt3"
-
-build() {
-   cd $srcdir/qt3
-
-   msg "Patching source code..."
-   # apply qt patches from debian/gentoo and kde
-   for patch in $srcdir/qt-patches/*.patch; do
-      _p=`basename $patch`
-      msg "Applying patch $_p.."
-      patch -Np0 -i $patch
-   done
-   unset _p patch
-
-   # Originally this was done in a patch but probably it's a bad idea
-   # Besides we need the rpath, since we don't install qt in the default
-   # system dirs. If we would install into default /usr hierarchy
-   # we would uncomment this. See Beyond Linux From Scratch book
-   # for more info.
-   # sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf
-
-   # These are probably arch-specific. They were present in old qt3 
-   # PKGBULD, they were present in kdemod3 PKGBUILD, they are present
-   # here.
-   sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
-   sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
-   sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
-   sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
-   sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
-
-   # auto license acceptance
-   sed -i "s|read acceptance|acceptance=yes|" configure
-
-   msg "Setting enviroment variables..."
-   export QTDIR="${srcdir}/qt3/" 
-   export PATH=${QTDIR}/bin:${PATH}
-   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
-   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-
-   if [ "$CARCH" = "x86_64" ]; then
-      export ARCH="-64"
-   else unset ARCH
-   fi
-   
-   # Remove useless to us mkspecs
-   rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
-
-   msg "Starting configure..."
-   ./configure \
-      -prefix ${_prefix} \
-      -sysconfdir /etc/qt \
-      -I/usr/include/mysql \
-      -I/usr/include/postgresql/server \
-      -lpq \
-      -lmysqlclient \
-      -L/usr/lib/mysql \
-      -qt-gif \
-      -system-zlib \
-      -system-libpng \
-      -system-libjpeg \
-      -system-libmng \
-      -plugin-imgfmt-png \
-      -plugin-imgfmt-jpeg \
-      -plugin-imgfmt-mng \
-      -plugin-sql-mysql \
-      -plugin-sql-psql \
-      -plugin-sql-sqlite \
-      -plugin-sql-odbc \
-      -platform linux-g++${ARCH} \
-      -no-exceptions \
-      -thread \
-      -dlopen-opengl \
-      -no-ipv6
-
-   # 64bit fixes pulled from extras/qt3 PKGBUILD
-   # this is Arch-specific
-   # fix /opt/qt/lib path
-   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/src/Makefile
-   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/tools/designer/designer/Makefile
-   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/tools/designer/editor/Makefile
-   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/tools/assistant/lib/Makefile
-   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/tools/designer/uilib/Makefile
-
-   msg "Building - $pkgname..."
-
-   # build sql plugins
-   # do we need this, I don't think so.
-   #cd "${srcdir}"/qt3
-   #make -C qmake
-   #cd "${srcdir}"/qt3/plugins/src/sqldrivers/mysql
-   #"${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-   #cd "${srcdir}"/qt3/plugins/src/sqldrivers/psql
-   #"${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
-
-   cd "${srcdir}"/qt3
-
-   # build rest, but without tutorials and examples
-   # of you want them, remove sub-tools
-   make sub-tools
-
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd "$srcdir/qt3"
-
-   make INSTALL_ROOT="$pkgdir" install
-
-   # install qmake
-   install -D -m755 qmake/qmake "${pkgdir}"$_prefix/bin/qmake
-
-   # install doc pages which are missed by make install
-   install -d -m755 "${pkgdir}"$_prefix/doc/
-   cp -r "${srcdir}"/qt3/doc "${pkgdir}"$_prefix/doc
-
-   # install link the apps provided by qt3 so we don't collide with
-   # qt4 and can run them.
-   ln -sf $_prefix/bin/assistant "${pkgdir}"$_prefix/bin/qt3assistant
-   ln -sf $_prefix/bin/designer "${pkgdir}"$_prefix/bin/qt3designer
-   ln -sf $_prefix/bin/linguist "${pkgdir}"$_prefix/bin/qt3linguist
-   ln -sf $_prefix/bin/lrelease "${pkgdir}"$_prefix/bin/qt3lrelease
-   ln -sf $_prefix/bin/lupdate "${pkgdir}"$_prefix/bin/qt3lupdate
-   ln -sf $_prefix/bin/moc "${pkgdir}"$_prefix/bin/qt3moc
-   ln -sf $_prefix/bin/qmake "${pkgdir}"$_prefix/bin/qt3qmake
-   ln -sf $_prefix/bin/qtconfig "${pkgdir}"$_prefix/bin/qt3config
-
-   # Build ld.so.conf file
-   install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
-   echo "${_prefix}/lib" >> ${pkgdir}/etc/ld.so.conf.d/qt3.conf
-
-   # Build and install qt.profile
-   install -d -m755 ${pkgdir}/etc/profile.d/
-   echo "export QTDIR=${_prefix}" > ${pkgdir}/etc/profile.d/qt3.sh
-   echo "export QT_XFT=true" >> ${pkgdir}/etc/profile.d/qt3.sh
-   echo "export PATH+=:${_prefix}/bin" >> ${pkgdir}/etc/profile.d/qt3.sh
-   echo "export PKG_CONFIG_PATH+=:${_prefix}/pkgconfig" >> ${pkgdir}/etc/profile.d/qt3.sh
-
-   msg "Cleaning package..."
-
-   #rm -rf "${pkgdir}"$_prefix/{phrasebooks,templates,translations}
-   
-   # remove any link to the compiled libraries present in
-   # $srcdir, which won't be present in non-building system.
-   sed -i "s|-L${srcdir}/qt3/lib ||g" "${pkgdir}"$_prefix/lib/*.prl
-
-   #rm -f "${pkgdir}"${_prefix}/mkspecs/linux-g++$ARCH/linux-g++$ARCH
-
-   # Fix issues with GCC4
-   sed -i 's/\(char\*\)/const char*/g' $pkgdir$_prefix/include/*.h
-   # Fix the mess we did fixing issues with GCC4
-   sed -i 's/const u char/const uchar/g' $pkgdir$_prefix/include/*.h
-   sed -i 's/u const char/const uchar/g' $pkgdir$_prefix/include/*.h
-   sed -i 's/const const/const/g' $pkgdir$_prefix/include/*.h
-   sed -i 's/uconst/ unsigned /g' $pkgdir$_prefix/include/*.h
-
-   # missing include "qglobal.h" in include/qtimer.h fix
-   sed -ie 's/define QTIMER_H/&\n#include "qglobal.h"/g' $pkgdir$_prefix/include/qtimer.h
-
-} 
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2
deleted file mode 100644
index cb53bd9df..000000000
--- a/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2
+++ /dev/null
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt3.install b/arch/3.5.13/trinity-base/trinity-qt3/qt3.install
deleted file mode 100644
index b059a2caa..000000000
--- a/arch/3.5.13/trinity-base/trinity-qt3/qt3.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-   ldconfig &> /dev/null
-   echo "Note that the tools provided by this package (assistant, designer,"
-   echo "linguist, lrelease, lupdate, moc, qmake and qtconfig) have been"
-   echo "renamet to qt3<toolname> to ensure compatibility with Qt4 and should"
-   echo "be run through new command scheme."
-   echo ""
-   echo "In order to update PATH to include Qt3 binaries location, You should"
-   echo "reboot your system. Before you do that you can access Qt3 bin path by"
-   echo "sourcing /etc/profile.d/qt3.sh"
-}
-
-post_upgrade() {
-   ldconfig &> /dev/null
-}
-
-post_remove() {
-   ldconfig &> /dev/null
-}
-
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
deleted file mode 100644
index a1f14f9a3..000000000
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-tqtinterface
-pkgver=3513
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://trinity.pearsoncomputing.net"
-license=('GPL2')
-groups=('trinity-base')
-pkgdesc="Trinity - TQt interface"
-depends=('trinity-qt3')
-makedepends=('pkgconfig' 'cmake')
-conflicts=('kdemod3-tqtinterface')
-makeopts=('libtool' '!emptydirs')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz'
-        'tqtpc-location.patch' 'trinity.profile.sh' 'trinity.profile.csh')
-md5sums=('d54cc9fd0b35555298efd17c32471a2b'
-         'c15745c944d98cb7c4cb553f0ca421d4'
-         '72c6c4fb492c1f4b4741fad1dd70d62f'
-         '915e14c6264a6b9c46a6a20b16cdcd06')
-install='trinity-tqtinterface.install'
-
-build() {
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   # Source the QT and KDE profile
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
-
-   cd $srcdir
-   msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
-   cd build
-
-   msg "Starting cmake..."
-   cmake "../dependencies/tqtinterface" \
-     -DCMAKE_INSTALL_PREFIX=/opt/trinity \
-     -DQT_PREFIX_DIR=${QTDIR} \
-     -DQT_INCLUDE_DIR=${QTDIR}/include \
-     -DMOC_EXECUTABLE=${QTDIR}/bin/moc \
-     -DQT_VERSION=3
-#     -DQT_INCLUDE_DIR=${QTDIR}/include/tqt/Qt
-#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
-#     -DCMAKE_SKIP_RPATH=ON || return 1
-
-   make
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd ${srcdir}/build
-   make DESTDIR="${pkgdir}" install
-
-   # include uic-tqt in package
-   #cd ${srcdir}
-   #mkdir -p ${pkgdir}/usr/bin
-   #cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
-
-   # it should contain sripts which would add
-   # their location into system variables
-   # this mean that this package should provide
-   # /etc/ld.so.conf.d/trinity.conf - lib locations for linker
-   # /etc/profile.d/trinity.sh - $PATH and other system variables for bash
-   # /etc/profile.d/trinity.csh - $PATH and other system variables for csh
-   # up until now it was done in the kdelibs PKGBUILD/package
-
-   # Create and install ld.so.conf.d file
-   install -d -m755 $pkgdir/etc/ld.so.conf.d/
-   echo /opt/trinity/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
-   echo /opt/trinity/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
-
-   # Install profiles
-   install -D -m755 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh
-   install -D -m755 $srcdir/trinity.profile.csh $pkgdir/etc/profile.d/trinity.csh
-
-}
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/tqtpc-location.patch b/arch/3.5.13/trinity-base/trinity-tqtinterface/tqtpc-location.patch
deleted file mode 100644
index f256e925c..000000000
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/tqtpc-location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dependencies/tqtinterface/CMakeLists.txt	2011-03-28 00:12:24.000000000 +0200
-+++ dependencies/tqtinterface/CMakeLists.txt.new	2012-01-29 12:15:16.000000000 +0100
-@@ -35,7 +35,7 @@
- tde_setup_install_path( BIN_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/bin"  )
- tde_setup_install_path( LIB_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
- tde_setup_install_path( INCLUDE_INSTALL_DIR   "${CMAKE_INSTALL_PREFIX}/include/tqt" )
--tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" )
-+tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" )
- 
- 
- ##### tqtinterface sources ######################
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh
deleted file mode 100644
index 7fc995130..000000000
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh
+++ /dev/null
@@ -1,21 +0,0 @@
-setenv TDEDIR /opt/trinity
-setenv TDEDIRS /usr:$TDEDIR
-setenv PATH $PATH:$TDEDIR/bin
-
-if ( ! $?PKG_CONFIG_PATH ) then
- setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig
-else
- setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH
-endif
-
-if ( ! $?XDG_DATA_DIRS ) then
-  setenv XDG_DATA_DIRS $TDEDIR/share
-else
-  setenv XDG_DATA_DIRS $TDEDIR/share:$XDG_DATA_DIRS
-endif
-
-if ( ! $?XDG_CONFIG_DIRS ) then
-  setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg
-else
-  setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg:$XDG_CONFIG_DIRS
-endif
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh
deleted file mode 100644
index 70e503534..000000000
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-export TDEDIR=/opt/trinity 
-export TDEDIRS=$TDEDIR
-export PATH=$PATH:$TDEDIR/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TDEDIR/lib/pkgconfig
-if [ ! -z $XDG_DATA_DIRS ]; then 
-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share 
-else 
-  export XDG_DATA_DIRS=$TDEDIR/share 
-fi 
-if [ ! -z $XDG_CONFIG_DIRS ]; then 
-  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$TDEDIR/etc/xdg 
-else 
-  export XDG_CONFIG_DIRS=$TDEDIR/etc/xdg 
-fi
\ No newline at end of file
diff --git a/arch/3.5.13/trinity-extras/mkpkg b/arch/3.5.13/trinity-extras/mkpkg
deleted file mode 100755
index 5b3fe3c10..000000000
--- a/arch/3.5.13/trinity-extras/mkpkg
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-pkgarray="kdeaccessibility kdeaddons kdeadmin kdeartwork kdeedu 
-          kdegames kdegraphics kdemultimedia kdenetwork kdepim 
-          kdesdk kdetoys kdeutils kdevelop kdewebdev libcaldav 
-          libcarddav libkdcraw libkexiv2 libkipi i18n"
-arch=`uname -m`
-
-for i in $pkgarray; do
-   cd trinity-${i}
-   makepkg -s -c -i --noconfirm
-   cd ..
-done
-
-[ -d binaries-$arch ] || mkdir binaires-$arch
-
-mv `find . -name *.tar.xz` binaries-$arch/
-
diff --git a/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD
deleted file mode 100644
index 01f86aefa..000000000
--- a/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD
+++ /dev/null
@@ -1,591 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=('trinity-i18n-af' 'trinity-i18n-ar' 'trinity-i18n-az' 
-         'trinity-i18n-be' 'trinity-i18n-bg' 'trinity-i18n-bn' 
-         'trinity-i18n-br' 'trinity-i18n-bs' 
-         'trinity-i18n-csb' 'trinity-i18n-cy' 
-         'trinity-i18n-ca' 'trinity-i18n-cs' 'trinity-i18n-da'         
-         'trinity-i18n-de' 'trinity-i18n-el' 
-         'trinity-i18n-en_gb' 'trinity-i18n-eo' 'trinity-i18n-es' 
-         'trinity-i18n-et' 'trinity-i18n-eu' 'trinity-i18n-fa' 
-         'trinity-i18n-fi' 'trinity-i18n-fr' 'trinity-i18n-fy' 
-         'trinity-i18n-ga' 'trinity-i18n-gl' 'trinity-i18n-he' 
-         'trinity-i18n-hi' 'trinity-i18n-hr' 'trinity-i18n-hu' 
-         'trinity-i18n-is' 'trinity-i18n-it' 'trinity-i18n-ja' 
-         'trinity-i18n-kk' 'trinity-i18n-km' 'trinity-i18n-ko' 
-         'trinity-i18n-lt' 'trinity-i18n-lv' 'trinity-i18n-mk' 
-         'trinity-i18n-mn' 'trinity-i18n-ms' 'trinity-i18n-nb' 
-         'trinity-i18n-nds' 'trinity-i18n-nl' 'trinity-i18n-nn' 
-         'trinity-i18n-pa' 'trinity-i18n-pl' 'trinity-i18n-pt' 
-         'trinity-i18n-pt_br' 'trinity-i18n-ro' 'trinity-i18n-ru' 
-         'trinity-i18n-rw' 'trinity-i18n-se' 'trinity-i18n-sk' 
-         'trinity-i18n-sl' 'trinity-i18n-sr' 'trinity-i18n-sr-latn' 
-         'trinity-i18n-ss' 'trinity-i18n-sv' 'trinity-i18n-ta' 
-         'trinity-i18n-te' 'trinity-i18n-tg' 'trinity-i18n-th' 
-         'trinity-i18n-tr' 'trinity-i18n-uk' 'trinity-i18n-uz' 
-         'trinity-i18n-uz-cyrillic' 'trinity-i18n-vi' 'trinity-i18n-wa' '
-         trinity-i18n-zh_cn' 'trinity-i18n-zh_tw')
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-i18n')
-pkgdesc="Trinity Localizations collection"
-depends=('trinity-kdelibs' 'trinity-kdebase')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kde-i18n-3.5.13.tar.gz)
-md5sums=('7c919c7cb85f454fed46767082a87773')
-
-build() {
-   msg "Setting Trinity Environment variables"
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   cd $srcdir/kde-i18n
-   rm HOW.TO.BUILD TRINITY.RELEASE
-
-   for _filename in *.tar.bz2; do
-      _dir=`echo "$_filename" | cut -d'.' -f1-3`
-      _newname=`echo "$_dir" | cut -d'-' -f2-4`
-
-      if [ ! -d trinity-${newname} ]; then
-         msg "Extracting $_filename..."
-         tar xfj $_filename
-         mv $_dir trinity-${_newname}
-      fi
-
-      cd trinity-${_newname}
-
-      msg "Starting trinity-${_newname} configure..."
-      ./configure --prefix=${TDEDIR} > /dev/null
-
-      msg "Building trinity-${_newname}..."
-      make > /dev/null
-
-      cd ..
-   done
-}
-
-package_trinity-i18n-af() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Afrikaans localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-ar() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Arabic localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-az() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Azerbaijani localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-be() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Belgian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-bg() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Bulgarian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-bn() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Brumei localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-br() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Breton localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-bs() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Bosnian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-ca() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Catalan localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-cs() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Czech localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-csb() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Kashubian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-cy() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Cyprus localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-da() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Danish localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-de() {
-groups=('trinity-i18n')
-pkgdesc="Trinity German localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-el() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Greek localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-en_gb() {
-groups=('trinity-i18n')
-pkgdesc="Trinity British English localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/trinity-i18n-en_GB-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-eo() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Esperanto localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-es() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Spanish localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-et() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Estonian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-eu() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Basque localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-fa() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Farsi localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-fi() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Finnish localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-fr() {
-groups=('trinity-i18n')
-pkgdesc="Trinity French localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-
-package_trinity-i18n-fy() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Frisian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-ga() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Irish Galeic localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-gl() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Galician localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-he() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Hebrew localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-hi() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Hindi localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-hr() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Croatian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-hu() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Hungarian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-is() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Icelandic localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-it() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Italian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-ja() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Japanese localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-kk() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Kazakh localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-km() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Khmer localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-ko() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Korean localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-lt() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Lithuanian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-lv() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Latvian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-mk() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Macedonian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-mn() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Mongolian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-ms() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Malay localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-nb() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Norvegian Bokmal localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-nds() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Low Saxon localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-nl() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Dutch localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-nn() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Norvegian Nynorsk localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-pa() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Panjabi/Punjabi localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-pl() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Polish localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-pt() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Portoghese localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-pt_br() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Brazilian Porthogese localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/trinity-i18n-pt_BR-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-ro() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Romanian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-ru() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Russian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-rw() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Kinyarwanda localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-se() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Northern Sami localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-sk() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Slovak localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-sl() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Slovenian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-sr() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Serbian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-sr-latn() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Serbian latin charset localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/trinity-i18n-sr@Latn-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-ss() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Swati localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-sv() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Swedish localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-ta() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Tamil localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-te() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Telgu localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-tg() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Tajik localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-th() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Thai localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-tr() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Turkish localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-uk() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Ukrainian localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-uz() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Uzbek localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-uz-cyrillic() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Uzbek cyrillic charset localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/trinity-i18n-uz@cyrillic-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-vi() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Vietnamese localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-wa() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Walloon localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-zh_cn() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Chinese Simplified localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/trinity-i18n-zh_CN-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
-package_trinity-i18n-zh_tw() {
-groups=('trinity-i18n')
-pkgdesc="Trinity Chinese Traditional localization"
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kde-i18n/trinity-i18n-zh_TW-3.5.10
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
deleted file mode 100644
index 8f6dea25a..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdeaccessibility
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity accessibility tools"
-depends=('trinity-kdebase')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=('festival: speech synthesis'
-            'epos: text to speech synthesis'
-            'flite: lighweght version of festival'
-            'mbrola: speech synthesis'
-            'txt2pho: frontend for mbrola')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaccessibility-3.5.13.tar.gz)
-md5sums=('ce31b01c1831046fb28aab172f2423bf')
-
-build() {
-   msg "Setting Trinity Environment variables"
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  
-   msg "Starting automake..."
-   cd "$srcdir/kdeaccessibility"
-   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-   sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-   make -f admin/Makefile.common
-
-   msg "Starting configure..."
-   ./configure --with-qt-dir=${QTDIR} \
-      --prefix=${TDEDIR} \
-      --enable-closure \
-      --with-alsa \
-      --with-extra-includes=${_prefix}/include \
-      --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-   msg "Building ${pkgname}..."
-   make
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd ${srcdir}/kdeaccesibility
-   make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
deleted file mode 100644
index 8ceafefde..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdeaddons
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity DE addons collection"
-depends=('trinity-kdelibs' 'trinity-kdebase' 'xmms')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=()
-provides=($pkgname)
-conflicts=()
-replaces=()
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaddons-3.5.13.tar.gz)
-md5sums=('f5fa96a5d99d1bc33600f609881eaee6')
-
-build() {
-  msg "Setting Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  
-  msg "Starting automake..."
-  cd "$srcdir/kdeaddons"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure \
-     --with-{sdl,xmms} \
-     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdeaddons
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
deleted file mode 100644
index 6ba924328..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdeadmin
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity system administration utils"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeadmin-3.5.13.tar.gz)
-md5sums=('b8bbabf353070a3e730464e0ce2960e2')
-
-build() {
-  msg "Setting Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  
-  msg "Starting automake..."
-  cd "$srcdir/kdeadmin"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure \
-     --with-shadow \
-     --with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     --with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdeadmin
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
deleted file mode 100644
index 3561960d5..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdeartwork
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity artwork collection"
-depends=('trinity-kdebase' 'trinity-arts' 'xscreensaver' 'libart-lgpl' 'glproto')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeartwork-3.5.13.tar.gz)
-md5sums=('24f85eb3e5a9106de48a3e81d2575ffe')
-
-build() {
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/kdeartwork \
-    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DWITH_XSCREENSAVER=ON \
-    -DWITH_LIBART=ON \
-    -DWITH_OPENGL=ON \
-    -DWITH_ARTS=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
deleted file mode 100644
index e50e88bab..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdeedu
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity educational applications and tools"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeedu-3.5.13.tar.gz)
-md5sums=('37a14a67c4d00babc3015c6a31698cb0')
-
-build() {
-
-  msg "Setting Trinity Environment variables"
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  
-  msg "Starting automake..."
-  cd "$srcdir/kdeedu"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure
-     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdeedu
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
deleted file mode 100644
index 6cdc98e0d..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdegames
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity games collection"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegames-3.5.13.tar.gz)
-md5sums=('6c63e161050939f53921bfceb923a19e')
-
-build() {
-
-  msg "Setting Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  
-  
-  msg "Starting automake..."
-  cd "$srcdir/kdegames"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure
-     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdegames
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/GSmartPointer.h.patch b/arch/3.5.13/trinity-extras/trinity-kdegraphics/GSmartPointer.h.patch
deleted file mode 100644
index 4634f8ca0..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdegraphics/GSmartPointer.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h
-+++ kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h	2011-05-08 11:47:20.000000000 -0500
-@@ -56,6 +56,7 @@
- 
- #ifndef _GSMARTPOINTER_H_
- #define _GSMARTPOINTER_H_
-+#include <cstddef>
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
deleted file mode 100644
index 49650579a..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdegraphics
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.com'
-license=('GPL')
-groups=('trinity-extras')
-kgdesc="Trinity graphics applications and tools"
-depends=('trinity-kdebase' 'libart-lgpl' 'libgphoto2' 'libtiff' 'openexr' 't1lib' 'imlib' 'sane' 'lcms' 'poppler')
-makedepends=('pkgconfig' 'cmake' 'imake' 'fribidi')
-# 'poppler-qt'
-optdepends=('xscreensaver: Screen saver and locker for the X Window System')
-provides=('trinity-kdegraphics')
-conflicts=('trinity-kdegraphics')
-replaces=('trinity-kdegraphics')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegraphics-3.5.13.tar.gz' 'ksnapshot.patch')
-md5sums=('a75c254cd1060343cd04c6744bce6798' '635ed9478cb3edde4fda84f3bac85438')
-
-build() {
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   msg "Patching..."
-   patch -p0 -i ${srcdir}/ksnapshot.patch
-
-   cd $srcdir
-   msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
-   cd build
-
-   msg "Starting cmake..."
-   cmake ${srcdir}/kdegraphics \
-      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DCMAKE_VERBOSE_MAKEFILE=ON \
-      -DQT_VERSION=3 \
-      -DCMAKE_CXX_FLAGS="-fpermissive" \
-      -DWITH_T1LIB=ON \
-      -DWITH_LIBPAPER=ON \
-      -DWITH_TIFF=ON \
-      -DWITH_OPENEXR=ON \
-      -DWITH_PDF=ON \
-      -DBUILD_ALL=ON
-   make
-
-#     -DWITH_PDF=ON \ (waiting on poppler-qt3)
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd ${srcdir}/build
-   make DESTDIR="$pkgdir" install
-   cd ${startdir}
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/ksnapshot.patch b/arch/3.5.13/trinity-extras/trinity-kdegraphics/ksnapshot.patch
deleted file mode 100644
index 5f7781771..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdegraphics/ksnapshot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r kdegraphics/ksnapshot/CMakeLists.txt src/kdegraphics/ksnapshot/CMakeLists.txt
---- kdegraphics/ksnapshot/CMakeLists.txt	2011-06-19 21:15:42.000000000 +0200
-+++ src/kdegraphics/ksnapshot/CMakeLists.txt	2012-01-23 23:02:15.000000000 +0100
-@@ -40,6 +40,6 @@
-   SOURCES
-     ksnapshotiface.skel main.cpp ksnapshot.cpp regiongrabber.cpp
-     windowgrabber.cpp ksnapshotwidget.ui
--  LINK kdeprint-shared
-+  LINK kdeprint-shared Xext
-   DESTINATION ${BIN_INSTALL_DIR}
- )
diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
deleted file mode 100644
index b812735ba..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdemultimedia
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity multimedia applications and tools"
-depends=('trinity-kdelibs' 'xine-lib' 'libvorbis' 'trinity-arts' 'alsa-lib' 'cdparanoia' 'lame' 'audiofile' 'libtheora' 'flac')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz' 'xine_artsplugin.patch')
-md5sums=('6d906b8a8fd0928e01ecd600175381c0' 'bb045d94e8dca80d73af4add43b7fc15')
-
-build() {
-  msg "Setting Trinity Environment variables"
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  msg "Patching..."
-  patch -p0 -i ${srcdir}/xine_artsplugin.patch
-  
-  msg "Starting automake..."
-  cd "$srcdir/kdemultimedia"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure \
-     --with-vorbis \
-     --with-alsa \
-     --with-cdparanoia \
-     --with-lame \
-     --with-audiofile \
-     --with-theora \
-     --with-flac \
-     --with-kscd-cdda \
-     --with-xine
-     #--with-gstreamer
-     #--with-akode \
-     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig \
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdemultimedia
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/xine_artsplugin.patch b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/xine_artsplugin.patch
deleted file mode 100644
index 36f89bcfd..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/xine_artsplugin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u -r src/kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp
---- src/kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp	2012-01-24 00:34:05.000000000 +0100
-+++ kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp	2011-08-13 08:18:23.000000000 +0200
-@@ -698,7 +698,7 @@
- 
- 	    if (stream != 0)
- 	    {
--		xine_gui_send_vo_data( stream,
-+		xine_port_send_gui_data( vo_port,
- 				       XINE_GUI_SEND_EXPOSE_EVENT,
- 				       &event );
- 	    }
-@@ -714,7 +714,7 @@
- 
- 	    if (stream != 0)
- 	    {
--		xine_gui_send_vo_data( stream,
-+		xine_port_send_gui_data( vo_port,
- 				       XINE_GUI_SEND_COMPLETION_EVENT,
- 				       &event );
- 	    }
-@@ -748,7 +748,7 @@
- 	{
- 	    resizeNotify();
- 
--	    xine_gui_send_vo_data( stream,
-+	    xine_port_send_gui_data( vo_port,
- 				   XINE_GUI_SEND_DRAWABLE_CHANGED,
- 				   (void *)window );
- 	}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
deleted file mode 100644
index a24800eef..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdenetwork
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity network utilities"
-depends=('trinity-kdebase' 
-         'trinity-arts' 
-         'speex' 'wireless_tools'
-         'gsmlib-git'
-         'libgadu'
-         'meanwhile'
-         'sqlite3'
-         'libidn'
-         'v4l-utils')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdenetwork-3.5.13.tar.gz' 'kdenetwork.patch')
-md5sums=('349f197c9af4bf0d9b8773f26829415e'
-         'ee468902b7c40ac1cc86cbaababa35dc')
-
-build() {
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  patch -p0 -i ${srcdir}/kdenetwork.patch
-  mv ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/tqname.cc
-  mv ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/tqname.h
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/kdenetwork \
-    -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DWITH_JINGLE=ON \
-    -DWITH_SPEEX=ON \
-    -DWITH_WEBCAM=ON \
-    -DWITH_GSM=ON \
-    -DWITH_ARTS=ON \
-    -DBUILD_KOPETE_PROTOCOL_ALL=ON \
-    -DBUILD_KOPETE_PLUGIN_ALL=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch b/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch
deleted file mode 100644
index 7da894f5f..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -u -r kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp src/kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp
---- kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp	2011-08-12 22:11:02.000000000 +0200
-+++ src/kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp	2011-12-15 23:25:02.000000000 +0100
-@@ -75,7 +75,7 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)
- #define _LINUX_TIME_H
- #endif
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- 
- #define DEF_WIDTH			352
- #define DEF_HEIGHT		288
-diff -u -r kdenetwork/kopete/protocols/jabber/CMakeLists.txt src/kdenetwork/kopete/protocols/jabber/CMakeLists.txt
---- kdenetwork/kopete/protocols/jabber/CMakeLists.txt	2011-06-22 03:37:12.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/CMakeLists.txt	2011-12-15 22:56:58.000000000 +0100
-@@ -80,6 +80,6 @@
-     jabberclient-static kopetejabberui-static
-     iris_jabber-static iris_xmpp_core-static iris_xmpp_im-static iris-static
-     qca-static cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES}
--    kopete-shared
-+    kopete-shared idn
-   DESTINATION ${PLUGIN_INSTALL_DIR}
- )
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h	2011-06-22 03:37:10.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h	2011-12-15 22:56:58.000000000 +0100
-@@ -80,6 +80,7 @@
- 
- #include <set>
- #include <list>
-+#include <stdlib.h>
- 
- // On our copy of sigslot.h, we force single threading
- #define SIGSLOT_PURE_ISO
-diff -u -r kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt src/kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt
---- kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt	2011-06-22 03:37:08.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt	2011-12-15 22:56:58.000000000 +0100
-@@ -35,7 +35,7 @@
- tde_add_kpart( kio_jabberdisco AUTOMOC
-   SOURCES jabberdisco.cpp
-   LINK
--    jabberclient-static
-+    jabberclient-static idn
-     iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
-     qca-static cutestuff_network-static cutestuff_util-static kio-shared
-   DESTINATION ${PLUGIN_INSTALL_DIR}
-diff -u -r kdenetwork/kopete/protocols/msn/CMakeLists.txt src/kdenetwork/kopete/protocols/msn/CMakeLists.txt
---- kdenetwork/kopete/protocols/msn/CMakeLists.txt	2011-06-22 03:37:22.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/msn/CMakeLists.txt	2011-12-15 22:56:58.000000000 +0100
-@@ -47,7 +47,7 @@
- 
- tde_add_kpart( kopete_msn AUTOMOC
-   SOURCES
--    dummy.cpp webcam.cpp
-+    webcam.cpp
-   LINK kopete_msn_shared-shared
-   DESTINATION ${PLUGIN_INSTALL_DIR}
- )
-diff -u -r kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp src/kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp
---- kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp	2011-08-12 22:11:37.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp	2011-12-15 22:56:58.000000000 +0100
-@@ -54,7 +54,7 @@
- #include "kopetemessage.h"
- #include "kopetecontact.h"
- #include "kopeteuiglobal.h"
--#include "kopeteemoticons.h"
-+#include "private/kopeteemoticons.h"
- //#include "kopeteaccountmanager.h"
- //#include "kopeteprotocol.h"
- 
-diff -u -r kdenetwork/kopete/protocols/sms/services/smsclient.cpp src/kdenetwork/kopete/protocols/sms/services/smsclient.cpp
---- kdenetwork/kopete/protocols/sms/services/smsclient.cpp	2011-08-12 22:11:13.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/sms/services/smsclient.cpp	2011-12-15 22:56:58.000000000 +0100
-@@ -67,7 +67,7 @@
- 		return;
- 	}
- 
--	TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString());
-+	TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"));
- 	if (programName.isNull())
- 		programName = "/usr/bin/sms_client";
- 
-diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt
---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt	2011-06-22 03:37:11.000000000 +0200
-+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt	2012-01-24 12:10:06.000000000 +0100
-@@ -23,6 +23,6 @@
- 
- tde_add_library( cricketxmllite STATIC_PIC
-   SOURCES
--    qname.cc xmlbuilder.cc xmlconstants.cc xmlelement.cc xmlnsstack.cc
-+    tqname.cc xmlbuilder.cc xmlconstants.cc xmlelement.cc xmlnsstack.cc
-     xmlparser.cc xmlprinter.cc
- )
-Only in kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: qname.cc
-Only in kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: qname.h
-Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.cc
-Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.h
diff --git a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
deleted file mode 100644
index dcb645557..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdepim
-pkgver=3513
-pkgrel=1.0
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.com'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity Personal Information Management suite"
-depends=('trinity-kdebase'
-         'gpgme'
-         'boost'
-         'gnokii' 'poppler'
-         'trinity-libcaldav'
-         'trinity-libcarddav')
-makedepends=('pkgconfig' 'cmake' 'imake' 'fribidi')
-# 'poppler-qt'
-provides=('trinity-kdepim')
-conflicts=('trinity-kdepim')
-replaces=('trinity-kdepim')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdepim-3.5.13.tar.gz')
-source=('http://anduin.linuxfromscratch.org/sources/trinity/kdepim-3.5.13.tar.gz')
-md5sums=('4488062d5400bdd99642fe0b72ebcf9a')
-
-build() {
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/kdepim \
-    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DWITH_SASL=ON \
-    -DWITH_NEWDISTRLISTS=ON \
-    -DWITH_GNOKII=ON \
-    -DWITH_EXCHANGE=ON \
-    -DWITH_EGROUPWARE=ON \
-    -DWITH_KOLAB=ON \
-    -DWITH_SLOX=ON \
-    -DWITH_GROUPWISE=ON \
-    -DWITH_FEATUREPLAN=ON \
-    -DWITH_GROUPDAV=ON \
-    -DWITH_BIRTHDAYS=ON \
-    -DWITH_NEWEXCHANGE=ON \
-    -DWITH_SCALIX=ON \
-    -DWITH_CALDAV=ON \
-    -DWITH_CARDDAV=ON \
-    -DWITH_INDEXLIB=ON \
-    -DWITH_ARTS=ON \
-    -DBUILD_ALL=ON
-  make
-
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir" install
-  cd ${startdir}
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
deleted file mode 100644
index b7cec01c2..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdesdk
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity Software Developement Kit"
-depends=('trinity-kdebase' 'subversion')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdesdk-3.5.13.tar.gz' 'kdesdk.patch')
-source=('http://anduin.linuxfromscratch.org/sources/trinity/kdesdk-3.5.13.tar.gz' 'kdesdk.patch')
-md5sums=('130662f683be1a49d56a713c5ae87e46'
-         'a1d0b533ae427847bd84e601c587f882')
-
-build() {
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   patch -N -d ${srcdir} -p0 < kdesdk.patch
-
-   cd $srcdir/kdesdk
-
-   msg "Starting configure..."
-   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-   sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-   make -f admin/Makefile.common
-
-   msg "Starting configure..."
-   ./configure --with-qt-dir=${QTDIR} \
-      --prefix=${TDEDIR} \
-      --enable-closure \
-      --with-berkeley-db \
-      --with-subversion
-      #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-      #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig \
-
-   make
-
-   #msg "Starting cmake..."
-   #cmake ${srcdir}/kdesdk \
-   #  -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-   #  -DCMAKE_VERBOSE_MAKEFILE=ON \
-   #  -DWITH_DBSEARCHENGINE=ON \
-   #  -DWITH_KCAL=ON \
-   #  -DBUILD_ALL=ON
-   #make
-
-   #--with-berkeley-db      enable the dictionary plugin based on Berkeley DB IV
-   #--with-db-dir=DIR       where the root of Berkeley DB IV is installed
-   #--with-db-include-dir=DIR where the includes of Berkeley DB IV are installed
-   #--with-db-include=FILE  path to the Berkeley DB IV header file
-   #--with-db-lib-dir=DIR   where the libs of Berkeley DB IV are installed
-   #--with-db-name=NAME     name of the Berkeley DB IV library (default db)
-   
-   #--with-subversion       enable support for subversion [default=check]
-   #--with-apr-config=FILE    Use the given path to apr-config when determining APR configuration; defaults to "apr-config"
-   #--with-apu-config=FILE    Use the given path to apu-config when determining APR util configuration; defaults to "apu-config"
-   #--with-subversion-dir=DIR           where Subversion is installed
-   #--with-svn-include=DIR   Use the given path to the subversion headers.
-   #--with-svn-lib=DIR
-
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdesdk
-  make DESTDIR="$pkgdir" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdesdk/kdesdk.patch b/arch/3.5.13/trinity-extras/trinity-kdesdk/kdesdk.patch
deleted file mode 100644
index 96018c87a..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdesdk/kdesdk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r kdesdk/kbabel/common/libgettext/CMakeLists.txt src/kdesdk/kbabel/common/libgettext/CMakeLists.txt
---- kdesdk/kbabel/common/libgettext/CMakeLists.txt	2011-06-12 06:48:47.000000000 +0200
-+++ src/kdesdk/kbabel/common/libgettext/CMakeLists.txt	2011-12-16 13:36:08.000000000 +0100
-@@ -20,7 +20,7 @@
- ##### pofiles.cc (source) #######################
- 
- add_custom_command( OUTPUT pofiles.cpp
--  COMMAND ${LEX_EXECUTABLE} -+ -opofiles.cpp ${CMAKE_CURRENT_SOURCE_DIR}/pofiles.ll
-+   COMMAND /usr/bin/flex -+ -opofiles.cpp ${CMAKE_CURRENT_SOURCE_DIR}/pofiles.ll
- )
- 
- 
-Only in src/kdesdk/kbabel/common/libgettext: .CMakeLists.txt.swp
diff --git a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
deleted file mode 100644
index bd20aa2e7..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdetoys
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity toys collection"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdetoys-3.5.13.tar.gz)
-md5sums=('823dd778c1e9e15972a509f4eee4434d')
-
-build() {
-  msg "Setting Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  msg "Starting automake..."
-  cd "$srcdir/kdetoys"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure 
-     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdetoys
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
deleted file mode 100644
index bd9a4da9d..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdeutils
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity TDE utilities collection"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeutils-3.5.13.tar.gz)
-md5sums=('e2cd6695606c5c91b3380dcc7f1a6a83')
-
-build() {
-  msg "Setting Trinity Environment variables"
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  
-  msg "Starting automake..."
-  cd "$srcdir/kdeutils"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure 
-     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
-     #--with-xmms
-     #--with-snmp \
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/kdeutils
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
deleted file mode 100644
index ff47e08f4..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kdevelop
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity Developement tools"
-depends=('trinity-kdebase')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdevelop-3.5.13.tar.gz' 'kdevelop.patch')
-md5sums=('777bd77e4f2dc6a5b5b45a370dcf6da0'
-         'ab23854b1658adc1da4621cb589ec1be')
-
-build() {
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  msg "Patching..."
-  # apply second part of Francois Andriot patch
-  patch -p0 -i ${srcdir}/kdevelop.patch
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/kdevelop \
-    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DQT_VERSION=3 \
-    -DWITH_QT3=ON \
-    -DQTDIR=/opt/qt \
-    -DQT_DOCDIR=/opt/qt/man \
-    -DQT_LIBRARY_DIRS=/opt/qt/lib \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdevelop/kdevelop.patch b/arch/3.5.13/trinity-extras/trinity-kdevelop/kdevelop.patch
deleted file mode 100644
index 14079908c..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdevelop/kdevelop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kdevelop/kdevdesigner/designer/listeditor.ui.h.ORI	2011-10-30 13:30:56.655489268 +0100
-+++ kdevelop/kdevdesigner/designer/listeditor.ui.h	2011-10-30 13:31:00.782489292 +0100
-@@ -30,7 +30,7 @@
- {
-     QListViewItem *i = new QListViewItem( listview, listview->lastItem() );
-     i->setRenameEnabled( 0, TRUE );
--    tqApp->processEvents();
-+    qApp->processEvents();
-     i->startRename( 0 );
- }
- 
-
diff --git a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
deleted file mode 100644
index aeb365b82..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-webdev
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity Web development tools"
-depends=('trinity-kdebase')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdewebdev-3.5.13.tar.gz' 'kdewebdev.patch')
-md5sums=('4f56a6c4b5916615ca3615f8e8f868c6'
-         '5ef6636db45e35d6dcda35332bdca931')
-
-build() {
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  patch -N -d ${srcdir} -p0 < kdewebdev.patch
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/kdewebdev \
-    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-kdewebdev/kdewebdev.patch b/arch/3.5.13/trinity-extras/trinity-kdewebdev/kdewebdev.patch
deleted file mode 100644
index 9d50197bf..000000000
--- a/arch/3.5.13/trinity-extras/trinity-kdewebdev/kdewebdev.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u -r kdewebdev/quanta/CMakeLists.txt src/kdewebdev/quanta/CMakeLists.txt
---- kdewebdev/quanta/CMakeLists.txt     2011-06-16 21:11:44.000000000 +0200
-+++ src/kdewebdev/quanta/CMakeLists.txt 2011-12-16 15:58:35.000000000 +0100
-@@ -18,6 +18,6 @@
- add_subdirectory( messages )
- add_subdirectory( plugins )
- add_subdirectory( parts )
--add_subdirectory( project )
-+add_subdirectory( "project" )
- add_subdirectory( src )
- add_subdirectory( scripts )
-diff -u -r kdewebdev/quanta/project/CMakeLists.txt src/kdewebdev/quanta/project/CMakeLists.txt
---- kdewebdev/quanta/project/CMakeLists.txt     2011-06-16 21:11:28.000000000 +0200
-+++ src/kdewebdev/quanta/project/CMakeLists.txt 2011-12-16 16:00:15.000000000 +0100
-@@ -15,6 +15,7 @@
-   ${CMAKE_SOURCE_DIR}/lib
-   ${CMAKE_SOURCE_DIR}/quanta/src
-   ${CMAKE_SOURCE_DIR}/quanta/parsers
-+  ${CMAKE_SOURCE_DIR}/quanta/project
-   ${CMAKE_SOURCE_DIR}/quanta/utility
-   ${CMAKE_SOURCE_DIR}/quanta/treeviews
-   ${CMAKE_SOURCE_DIR}/quanta/dialogs
diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/Changelog.patch b/arch/3.5.13/trinity-extras/trinity-libcaldav/Changelog.patch
deleted file mode 100644
index db579b99b..000000000
--- a/arch/3.5.13/trinity-extras/trinity-libcaldav/Changelog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libcaldav-0.6.5/ChangeLog
-+++ libcaldav-0.6.5/ChangeLog	2011-05-08 00:56:11.000000000 -0500
-@@ -1,3 +1,9 @@
-+libcaldav (0.6.5)
-+  * Fix bug to be able to integrate the debian libcaldav
-+    source with Arch PKGBUILD Patch provided by Timothy Pearson
-+
-+-- David Rankin <drankinatty@gmail.com>  Sun, 8 May 2011 22:51:03 +0100
-+
- libcaldav (0.6.2)
-   * Fix bug to be able to handle HTTP HEADER lines split
-     over multiple lines. Patch provided by Timothy Pearson
diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.am.patch b/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.am.patch
deleted file mode 100644
index 37a673219..000000000
--- a/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libcaldav-0.6.5/src/Makefile.am
-+++ libcaldav-0.6.5/src/Makefile.am	2011-05-08 01:16:47.000000000 -0500
-@@ -37,7 +37,7 @@
- 			get-freebusy-report.c \
- 			get-freebusy-report.h
- 
--libcaldav_includedir=$(includedir)/libcaldav-@VERSION@
-+libcaldav_includedir=$(includedir)/libcaldav
- libcaldav_include_HEADERS = caldav.h
- 
- noinst_HEADERS = \
diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.in.patch b/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.in.patch
deleted file mode 100644
index cb0ad466a..000000000
--- a/arch/3.5.13/trinity-extras/trinity-libcaldav/Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libcaldav-0.6.5/src/Makefile.in
-+++ libcaldav-0.6.5/src/Makefile.in	2011-05-08 01:16:15.000000000 -0500
-@@ -284,7 +284,7 @@
- 			get-freebusy-report.c \
- 			get-freebusy-report.h
- 
--libcaldav_includedir = $(includedir)/libcaldav-@VERSION@
-+libcaldav_includedir = $(includedir)/libcaldav
- libcaldav_include_HEADERS = caldav.h
- noinst_HEADERS = \
- 			add-caldav-object.h \
diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD
deleted file mode 100644
index 97ce89858..000000000
--- a/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-libcaldav
-pkgver=0.6.5
-_pkgsuffix=2debian2
-pkgrel=1
-pkgdesc="A client library adding support for the CalDAV protocol"
-arch=('i686' 'x86_64')
-url="http://www.trinitydesktop.org"
-groups=('trinity-extras')
-depends=('doxygen' 'curl')
-license=('GPL')
-provides=('trinity-libcaldav' 'libcaldav')
-conflicts=('libcaldav')
-replaces=('trinity-libcaldav')
-source=("http://quickbuild.pearsoncomputing.net:58080/2055979/libcaldav_0.6.5-2debian2.tar.gz" "Changelog.patch" "Makefile.am.patch" "Makefile.in.patch")
-md5sums=('fba66a6c605a6d7be67a638cd29667b6'
-         '184818aedf65459ad3f9c0741462f85a'
-         '5ce5bd3c1ed4d5004a864130a971f737'
-         'c136e14af1923c2cf6dc5beb93da2ba4')
-
-build() {
-   msg "Setting enviroment variables..."
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  # patch for Changelog version
-  patch -p0 -i ${srcdir}/Changelog.patch || return 1
-  patch -p0 -i ${srcdir}/Makefile.am.patch || return 1
-  patch -p0 -i ${srcdir}/Makefile.in.patch || return 1
-
-  cd ${srcdir}/libcaldav-${pkgver}
-  msg "Running ./autogen.sh for autoreconf"
-  ./autogen.sh --prefix=${TDEDIR}
-#    --includedir=/usr/include
-#   msg "Running configure"
-#   ./configure --prefix=${TDEDIR}
-
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/libcaldav-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD
deleted file mode 100644
index f08419908..000000000
--- a/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-libcarddav
-pkgver=0.6.2
-_pkgsuffix=2debian2
-pkgrel=1
-pkgdesc="A client library adding support for the CardDAV protocol"
-arch=('i686' 'x86_64')
-url="http://www.trinitydesktop.org/"
-groups=('trinity-extras')
-depends=('curl')
-license=('GPL')
-provides=('trinity-libcarddav' 'libcarddav')
-conflicts=('libcarddav')
-replaces=('trinity-libcarddav')
-source=("http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_${pkgver}-${_pkgsuffix}.tar.gz" "libcarddav.patch")
-md5sums=('42a0fe57ba4c639aad53024f6c8d5614'
-         '63ef0b91ff27dfb7c48ca0f07866af79')
-
-build() {
-   cd ${srcdir}
-   msg "setting environment variables..."
-   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-   # apply libcarddav patch
-   msg "Applying Patch: libcarddav.patch"
-   patch -uNp2 -i ${srcdir}/libcarddav.patch || return 1
-
-   cd ${srcdir}/libcarddav-${pkgver}
-   msg "Running ./autogen.sh for autoreconf"
-   ./autogen.sh --prefix=${TDEDIR}
-   #   msg "Running configure"
-   #   ./configure --prefix=${TDEDIR}
-
-   make || return 1
-}
-
-package() {
-   cd ${srcdir}/libcarddav-${pkgver}
-   make DESTDIR=${pkgdir} install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-libcarddav/libcarddav.patch b/arch/3.5.13/trinity-extras/trinity-libcarddav/libcarddav.patch
deleted file mode 100644
index 00621d45e..000000000
--- a/arch/3.5.13/trinity-extras/trinity-libcarddav/libcarddav.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur trinity-libcarddav-orig//src/libcarddav-0.6.2/ChangeLog trinity-libcarddav//src/libcarddav-0.6.2/ChangeLog
---- trinity-libcarddav-orig//src/libcarddav-0.6.2/ChangeLog 2010-07-21 02:57:45.000000000 -0500
-+++ trinity-libcarddav//src/libcarddav-0.6.2/ChangeLog   2011-05-08 14:08:07.000000000 -0500
-@@ -1,3 +1,9 @@
-+libcarddav (0.6.2)
-+  * Update Changelog to correct version. Includes patch
-+    provided by Timothy Pearson
-+
-+-- David Rankin <drankinatty@gmail.com>  Sun, 8 May 2011 22:51:03 +0100
-+
- libcarddav (0.6.1)
-   * Fix redirection bug to fully support Zimbra server. Patch
-     provided by Timothy Pearson
-diff -Naur trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.am trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.am
---- trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.am 2010-07-21 02:57:45.000000000 -0500
-+++ trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.am   2011-05-08 14:08:37.000000000 -0500
-@@ -35,7 +35,7 @@
-                        lock-carddav-object.c \
-                        lock-carddav-object.h
-
--libcarddav_includedir=$(includedir)/libcarddav-@VERSION@
-+libcarddav_includedir=$(includedir)/libcarddav
- libcarddav_include_HEADERS = carddav.h
-
- noinst_HEADERS = \
-diff -Naur trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.in trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.in
---- trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.in  2010-07-21 02:57:45.000000000 -0500
-+++ trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.in 2011-05-08 14:09:05.000000000 -0500
-@@ -278,7 +278,7 @@
-                        lock-carddav-object.c \
-                        lock-carddav-object.h
-
--libcarddav_includedir = $(includedir)/libcarddav-@VERSION@
-+libcarddav_includedir = $(includedir)/libcarddav
- libcarddav_include_HEADERS = carddav.h
- noinst_HEADERS = \
-                     add-carddav-object.h \
-
diff --git a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
deleted file mode 100644
index 17e05aa0b..000000000
--- a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-libkdcraw
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity DCRaw library"
-depends=('trinity-kdelibs')
-         #openmpi
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkdcraw-3.5.13.tar.gz)
-md5sums=('770dd734dc427337a1a2e61b6b0874ae')
-
-build() {
-  msg "Setting Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  msg "Starting automake..."
-  cd "$srcdir/libraries/libkdcraw"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure \
-     --enable-openmp
-     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/libraries/libkdcraw
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
deleted file mode 100644
index 585cc5010..000000000
--- a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-libkexiv2
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity exiv2 library"
-depends=('trinity-kdelibs' 'exiv2')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkexiv2-3.5.13.tar.gz)
-md5sums=('74b160da8ea95f25048757b5fe692f85')
-
-build() {
-  msg "Setting Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-
-  msg "Starting automake..."
-  cd "$srcdir/libraries/libkexiv2"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure
-     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/libraries/libkexiv2
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
deleted file mode 100644
index 6ff3593c5..000000000
--- a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
-# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-libkipi
-pkgver=3513
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity kipi library"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-options=('libtool' '!strip')
-source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkipi-3.5.13.tar.gz)
-md5sums=('22cb0ba7507cac99140cd1c0180cbe99')
-
-build() {
-  msg "Setting Trinity Environment variables"
-  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
-  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
-  
-  msg "Starting automake..."
-  cd "$srcdir/libraries/libkipi"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${TDEDIR} \
-     --enable-closure
-     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
-     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/libraries/libkipi
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/3.5.13_broken/README b/arch/3.5.13_broken/README
deleted file mode 100644
index 4631fc8dc..000000000
--- a/arch/3.5.13_broken/README
+++ /dev/null
@@ -1,27 +0,0 @@
-Those are PKGBUILDs for trinity components 
-that won't build on arch because of various reasons.
-
-I've out them here for archival reasons.
-
-PKGBUILDs itself (apart for dependencies) are pretty
-much finished for those.
-
-After fixing and veryfing that they build pleas move
-them to the 3.5.13 dir.
-
-Problems with builds:
-   kgtk-qt3:
-      not our CMakeLists.txt files. Probably created
-      by original KDE team (since it includes options
-      for building it for Qt4). Cannot be build because
-      of hard coded paths to tmoc. And uic-tqt.
-      Fix for uic-tqt is included in the patch, but tmoc
-      cannot be fixed. Maybe manually passing 
-      -DQT_MOC_EXECUTABLE=/opt/trinity/bin/tmoc could help?
-      Tried: cmake hangs after "--Found Threads:TRUE"
-      message. Top shows 24 sed processes. Any fix?
-      If it cannot be fixed, maybe whole CMake should
-      be rewritten for this?
-
-   wlassistant:
-      hardcoded incudes? Does not compile?
diff --git a/arch/3.5.13_broken/trinity-kgtk-qt3/PKGBUILD b/arch/3.5.13_broken/trinity-kgtk-qt3/PKGBUILD
deleted file mode 100644
index 847476191..000000000
--- a/arch/3.5.13_broken/trinity-kgtk-qt3/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-kgtk-qt3
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - kgtk-qt3"
-depends=('trinity-kdebase' 'gtk2')
-makedepends=('pkgconfig' 'cmake' 'imake')
-options=('libtool' '!strip')
-source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kgtk-qt3-3.5.13.tar.gz' 'kgtk.patch')
-md5sums=('27eb49a405696db149c6bb2e030b6ee0'
-         'ccf1b146105dd38b6dcbc49b4b8fb376')
-
-_svnmod=applications/kgtk-qt3
-
-build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
-  trinity_prefix="/opt/trinity"
-
-  patch -N -d ${srcdir} -p0 < kgtk.patch
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DQT_MOC_EXECUTABLE=/opt/trinity/bin/tmoc \
-    -DBUILD_ALL=ON
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/arch/3.5.13_broken/trinity-kgtk-qt3/kgtk.patch b/arch/3.5.13_broken/trinity-kgtk-qt3/kgtk.patch
deleted file mode 100644
index 88eabc14a..000000000
--- a/arch/3.5.13_broken/trinity-kgtk-qt3/kgtk.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -u -r applications/kgtk-qt3/CMakeLists.txt src/applications/kgtk-qt3/CMakeLists.txt
---- applications/kgtk-qt3/CMakeLists.txt	2011-05-08 21:37:48.000000000 +0200
-+++ src/applications/kgtk-qt3/CMakeLists.txt	2011-12-16 16:42:01.000000000 +0100
-@@ -16,9 +16,9 @@
- include(CheckFunctionExists)
- check_function_exists(getpeereid HAVE_GETPEEREID)
- 
--SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
--SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt")
--#SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include/tqt -include tqt.h -DTQT_THREAD_SUPPORT")
-+SET(QT_UIC_EXECUTABLE "/opt/trinity/bin/uic-tqt")
-+#SET(QT_MOC_EXECUTABLE "/opt/trinity/bin/tmoc")
- 
- if (NOT "${KGTK_KDE3}" MATCHES "false")
-     add_subdirectory(kdialogd3)
-Only in src/applications/kgtk-qt3: .CMakeLists.txt.swp
diff --git a/arch/3.5.13_broken/trinity-wlassistant/PKGBUILD b/arch/3.5.13_broken/trinity-wlassistant/PKGBUILD
deleted file mode 100644
index e051328fe..000000000
--- a/arch/3.5.13_broken/trinity-wlassistant/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-wlassistant
-pkgver=3513
-pkgrel=1
-
-arch=('i686' 'x86_64')
-
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity')
-pkgdesc="Trinity - wlassistant"
-
-depends=('trinity-kdelibs' 'trinity-pyqt3')
-makedepends=('pkgconfig' 'autoconf' 'automake' 'scons')
-
-options=('libtool' '!strip')
-
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/wlassistant-3.5.13.tar.gz)
-md5sums=('1fd3680a634fedee3c2d90b81c1ffe23')
-
-_builddir=applications/wlassistant
-_prefix=/opt/trinity
-
-build() {
-
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  cd ${srcdir}/${_builddir}
-  msg "Starting configure..."
-  ./configure --qtdir=${QTDIR} \
-     --qtlibs=${QTDIR}/lib \
-     --kdedir=${_prefix} \
-     --prefix=${_prefix} \
-     --kdeincludes=${_prefix}/include \
-     --kde-libs=${_prefix}/lib
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${_builddir}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/DockerBuildEnvironment/Dockerfile b/arch/DockerBuildEnvironment/Dockerfile
new file mode 100644
index 000000000..d657a60b0
--- /dev/null
+++ b/arch/DockerBuildEnvironment/Dockerfile
@@ -0,0 +1,16 @@
+FROM archlinux/base
+
+RUN echo "[docker-dev]" >> /etc/pacman.conf
+RUN echo "SigLevel = Optional TrustAll" >> /etc/pacman.conf
+RUN echo "Server = http://repo.nasutek.com/arch/contrib/docker-dev/" >> /etc/pacman.conf
+
+RUN pacman -Syyu --noconfirm
+RUN pacman-db-upgrade
+
+RUN pacman -S --noconfirm base-devel sudo grep wget xscreensaver libxss libgphoto2 fribidi sane xmms2 alsa-plugins alsa-tools alsa-utils audiofile glib2 libmad libogg libvorbis pulseaudio-alsa avahi nss-mdns dbus libraw1394 libxtst lm_sensors ttf-dejavu ttf-freefont xorg-server xorg-xinit openssl-1.0 aspell hspell jasper libcups libidn libutempter libxcomposite libxslt openexr pcre xorg-iceauth xorg-xmessage xorg-xprop xorg-xset xorg-xsetroot glu taglib gtk3 dbus-glib speex wireless_tools wpa_supplicant boost boost-libs gnokii curl libraw pkgconfig autoconf imake cmake python2 imlib automake libtool libxkbfile smbclient rpcsvc-proto xorg-bdftopcf libiodbc libxi mariadb unixodbc libmng xorg-xrandr libxft flex subversion mplayer exiv2 doxygen
+RUN pacman -S --noconfirm htdig lcms postgresql-9.6
+
+RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+RUN useradd -m dev
+RUN gpasswd -a dev wheel
diff --git a/arch/DockerBuildEnvironment/README.md b/arch/DockerBuildEnvironment/README.md
new file mode 100644
index 000000000..325616f3d
--- /dev/null
+++ b/arch/DockerBuildEnvironment/README.md
@@ -0,0 +1,23 @@
+# Trinity Build Environment Docker Image
+
+## How to build
+All you need to do is run 
+```
+docker build
+```
+
+in this directory and it will create an image for building Trinity with.
+
+## Using the docker image
+Here is an example way to run docker for building trinity
+```
+docker run -it --rm -v `pwd`:/tmp/src <finalimageid>
+```
+
+Once running just run
+```
+su - dev
+```
+To enter a non-root user
+
+This will mount your source directory in /tmp/src where you can run ./build.
diff --git a/arch/PKGBUILD.template b/arch/PKGBUILD.template
new file mode 100644
index 000000000..8273b6e02
--- /dev/null
+++ b/arch/PKGBUILD.template
@@ -0,0 +1,59 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdepowersave
+_cat=applications/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Desktop Enviroment $_cat$_mod"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+  'autoconf'
+  'pkgconfig'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=()
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/README.md b/arch/README.md
new file mode 100644
index 000000000..6b7e0f047
--- /dev/null
+++ b/arch/README.md
@@ -0,0 +1,24 @@
+# Trinity_ArchLinux_PKGBUILD
+PKGBUILD's for building Trinity on Arch Linux
+
+## How to build Trinity with these Files
+If you have trouble building one of these packages,
+please source the environment variables by issuing (from package directory):
+```
+. ../environment
+```
+OR
+```
+source ../environment
+```
+
+The Build Script build.sh will automatically source this environment and is not needed to be ran beforehand
+
+## Building the Trinity Packages
+All you need to do is run ./build.sh after installing any dependencies. A Docker Script is included to create
+a temporary build environment for Trinity. It is recommended to use this Docker Environment as this is how
+the official trinity arch repo is compiled by. See the README.md in DockerBuildEnvironment for details.
+
+## Unbuildable Packages
+Here lists the unbuildable packages at the moment. Please help make these packages buildable and submit any pull
+requests to fix them. Each package has a Bug entry which includes the build log for reference.
diff --git a/arch/build.sh b/arch/build.sh
new file mode 100755
index 000000000..f796124f5
--- /dev/null
+++ b/arch/build.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e
+tdesrc=$PWD
+tdearch=$(uname -m)
+rm -rf $tdesrc/out/${tdearch}
+
+. $tdesrc/environment
+
+compile_directory() {  
+  cd $tdesrc/$1
+  dir=$PWD
+  for pkg in $2; do
+    if [[ $pkg != .* ]]; then
+      cd "$dir"/tde-"$pkg"
+      makepkg -Lsci
+    fi
+  done
+}
+
+### Build Packages
+compile_directory tde-core "cmake-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca tqca-tls libart-lgpl avahi-tqt tdelibs tdebase"
+compile_directory tde-libs "libcaldav libcarddav libkdcraw libkexiv2 libkipi"
+compile_directory tde-base "i18n tdeartwork tdebindings tdegraphics tdeutils tdeadmin"
+compile_directory tde-extra "akode tdepim tdemultimedia tdenetwork tdeedu tdegames tdetoys tdeaccessibility tdeaddons gtk-qt-engine gtk3-tqt-engine systemsettings abakus amarok basket filelight kbiff kchmviewer kcpuload kile kmplayer kmymoney konversation kooldock krusader kshutdown ksplash-engine-moodin kvkbd style-baghira style-domino style-lipstik style-qtcurve tdeio-appinfo tdeio-ftps tdeio-locate tdenetworkmanager tdepowersave tdesudo tdmtheme tork twin-style-crystal twin-style-dekorator yakuake"
+compile_directory tde-devel "tdesdk tdevelop tdewebdev kdbg kdiff3 kscope kxmleditor"
+
+### Copy completed packages to out/${tdearch} folder and download dependencies to out/${tdearch} folder
+cd $tdesrc
+mkdir -p $tdesrc/out/${tdearch}
+cp $(find $tdesrc -name *.pkg.tar.zst) $tdesrc/out/${tdearch}
+wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/${tdearch}/gnokii-0.6.31-19.1-${tdearch}.pkg.tar.zst -O $tdesrc/out/${tdearch}/gnokii-0.6.31-19.1-${tdearch}.pkg.tar.zst
+wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/${tdearch}/htdig-3.2.0b6-11.1-${tdearch}.pkg.tar.zst -O $tdesrc/out/${tdearch}/htdig-3.2.0b6-11.1-${tdearch}.pkg.tar.zst
+wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/${tdearch}/lcms-1.19-7.1-${tdearch}.pkg.tar.zst -O $tdesrc/out/${tdearch}/lcms-1.19-7.1-${tdearch}.pkg.tar.zst
+wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/${tdearch}/pod2man-5.30.2-1-${tdearch}.pkg.tar.zst -O $tdesrc/out/${tdearch}/pod2man-5.30.2-1-${tdearch}.pkg.tar.zst
+
+### Create trinity pacman repo
+repo-add $tdesrc/out/${tdearch}/trinity.db.tar.gz $tdesrc/out/${tdearch}/*.pkg.tar.{xz,zst}
diff --git a/arch/environment b/arch/environment
new file mode 100644
index 000000000..47c78143b
--- /dev/null
+++ b/arch/environment
@@ -0,0 +1,29 @@
+export TDEDIR=/opt/trinity
+export QTDIR=$TDEDIR/tqt3
+export TQTDIR=$QTDIR
+#export SYSCONFDIR=/etc/trinity
+#export LIBDIR=$TDEDIR/lib
+#export MANDIR=$TDEDIR/man
+export QT_XFT=true
+export PATH=$PATH:$TQTDIR/bin:$TDEDIR/bin
+
+if [ ! -z $PKG_CONFIG_PATH ]; then 
+  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TDEDIR/lib/pkgconfig:$TQTDIR/lib/pkgconfig
+else 
+  export PKG_CONFIG_PATH=$TDEDIR/share 
+fi 
+if [ ! -z $XDG_DATA_DIRS ]; then 
+  export XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share 
+else 
+  export XDG_DATA_DIRS=$TDEDIR/share 
+fi 
+if [ ! -z $XDG_CONFIG_DIRS ]; then 
+  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$TDEDIR/etc/xdg 
+else 
+  export XDG_CONFIG_DIRS=$TDEDIR/etc/xdg 
+fi
+if [ ! -z $PKG_CONFIG_PATH ]; then 
+  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TDEDIR/lib/pkgconfig:$TQTDIR/lib/pkgconfig
+else 
+  export PKG_CONFIG_PATH=$TDEDIR/share 
+fi 
diff --git a/arch/extras/README b/arch/extras/README
deleted file mode 100644
index d508b327f..000000000
--- a/arch/extras/README
+++ /dev/null
@@ -1,12 +0,0 @@
-contents of this directory
-
-   autotools_PKGBUILD: example of PKGBUILD for building 
-      trinity components with autotools. Should be used 
-      as template for new PKGBUILDS.
-   
-   cmake_PKGBUILD: example of PKGBUILD for building 
-      trinity components with CMake. Should be used as 
-      a template for new PKGBUILDS.
-   
-   batchbuild: simple scirpt for batch building trinity 
-      components.
diff --git a/arch/extras/autotools_PKGBUILD b/arch/extras/autotools_PKGBUILD
deleted file mode 100644
index 36f2c6312..000000000
--- a/arch/extras/autotools_PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-pkname
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity')
-pkgdesc="Trinity - pkgdesc"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=()
-provides=($pkgname)
-conflicts=()
-replaces=()
-options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/pkname-3.5.13.tar.gz)
-md5sums=('pkgmd5')
-
-_builddir=applications/pkname
-_prefix=/opt/trinity
-
-build() {
-
-  msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-  #msg "Patching..."
-  #patch -N -d ${srcdir} -p0 < pkname.patch
-  
-  msg "Starting automake..."
-  cd "$srcdir/${_builddir}"
-  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-  make -f admin/Makefile.common
-
-  msg "Starting configure..."
-  ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
-
-  msg "Building ${pkgname}..."
-  make
-}
-
-package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/${_builddir}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/extras/batchbuild b/arch/extras/batchbuild
deleted file mode 100755
index 01b9a3e05..000000000
--- a/arch/extras/batchbuild
+++ /dev/null
@@ -1,324 +0,0 @@
-#!/bin/bash
-
-# some of base things
-version="3.5.13"
-arch=`arch`
-startdir=`pwd`
-binariesdir="${startdir}/binaries-${arch}"
-scriptname=`basename $0`
-
-#usage function
-function usage(){
-   printf "Usage: %s [ OPTIONS ]\n\n" ${scriptname}
-   printf "Options:\n"
-   printf "  -a,  --all\t\tBuild all binaries.\n"
-   printf "  -b,  --base\t\tBuild base components.\n"
-   printf "  -x,  --extras\t\tBuild extras.\n"
-   printf "  -d,  --deps\t\tBuild external dependencies.\n"
-   printf "  -h,  --help\t\tDisplay this mesage.\n"
-   printf "  -p,  --patch [dir]\tPatch PKGBUILDs using patches found in patch folder.\n"
-   printf "\t\t\tThis files should be created manually.\n"
-   printf "\t\t\tPatches should be named after PKGBUILD they correct.\n"
-   printf "\t\t\tExample: kdebase.patch\n"
-   printf "\t\t\tOptionally you can specify patches location (default\n"
-   printf "\t\t\tpatch folder).\n"
-   printf "  -c,  --dont-clean\tDont remove anything.\n"
-   printf "Note: This script should be run on clean and out-of-box arch\n"
-   printf "installation for the best outcome. There is no need to \n"
-   printf "pull anything needed for building manually.\n"
-   printf "Binaries will be automatically installed as build process\n"
-   printf "progress and gethered in %s dir.\n" ${binariesdir}
-   printf "\e[0;31m THIS SCRIPT SHOULD BE RUN AS ROOT\e[0m\n\n\n"
-   exit 1
-}
-
-function build_pkg(){
-   cd $1
-   makepkg -i $cleanflag -s --noconfirm --asroot
-   cd ..
-}
-
-function patch_pkgbuild(){
-if [ -e ${startdir}/patch/${1}.patch ]; then
-   patch ${1}/PKGBUILD < ${patchdir}/${1}.patch
-fi
-}
-
-# Parse args
-if [ $# -lt 1 ]; then
-   usage
-fi
-
-args=`getopt -o abxdrhp::c \
-      -l all,base,extras,asroot,deps,"help",patch::,dont-clean \
-      -n $scriptname -- "$@"`
-eval set -- "$args"
-while true ; do
-   case "$1" in
-      -a|--all)
-         buildbase=1
-         fetch=1
-         builddeps=1
-         buildextras=1
-         shift 1
-         ;;
-      -b|--base)
-         buildbase=1
-         fetch=1
-         shift 1
-         ;;
-      -x|--extras)
-         buildextras=1
-         fetch=1
-         shift 1
-         ;;
-      -d|--deps)
-         builddeps=1
-         shift 1
-         ;;
-      -h|--help)
-         usage
-         shift 1
-         ;;
-      -p|--patch)
-         patch=1
-         case $2 in
-            "")
-               patchdir=${curdir}/patch/
-               shift 2
-               ;;
-            *)
-               patchdir=${2}
-               shift 2
-               ;;
-         esac
-         ;;
-      -c|--dont-clean)
-         dontclean=1
-         shift 1
-         ;;
-      --) shift ; break ;;
-   esac
-done
-
-if [ ! $dontclean ]; then
-   cleanflag="-c"
-fi
-
-if [ $builddeps ]; then
-   printf "\e[0;34m=========================================\e[0m\n"
-   printf "\n\e[0;34mBuilding dependencies form aur\e[0m\n"
-   printf "\e[0;34m=========================================\e[0m\n"
-
-   mkdir deps
-   cd deps
-
-   printf "\n\e[0;34mhal-info\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-
-   wget http://aur.archlinux.org/packages/ha/hal-info/hal-info.tar.gz
-   tar zxvf hal-info.tar.gz
-   build_pkg hal-info
-
-   printf "\n\e[0;34mhal-git\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-
-   wget http://aur.archlinux.org/packages/ha/hal-git/hal-git.tar.gz
-   tar zxvf hal-git.tar.gz
-   build_pkg hal-git
-
-   printf "\n\e[0;34mlibnjb\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-
-   wget http://aur.archlinux.org/packages/li/libnjb/libnjb.tar.gz
-   tar zxvf libnjb.tar.gz
-   build_pkg libnjb
-
-   # gather binaries
-   cd $curdir
-   mkdir -p ${binariesdir}/deps/
-   mv aur/*/*.tar.xz ${binariesdir}/deps/
-   if [ ! $dontclean ]; then
-      rm -r deps
-   fi
-   printf "\e[0;34m=========================================\e[0m\n"
-   printf "\e[0;34mFinished building external dependencies\e[0m\n"
-   printf "\e[0;34m=========================================\e[0m\n"
-fi
-
-if [ $fetch ]; then
-   printf "\e[0;34m=========================================\e[0m\n"
-   printf "\n\e[0;34mFetching trinity PKGBUILDs\e[0m\n"
-   printf "\e[0;34m=========================================\e[0m\n"
-
-   # fetch PKGBUILD and remove useless things
-   git clone http://scm.trinitydesktop.org/scm/git/tde-packaging
-   cd tde-packaging
-   git submodule init
-   git submodule update
-   rm -r ark debian ubuntu fedora mandriva opensuse redhat slackware README.GIT
-   cd $startdir
-   mv tde-packaging/arch/${version}/* .
-   rm -r tde-packaging
-   if [ ! $buildbase ]; then
-      rm -r trinity-base
-   fi
-   if [ ! $buildextras ]; then
-      rm -r trinity-extras
-   fi
-
-fi
-
-if [ $buildbase ]; then
-   cd trinity-base
-
-   # build
-   printf "\e[0;34m=========================================\e[0m\n"
-   printf "Building base trinity components\n"
-   printf "\e[0;34m=========================================\e[0m\n"
-
-   printf "\n\e[0;34mtrinity-qt3\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild qt3
-   fi
-   build_pkg trinity-qt3
-
-   printf "\n\e[0;34mtrinity-pyqt3\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild pyqt3
-   fi
-   build_pkg trinity-pyqt3
-
-   printf "\n\e[0;34mtrinity-tqtinterface\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild tqtinterface
-   fi
-   build_pkg trinity-tqtinterface
-
-   printf "\n\e[0;34mtrinity-arts\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild arts
-   fi
-   build_pkg trinity-arts
-
-   printf "\n\e[0;34mtrinity-dbus-1-qt3\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild dbus-1-qt3
-   fi
-   build_pkg trinity-dbus-1-qt3
-
-   printf "\n\e[0;34mtrinity-dbus-tqt\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild dbus-tqt
-   fi
-   build_pkg trinity-dbus-tqt
-
-   printf "\n\e[0;34mtrinity-dbus-tqt-1\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild dbus-tqt-1
-   fi
-   build_pkg trinity-dbus-tqt-1
-
-   printf "\n\e[0;34mtrinity-kdelibs\e[0m\n\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild kdelibs
-   fi
-   build_pkg trinity-kdelibs
-
-   printf "\n\e[0;34mtrinity-kdebase\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild kdebase
-   fi
-   build_pkg trinity-kdebase
-   
-   # gather binaries and clean
-   cd $curdir
-   mkdir -p ${binariesdir}/trinity-base/
-   mv aur/*/*.tar.xz ${binariesdir}/trinity-base/
-   if [ ! $dontclean ]; then
-      rm -r trinity-base
-   fi
-
-   printf "\e[0;34m=========================================\e[0m\n"
-   printf "\e[0;34mFinished building base components\e[0m\n"
-   printf "\e[0;34m=========================================\e[0m\n"
-fi
-
-if [ $buildextras ]; then
-
-   cd trinity-extras
-
-   printf "\e[0;34m=========================================\e[0m\n"
-   printf "\n\e[0;34mBuilding trinity-extras\e[0m\n"
-   printf "\e[0;34m=========================================\e[0m\n"
-
-   printf "\n\e[0;34mtrinity-amarok\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild amarok
-   fi
-   build_pkg trinity-amarok
-
-   printf "\n\e[0;34mtrinity-gtk-qt-engine\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild gtk-qt-engine
-   fi
-   build_pkg trinity-gtk-qt-engine
-
-   printf "\n\e[0;34mtrinity-kdegraphics\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild kdegraphics
-   fi
-   build_pkg trinity-kdegraphics
-
-   printf "\n\e[0;34mtrinity-kdevelop\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild kdevelop
-   fi
-   build_pkg trinity-kdevelop
-
-   printf "\n\e[0;34mtrinity-konversation\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild konversation
-   fi
-   build_pkg trinity-konversation
-
-   printf "\n\e[0;34mtrinity-kpowersave\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild kpowersave
-   fi
-   build_pkg trinity-kpowersave
-
-   printf "\n\e[0;34mtrinity-amarok\e[0m\n"
-   printf "\e[0;34m%b----------------------------------------\e[0m\n"
-   if [ $patch ]; then
-      patch_pkgbuild qtcurve
-   fi
-   build_pkg trinity-qtcurve
-
-   # gather binaries and clean
-   cd $curdir
-   mkdir -p ${binariesdir}/trinity-extras/
-   mv aur/*/*.tar.xz ${binariesdir}/trinity-extras/
-   if [ ! $dontclean ]; then
-      rm -r trinity-extras
-   fi
-   printf "\e[0;34m=========================================\e[0m\n"
-   printf "\e[0;34mFinished building external dependencies\e[0m\n"
-   printf "\e[0;34m=========================================\e[0m\n"
-fi
-
diff --git a/arch/extras/cmake_PKGBUILD b/arch/extras/cmake_PKGBUILD
deleted file mode 100644
index bf2583449..000000000
--- a/arch/extras/cmake_PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
-
-pkgname=trinity-pkname
-pkgver=3513
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.trinitydesktop.org'
-license=('GPL')
-groups=('trinity-extras')
-pkgdesc="Trinity - pkgdesc"
-depends=('trinity-kdelibs')
-makedepends=('pkgconfig' 'cmake' 'imake')
-optdepends=()
-provides=($pkgname)
-confilcts=()
-replaces=()
-options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/pkname-3.5.13.tar.gz)
-md5sums=('')
-
-_svnmod=applications/kpowersave
-_builddir=build
-_prefix="/opt/trinity"
-
-build() {
-   msg "Setting PATH, CMAKE and Trinity Environment variables"
-   export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
-   export CMAKE_INCLUDE_PATH=${QTDIR}/include:${QTDIR}/include/tqt:/usr/include/dbus-1.0:${_prefix}/include:${_prefix}/include/libkrandr
-   export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-   export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
-# patch
-# msg "Patching..."
-# patch -N -d ${srcdir} -p0 < ${srcdir}/pkname.patch
-
-   cd $srcdir
-   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
-   mkdir -p ${_builddir}
-   cd ${_builddir}
-
-   msg "Starting cmake..."
-   cmake ${srcdir}/${_svnmod} \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON \
-    -DQT_VERSION=3 \
-    -DWITH_QT3=ON \
-    -DQTDIR=${QTDIR} \
-    -DQT_DOCDIR=${QTDIR}/man \
-    -DQT_LIBRARY_DIRS=${QTDIR}/lib \
-    -DBUILD_ALL=ON
-
-   msg "Building - $pkgname..."
-   make
-}
-
-package() {
-   msg "Packaging - $pkgname-$pkgver"
-   cd ${srcdir}/${_builddir}
-   make DESTDIR="${pkgdir}" install
-}
diff --git a/arch/tde-base/tde-i18n/PKGBUILD b/arch/tde-base/tde-i18n/PKGBUILD
new file mode 100644
index 000000000..e9e3c222e
--- /dev/null
+++ b/arch/tde-base/tde-i18n/PKGBUILD
@@ -0,0 +1,148 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tde-i18n
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod/tde-}"
+pkgname=("$pkgbase")
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Internationalized (i18n) files for TDE"
+arch=('any')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+makedepends=('tde-cmake-trinity')
+depends=('tde-tdelibs')
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ad823306858c077c17051e991467afb9')
+install=''
+
+_languages=(
+  'af               "Afrikaans"'
+  'ar               "Arabic"'
+  'az               "Azerbaijani"'
+  'be               "Belarusian"'
+  'bg               "Bulgarian"'
+  'bn               "Bengali"'
+  'br               "Breton"'
+  'bs               "Bosnian"'
+  'ca               "Catalan"'
+  'cs               "Czech"'
+  'csb              "Kashubian"'
+  'cy               "Welsh"'
+  'da               "Danish"'
+  'de               "German"'
+  'el               "Greek"'
+  'en_GB            "English (British)"'
+  'eo               "Esperanto"'
+  'es               "Spanish"'
+  'es_AR            "Spanish (Argentina)"'
+  'et               "Estonian"'
+  'eu               "Basque"'
+  'fa               "Persian"'
+  'fi               "Finnish"'
+  'fr               "French"'
+  'fy               "Frisian"'
+  'ga               "Irish"'
+  'gl               "Galician"'
+  'he               "Hebrew"'
+  'hi               "Hindi"'
+  'hr               "Croatian"'
+  'hu               "Hungarian"'
+  'is               "Icelandic"'
+  'it               "Italian"'
+  'ja               "Japanese"'
+  'kk               "Kazakh"'
+  'km               "Khmer"'
+  'ko               "Korean"'
+  'lt               "Lithuanian"'
+  'lv               "Latvian"'
+  'mk               "Macedonian"'
+  'mn               "Mongolian"'
+  'ms               "Malay"'
+  'nb               "Norwegian Bokmål"'
+  'nds              "Low Saxon"'
+  'nl               "Dutch"'
+  'nn               "Norwegian Nynorsk"'
+  'pa               "Punjabi"'
+  'pl               "Polish"'
+  'pt               "Portuguese"'
+  'pt_BR            "Portuguese (Brazil)"'
+  'ro               "Romanian"'
+  'ru               "Russian"'
+  'rw               "Kinyarwanda"'
+  'se               "Northern Sami"'
+  'sk               "Slovak"'
+  'sl               "Slovenian"'
+  'sr               "Serbian"'
+  'sr@Latn          "Serbian Latin"'
+  'ss               "Swati"'
+  'sv               "Swedish"'
+  'ta               "Tamil"'
+  'te               "Telugu"'
+  'tg               "Tajik"'
+  'th               "Thai"'
+  'tr               "Turkish"'
+  'uk               "Ukrainian"'
+  'uz               "Uzbek"'
+  'uz@cyrillic      "Uzbek (Cyrillic)"'
+  'vi               "Vietnamese"'
+  'wa               "Walloon"'
+  'zh_CN            "Chinese (Simplified)"'
+  'zh_TW            "Chinese (Traditional)"'
+)
+
+_pkglangs=()
+for _lang in "${_languages[@]}"; do
+  _locale=${_lang%% *}
+  _pkglang=$(echo ${_locale,,} | tr '[:upper:]' '[:lower:]' | \
+             sed "s|@latn|latin|" | \
+             tr -d "_" | tr -d "@")
+  _pkgname=${pkgbase}-${_pkglang}
+
+  pkgname+=($_pkgname)
+  _pkglangs+=($_pkgname)
+  eval "package_$_pkgname() {
+    _package $_pkglang $_lang
+  }"
+done
+
+_package() {
+  pkgdesc="$3 ($2) internationalized (i18n) files for TDE"
+  provides=("${_mod}-${1}")
+  conflicts=("trinity-${_kdemod}-${1}" "kdemod3-${_kdemod}-${1}")
+  replaces=("trinity-${_mod}-${1}")
+
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install-${2/@/_}
+}
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package_tde-i18n() {
+  pkgdesc="All languages (all) internationalized (i18n) files for TDE"
+  provides=("${_mod}")
+  conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+  replaces=("trinity-${_mod}")
+  depends+=(${_pkglangs[@]})
+}
diff --git a/arch/tde-base/tde-polkit-agent-tde/PKGBUILD b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD
new file mode 100644
index 000000000..ecab0d825
--- /dev/null
+++ b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=polkit-agent-tde
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE dialogs for PolicyKit"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-base')
+depends=(
+  'tde-tdelibs'
+  'tde-polkit-tqt'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('bf7e4c181d8c57fd38b32e4044d04579')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD
new file mode 100644
index 000000000..ad5fd7941
--- /dev/null
+++ b/arch/tde-base/tde-tdeadmin/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdeadmin
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="The TDE system administration utilities"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity')
+optdepends=()
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('a2426cca4b42cb4c625b56c743fe0c86')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DBUILD_KNETWORKCONF=OFF \
+     -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD
new file mode 100644
index 000000000..14ca1a7d9
--- /dev/null
+++ b/arch/tde-base/tde-tdeartwork/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdeartwork
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+pkgdesc="Trinity Desktop Development Ingegration Components - TDE upstream GIT"
+depends=('tde-tdebase' 'xscreensaver' 'libxss')
+makedepends=('tde-cmake-trinity')
+optdepends=()
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('435caf2c3e4e4e5e8c4b0473085997a6')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname#*-}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD
new file mode 100644
index 000000000..a3473b299
--- /dev/null
+++ b/arch/tde-base/tde-tdebindings/PKGBUILD
@@ -0,0 +1,64 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdebindings
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https//scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+pkgdesc="Trinity Desktop bindings"
+depends=('tde-tdelibs')
+makedepends=('pkgconfig' 'autoconf' 'ruby' 'jdk-openjdk')
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('5ff91819a140210b4a946ef7384b7abb')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  ## Generate config files and update with autoreconf
+  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
+
+  msg "Copying system libtool files...."
+  cp -a /usr/share/libtool/build-aux/config.guess ./admin/
+  cp -a /usr/share/libtool/build-aux/config.sub ./admin/
+  cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
+  cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
+
+  msg "Running make -f admin/Makefile.common ...."
+  make -f admin/Makefile.common
+
+  ## configure
+  msg "Configuring - ${pkgname}..."
+  PYTHON=/usr/bin/python2 \
+  ./configure \
+    --prefix=${TDEDIR} \
+    --with-qt-dir=${QTDIR} \
+    --with-qt-includes=${QTDIR}/include \
+    --with-qt-libraries=${QTDIR}/lib \
+    --with-extra-includes="/usr/include/tqt:/usr/include/tqt/Qt" \
+    --with-extra-libs="${TDEDIR}/lib:${TDEDIR}/lib/trinity" \
+    --with-java=/usr/lib/jvm/default \
+    --sysconfdir=${TDEDIR}/etc \
+    --localstatedir=/var \
+    --enable-closure \
+    DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts python'
+
+  msg "Building - ${pkgname}..."
+  make $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
+  make -j1 DESTDIR="${pkgdir}" install
+}
diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD
new file mode 100644
index 000000000..9091c7122
--- /dev/null
+++ b/arch/tde-base/tde-tdegraphics/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: e1z0 <marcinkeviciusjustinas at gmail dot com>
+
+_mod=tdegraphics
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Desktop Graphics Components"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+depends=('tde-tdelibs' 'fribidi' 'imlib' 'libgphoto2' 'libpaper' 'poppler' 'sane' 't1lib')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4ac1e61bdf0f233901a0c2e802335282')
+# install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+prepare() {
+  msg "Apply backported patches"
+  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1
+#  patch -p1 < ${srcdir}/bp000-?.diff
+}
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DWITH_T1LIB=ON \
+     -DWITH_PAPER=ON \
+     -DWITH_TIFF=ON \
+     -DWITH_OPENEXR=ON \
+     -DWITH_PDF=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-base/tde-tdeutils/PKGBUILD b/arch/tde-base/tde-tdeutils/PKGBUILD
new file mode 100644
index 000000000..120fa6161
--- /dev/null
+++ b/arch/tde-base/tde-tdeutils/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdeutils
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="The TDE something - with Trinity upstream"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-base')
+depends=('tde-tdebase' 'xmms2')
+makedepends=('tde-cmake-trinity' 'python3')
+optdepends=()
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4296fb39a6d025906526e75b6992f460')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   ## cmake call
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DWITH_DPMS=ON \
+     -DWITH_XSCREENSAVER=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD
new file mode 100644
index 000000000..4ab44fff2
--- /dev/null
+++ b/arch/tde-core/tde-arts/PKGBUILD
@@ -0,0 +1,65 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=arts
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity aRts Sound System and libraries"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+depends=('alsa-plugins'
+	'alsa-tools'
+	'alsa-utils'
+	'audiofile'
+	'glib2'
+	'libmad'
+	'libogg'
+	'libvorbis'
+	'pulseaudio-alsa'
+	'tde-tqtinterface')
+makedepends=('tde-cmake-trinity')
+optdepends=('audio-convert: A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma'
+	'lame: A high quality MPEG Audio Layer III (MP3) encoder'
+	'libmp3splt: Library for splitting mp3 and ogg files without decoding'
+	'mpd: Music daemon that plays MP3, FLAC, and Ogg Vorbis files'
+	'vorbis-tools: Extra tools for Ogg-Vorbis')
+provides=("${_mod}")
+conflicts=("kdemod3-${_mod}" "${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('b1ccb0f271c19b667ab9736dd658ccaf')
+install="tde-${_mod}.install"
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_ESOUND=OFF \
+      -DWITH_JACK=OFF
+
+   msg "Building $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/3.5.13/trinity-base/trinity-arts/trinity-arts.install b/arch/tde-core/tde-arts/tde-arts.install
index 30e6e407f..30e6e407f 100644
--- a/arch/3.5.13/trinity-base/trinity-arts/trinity-arts.install
+++ b/arch/tde-core/tde-arts/tde-arts.install
diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD
new file mode 100644
index 000000000..78b5e599f
--- /dev/null
+++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=avahi-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Avahi-TQt"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+depends=('tde-tqtinterface' 'avahi' 'nss-mdns')
+# nss-mdns should probably move to tdelibs depends
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('1aa6516656a6502ac798ebdbe6060d4a')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-cmake-trinity/PKGBUILD b/arch/tde-core/tde-cmake-trinity/PKGBUILD
new file mode 100644
index 000000000..568605b9a
--- /dev/null
+++ b/arch/tde-core/tde-cmake-trinity/PKGBUILD
@@ -0,0 +1,51 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=cmake-trinity
+_cat=common/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE CMake modules"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/tde-common-cmake"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-core')
+depends=(
+  'cmake'
+  'perl'
+  'ninja'
+  'pkgconfig'
+)
+makedepends=()
+optdepends=()
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz")
+md5sums=('e00590787e67d679af8d7a1f8e0dae5a')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
new file mode 100644
index 000000000..883f45138
--- /dev/null
+++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=dbus-1-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core' 'tde-base')
+depends=('tde-tqtinterface' 'dbus')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}" 'trinity-dbus-1-qt3' 'dbus-1-qt3')
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6bb6714e96d631602aee6151a41cb0c3')
+install="trinity-${_mod}.install"
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/trinity-dbus-tqt.install b/arch/tde-core/tde-dbus-1-tqt/trinity-dbus-1-tqt.install
index 2a8dc4c98..2a8dc4c98 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/trinity-dbus-tqt.install
+++ b/arch/tde-core/tde-dbus-1-tqt/trinity-dbus-1-tqt.install
diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD
new file mode 100644
index 000000000..9e14b3472
--- /dev/null
+++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=dbus-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+pkgdesc="Trinity TQt DBus wrapper"
+depends=('tde-tqtinterface' 'dbus')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('626f54982411dd7ba188fa02826e1d66')
+install="trinity-${_mod}.install"
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR
+
+   msg "Building - $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity-tqtinterface.install b/arch/tde-core/tde-dbus-tqt/trinity-dbus-tqt.install
index 2a8dc4c98..2a8dc4c98 100644
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity-tqtinterface.install
+++ b/arch/tde-core/tde-dbus-tqt/trinity-dbus-tqt.install
diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD
new file mode 100644
index 000000000..9b296b2cb
--- /dev/null
+++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=libart-lgpl
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Desktop LGPL'd Component"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('LGPL')
+groups=('tde-core')
+#depends=('')
+makedepends=('tde-cmake-trinity')
+optdepends=()
+provides=("${_mod}")
+conflicts=()
+replaces=()
+options=('staticlibs' 'libtool' '!strip')
+install=
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('f50fa2b4b16e073b5b31e7cf82e6c919')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DWITH_GCC_VISIBILITY=ON
+
+   msg "Building - $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-polkit-tqt/PKGBUILD b/arch/tde-core/tde-polkit-tqt/PKGBUILD
new file mode 100644
index 000000000..5d878fe95
--- /dev/null
+++ b/arch/tde-core/tde-polkit-tqt/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=polkit-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity PolicyKit-tqt library"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core' 'tde-base')
+depends=('tde-tqtinterface' 'tde-dbus-1-tqt' 'polkit')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('89ff224bc5295de36792ba27c69d568b')
+install="trinity-${_mod}.install"
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install
new file mode 100644
index 000000000..2a8dc4c98
--- /dev/null
+++ b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install
@@ -0,0 +1,12 @@
+post_install() {
+   ldconfig &> /dev/null
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}
+
diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD
new file mode 100644
index 000000000..6ae0352c8
--- /dev/null
+++ b/arch/tde-core/tde-tdebase/PKGBUILD
@@ -0,0 +1,157 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdebase
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Desktop Enviroment base components"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-core')
+depends=('libraw1394'
+         'libssh'
+         'libxtst'
+         'libxss'
+         'lm_sensors'
+         'tde-tdelibs'
+         'tde-dbus-1-tqt'
+         'ttf-dejavu'
+         'ttf-freefont'
+         'xorg-server'
+         'xorg-xinit'
+         'htdig'
+         'openssl-1.0')
+makedepends=('tde-cmake-trinity'
+         'libxkbfile'
+         'smbclient'
+         'rpcsvc-proto'
+         'xorg-bdftopcf'
+         'xscreensaver')
+optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
+            'pciutils: PCI bus configuration space access library and tools'
+            'samba: file sharing over SMB'
+            'tde-extra: (meta-package) extra utilities and applications for TDE'
+            'tde-multimedia: (meta-package) multimedia applications, k3b, rosegarden, etc..'
+            'tde-complete: (meta-package) install all of TDE'
+            'tde-avahi-tqt: Trinity Avahi-TQt implementation'
+            'tde-libcaldav: A client library adding support for the CalDAV protocol'
+            'tde-libcarddav: A client library adding support for the CardDAV protocol'
+            'tde-tqca-tls: Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)'
+            'xorg-fonts-75dpi: X.org 75dpi fonts collection'
+            'xscreensaver: Screen saver and locker for the X Window System')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+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"
+        'agent-shutdown.sh'
+        'agent-startup.sh'
+        'tdm-trinity'
+        'trinity.desktop'
+        'tdm.service'
+        'xsession.patch')
+
+md5sums=('33f716d80d90a12fd09ec2536b6e249a'
+         '18e8d01124b19f7df2937c06e177bf7f'
+         'c963ef6e37c9051119972a58c67f05fb'
+         'bb4c25e560fa719e8e8f49ef80bd1c99'
+         '091f4e1045867bbbc15bf323731aae82'
+         'e0ddb96fc86bd081ce691744a68d2f9a'
+         'a761787a4d2f917389ced194552addca')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
+
+  msg "Starting cmake..."
+
+  export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
+
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DWITH_SASL=ON \
+    -DWITH_LDAP=ON \
+    -DWITH_SAMBA=ON \
+    -DWITH_OPENEXR=ON \
+    -DWITH_XCOMPOSITE=ON \
+    -DWITH_XCURSOR=ON \
+    -DWITH_XFIXES=ON \
+    -DWITH_XRANDR=ON \
+    -DWITH_XRENDER=ON \
+    -DWITH_XTEST=ON \
+    -DWITH_OPENGL=ON \
+    -DWITH_XSCREENSAVER=ON \
+    -DWITH_LIBART=ON \
+    -DWITH_LIBRAW1394=ON \
+    -DWITH_PAM=ON \
+    -DWITH_XDMCP=ON \
+    -DWITH_XINERAMA=ON \
+    -DWITH_ARTS=ON \
+    -DWITH_I8K=ON \
+    -DWITH_SENSORS=ON \
+    -DWITH_HAL=OFF \
+    -DWITH_TDEHWLIB=ON \
+    -DWITH_UPOWER=ON \
+    -DBUILD_ALL=ON \
+    -DWITH_GCC_VISIBILITY=ON \
+    -DKCHECKPASS_PAM_SERVICE=tde-checkpass \
+    -DTDM_PAM_SERVICE=tde \
+    -DTDESCREENSAVER_PAM_SERVICE=tde-screensaver
+
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd $srcdir/build
+  DESTDIR="$pkgdir" ninja -j1 install
+
+  # install X11 session file /usr/share/xsessions (changed from /etc/X11 sessions)
+  install -d -m755 ${pkgdir}/usr/share/xsessions
+  install -m755 ${srcdir}/trinity.desktop ${pkgdir}/usr/share/xsessions/trinity.desktop
+
+  # update the Xsession file, this resolves problem with kdm dropping back
+  # to the login screen.
+
+  patch -N ${pkgdir}${TDEDIR}/share/config/tdm/Xsession < ${srcdir}/xsession.patch
+
+  ## we will need systemd service files created
+  install -D -m644 "${srcdir}"/tdm.service \
+    "${pkgdir}"/usr/lib/systemd/system/tdm.service
+
+  # create the starttrinity link
+  # do we need this? wouldn't be better to rename startkde script
+  # to starttrinity? (renamed to starttde) Create for compatibility sake.
+  ln -sf $TDEDIR/bin/starttde ${pkgdir}$TDEDIR/bin/starttrinity
+
+  # install mkpamserv script, so we can auto-generate pam.d configs in post_install()
+  install -D -m755 ${srcdir}/${pkgname#*-}-trinity-${pkgver}/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
+
+  # add startup/shutdown agents for ssh and gpg-agent
+  install -m644 -D $srcdir/agent-startup.sh ${pkgdir}$TDEDIR/env/agent-startup.sh
+  install -m755 -D $srcdir/agent-shutdown.sh ${pkgdir}$TDEDIR/shutdown/agent-shutdown.sh
+
+  # fix kde icons for gnome by creating symlinks
+  mkdir -p ${pkgdir}$TDEDIR/share/icons/gnome/{128x128,64x64,32x32,16x16,48x48,22x22,scalable}
+  mkdir -p ${pkgdir}$TDEDIR/share/icons/crystalsvg/{128x128/apps,64x64/apps,32x32/apps,16x16/apps,48x48/apps,22x22/apps,scalable/apps}
+
+  cd ${pkgdir}$TDEDIR/share/icons/gnome/
+
+  for i in *; do
+    cd $i
+    ln -sf ../../crystalsvg/$i/apps/ apps
+    cd ..
+  done
+}
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh b/arch/tde-core/tde-tdebase/agent-shutdown.sh
index 71b056af3..71b056af3 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh
+++ b/arch/tde-core/tde-tdebase/agent-shutdown.sh
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh b/arch/tde-core/tde-tdebase/agent-startup.sh
index 88d1373a1..88d1373a1 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh
+++ b/arch/tde-core/tde-tdebase/agent-startup.sh
diff --git a/arch/tde-core/tde-tdebase/tdm-trinity b/arch/tde-core/tde-tdebase/tdm-trinity
new file mode 100644
index 000000000..9f425b809
--- /dev/null
+++ b/arch/tde-core/tde-tdebase/tdm-trinity
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /opt/trinity/bin/tdm`
+case "$1" in
+   start)
+      #Check for running tdm, start when not running
+      stat_busy "Starting TDE Desktop Manager (tdm)"
+      [ -z "$PID" ] && /opt/trinity/bin/tdm &> /dev/null
+	   if [ $? -gt 0 ]; then
+         stat_fail
+      else
+         echo $PID > /var/run/tdm.pid
+         add_daemon tdm-trinity
+         stat_done
+      fi
+      ;;
+   stop)
+      stat_busy "Stopping TDE Desktop Manager (tdm)"
+      [ ! -z "$PID" ] && kill $PID &> /dev/null
+      if [ $? -gt 0 ]; then
+         stat_fail
+      else
+         rm_daemon tdm-trinity
+         stat_done
+      fi
+      ;;
+   restart)
+      $0 stop
+      sleep 1
+      $0 start
+      ;;
+   *)
+      echo "usage: $0 {start|stop|restart}"
+      ;;
+esac
+exit 0
diff --git a/arch/tde-core/tde-tdebase/tdm.service b/arch/tde-core/tde-tdebase/tdm.service
new file mode 100644
index 000000000..181f6cf1d
--- /dev/null
+++ b/arch/tde-core/tde-tdebase/tdm.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=TDE Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/opt/trinity/bin/tdm
+
+[Install]
+Alias=display-manager.service
diff --git a/arch/tde-core/tde-tdebase/trinity-tdebase.install b/arch/tde-core/tde-tdebase/trinity-tdebase.install
new file mode 100644
index 000000000..b2ba604ef
--- /dev/null
+++ b/arch/tde-core/tde-tdebase/trinity-tdebase.install
@@ -0,0 +1,17 @@
+post_install() {
+   ldconfig &> /dev/null
+   [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+   $TDEDIR/bin/mkpamserv tde
+   $TDEDIR/bin/mkpamserv tde-screensaver
+   $TDEDIR/bin/mkpamserv tde-checkpass
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   ldconfig &> /dev/null
+   rm /etc/pam.d/{tde,tde-screensaver,tde-checkpass}
+}
+
diff --git a/arch/tde-core/tde-tdebase/trinity.desktop b/arch/tde-core/tde-tdebase/trinity.desktop
new file mode 100644
index 000000000..6594afb2d
--- /dev/null
+++ b/arch/tde-core/tde-tdebase/trinity.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Exec=/opt/trinity/bin/starttde
+TryExec=/opt/trinity/bin/starttde
+Name=Trinity
+Comment=The Trinity Desktop Environment (TDE). A powerful Open Source graphical desktop environment.
+
diff --git a/arch/tde-core/tde-tdebase/xsession.patch b/arch/tde-core/tde-tdebase/xsession.patch
new file mode 100644
index 000000000..8084fda40
--- /dev/null
+++ b/arch/tde-core/tde-tdebase/xsession.patch
@@ -0,0 +1,28 @@
+--- /mnt/archlinux/opt/trinity/share/config/kdm/Xsession	2011-12-08 13:08:43.000000000 +0100
++++ /opt/trinity/share/config/tdm/Xsession	2011-09-24 14:52:28.000000000 +0200
+@@ -43,4 +43,24 @@
+     ;;
+ esac
+ # invoke global X session script
+-. /etc/X11/Xsession
++ 
++ 
++	case $session in
++	  "")
++	    exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
++	    ;;
++	  failsafe)
++	    exec xterm -geometry 80x24-0-0
++	    ;;
++	  custom)
++	    exec $HOME/.xsession
++	    ;;
++	  default)
++	    exec /opt/trinity/bin/starttde
++	    ;;
++	  *)
++	    eval exec "$session"
++	    ;;
++	esac
++	exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
++	
diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD
new file mode 100644
index 000000000..3ac4c51f4
--- /dev/null
+++ b/arch/tde-core/tde-tdelibs/PKGBUILD
@@ -0,0 +1,99 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdelibs
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Desktop core libraries and applications"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+depends=('aspell'
+	'hspell'
+	'jasper'
+	'libcups'
+	'libidn'
+	'libutempter'
+	'libxcomposite'
+	'libxslt'
+	'libxtst'
+	'openssl-1.0'
+	'openexr'
+	'pcre'
+	'tde-arts'
+	'tde-avahi-tqt'
+	'tde-dbus-1-tqt'
+	'tde-libart-lgpl'
+	'xorg-iceauth'
+	'xorg-xmessage'
+	'xorg-xprop'
+	'xorg-xset'
+	'xorg-xsetroot')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}3")
+replaces=("trinity-${_kdemod}" "trinity-${_mod}")
+options=('staticlibs' 'libtool' '!makeflags' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('480783f105aefbecce9aec224105c9d8')
+
+install="trinity-${_mod}.install"
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
+
+  export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DWITH_ARTS=ON \
+    -DWITH_ALSA=ON \
+    -DWITH_LIBART=ON \
+    -DWITH_LIBIDN=ON \
+    -DWITH_SSL=ON \
+    -DWITH_CUPS=ON \
+    -DWITH_LUA=OFF \
+    -DWITH_TIFF=ON \
+    -DWITH_JASPER=ON \
+    -DWITH_OPENEXR=ON \
+    -DWITH_UTEMPTER=ON \
+    -DWITH_AVAHI=ON \
+    -DWITH_PAM=ON \
+    -DWITH_PCRE=ON \
+    -DWITH_GCC_VISIBILITY=ON \
+    -DWITH_TDEHWLIB_DAEMONS=ON \
+    -DWITH_UPOWER=ON \
+    -DWITH_UDISKS2=ON \
+    -DWITH_NETWORK_MANAGER_BACKEND=ON \
+    -DWITH_LZMA=ON \
+    -DWITH_XRANDR=ON \
+    -DWITH_XCOMPOSITE=ON \
+    -DWITH_ASPELL=ON \
+    -DWITH_HSPELL=ON
+
+  msg "Building - $pkgname..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="$pkgdir" ninja -j1 install
+  msg "Removing conflicting images"
+  rm ${pkgdir}/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
+}
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/trinity-kdelibs.install b/arch/tde-core/tde-tdelibs/trinity-tdelibs.install
index e2db661ac..e2db661ac 100644
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/trinity-kdelibs.install
+++ b/arch/tde-core/tde-tdelibs/trinity-tdelibs.install
diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD
new file mode 100644
index 000000000..def3754da
--- /dev/null
+++ b/arch/tde-core/tde-tqca-tls/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tqca-tls
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod%-tls}"
+license=('GPL')
+groups=('tde-core')
+depends=('tde-tqtinterface' 'openssl-1.0')
+makedepends=('tde-cmake-trinity')
+provides=(${_mod})
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod%-tls}-trinity-${pkgver}.tar.xz")
+md5sums=('f6d1ec68e91cf8d4ca103628585a0466')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${_mod%-tls}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=OFF \
+      -DBUILD_TQCA_TLS=ON \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-tqca/PKGBUILD b/arch/tde-core/tde-tqca/PKGBUILD
new file mode 100644
index 000000000..bc99697a0
--- /dev/null
+++ b/arch/tde-core/tde-tqca/PKGBUILD
@@ -0,0 +1,54 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tqca
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+depends=('tde-tqtinterface' 'openssl-1.0')
+makedepends=('tde-cmake-trinity')
+provides=(${_mod})
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('f6d1ec68e91cf8d4ca103628585a0466')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=$QTDIR \
+      -DBUILD_ALL=OFF \
+      -DBUILD_TQCA=ON \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD
new file mode 100644
index 000000000..107d4f6a9
--- /dev/null
+++ b/arch/tde-core/tde-tqt3/PKGBUILD
@@ -0,0 +1,195 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <MutantTurkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tqt3
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod}"
+pkgname=("$pkgbase" "${pkgbase}-docs")
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+options=('staticlibs' 'libtool' '!emptydirs' '!strip')
+makedepends=('libcups'
+        'libiodbc'
+        'libxi'
+        'postgresql'
+        'mariadb'
+        'unixodbc'
+        'libmng'
+        'xorg-xrandr'
+        'libxft'
+        'libxmu'
+        'glu')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3ea682bfceca2fb8e53234055a82bb8d')
+
+_prefix="/opt/trinity/tqt3"
+
+build() {
+
+  cd ${srcdir}/${_mod}-trinity-${pkgver}
+
+  # These are probably arch-specific. They were present in old qt3
+  # PKGBULD, they were present in kdemod3 PKGBUILD, they are present
+  # here.
+  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
+  sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
+
+  ## Fix commits 4412d295 and 18696899 that broke tqca-tls building
+  # by changing mkspecs/linux-g++-64/qmake.conf to include ../lib64.
+  # Just change all lib64 paths back to lib since Arch doesn't use lib64
+  sed -i 's|lib64|lib|g' mkspecs/linux-g++-64/qmake.conf
+
+  # auto license acceptance
+  sed -i "s|read acceptance|acceptance=yes|" configure
+
+  msg "Setting enviroment variables..."
+  export QTDIR="${srcdir}/${_mod}-trinity-${pkgver}"
+  export PATH=${QTDIR}/bin:${PATH}
+  export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+  export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+
+  if [ "$CARCH" = "x86_64" ]; then
+    export ARCH="-64"
+  else unset ARCH
+  fi
+
+  # Remove useless to us mkspecs
+  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
+
+  msg "Starting configure..."
+  ./configure \
+    -prefix ${_prefix} \
+    -sysconfdir /etc/tqt \
+    -I/usr/include/mysql \
+    -I/usr/include/postgresql/server \
+    -I/usr/include/libiodbc \
+    -I/usr/include/freetype2 \
+    -I/usr/include/tirpc \
+    -lpq \
+    -lmysqlclient \
+    -L/usr/lib/mysql \
+    -qt-gif \
+    -system-zlib \
+    -system-libpng \
+    -system-libjpeg \
+    -system-libmng \
+    -plugin-imgfmt-png \
+    -plugin-imgfmt-jpeg \
+    -plugin-imgfmt-mng \
+    -plugin-sql-mysql \
+    -plugin-sql-psql \
+    -plugin-sql-sqlite \
+    -plugin-sql-odbc \
+    -platform linux-g++${ARCH} \
+    -no-exceptions \
+    -thread \
+    -enable-opengl \
+    -dlopen-opengl \
+    -no-ipv6
+
+  # 64bit fixes pulled from extras/qt3 PKGBUILD
+  # this is Arch-specific
+  # fix /opt/qt/lib path
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile
+
+  msg "--- \$CARCH is $CARCH ---"
+  msg "Building - $pkgbase..."
+
+  cd "${QTDIR}"
+
+  # build rest, but without tutorials and examples
+  # of you want them, remove sub-tools
+  make sub-tools
+
+}
+
+## split package for tqt3
+package_tde-tqt3() {
+  pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3 - git version"
+  depends=('libjpeg-turbo'
+          'libmng'
+          'libmariadbclient'
+          'libpng'
+          'libxcursor'
+          'libxft'
+          'libxinerama'
+          'libxmu'
+          'libxrandr'
+          'mesa'
+          'postgresql')
+  optdepends=('cups: The CUPS Printing System - for printing support'
+          'postgresql: A sophisticated object-relational DBMS - databse support'
+          'unixodbc: ODBC API for linux - databse support'
+          'mariadb: A fast SQL database server - databse support')
+  provides=('qt3' 'tqt3')
+  replaces=('qt3' 'qt3-enhanced' 'trinity-tqt3')
+  options=('staticlibs' 'libtool' '!emptydirs' '!strip')
+  groups=('tde-core')
+  install='tqt3.install'
+
+   msg "Packaging - $pkgname-$pkgver"
+   cd "${QTDIR}"
+
+   make INSTALL_ROOT="$pkgdir" install
+
+   ## remove doc as it is now in a split package tde-tqt3-doc
+   rm -r "${pkgdir}${_prefix}/doc"
+
+   # install link the apps provided by qt3 so we don't collide with
+   # qt4 and can run them.
+
+   # New links providing old package functionality (however 3rd party packages unlikely to build
+   # unless updated to use new name references. Can drop this if it doesn't work.
+   ln -sf "${_prefix}/bin/tqassistant" "${pkgdir}${_prefix}/bin/assistant"
+   ln -sf "${_prefix}/bin/tqdesigner" "${pkgdir}${_prefix}/bin/designer"
+   ln -sf "${_prefix}/bin/tqlinguist" "${pkgdir}${_prefix}/bin/linguist"
+   ln -sf "${_prefix}/bin/tqlrelease" "${pkgdir}${_prefix}/bin/lrelease"
+   ln -sf "${_prefix}/bin/tqlupdate" "${pkgdir}${_prefix}/bin/lupdate"
+   ln -sf "${_prefix}/bin/tqmoc" "${pkgdir}${_prefix}/bin/moc"
+   ln -sf "${_prefix}/bin/tqmake" "${pkgdir}${_prefix}/bin/qmake"
+   ln -sf "${_prefix}/bin/tqtconfig" "${pkgdir}${_prefix}/bin/qtconfig"
+   ln -sf "${_prefix}/bin/tquic" "${pkgdir}${_prefix}/bin/uic"
+
+   # Build ld.so.conf file
+   install -d -m755 "${pkgdir}/etc/ld.so.conf.d/"
+   echo "${_prefix}/lib" >> "${pkgdir}/etc/ld.so.conf.d/${pkgbase#*-}.conf"
+
+   msg "Cleaning package..."
+
+   # remove any link to the compiled libraries present in
+   # $srcdir, which won't be present in non-building system.
+   sed -i "s|-L${srcdir}/${pkgbase#*-}/lib ||g" "${pkgdir}${_prefix}"/lib/*.prl
+
+   # missing include "qglobal.h" in include/qtimer.h fix
+   sed -i 's/define TQTIMER_H/&\n#include "ntqglobal.h"/' "${pkgdir}${_prefix}/include/ntqtimer.h"
+}
+
+## split package for tqt3 documentation
+package_tde-tqt3-docs() {
+  pkgdesc="TQt3 gui toolkit documentation - based on TDE upstream Qt3 - git version"
+  provides=('tqt3-docs')
+  groups=('tde-docs')
+
+  msg "Packaging - $pkgname-$pkgver"
+
+  ## install doc pages which are missed by make install
+  ## convenient for a split package
+  install -d -m755 "${pkgdir}${_prefix}/doc/"
+  cp -r "${QTDIR}/doc" "${pkgdir}${_prefix}"
+}
diff --git a/arch/tde-core/tde-tqt3/tqt3.install b/arch/tde-core/tde-tqt3/tqt3.install
new file mode 100644
index 000000000..03e30fa60
--- /dev/null
+++ b/arch/tde-core/tde-tqt3/tqt3.install
@@ -0,0 +1,16 @@
+post_install() {
+   ldconfig &> /dev/null
+   echo "Note that the tools provided by this package (assistant, designer,"
+   echo "linguist, lrelease, lupdate, moc, qmake and qtconfig) have been"
+   echo "renamed to tqt3<toolname> to ensure compatibility with Qt4 and should"
+   echo "be run through new command scheme."
+}
+
+post_upgrade() {
+   ldconfig &> /dev/null
+}
+
+post_remove() {
+   ldconfig &> /dev/null
+}
+
diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD
new file mode 100644
index 000000000..0ba1f8996
--- /dev/null
+++ b/arch/tde-core/tde-tqtinterface/PKGBUILD
@@ -0,0 +1,64 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tqtinterface
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL2')
+groups=('tde-core')
+pkgdesc="TQt interface for the TDE desktop"
+depends=('tde-tqt3' 'glu')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+# makeopts=('libtool' '!emptydirs' '!strip')
+options=('staticlibs' 'libtool' '!emptydirs' '!strip')
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('33e47ac8eb16ffec0c4c5e802b9461f7')
+
+install="trinity-${_mod}.install"
+
+_prefix=/usr
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+     -GNinja \
+     -DCMAKE_INSTALL_PREFIX=${_prefix} \
+     -DQT_PREFIX_DIR=${QTDIR} \
+     -DQT_INCLUDE_DIR=${QTDIR}/include \
+     -DMOC_EXECUTABLE=${QTDIR}/bin/moc \
+     -DQT_VERSION=3
+
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+
+   # Create and install ld.so.conf.d file
+   install -d -m755 $pkgdir/etc/ld.so.conf.d/
+   echo ${TDEDIR}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
+   echo ${TDEDIR}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
+}
diff --git a/arch/tde-core/tde-tqtinterface/trinity-tqtinterface.install b/arch/tde-core/tde-tqtinterface/trinity-tqtinterface.install
new file mode 100644
index 000000000..2a8dc4c98
--- /dev/null
+++ b/arch/tde-core/tde-tqtinterface/trinity-tqtinterface.install
@@ -0,0 +1,12 @@
+post_install() {
+   ldconfig &> /dev/null
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}
+
diff --git a/arch/tde-deps/gnokii/.SRCINFO b/arch/tde-deps/gnokii/.SRCINFO
new file mode 100644
index 000000000..a3ba54279
--- /dev/null
+++ b/arch/tde-deps/gnokii/.SRCINFO
@@ -0,0 +1,36 @@
+pkgbase = gnokii
+	pkgdesc = Tools and user space driver for use with mobile phones
+	pkgver = 0.6.31
+	pkgrel = 19
+	url = https://www.gnokii.org/
+	install = gnokii.install
+	arch = x86_64
+	license = GPL
+	makedepends = gtk2
+	makedepends = mariadb-libs
+	makedepends = postgresql-libs
+	makedepends = intltool
+	depends = libusb-compat
+	depends = libxpm
+	depends = bluez-libs
+	depends = libical
+	depends = sqlite
+	depends = systemd
+	optdepends = dialog: sendsms tool
+	optdepends = gtk2: xgnokii GUI
+	optdepends = mariadb-libs: smsd mysql backend
+	optdepends = postgresql-libs: smsd postgresql backend
+	backup = etc/gnokiirc
+	source = https://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
+	source = gnokii-config.patch
+	source = gnokii-lock.patch
+	source = gnokii-gcc5.patch
+	source = gnokii-gcc7.patch
+	sha256sums = 8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501
+	sha256sums = 4c795f0b80b3703a2813adb32399b42080a01670619c1db63ab094494cb6f329
+	sha256sums = e0584a44268e9055b43f1673d7db828f45294c5108635ebd5f664e12703f108b
+	sha256sums = eafe67990e383e92636a88de27f003674374db81d986ddbb397ab18d82b6556d
+	sha256sums = a5db8684216904bd2a2cd8a557dcc16484831b9bc2ec91a0b102b14c3bfe9245
+
+pkgname = gnokii
+
diff --git a/arch/tde-deps/gnokii/PKGBUILD b/arch/tde-deps/gnokii/PKGBUILD
new file mode 100644
index 000000000..3052f5ff3
--- /dev/null
+++ b/arch/tde-deps/gnokii/PKGBUILD
@@ -0,0 +1,79 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Roman Kyrylych <roman@archlinux.org>
+# Contributor: Aurelien Foret <orelien@chez.com>
+
+pkgname=gnokii
+pkgver=0.6.31
+pkgrel=19.1
+pkgdesc='Tools and user space driver for use with mobile phones'
+arch=('x86_64' 'aarch64' 'armv7h')
+url='https://www.gnokii.org/'
+license=('GPL')
+depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite' 'systemd')
+makedepends=('gtk2' 'mariadb-libs' 'postgresql-libs' 'intltool')
+optdepends=('dialog: sendsms tool'
+            'gtk2: xgnokii GUI'
+            'mariadb-libs: smsd mysql backend'
+            'postgresql-libs: smsd postgresql backend')
+backup=('etc/gnokiirc')
+install=$pkgname.install
+source=("https://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'gnokii-config.patch'
+        'gnokii-lock.patch'
+        'gnokii-gcc5.patch'
+        'gnokii-gcc7.patch')
+sha256sums=('8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501'
+            '4c795f0b80b3703a2813adb32399b42080a01670619c1db63ab094494cb6f329'
+            'e0584a44268e9055b43f1673d7db828f45294c5108635ebd5f664e12703f108b'
+            'eafe67990e383e92636a88de27f003674374db81d986ddbb397ab18d82b6556d'
+            'a5db8684216904bd2a2cd8a557dcc16484831b9bc2ec91a0b102b14c3bfe9245')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Set bindir location
+  patch -Np1 -i ../gnokii-config.patch
+
+  # Set lock path
+  patch -Np1 -i ../gnokii-lock.patch
+
+  # Fix build with GCC 5 (Fedora patch)
+  patch -Np1 -i ../gnokii-gcc5.patch
+
+  # Fix build with GCC 7
+  patch -Np1 -i ../gnokii-gcc7.patch
+
+  # Update automake build system
+  cp -a /usr/share/libtool/build-aux/config.guess .
+  cp -a /usr/share/libtool/build-aux/config.sub .
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
+              --enable-security
+  make
+  pushd xgnokii
+  make
+  popd
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+  pushd xgnokii
+  make DESTDIR="$pkgdir" install
+  popd
+
+  # Install initial config file
+  install -Dm644 Docs/sample/gnokiirc "$pkgdir/etc/gnokiirc"
+
+  # Fix file permission
+  chmod 755 "$pkgdir/usr/bin/sendsms"
+
+  # Setup lock directory
+  install -dm755 "$pkgdir"/usr/lib/tmpfiles.d
+  echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+}
diff --git a/arch/tde-deps/gnokii/gnokii-config.patch b/arch/tde-deps/gnokii/gnokii-config.patch
new file mode 100644
index 000000000..c10d19cec
--- /dev/null
+++ b/arch/tde-deps/gnokii/gnokii-config.patch
@@ -0,0 +1,12 @@
+diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc
+--- gnokii-0.6.31.orig/Docs/sample/gnokiirc	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/Docs/sample/gnokiirc	2012-02-18 12:49:26.957557504 +0100
+@@ -238,7 +238,7 @@
+ # In particular ensure that mgnokiidev is in this location, with
+ # permissions 4750, owned by root, group gnokii.  Ensure you
+ # are in the gnokii group and that the group exists...
+-bindir = /usr/local/sbin/
++bindir = /usr/bin/
+ 
+ # Any entries in the following two sections will be set as environment
+ # variables when running the scripts.
diff --git a/arch/tde-deps/gnokii/gnokii-gcc5.patch b/arch/tde-deps/gnokii/gnokii-gcc5.patch
new file mode 100644
index 000000000..09b65f5b0
--- /dev/null
+++ b/arch/tde-deps/gnokii/gnokii-gcc5.patch
@@ -0,0 +1,27 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid
+build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined
+reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0):
+undefined reference to `CloseLogosWindow'".
+
+--- gnokii-0.6.31/xgnokii/xgnokii.c		2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5	2015-06-20 15:49:59.000000000 +0200
+@@ -798,7 +798,7 @@
+ }
+ 
+ 
+-inline void GUI_HideAbout(void)
++void GUI_HideAbout(void)
+ {
+ 	gtk_widget_hide(AboutDialog);
+ }
+--- gnokii-0.6.31/xgnokii/xgnokii_logos.c	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5	2015-06-20 15:50:15.000000000 +0200
+@@ -1304,7 +1304,7 @@
+ 	return 0;
+ }
+ 
+-inline void CloseLogosWindow(void)
++void CloseLogosWindow(void)
+ {
+ 	gtk_widget_hide(GUI_LogosWindow);
+ }
diff --git a/arch/tde-deps/gnokii/gnokii-gcc7.patch b/arch/tde-deps/gnokii/gnokii-gcc7.patch
new file mode 100644
index 000000000..24fc9c9b1
--- /dev/null
+++ b/arch/tde-deps/gnokii/gnokii-gcc7.patch
@@ -0,0 +1,13 @@
+diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c
+index b4ceea1..264420a 100644
+--- a/common/gsm-filetypes.c
++++ b/common/gsm-filetypes.c
+@@ -1409,7 +1409,7 @@ static int get_next_token(char *src, int delim)
+ #define GET_NEXT_TOKEN()	o = get_next_token(line + offset, ';')
+ #define STORE_TOKEN(a)		strip_slashes(a, line + offset, sizeof(a) - 1, o - 1)
+ 
+-inline int local_atoi(char *str, int len)
++int local_atoi(char *str, int len)
+ {
+ 	int retval;
+ 	char *aux = strndup(str, len);
diff --git a/arch/tde-deps/gnokii/gnokii-lock.patch b/arch/tde-deps/gnokii/gnokii-lock.patch
new file mode 100644
index 000000000..61bcfaf40
--- /dev/null
+++ b/arch/tde-deps/gnokii/gnokii-lock.patch
@@ -0,0 +1,15 @@
+diff -Naur gnokii-0.6.31.orig/common/misc.c gnokii-0.6.31/common/misc.c
+--- gnokii-0.6.31.orig/common/misc.c	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/common/misc.c	2013-08-12 18:38:41.021668458 +0200
+@@ -448,9 +448,9 @@
+ 
+ #define BUFFER_MAX_LENGTH 128
+ #if defined (__svr4__)
+-#  define lock_path "/var/run/LCK.."
++#  define lock_path "/var/run/lockdev/LCK.."
+ #else
+-#  define lock_path "/var/lock/LCK.."
++#  define lock_path "/var/lock/lockdev/LCK.."
+ #endif
+ 
+ /* Lock the device. Return allocated string with a lock name */
diff --git a/arch/tde-deps/gnokii/gnokii.install b/arch/tde-deps/gnokii/gnokii.install
new file mode 100644
index 000000000..354b345a2
--- /dev/null
+++ b/arch/tde-deps/gnokii/gnokii.install
@@ -0,0 +1,3 @@
+post_install() {
+  echo "Users need to be in 'lock' and 'uucp' groups to connect to devices"
+}
diff --git a/arch/tde-deps/htdig/.SRCINFO b/arch/tde-deps/htdig/.SRCINFO
new file mode 100644
index 000000000..f4da67b4b
--- /dev/null
+++ b/arch/tde-deps/htdig/.SRCINFO
@@ -0,0 +1,18 @@
+pkgbase = htdig
+	pkgdesc = Scripts and HTML code needed for using ht://Dig as a web search engine
+	pkgver = 3.2.0b6
+	pkgrel = 11
+	url = http://www.htdig.org/
+	arch = i686
+	arch = x86_64
+	license = GPL
+	depends = openssl
+	source = http://downloads.sourceforge.net/htdig/htdig-3.2.0b6.tar.bz2
+	source = gcc4.3.patch
+	source = CVE-2007-6110.patch
+	md5sums = 8b9b9587a411ac7dd278fa5413428960
+	md5sums = 2aeda683f95b58efc0978d7fe951de59
+	md5sums = 0d9099d3b5a32d322a8e0240f85a3578
+
+pkgname = htdig
+
diff --git a/arch/tde-deps/htdig/CVE-2007-6110.patch b/arch/tde-deps/htdig/CVE-2007-6110.patch
new file mode 100644
index 000000000..57b0e3b78
--- /dev/null
+++ b/arch/tde-deps/htdig/CVE-2007-6110.patch
@@ -0,0 +1,26 @@
+Index: htdig-3.2.0b6/htsearch/Display.cc
+===================================================================
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -137,7 +137,7 @@ Display::display(int pageNumber)
+       // Must temporarily stash the message in a String, since
+       // displaySyntaxError will overwrite the static temp used in form.
+ 
+-      String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++      String s("invalid sort method");
+ 
+       displaySyntaxError(s);
+       return;
+Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc
+===================================================================
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@ ResultFetch::fetch()
+         // Must temporarily stash the message in a String, since
+         // displaySyntaxError will overwrite the static temp used in form.
+ 
+-        String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++        String s("invalid sort method");
+ 
+         displaySyntaxError(s);
+         //return;
diff --git a/arch/tde-deps/htdig/PKGBUILD b/arch/tde-deps/htdig/PKGBUILD
new file mode 100644
index 000000000..1edf3a90f
--- /dev/null
+++ b/arch/tde-deps/htdig/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 260530 2016-03-02 18:25:02Z foutrelis $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=htdig
+pkgver=3.2.0b6
+pkgrel=11.1
+pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
+url="http://www.htdig.org/"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+license=('GPL')
+depends=('openssl')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'gcc4.3.patch'
+        'CVE-2007-6110.patch')
+md5sums=('8b9b9587a411ac7dd278fa5413428960'
+         '2aeda683f95b58efc0978d7fe951de59'
+         '0d9099d3b5a32d322a8e0240f85a3578')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  patch -p1 -i "${srcdir}/gcc4.3.patch"
+  patch -p1 -i "${srcdir}/CVE-2007-6110.patch"
+
+  cp -a /usr/share/libtool/build-aux/config.guess .
+  cp -a /usr/share/libtool/build-aux/config.sub .
+  cp -a /usr/share/libtool/build-aux/config.guess ./db/
+  cp -a /usr/share/libtool/build-aux/config.sub ./db/
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  CFLAGS=-Wno-narrowing CXXFLAGS="-Wno-narrowing  -std=c++03" \
+  ./configure --prefix=/usr \
+    --mandir=/usr/share/man \
+    --with-config-dir=/etc/htdig \
+    --with-default-config-file=/etc/htdig/htdig.conf \
+    --with-database-dir=/var/lib/htdig/db \
+    --with-cgi-bin-dir=/usr/bin \
+    --with-common-dir=/usr/share/doc/htdig \
+    --with-search-dir=/usr/share/doc/htdig \
+    --with-image-dir=/usr/share/doc/htdig \
+    --localstatedir=/var/lib/htdig \
+    --with-ssl
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/arch/tde-deps/htdig/gcc4.3.patch b/arch/tde-deps/htdig/gcc4.3.patch
new file mode 100644
index 000000000..58dec1395
--- /dev/null
+++ b/arch/tde-deps/htdig/gcc4.3.patch
@@ -0,0 +1,15 @@
+diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h
+--- htdig-3.2.0b6.orig/htsearch/Collection.h	2004-05-28 06:15:24.000000000 -0700
++++ htdig-3.2.0b6/htsearch/Collection.h	2006-03-22 11:35:40.000000000 -0800
+@@ -36,9 +36,9 @@ public:
+                const char *docExcerpt);
+     ~Collection();
+ 
+-    void Collection::Open();
++    void Open();
+ 
+-    void Collection::Close(); 
++    void Close(); 
+ 
+     char *getWordFile() { return wordFile.get(); }
+     DocumentRef         *getDocumentRef(int id);
diff --git a/arch/tde-deps/lcms/.SRCINFO b/arch/tde-deps/lcms/.SRCINFO
new file mode 100644
index 000000000..7121ba137
--- /dev/null
+++ b/arch/tde-deps/lcms/.SRCINFO
@@ -0,0 +1,21 @@
+pkgbase = lcms
+	pkgdesc = Lightweight color management development library/engine
+	pkgver = 1.19
+	pkgrel = 7
+	url = http://www.littlecms.com
+	arch = x86_64
+	arch = i686
+	license = custom
+	makedepends = python2
+	depends = libtiff
+	source = https://downloads.sourceforge.net/sourceforge/lcms/lcms-1.19.tar.gz
+	source = cve-2013-4276.patch
+	sha256sums = 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
+	sha256sums = cd10cc5ce791ae782b1257e6181a71cbdb685b705779c9ef2ceffc7fb2021bd0
+
+pkgname = lcms
+
+pkgname = python2-lcms
+	pkgdesc = LittleCMS Python bindings
+	depends = lcms
+
diff --git a/arch/tde-deps/lcms/PKGBUILD b/arch/tde-deps/lcms/PKGBUILD
new file mode 100644
index 000000000..fdd0ea552
--- /dev/null
+++ b/arch/tde-deps/lcms/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Tobias Kieslich <neri@archlinux.org>
+# Contributor: Ben <contrasutra@myrealbox.com>
+
+pkgbase=lcms
+pkgname=(lcms)
+pkgver=1.19
+pkgrel=7.1
+pkgdesc='Lightweight color management development library/engine'
+arch=('x86_64' 'i686' 'aarch64' 'armv7h')
+license=('custom')
+depends=('libtiff')
+#makedepends=('python2')
+url='http://www.littlecms.com'
+source=("https://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz"
+        'cve-2013-4276.patch')
+sha256sums=('80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9'
+            'cd10cc5ce791ae782b1257e6181a71cbdb685b705779c9ef2ceffc7fb2021bd0')
+
+prepare() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  patch -Np1 -i ../cve-2013-4276.patch
+
+  cp -a /usr/share/libtool/build-aux/config.guess .
+  cp -a /usr/share/libtool/build-aux/config.sub .
+}
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  ./configure \
+    --prefix=/usr \
+    --without-python
+  make
+  #make -C python
+}
+
+package_lcms() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -D -m0644 COPYING \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  rm -rf "${pkgdir}/usr/lib/python2.7/"
+}
+
+#package_python2-lcms() {
+#  pkgdesc='LittleCMS Python bindings'
+#  depends=('lcms')
+#
+#  cd "${srcdir}/${pkgbase}-${pkgver}"
+#
+#  make DESTDIR="${pkgdir}" install
+#  install -D -m0644 COPYING \
+#    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+#
+#  rm -rf "${pkgdir}/usr/"{bin,include,lib/{pkgconfig,liblcms.*},share/man}
+#}
diff --git a/arch/tde-deps/lcms/cve-2013-4276.patch b/arch/tde-deps/lcms/cve-2013-4276.patch
new file mode 100644
index 000000000..8f2f32297
--- /dev/null
+++ b/arch/tde-deps/lcms/cve-2013-4276.patch
@@ -0,0 +1,62 @@
+diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c
+--- lcms-1.19.dfsg/samples/icctrans.c	2009-10-30 15:57:45.000000000 +0000
++++ lcms-1.19.dfsg-patched/samples/icctrans.c	2013-08-06 11:53:14.385266647 +0100
+@@ -86,6 +86,8 @@
+ static LPcmsNAMEDCOLORLIST InputColorant = NULL;
+ static LPcmsNAMEDCOLORLIST OutputColorant = NULL;
+ 
++unsigned int Buffer_size = 4096;
++
+ 
+ // isatty replacement
+ 
+@@ -500,7 +502,7 @@
+ 
+     Prefix[0] = 0;
+     if (!lTerse)
+-        sprintf(Prefix, "%s=", C);
++        snprintf(Prefix, 20, "%s=", C);
+ 
+     if (InHexa)
+     {
+@@ -648,7 +650,9 @@
+ static
+ void GetLine(char* Buffer)
+ {    
+-    scanf("%s", Buffer);
++    char User_buffer[Buffer_size];
++    fgets(User_buffer, (Buffer_size - 1), stdin);
++    sscanf(User_buffer,"%s", Buffer);
+     
+     if (toupper(Buffer[0]) == 'Q') { // Quit?
+ 
+@@ -668,7 +672,7 @@
+ static
+ double GetAnswer(const char* Prompt, double Range)
+ {
+-    char Buffer[4096];
++    char Buffer[Buffer_size];
+     double val = 0.0;
+ 	       
+     if (Range == 0.0) {              // Range 0 means double value
+@@ -738,7 +742,7 @@
+ static
+ WORD GetIndex(void)
+ {
+-    char Buffer[4096], Name[40], Prefix[40], Suffix[40];
++    char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40];
+     int index, max;
+ 
+     max = cmsNamedColorCount(hTrans)-1;
+diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c
+--- lcms-1.19.dfsg/tifficc/tiffdiff.c	2009-10-30 15:57:46.000000000 +0000
++++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c	2013-08-06 11:49:06.698951157 +0100
+@@ -633,7 +633,7 @@
+     cmsIT8SetSheetType(hIT8, "TIFFDIFF");
+     
+    
+-    sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2);
++    snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2);
+   
+     cmsIT8SetComment(hIT8, Buffer);
+ 
diff --git a/arch/tde-deps/lcms/lcms-1.19.tar.gz b/arch/tde-deps/lcms/lcms-1.19.tar.gz
new file mode 100644
index 000000000..0e45d75d7
--- /dev/null
+++ b/arch/tde-deps/lcms/lcms-1.19.tar.gz
diff --git a/arch/tde-deps/pod2man/.SRCINFO b/arch/tde-deps/pod2man/.SRCINFO
new file mode 100644
index 000000000..412bde20b
--- /dev/null
+++ b/arch/tde-deps/pod2man/.SRCINFO
@@ -0,0 +1,12 @@
+pkgbase = pod2man
+	pkgdesc = Make pod2man easily accessible
+	pkgver = 5.30.2
+	pkgrel = 1
+	url = https://perl.org/
+	arch = x86_64
+	license = GPL
+	license = PerlArtistic
+	depends = perl
+
+pkgname = pod2man
+
diff --git a/arch/tde-deps/pod2man/.gitignore b/arch/tde-deps/pod2man/.gitignore
new file mode 100644
index 000000000..b3cd27837
--- /dev/null
+++ b/arch/tde-deps/pod2man/.gitignore
@@ -0,0 +1,6 @@
+pkg
+src
+*.gz
+*.xz
+*.bak
+*.new
diff --git a/arch/tde-deps/pod2man/PKGBUILD b/arch/tde-deps/pod2man/PKGBUILD
new file mode 100644
index 000000000..3132a72d0
--- /dev/null
+++ b/arch/tde-deps/pod2man/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Fernando Ortiz <nandub+arch@nandub.info >
+# Contributor: Alexander F. Rødseth <xyproto@archlinux.org>
+
+pkgname=pod2man
+pkgver=5.30.2
+pkgrel=1
+pkgdesc='Make pod2man easily accessible'
+arch=(x86_64 aarch64 armv7h)
+license=(GPL PerlArtistic)
+url='https://perl.org/'
+depends=(perl)
+
+package() {
+  # perl 5 places pod2man in /usr/bin/core_perl instead of /usr/bin,
+  # for unknown reasons. This creates a symlink in what is what is now a more
+  # conventional location.
+
+  install -d "$pkgdir/usr/bin"
+  ln -s /usr/bin/core_perl/pod2man "$pkgdir/usr/bin/pod2man"
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/arch/tde-deps/pod2man/pkgsum.sh b/arch/tde-deps/pod2man/pkgsum.sh
new file mode 100755
index 000000000..e908ad353
--- /dev/null
+++ b/arch/tde-deps/pod2man/pkgsum.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+#taken from https://bbs.archlinux.org/viewtopic.php?id=131666 by falconindy
+awk -v newsums="$(makepkg -g)" '
+BEGIN {
+  if (!newsums) exit 1
+}
+
+/^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*$/ {
+  if (!i) print newsums; i++
+  next
+}
+
+1
+' PKGBUILD > PKGBUILD.new && mv PKGBUILD{.new,}
\ No newline at end of file
diff --git a/arch/tde-deps/pod2man/update.sh b/arch/tde-deps/pod2man/update.sh
new file mode 100755
index 000000000..b176cad88
--- /dev/null
+++ b/arch/tde-deps/pod2man/update.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+get_latest() {
+  wget -q -O- 'https://github.com/kimwalisch/primesieve/wiki/Downloads' | \
+  sed -n 's,.*primesieve-\([0-9][^>]*\)\.tar.*,\1,p' | \
+  grep -v '\(linux\|mac\|win\)' | \
+  sort -r | \
+  head -1
+}
+
+latest_version=$1
+#latest_version=$(get_latest)
+current_version=$(cat PKGBUILD | grep pkgver= | awk -F'=' '{print $2}')
+
+if ! [ "$latest_version" = "$current_version" ]; then
+  echo Updating the package with the latest version
+  echo latest: $latest_version
+  echo current: $current_version
+  sed -i.bak "s/$current_version/$latest_version/g" PKGBUILD
+  sed -i.bak "s/pkgrel=[^d.]/pkgrel=1/g" PKGBUILD
+  ./pkgsum.sh
+  if which makepkg &> /dev/null; then
+    makepkg --printsrcinfo > .SRCINFO
+  else
+    mksrcinfo
+  fi
+else
+  echo Nothing to update.
+fi
diff --git a/arch/tde-devel/tde-kdbg/PKGBUILD b/arch/tde-devel/tde-kdbg/PKGBUILD
new file mode 100644
index 000000000..2bd547da3
--- /dev/null
+++ b/arch/tde-devel/tde-kdbg/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kdbg
+_cat=applications/development/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Graphical debugger interface for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('a18fb41aff54bc952f366aff90125443')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-devel/tde-kdiff3/PKGBUILD b/arch/tde-devel/tde-kdiff3/PKGBUILD
new file mode 100644
index 000000000..a8322be52
--- /dev/null
+++ b/arch/tde-devel/tde-kdiff3/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kdiff3
+_cat=applications/development/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Compares and merges 2 or 3 files or directories"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdebase'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('5b92c74663f12cc50fcc5061e8e6d5ca')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-devel/tde-kscope/PKGBUILD b/arch/tde-devel/tde-kscope/PKGBUILD
new file mode 100644
index 000000000..09a65a4d2
--- /dev/null
+++ b/arch/tde-devel/tde-kscope/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kscope
+_cat=applications/development/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Source editing environment for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdebase'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('f6849ce333dbb68e6fca0486cad68b67')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-devel/tde-kxmleditor/PKGBUILD b/arch/tde-devel/tde-kxmleditor/PKGBUILD
new file mode 100644
index 000000000..7703e8eaf
--- /dev/null
+++ b/arch/tde-devel/tde-kxmleditor/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kxmleditor
+_cat=applications/development/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="XML Editor for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6f43fe4d8a405513b226ecef268cae0f')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-devel/tde-tdesdk/PKGBUILD b/arch/tde-devel/tde-tdesdk/PKGBUILD
new file mode 100644
index 000000000..f9c17a217
--- /dev/null
+++ b/arch/tde-devel/tde-tdesdk/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdesdk
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-devel')
+pkgdesc="Trinity Desktop Development Tools"
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity' 'flex' 'subversion' 'pod2man')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ac5c7996c46d58ffa7420f07720614fd')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-devel/tde-tdevelop/PKGBUILD b/arch/tde-devel/tde-tdevelop/PKGBUILD
new file mode 100644
index 000000000..d12d23174
--- /dev/null
+++ b/arch/tde-devel/tde-tdevelop/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdevelop
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-devel')
+pkgdesc="Trinity Desktop Developer Tools"
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity' 'tde-tdesdk' 'subversion')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3b849a465a949ec38fe54557f86f8ec1')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=ON \
+      -DWITH_BUILDTOOL_ALL=ON \
+      -DWITH_LANGUAGE_ALL=ON \
+      -DWITH_VCS_ALL=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-devel/tde-tdewebdev/PKGBUILD b/arch/tde-devel/tde-tdewebdev/PKGBUILD
new file mode 100644
index 000000000..c696da6a4
--- /dev/null
+++ b/arch/tde-devel/tde-tdewebdev/PKGBUILD
@@ -0,0 +1,47 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=tdewebdev
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-devel')
+pkgdesc="Trinity Web Developer Tools"
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity' 'tde-tdesdk')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('84afeda8ecfb2283eab5fafddb1ab0a1')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=ON \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-abakus/PKGBUILD b/arch/tde-extra/tde-abakus/PKGBUILD
new file mode 100644
index 000000000..d2b605c27
--- /dev/null
+++ b/arch/tde-extra/tde-abakus/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=abakus
+_cat=applications/utilities/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Calculator for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('686eb2d4f8d1f26c9b6112a6c85e667e')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-akode/PKGBUILD b/arch/tde-extra/tde-akode/PKGBUILD
new file mode 100644
index 000000000..5587b3dc9
--- /dev/null
+++ b/arch/tde-extra/tde-akode/PKGBUILD
@@ -0,0 +1,54 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=akode
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="akode plugin for aRts"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('alsa-plugins'
+	'alsa-tools'
+	'alsa-utils'
+	'audiofile'
+	'libmad'
+	'libogg'
+	'libvorbis'
+	'pulseaudio-alsa')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("kdemod3-${_mod}" "${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('cb44fed3d78b5c542f688aad8dd7cc5e')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_JACK_SINK=OFF
+
+   msg "Building $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-akode/tde-akode.install b/arch/tde-extra/tde-akode/tde-akode.install
new file mode 100644
index 000000000..30e6e407f
--- /dev/null
+++ b/arch/tde-extra/tde-akode/tde-akode.install
@@ -0,0 +1,11 @@
+post_install() {
+   ldconfig &> /dev/null
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}
diff --git a/arch/tde-extra/tde-amarok/PKGBUILD b/arch/tde-extra/tde-amarok/PKGBUILD
new file mode 100644
index 000000000..bf7771377
--- /dev/null
+++ b/arch/tde-extra/tde-amarok/PKGBUILD
@@ -0,0 +1,60 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=amarok
+_cat=applications/multimedia/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE Amarok"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdebase' 'taglib' 'xine-lib')
+makedepends=('tde-cmake-trinity' 'tde-akode' 'ruby' 'libmtp' 'libvisual' 'sdl')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6985738985bc2cb99ee599a1b3e38739')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON \
+     -DWITH_YAUAP=OFF \
+     -DWITH_NJB=OFF \
+     -DWITH_IFP=OFF \
+     -DWITH_IPOD=OFF \
+     -DWITH_MP4V2=OFF \
+     -DWITH_EMBEDDED_SQLITE=ON \
+     -DWITH_SYSTEM_SQLITE=OFF \
+     -DWITH_MYSQL=OFF \
+     -DWITH_POSTGRESQL=OFF \
+     -DWITH_AMAZON=OFF
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-basket/PKGBUILD b/arch/tde-extra/tde-basket/PKGBUILD
new file mode 100644
index 000000000..6a0293012
--- /dev/null
+++ b/arch/tde-extra/tde-basket/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=basket
+_cat=applications/office/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="A multi-purpose note-taking application for KDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+  'tde-tdepim'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('38301eb3c130ba64fbd2a5aff4653bc8')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-filelight/PKGBUILD b/arch/tde-extra/tde-filelight/PKGBUILD
new file mode 100644
index 000000000..95d3a2064
--- /dev/null
+++ b/arch/tde-extra/tde-filelight/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=filelight
+_cat=applications/utilities/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Show where your diskspace is being used"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('28eb15886460968994467eabbd26a870')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
new file mode 100644
index 000000000..e7ad31edf
--- /dev/null
+++ b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=gtk-qt-engine
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=2
+pkgdesc="gtk qt engine"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs' 'gtk2')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('bd7f8d1c928437f4cb40121a1851c0d0')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
+
+  msg "Starting cmake..."
+
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_GCC_VISIBILITY=ON
+
+  msg "Building - ${pkgname#*-}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
new file mode 100644
index 000000000..e7bc4e4cd
--- /dev/null
+++ b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=gtk3-tqt-engine
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="gtk3 tqt engine"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs' 'gtk3')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('33eced7adfe5b32efd5758307d4f7c4e')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
+
+  msg "Starting cmake..."
+
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname#*-}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-kbiff/PKGBUILD b/arch/tde-extra/tde-kbiff/PKGBUILD
new file mode 100644
index 000000000..0497bb7b2
--- /dev/null
+++ b/arch/tde-extra/tde-kbiff/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kbiff
+_cat=applications/internet/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE mail notification utility"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('499c77307e53b094c72a745c0925a9cc')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-kchmviewer/PKGBUILD b/arch/tde-extra/tde-kchmviewer/PKGBUILD
new file mode 100644
index 000000000..8dc94b1a4
--- /dev/null
+++ b/arch/tde-extra/tde-kchmviewer/PKGBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kchmviewer
+_cat=applications/utilities/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="CHM viewer for Trinity"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+  'chmlib'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4d9cb2ddbb0721c6211453c0d9d4d9be')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-kcpuload/PKGBUILD b/arch/tde-extra/tde-kcpuload/PKGBUILD
new file mode 100644
index 000000000..f694b3730
--- /dev/null
+++ b/arch/tde-extra/tde-kcpuload/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kcpuload
+_cat=applications/utilities/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="A CPU meter for Kicker"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6e2d9d5f2b6fbf0b62e8eb24e78c5b1a')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-kile/PKGBUILD b/arch/tde-extra/tde-kile/PKGBUILD
new file mode 100644
index 000000000..f69d770b6
--- /dev/null
+++ b/arch/tde-extra/tde-kile/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kile
+_cat=applications/office/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE Integrated LaTeX Environment"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('03253c74c11e8f155e01b8b8f5d91303')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+  msg "Removing conflicting syntax files"
+  rm -rf ${pkgdir}/opt/trinity/share/apps/katepart
+}
diff --git a/arch/tde-extra/tde-kmplayer/PKGBUILD b/arch/tde-extra/tde-kmplayer/PKGBUILD
new file mode 100644
index 000000000..941354b07
--- /dev/null
+++ b/arch/tde-extra/tde-kmplayer/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kmplayer
+_cat=applications/multimedia/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE KMPlayer"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdebase' 'tde-dbus-tqt' 'dbus-glib')
+makedepends=('tde-cmake-trinity' 'mplayer' 'xine-lib' 'nspr' 'gtk2')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('929ac9336f2f09131f2990a240b1bc57')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DBUILD_KOFFICE_PLUGIN=OFF \
+     -DBUILD_KGSTPLAYER=OFF \
+     -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-kmymoney/PKGBUILD b/arch/tde-extra/tde-kmymoney/PKGBUILD
new file mode 100644
index 000000000..859245a09
--- /dev/null
+++ b/arch/tde-extra/tde-kmymoney/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kmymoney
+_cat=applications/office/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Personal finance manager for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+  'libofx'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('36f5a0a4257e0614e94c72e37c2b0c50')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON \
+    -DBUILD_DEVELOPER_DOCS="OFF"
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-konversation/PKGBUILD b/arch/tde-extra/tde-konversation/PKGBUILD
new file mode 100644
index 000000000..a6741a05f
--- /dev/null
+++ b/arch/tde-extra/tde-konversation/PKGBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=konversation
+_cat=applications/internet/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="User friendly Internet Relay Chat (IRC) client for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+  'libxss'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2855fb9779afacaed2574a92eb9959e5')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-kooldock/PKGBUILD b/arch/tde-extra/tde-kooldock/PKGBUILD
new file mode 100644
index 000000000..28877be58
--- /dev/null
+++ b/arch/tde-extra/tde-kooldock/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kooldock
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Dock for TDE with cool visual enhancements"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6d2e7a4c2343fca9327da32dc19020d8')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-krusader/PKGBUILD b/arch/tde-extra/tde-krusader/PKGBUILD
new file mode 100644
index 000000000..90687e4d7
--- /dev/null
+++ b/arch/tde-extra/tde-krusader/PKGBUILD
@@ -0,0 +1,62 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=krusader
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE Krusader"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdebase')
+makedepends=('pkgconfig' 'automake')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('c28d5b0b67370b464897ba17b2177df0')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  ## Generate config files and update with autoreconf
+  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}
+
+  msg "Copying system libtool files...."
+  cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
+  cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh
+  cp -a /usr/share/libtool/build-aux/config.guess ./admin/
+  cp -a /usr/share/libtool/build-aux/config.sub ./admin/
+
+  msg "Running make -f admin/Makefile.common ...."
+  make -f admin/Makefile.common
+
+  ## configure
+  msg "Configuring - ${pkgname}..."
+  CFLAGS="${CFLAGS} -fpermissive" \
+  CXXFLAGS="${CXXFLAGS} -fpermissive" \
+  ./configure \
+    --prefix=${TDEDIR} \
+    --with-qt-dir=${QTDIR} \
+    --with-qt-includes=${QTDIR}/include \
+    --with-qt-libraries=${QTDIR}/lib \
+    --sysconfdir=${TDEDIR}/etc \
+    --localstatedir=/var \
+    --enable-closure
+
+  msg "Building - ${pkgname#*-}..."
+  make $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${pkgname#*-}-trinity-${pkgver}            # use for libtool
+  make -j1 DESTDIR="${pkgdir}" install
+}
diff --git a/arch/tde-extra/tde-kshutdown/PKGBUILD b/arch/tde-extra/tde-kshutdown/PKGBUILD
new file mode 100644
index 000000000..d13fad9e3
--- /dev/null
+++ b/arch/tde-extra/tde-kshutdown/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kshutdown
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="An advanced shut down utility for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('1485410bbbf5a8b3185a7ad1915487e1')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
new file mode 100644
index 000000000..8ce30714d
--- /dev/null
+++ b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD
@@ -0,0 +1,50 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=ksplash-engine-moodin
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE KSplash Engine Moodin"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdebase')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6b28658272e7cf964350d13fffe30243')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-kvkbd/PKGBUILD b/arch/tde-extra/tde-kvkbd/PKGBUILD
new file mode 100644
index 000000000..ae6d2f060
--- /dev/null
+++ b/arch/tde-extra/tde-kvkbd/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=kvkbd
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Virtual keyboard for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ac97d9fea50e8675629c0c956334b33e')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-style-baghira/PKGBUILD b/arch/tde-extra/tde-style-baghira/PKGBUILD
new file mode 100644
index 000000000..77021eab1
--- /dev/null
+++ b/arch/tde-extra/tde-style-baghira/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tde-style-baghira
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE style for Apple junkies :)"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdebase'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4df33774e98c3c5dcb57de85a32b51e6')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-style-domino/PKGBUILD b/arch/tde-extra/tde-style-domino/PKGBUILD
new file mode 100644
index 000000000..f0f7f4e3e
--- /dev/null
+++ b/arch/tde-extra/tde-style-domino/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tde-style-domino
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Domino widget style and twin decoration for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdebase'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3c3add6b3cc8ad0ebefcf84848a551cf')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-style-lipstik/PKGBUILD b/arch/tde-extra/tde-style-lipstik/PKGBUILD
new file mode 100644
index 000000000..36646be65
--- /dev/null
+++ b/arch/tde-extra/tde-style-lipstik/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tde-style-lipstik
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Lipstik style for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6d6c279995361b6507fcfbba89f6e22d')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-style-qtcurve/PKGBUILD b/arch/tde-extra/tde-style-qtcurve/PKGBUILD
new file mode 100644
index 000000000..a5325a9b2
--- /dev/null
+++ b/arch/tde-extra/tde-style-qtcurve/PKGBUILD
@@ -0,0 +1,48 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=tde-style-qtcurve
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE Style QTCurve"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="http://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('69e5861bd5b6b326f9bee1bc622b22b3')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_GCC_VISIBILITY=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-systemsettings/PKGBUILD b/arch/tde-extra/tde-systemsettings/PKGBUILD
new file mode 100644
index 000000000..5ffc6cc7b
--- /dev/null
+++ b/arch/tde-extra/tde-systemsettings/PKGBUILD
@@ -0,0 +1,48 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=tde-systemsettings
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE System Settings"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('bbb25f3887b2b2873704514e3fa53aff')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DBUILD_KNETWORKCONF=OFF
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
new file mode 100644
index 000000000..d89c73da1
--- /dev/null
+++ b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdeaccessibility
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Accessibility utilities for the TDE Desktop"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity' 'tde-tdemultimedia')
+optdepends=()
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('63ca600bee2728129cb49334488798f3')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdeaddons/PKGBUILD b/arch/tde-extra/tde-tdeaddons/PKGBUILD
new file mode 100644
index 000000000..9e8d89d1e
--- /dev/null
+++ b/arch/tde-extra/tde-tdeaddons/PKGBUILD
@@ -0,0 +1,50 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=tdeaddons
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+pkgdesc="Trinity Desktop Addons"
+depends=('tde-tdebase')
+makedepends=('tde-cmake-trinity' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim' 'sdl')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('bdc8e069054c3d7ff501373e33b4783b')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=ON \
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_XMMS=OFF
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdeedu/PKGBUILD b/arch/tde-extra/tde-tdeedu/PKGBUILD
new file mode 100644
index 000000000..8cf99ac89
--- /dev/null
+++ b/arch/tde-extra/tde-tdeedu/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: e1z0 <justinas at eofnet dot lt>
+
+_mod=tdeedu
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Educational utilities for the TDE Desktop"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin')
+optdepends=()
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('09a6c11a81b8ffc25fb14e127d450c77')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON \
+     -DWITH_OCAML_SOLVER=OFF \
+     -DWITH_LIBUSB=OFF
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdegames/PKGBUILD b/arch/tde-extra/tde-tdegames/PKGBUILD
new file mode 100644
index 000000000..59972c6d2
--- /dev/null
+++ b/arch/tde-extra/tde-tdegames/PKGBUILD
@@ -0,0 +1,49 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=tdegames
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+pkgdesc="Trinity Desktop Games"
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3fc19f55eefae8850975f6efd582306c')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=ON \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdeio-appinfo/PKGBUILD b/arch/tde-extra/tde-tdeio-appinfo/PKGBUILD
new file mode 100644
index 000000000..fa585067f
--- /dev/null
+++ b/arch/tde-extra/tde-tdeio-appinfo/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdeio-appinfo
+_cat=applications/tdeio/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDEIO slave for the appinfo protocol"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('5fd6e345590b50cea978e7753243c699')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdeio-ftps/PKGBUILD b/arch/tde-extra/tde-tdeio-ftps/PKGBUILD
new file mode 100644
index 000000000..8d4075323
--- /dev/null
+++ b/arch/tde-extra/tde-tdeio-ftps/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdeio-ftps
+_cat=applications/tdeio/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="An ftps TDEIO slave for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2553590a4b575f9a46608994db0894e4')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdeio-locate/PKGBUILD b/arch/tde-extra/tde-tdeio-locate/PKGBUILD
new file mode 100644
index 000000000..71f9c6b63
--- /dev/null
+++ b/arch/tde-extra/tde-tdeio-locate/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdeio-locate
+_cat=applications/tdeio/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="tdeio-slave for the locate command"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('ca967bcdeda782b8df18f8e1bf0c4af3')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdemultimedia/PKGBUILD b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
new file mode 100644
index 000000000..6cbddb339
--- /dev/null
+++ b/arch/tde-extra/tde-tdemultimedia/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdemultimedia
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Desktop MultiMedia Components"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs' 'tde-akode' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('b92dc240e2b05c4c3088580dcff67f55')
+# install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=ON \
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_GSTREAMER=OFF
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdenetwork/PKGBUILD b/arch/tde-extra/tde-tdenetwork/PKGBUILD
new file mode 100644
index 000000000..7d72841fb
--- /dev/null
+++ b/arch/tde-extra/tde-tdenetwork/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdenetwork
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+pkgdesc="Trinity Desktop Network Components"
+depends=('tde-tdelibs' 'tde-tqca' 'libgadu' 'wireless_tools' 'wpa_supplicant')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('71d84d3d0b591a4f0ab4efc471dc6f0f')
+# install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=ON \
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_JINGLE=OFF \
+      -DWITH_SPEEX=OFF \
+      -DWITH_XMMS=OFF \
+      -DWITH_SLP=OFF \
+      -DBUILD_KOPETE_PROTOCOL_ALL=ON \
+      -DBUILD_KOPETE_PROTOCOL_SMS=OFF \
+      -DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF \
+      -DBUILD_KOPETE_PLUGIN_ALL=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
new file mode 100644
index 000000000..7213b2c25
--- /dev/null
+++ b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD
@@ -0,0 +1,48 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=tdenetworkmanager
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="gtk qt engine"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4be201b5d8f8b12f60e9ffb1f0790553')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "${srcdir}/build"
+  cd "${srcdir}/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_GCC_VISIBILITY=ON
+
+  msg "Building - ${pkgname#*-}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdepim/PKGBUILD b/arch/tde-extra/tde-tdepim/PKGBUILD
new file mode 100644
index 000000000..6d101daea
--- /dev/null
+++ b/arch/tde-extra/tde-tdepim/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdepim
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Desktop PIM Components"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('boost' 'boost-libs' 'gnokii' 'libxss' 'xscreensaver' 'tde-tdelibs' 'tde-libcaldav' 'tde-libcarddav')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('c6dfb917542985cc9910526070f2a5b3')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_C_FLAGS="-fpermissive" \
+    -DCMAKE_CXX_FLAGS="-fpermissive" \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+    -DWITH_ALL_OPTIONS=ON \
+    -DBUILD_ALL=ON
+
+  msg "Building - ${pkgname#*-}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+  # Removing /opt/trinity/share/icons/default.tde to prevent a conflict
+  rm -rf ${pkgdir}/opt/trinity/share/icons/default.tde
+}
diff --git a/arch/tde-extra/tde-tdepowersave/PKGBUILD b/arch/tde-extra/tde-tdepowersave/PKGBUILD
new file mode 100644
index 000000000..6e3313489
--- /dev/null
+++ b/arch/tde-extra/tde-tdepowersave/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tdepowersave
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Desktop Enviroment - ${_mod}"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-extra')
+depends=(
+  'tde-tdelibs'
+  'tde-dbus-1-tqt'
+  'libxss'
+)
+makedepends=('tde-cmake-trinity')
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('881902a1c8af770d04bced6d335b9f45')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "${srcdir}/build"
+  cd "${srcdir}/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_GCC_VISIBILITY=ON
+
+  msg "Building - ${pkgname#*-}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdesudo/PKGBUILD b/arch/tde-extra/tde-tdesudo/PKGBUILD
new file mode 100644
index 000000000..76b8ce341
--- /dev/null
+++ b/arch/tde-extra/tde-tdesudo/PKGBUILD
@@ -0,0 +1,50 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=tdesudo
+_cat=applications/settings/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE Sudo"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('28b377bf0e93c9f8a9f73e1e2c6db4e3')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p $srcdir/build
+   cd $srcdir/build
+
+   #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdetoys/PKGBUILD b/arch/tde-extra/tde-tdetoys/PKGBUILD
new file mode 100644
index 000000000..d000a6760
--- /dev/null
+++ b/arch/tde-extra/tde-tdetoys/PKGBUILD
@@ -0,0 +1,46 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=tdetoys
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+pkgdesc="Trinity Desktop Toys"
+depends=('tde-tdebase')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('d3af557e53e22f96bcc56e58402fe42e')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+      -GNinja \
+      -DCMAKE_VERBOSE_MAKEFILE=ON \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
+      -DBUILD_ALL=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tdmtheme/PKGBUILD b/arch/tde-extra/tde-tdmtheme/PKGBUILD
new file mode 100644
index 000000000..ad379c1ed
--- /dev/null
+++ b/arch/tde-extra/tde-tdmtheme/PKGBUILD
@@ -0,0 +1,48 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=tdmtheme
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDM Theme"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3fc83277627cc55aed4e0bf25f14dcf4')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p $srcdir/build
+   cd $srcdir/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \
+     -GNinja \
+     -DCMAKE_VERBOSE_MAKEFILE=ON \
+     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+     -DBUILD_ALL=ON \
+     -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - ${pkgname#*-}..."
+   ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/build
+  DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-tork/PKGBUILD b/arch/tde-extra/tde-tork/PKGBUILD
new file mode 100644
index 000000000..5092bb23f
--- /dev/null
+++ b/arch/tde-extra/tde-tork/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=tork
+_cat=applications/internet/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Anonymity manager for TDE"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+  'geoip'
+  'torsocks'
+)
+makedepends=('tde-cmake-trinity')
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('a7cf36bc4c70c5a17d5bbf6bd380e2da')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
new file mode 100644
index 000000000..c488f098c
--- /dev/null
+++ b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD
@@ -0,0 +1,50 @@
+# Contributor: e1z0 <justinas at eofnet dot lt>
+
+_mod=twin-style-crystal
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="TDE TWin Style Crystal"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-extra')
+depends=('tde-tdebase')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_kdemod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3a15cf9b2113886c5b13e27f2640bcb9')
+install=''
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-twin-style-dekorator/PKGBUILD b/arch/tde-extra/tde-twin-style-dekorator/PKGBUILD
new file mode 100644
index 000000000..9a10ebc5c
--- /dev/null
+++ b/arch/tde-extra/tde-twin-style-dekorator/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=twin-style-dekorator
+_cat=applications/themes/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod/tde-}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Window decorations for TDE using user-supplied PNG files"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdebase'
+)
+makedepends=(
+  'tde-cmake-trinity'
+)
+optdepends=()
+conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('25f7de5dec8ef6462f9b4ea7f0f22bf6')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-extra/tde-yakuake/PKGBUILD b/arch/tde-extra/tde-yakuake/PKGBUILD
new file mode 100644
index 000000000..853769f2b
--- /dev/null
+++ b/arch/tde-extra/tde-yakuake/PKGBUILD
@@ -0,0 +1,55 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=yakuake
+_cat=applications/system/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="A Quake-style terminal emulator based on TDE Konsole technology"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-complete')
+depends=(
+  'tde-tdelibs'
+)
+makedepends=('tde-cmake-trinity')
+optdepends=()
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4655f9705eb81827db4ea845da7cf34d')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-trinity-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+    -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
+    -DBUILD_ALL=ON \
+    -DWITH_ALL_OPTIONS=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-libs/tde-libcaldav/PKGBUILD b/arch/tde-libs/tde-libcaldav/PKGBUILD
new file mode 100644
index 000000000..523d49568
--- /dev/null
+++ b/arch/tde-libs/tde-libcaldav/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contribuitor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=libcaldav
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="A client library adding support for the CalDAV protocol (rfc4791)"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-libs')
+depends=('curl' 'glib2')
+makedepends=('doxygen' 'tde-cmake-trinity')
+optdepends=()
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+install=
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4d543a91fedd1b38159d9680989d5794')
+
+_prefix=/usr
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${_prefix} \
+      -DWITH_GCC_VISIBILITY=ON
+
+   msg "Building $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-libs/tde-libcarddav/PKGBUILD b/arch/tde-libs/tde-libcarddav/PKGBUILD
new file mode 100644
index 000000000..24a720768
--- /dev/null
+++ b/arch/tde-libs/tde-libcarddav/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty@gmail.com>
+
+_mod=libcarddav
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="A client library adding support for the CardDAV protocol"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+groups=('tde-libs')
+depends=('curl')
+makedepends=('tde-cmake-trinity')
+license=('GPL')
+provides=("${_mod}")
+# conflicts=()
+replaces=("trinity-${_mod}")
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('02f5a5bad32e87c70ecdb28a1dfdd167')
+
+_prefix=/usr
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${_prefix} \
+      -DWITH_GCC_VISIBILITY=ON
+
+   msg "Building $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-libs/tde-libkdcraw/PKGBUILD b/arch/tde-libs/tde-libkdcraw/PKGBUILD
new file mode 100644
index 000000000..d8ec6f55d
--- /dev/null
+++ b/arch/tde-libs/tde-libkdcraw/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=libkdcraw
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-libs')
+depends=('tde-tdelibs' 'libraw' 'lcms2')
+makedepends=('tde-cmake-trinity')
+optdepends=()
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('74843f1f0fa0c4bde1dd17f1bec7de94')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DBUILD_ALL=ON \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-libs/tde-libkexiv2/PKGBUILD b/arch/tde-libs/tde-libkexiv2/PKGBUILD
new file mode 100644
index 000000000..98242c306
--- /dev/null
+++ b/arch/tde-libs/tde-libkexiv2/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=libkexiv2
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="The EXIV2 Library interface for TDE kipi-plugins"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-libs')
+depends=('tde-tdelibs' 'exiv2')
+makedepends=('tde-cmake-trinity')
+optdepends=()
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('5fb0608a3694e931bc4051b94d17951e')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-libs/tde-libkipi/PKGBUILD b/arch/tde-libs/tde-libkipi/PKGBUILD
new file mode 100644
index 000000000..1b0bc7b64
--- /dev/null
+++ b/arch/tde-libs/tde-libkipi/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+
+_mod=libkipi
+_cat=libraries/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="The library for apps that want to use TDE kipi-plugins"
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-libs')
+depends=('tde-tdelibs')
+makedepends=('tde-cmake-trinity')
+optdepends=()
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!emptydirs')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('bf86456c8c14a9c2b74e000b32dc4631')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-meta/PKGBUILD b/arch/tde-meta/PKGBUILD
new file mode 100644
index 000000000..df5e9e105
--- /dev/null
+++ b/arch/tde-meta/PKGBUILD
@@ -0,0 +1,97 @@
+pkgname=tde-meta
+pkgver=14.0.13
+pkgrel=1
+pkgdesc="Trinity Desktop Environment"
+arch=('any')
+url="https://www.trinitydesktop.org/"
+license=('GPL')
+depends=(
+    # tde-base
+    'tde-i18n'
+    'tde-polkit-agent-tde'
+    'tde-tdeadmin'
+    'tde-tdeartwork'
+    'tde-tdebindings'
+    'tde-tdegraphics'
+    'tde-tdeutils'
+
+    # tde-core
+    'tde-arts'
+    'tde-avahi-tqt'
+    'tde-cmake-trinity'
+    'tde-dbus-1-tqt'
+    'tde-dbus-tqt'
+    'tde-libart-lgpl'
+    'tde-polkit-tqt'
+    'tde-tdebase'
+    'tde-tdelibs'
+    'tde-tqca'
+    'tde-tqca-tls'
+    'tde-tqt3'
+    'tde-tqtinterface'
+
+    # tde-dev
+    'tde-tdesdk'
+    'tde-tdevelop'
+    'tde-tdewebdev'
+    'tde-kdbg'
+    'tde-kdiff3'
+    'tde-kscope'
+    'tde-kxmleditor'
+
+    # tde-libs
+    'tde-libcaldav'
+    'tde-libcarddav'
+    'tde-libkdcraw'
+    'tde-libkexiv2'
+    'tde-libkipi'
+
+    # tde-extra
+    'tde-abakus'
+    'tde-akode'
+    'tde-amarok'
+    'tde-basket'
+    'tde-filelight'
+    'tde-gtk3-tqt-engine'
+    'tde-gtk-qt-engine'
+    'tde-kbiff'
+    'tde-kchmviewer'
+    'tde-kcpuload'
+    'tde-kile'
+    'tde-kmplayer'
+    'tde-kmymoney'
+    'tde-konversation'
+    'tde-kooldock'
+    'tde-krusader'
+    'tde-kshutdown'
+    'tde-ksplash-engine-moodin'
+    'tde-kvkbd'
+    'tde-style-baghira'
+    'tde-style-domino'
+    'tde-style-lipstik'
+    'tde-style-qtcurve'
+    'tde-systemsettings'
+    'tde-tdeaccessibility'
+    'tde-tdeaddons'
+    'tde-tdeedu'
+    'tde-tdegames'
+    'tde-tdeio-appinfo'
+    'tde-tdeio-ftps'
+    'tde-tdeio-locate'
+    'tde-tdemultimedia'
+    'tde-tdenetwork'
+    'tde-tdenetworkmanager'
+    'tde-tdepim'
+    'tde-tdepowersave'
+    'tde-tdesudo'
+    'tde-tdetoys'
+    'tde-tdmtheme'
+    'tde-tork'
+    'tde-twin-style-crystal'
+    'tde-twin-style-dekorator'
+    'tde-yakuake'
+)
+
+package() {
+  true
+}
diff --git a/arch/updatehashes.sh b/arch/updatehashes.sh
new file mode 100755
index 000000000..268c97241
--- /dev/null
+++ b/arch/updatehashes.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+tdesrc=$PWD
+
+cd $tdesrc/tde-core
+dir=$PWD
+for pkg in tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca-tls libart-lgpl avahi-tqt tdelibs tdebase; do
+  cd "$dir"/tde-"$pkg"
+  updpkgsums
+done
+
+cd $tdesrc/tde-base
+dir=$PWD
+for pkg in tdeadmin tdeartwork tdebindings tdegraphics tdeutils; do
+  cd "$dir"/tde-"$pkg"
+  updpkgsums
+done
+
+cd $tdesrc/tde-libs
+dir=$PWD
+for pkg in libcaldav libcarddav libkdcraw libkexiv2; do
+  cd "$dir"/tde-"$pkg"
+  updpkgsums
+done
+
+cd $tdesrc/tde-extra
+dir=$PWD
+for pkg in tdenetwork tdegames amarok gtk-qt-engine gtk3-tqt-engine kmplayer krusader ksplash-engine-moodin style-qtcurve systemsettings tdeaccessibility tdeaddons tdeedu tdemultimedia tdenetworkmanager tdepim tdepowersave tdesudo tdetoys tdmtheme twin-style-crystal; do
+  cd "$dir"/tde-"$pkg"
+  updpkgsums
+done
+
+cd $tdesrc/tde-devel
+dir=$PWD
+for pkg in tdesdk tdevelop tdewebdev; do
+  cd "$dir"/tde-"$pkg"
+  updpkgsums
+done
\ No newline at end of file
diff --git a/debian/_base/applications/development/kdbg/debian/docs b/debian/_base/applications/development/kdbg/debian/docs
index d5aaf5213..8f287764a 100644
--- a/debian/_base/applications/development/kdbg/debian/docs
+++ b/debian/_base/applications/development/kdbg/debian/docs
@@ -1,3 +1,3 @@
 BUGS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/development/kdiff3/debian/docs b/debian/_base/applications/development/kdiff3/debian/docs
index e845566c0..b43bf86b5 100644
--- a/debian/_base/applications/development/kdiff3/debian/docs
+++ b/debian/_base/applications/development/kdiff3/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/_base/applications/development/kpicosim/debian/docs b/debian/_base/applications/development/kpicosim/debian/docs
index e845566c0..b43bf86b5 100644
--- a/debian/_base/applications/development/kpicosim/debian/docs
+++ b/debian/_base/applications/development/kpicosim/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/_base/applications/development/kscope/debian/docs b/debian/_base/applications/development/kscope/debian/docs
index 1333ed77b..76c3076c9 100644
--- a/debian/_base/applications/development/kscope/debian/docs
+++ b/debian/_base/applications/development/kscope/debian/docs
@@ -1 +1,3 @@
+AUTHORS
+README.md
 TODO
diff --git a/debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff b/debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
- 
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
- 
- dnl generate the config header
diff --git a/debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff b/debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
-        KDE_USE_CLOSURE_TRUE="#"
-        KDE_USE_CLOSURE_FALSE=""
-        KDE_NO_UNDEFINED=""
--       case $host in 
--         *-*-linux-gnu)
--           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
--                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
--		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
--		[KDE_NO_UNDEFINED=""])],
--	    [KDE_NO_UNDEFINED=""])
--           ;;
--       esac
-   fi
-   AC_SUBST(KDE_USE_CLOSURE_TRUE)
-   AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/debian/_base/applications/development/kscope/debian/patches/series b/debian/_base/applications/development/kscope/debian/patches/series
index b8743ddd9..e69de29bb 100644
--- a/debian/_base/applications/development/kscope/debian/patches/series
+++ b/debian/_base/applications/development/kscope/debian/patches/series
@@ -1,2 +0,0 @@
-04_am_maintainer_mode.diff
-06_disable_no_undefined.diff
diff --git a/debian/_base/applications/development/ktechlab/debian/docs b/debian/_base/applications/development/ktechlab/debian/docs
index 724e08449..76c3076c9 100644
--- a/debian/_base/applications/development/ktechlab/debian/docs
+++ b/debian/_base/applications/development/ktechlab/debian/docs
@@ -1,2 +1,3 @@
-README
+AUTHORS
+README.md
 TODO
diff --git a/debian/_base/applications/development/kxmleditor/debian/docs b/debian/_base/applications/development/kxmleditor/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/development/kxmleditor/debian/docs
+++ b/debian/_base/applications/development/kxmleditor/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/games/knights/debian/docs b/debian/_base/applications/games/knights/debian/docs
index 724e08449..76c3076c9 100644
--- a/debian/_base/applications/games/knights/debian/docs
+++ b/debian/_base/applications/games/knights/debian/docs
@@ -1,2 +1,3 @@
-README
+AUTHORS
+README.md
 TODO
diff --git a/debian/_base/applications/games/tdepacman/debian/docs b/debian/_base/applications/games/tdepacman/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/games/tdepacman/debian/docs
+++ b/debian/_base/applications/games/tdepacman/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/graphics/potracegui/debian/docs b/debian/_base/applications/graphics/potracegui/debian/docs
index ba8894c15..648393dc3 100644
--- a/debian/_base/applications/graphics/potracegui/debian/docs
+++ b/debian/_base/applications/graphics/potracegui/debian/docs
@@ -1,2 +1,2 @@
-README
+README.md
 
diff --git a/debian/_base/applications/internet/kasablanca/debian/docs b/debian/_base/applications/internet/kasablanca/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/internet/kasablanca/debian/docs
+++ b/debian/_base/applications/internet/kasablanca/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/internet/kbiff/debian/docs b/debian/_base/applications/internet/kbiff/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/internet/kbiff/debian/docs
+++ b/debian/_base/applications/internet/kbiff/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/control b/debian/_base/applications/internet/kftpgrabber/debian/control
index 8413b0e9b..832139e15 100644
--- a/debian/_base/applications/internet/kftpgrabber/debian/control
+++ b/debian/_base/applications/internet/kftpgrabber/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libssl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kftp.org
 
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/docs b/debian/_base/applications/internet/kftpgrabber/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/internet/kftpgrabber/debian/docs
+++ b/debian/_base/applications/internet/kftpgrabber/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml b/debian/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml
deleted file mode 100644
index ae9a1cc32..000000000
--- a/debian/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY dhfirstname "<firstname>Fathi</firstname>">
-  <!ENTITY dhsurname   "<surname>Boudra</surname>">
-  <!ENTITY dhdate      "<date>mars 17, 2006</date>">
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>fboudra@free.fr</email>">
-  <!ENTITY dhusername  "Fathi Boudra">
-  <!ENTITY dhucpackage "<refentrytitle>kftpgrabber</refentrytitle>">
-  <!ENTITY dhpackage   "kftpgrabber">
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>ftp client for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable>options</replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&dhpackage;</command> is a graphical ftp client for TDE.
-    It supports technologies like ZeroConf, TLS/SSL and FXP</para>
-
-    <para>Some features:
-      <simplelist>
-        <member>- Multiple FTP sessions (tabs)</member>
-        <member>- Transfer queue</member>
-        <member>- TLS/SSL support for encrypted connections (implicit and explicit)</member>
-        <member>- Partial X509 certificate support for authentication</member>
-        <member>- File eXchange Protocol (FXP) transfer support</member>
-        <member>- One Time Password (OTP) support - S/Key, MD5, RMD160, SHA1</member>
-        <member>- Drag and Drop support</member>
-        <member>- Site bookmarking</member>
-        <member>- Encrypted bookmark support (password can be saved to TDEWallet)</member>
-        <member>- Distributed FTP support (PRET)</member>
-        <member>- SSCN and CPSV support</member>
-        <member>- Skiplist</member>
-        <member>- ZeroConf (aka. Rendezvous) support for local site discovery</member>
-        <member>- Bookmark sharing with Kopete contacts</member>
-        <member>- Bookmark import plugins</member>
-        <member>- Support for SFTP protocol</member>
-        <member>- Traffic graph</member>
-        <member>- Speed limiting</member>
-        <member>- Priority and skip lists</member>
-        <member>- Fast directory listings via control channel on servers that support STAT</member>
-        <member>- Integrated SFV checksum verifier</member>
-        <member>- Ability to view/edit remote files</member>
-        <member>- Exporting of directory listings into text files</member>
-        <member>- "On file exists" action matrix for Download, Upload and FXP transfers</member>
-      </simplelist>
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>All TDE and Qt programs accept some common command-line options.
-    <command>&dhpackage;</command> has no application-specific options.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show help about options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-qt</option>
-        </term>
-        <listitem>
-          <para>Show Qt specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-tde</option>
-        </term>
-        <listitem>
-          <para>Show TDE specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-all</option>
-        </term>
-        <listitem>
-          <para>Show all options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--author</option>
-        </term>
-        <listitem>
-          <para>Show author information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--license</option>
-        </term>
-        <listitem>
-          <para>Show license information</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/manpages b/debian/_base/applications/internet/kftpgrabber/debian/manpages
deleted file mode 100644
index ac7779c7e..000000000
--- a/debian/_base/applications/internet/kftpgrabber/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-kftpgrabber.1
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/rules b/debian/_base/applications/internet/kftpgrabber/debian/rules
index 8292bc38c..a6797f19a 100755
--- a/debian/_base/applications/internet/kftpgrabber/debian/rules
+++ b/debian/_base/applications/internet/kftpgrabber/debian/rules
@@ -1,23 +1,17 @@
 #!/usr/bin/make -f
 
-# Currently is not possible to build with --enable-final
-DEB_BUILD_OPTIONS += noopt
-
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-build/kftpgrabber-trinity::
-	/usr/bin/docbook2x-man debian/kftpgrabber.xml
-
-binary-install/kftpgrabber-trinity::
-	install -D -p -m644 debian/kftpgrabber-trinity.lintian-overrides \
-	  debian/kftpgrabber-trinity/usr/share/lintian/overrides/kftpgrabber-trinity
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
-	rm -f kftpgrabber.1
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/internet/kftpgrabber/debian/watch b/debian/_base/applications/internet/kftpgrabber/debian/watch
deleted file mode 100644
index a0f049d56..000000000
--- a/debian/_base/applications/internet/kftpgrabber/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://www.kftp.org/misc/downloads/ /uploads/files/kftpgrabber-(.*)\.tar\.bz2 debian svn-upgrade
diff --git a/debian/_base/applications/internet/knmap/debian/docs b/debian/_base/applications/internet/knmap/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/internet/knmap/debian/docs
+++ b/debian/_base/applications/internet/knmap/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/internet/kopete-otr/debian/docs b/debian/_base/applications/internet/kopete-otr/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/internet/kopete-otr/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/internet/kshowmail/debian/docs b/debian/_base/applications/internet/kshowmail/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/internet/kshowmail/debian/docs
+++ b/debian/_base/applications/internet/kshowmail/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/internet/kstreamripper/debian/docs b/debian/_base/applications/internet/kstreamripper/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/internet/kstreamripper/debian/docs
+++ b/debian/_base/applications/internet/kstreamripper/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/internet/ktorrent/debian/control b/debian/_base/applications/internet/ktorrent/debian/control
index d469dc93d..d7582a0ec 100644
--- a/debian/_base/applications/internet/ktorrent/debian/control
+++ b/debian/_base/applications/internet/ktorrent/debian/control
@@ -2,7 +2,7 @@ Source: ktorrent-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktorrent-trinity
diff --git a/debian/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook b/debian/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
deleted file mode 100644
index 63a5fa185..000000000
--- a/debian/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Mercatante</firstname>
-      <surname>Anthony</surname>
-      <email>tonio@ubuntu.com</email>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Anthony Mercatante</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2006-12-205</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>ktorrent</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>ktorrent</refname>
-    <refpurpose>BitTorrent client for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>ktorrent</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      BitTorrent client for TDE.
-    </para>
-    <para>
-      KTorrent is a BitTorrent program for TDE. Its features include speed capping (both down and up), integrated searching, UDP tracker support, preview of certain file types (video and audio) and integration into the TDE Panel enabling background downloading.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options. ktorrent has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to ktorrent it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Anthony Mercatante
-      <email>tonio@ubuntu.com</email> for the
-      <productname>Debian</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
-
diff --git a/debian/_base/applications/internet/ktorrent/debian/rules b/debian/_base/applications/internet/ktorrent/debian/rules
index a90794996..4ad6f5c28 100755
--- a/debian/_base/applications/internet/ktorrent/debian/rules
+++ b/debian/_base/applications/internet/ktorrent/debian/rules
@@ -13,9 +13,3 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-build/ktorrent-trinity::
-	docbook2x-man debian/ktorrent.1.docbook
-
-clean::
-	rm -f ktorrent.1
diff --git a/debian/_base/applications/internet/ktorrent/debian/watch b/debian/_base/applications/internet/ktorrent/debian/watch
deleted file mode 100644
index 0262eb3c5..000000000
--- a/debian/_base/applications/internet/ktorrent/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://ktorrent.org/downloads/(^2\.[\d\.]+)/ktorrent-(.*)\.tar\.bz2
diff --git a/debian/_base/applications/internet/kvpnc/debian/docs b/debian/_base/applications/internet/kvpnc/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/internet/kvpnc/debian/docs
+++ b/debian/_base/applications/internet/kvpnc/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/internet/tork/debian/docs b/debian/_base/applications/internet/tork/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/internet/tork/debian/docs
+++ b/debian/_base/applications/internet/tork/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
index 9737d93a4..38f031651 100644
--- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
+++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
@@ -1,2 +1,2 @@
 INSTALL
-README
+README.md
diff --git a/debian/_base/applications/misc/kcmldap/debian/docs b/debian/_base/applications/misc/kcmldap/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/debian/_base/applications/misc/kcmldap/debian/docs
+++ b/debian/_base/applications/misc/kcmldap/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 INSTALL
-README
+README.md
diff --git a/debian/_base/applications/misc/kcmldapcontroller/debian/docs b/debian/_base/applications/misc/kcmldapcontroller/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/debian/_base/applications/misc/kcmldapcontroller/debian/docs
+++ b/debian/_base/applications/misc/kcmldapcontroller/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 INSTALL
-README
+README.md
diff --git a/debian/_base/applications/misc/kcmldapmanager/debian/docs b/debian/_base/applications/misc/kcmldapmanager/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/debian/_base/applications/misc/kcmldapmanager/debian/docs
+++ b/debian/_base/applications/misc/kcmldapmanager/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 INSTALL
-README
+README.md
diff --git a/debian/_base/applications/misc/kerberostray/debian/docs b/debian/_base/applications/misc/kerberostray/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/applications/misc/kerberostray/debian/docs
+++ b/debian/_base/applications/misc/kerberostray/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install b/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
index 8c3677c1a..28bc4ff13 100644
--- a/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
+++ b/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
@@ -1,6 +1,7 @@
 debian/tmp/opt/trinity/share/apps
 debian/tmp/opt/trinity/share/icons
 debian/tmp/opt/trinity/share/locale
+debian/tmp/opt/trinity/share/man/man1/krecipes.1
 debian/tmp/opt/trinity/share/mimelnk
 
 debian/krecipes.xpm	opt/trinity/share/pixmaps/
diff --git a/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages b/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
deleted file mode 100644
index 196cdc430..000000000
--- a/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/krecipes.1
diff --git a/debian/_base/applications/misc/krecipes/debian/krecipes.1 b/debian/_base/applications/misc/krecipes/debian/krecipes.1
deleted file mode 100644
index aaf56f777..000000000
--- a/debian/_base/applications/misc/krecipes/debian/krecipes.1
+++ /dev/null
@@ -1,187 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KRECIPES 1 "May 2009"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-Krecipes \- The TDE Cookbook
-.SH SYNOPSIS
-.B krecipes
-[Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-.B Krecipes
-is a program that lets you to manage your recipes, create shopping
-lists, choose a recipe based on available ingredients and plan your
-menu/diet in advance.
-.PP
-This manual page briefly describes its command line options.
-.SH OPTIONS
-This program follows the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-.TP
-.B \-\-convert-sqlite3
-Convert the current SQLite 2.x database to SQLite 3 and exit
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS Qt options
-.TP
-.B \-\-display <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color map on an 8-bit
-display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color cube on an 8-bit
-display, if the application is using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb
-running under a debugger can cause an implicit \-nograb, use \-dograb
-to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an application palette (light
-and dark shades are calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on an 8\-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible values are onthespot,
-overthespot, offthespot and root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS TDE options
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget \- see man X for the
-argument format
-.TP
-.B \-\-nofork
-Don't run in the background.
-
-.SH FILES
-.TP
-.I ~/.trinity/share/config/krecipesrc
-.B Krecipes
-configuration file
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You
-can also enter the URL
-.BR help:/krecipes/
-directly into konqueror or you can run
-.BR "khelpcenter help:/krecipes/"
-from the command\-line.
-
-.SH AUTHORS
-.nf
-Jason Kivlighn <jkivlighn@gmail.com>
-.br
-Unai Garro <ugarro@users.sourceforge.net>
-.br
-Cyril Bosselut <bosselut@b1project.com>
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors
-directly.
-.PP
-This manual page was written by Matthias Julius <mdeb@julius-net.net>,
-for the Debian project (and may be used by others).  Permission is
-granted to copy, distribute and/or modify this document under the
-terms of the GNU General Public License, Version 2 or any later
-version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License
-version 2 can be found in /usr/share/common\-licenses/GPL\-2.
diff --git a/debian/_base/applications/misc/krecipes/debian/rules b/debian/_base/applications/misc/krecipes/debian/rules
index e3708987f..523611ff9 100755
--- a/debian/_base/applications/misc/krecipes/debian/rules
+++ b/debian/_base/applications/misc/krecipes/debian/rules
@@ -33,10 +33,6 @@ binary-install/krecipes-trinity::
 	install -p -D -m644 debian/$(cdbs_curpkg).lintian \
 		debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
 
-binary-install/krecipes-data-trinity::
-	dh_testdir
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
 clean::
 	dh_testdir
 	rm -f debian/stamp-bootstrap
diff --git a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..0dbd9f84e 100644
--- a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -1,28 +1,32 @@
-debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
-debian/tmp/opt/trinity/share/services/amarokitpc.protocol
-debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
-debian/tmp/opt/trinity/share/services/amarokpcast.protocol
-debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
-debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop 
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop 
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
+debian/tmp/opt/trinity/share/man/man1/amarokapp.1
+debian/tmp/opt/trinity/share/man/man1/amarokcollectionscanner.1
+debian/tmp/opt/trinity/share/man/man1/amarok_libvisual.1
+debian/tmp/opt/trinity/share/man/man1/amarok.1
+debian/tmp/opt/trinity/share/services/amarokitpc.protocol
+debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
+debian/tmp/opt/trinity/share/services/amarokpcast.protocol
+debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
+debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
 
 #libkarma is not in MAIN yet
 #debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la
@@ -31,8 +35,6 @@ debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
 debian/tmp/opt/trinity/lib/ruby_lib/*           /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
 debian/tmp/opt/trinity/bin/amarok
 debian/tmp/opt/trinity/bin/amarokapp
 debian/tmp/opt/trinity/bin/amarok_libvisual
diff --git a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages b/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
deleted file mode 100644
index 8094eebb9..000000000
--- a/debian/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/amarokapp-trinity.1
-debian/man/amarok-trinity.1
-debian/man/amarokcollectionscanner-trinity.1
-debian/man/amarok_libvisual-trinity.1
diff --git a/debian/_base/applications/multimedia/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control
index 00d0b4b9c..e0593e503 100644
--- a/debian/_base/applications/multimedia/amarok/debian/control
+++ b/debian/_base/applications/multimedia/amarok/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bzip2,
  tdelibs14-trinity-dev, tdebase-trinity-dev,
- libakode-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev,
+ libakode-dev, libxine2-dev | libxine-dev,
  libtag1-dev, libsqlite3-dev,
  default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
@@ -17,7 +17,7 @@ Homepage: http://amarok.kde.org
 
 Package: amarok-trinity
 Architecture: any
-Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
+Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
 Replaces: amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
@@ -45,6 +45,16 @@ Description: versatile and easy to use audio player for Trinity
  Support for libvisual visualization plugins is also compiled in (you need 
  to have libvisual-0.4-plugins installed to be able to use it).
 
+Package: libamarok-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Breaks: amarok-trinity (<< 4:14.0.11~)
+Replaces: amarok-trinity (<< 4:14.0.11~)
+Description: base library for Amarok [Trinity]
+ This package contains base library needed for Amarok to run properly.
+ Therefore, unless you have 'amarok' package installed, you will hardly
+ find this package useful.
+
 Package: amarok-common-trinity
 Architecture: all
 Depends: ruby
@@ -72,7 +82,7 @@ Description: Amarok sidebar for konqueror [Trinity]
 Package: amarok-engines-trinity
 Architecture: all
 Depends: amarok-engine-xine-trinity (>= ${source:Version}) | amarok-engine-akode-trinity (>= ${source:Version})
-Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version})
 Replaces: amarok-engines-trinity (<< 4:14.0.0~)
 Breaks: amarok-engines-trinity (<< 4:14.0.0~)
 Description: output engines for the Amarok music player [Trinity]
@@ -100,18 +110,6 @@ Description: xine engine for the Amarok audio player [Trinity]
  for some reason over the other engines (e.g., it is the lightest engine
  Dependency-wise).
 
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Breaks: amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features 
- (like visualizations) might not be available while using this engine.
-
 Package: amarok-trinity-dbg
 Priority: extra
 Architecture: any
diff --git a/debian/_base/applications/multimedia/amarok/debian/docs b/debian/_base/applications/multimedia/amarok/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/multimedia/amarok/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install b/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
new file mode 100644
index 000000000..69d47ff8d
--- /dev/null
+++ b/debian/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libamarok.so.0
+debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
deleted file mode 100644
index 821ec48c7..000000000
--- a/debian/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Mar 2004" "Trinity Desktop Environment" "An audio player for TDE"
-.SH NAME
-amarok
-\- An audio player for TDE
-.SH SYNOPSIS
-amarok [Qt-options] [TDE-options] [URL(s)] 
-.SH DESCRIPTION
-amaroK is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'.
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'.
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-\-nograb, use \-\-dograb to override.
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging.
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font.
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color.
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color.
-.TP
-.B  \-\-name  <name>
-sets the application name.
-.TP
-.B  \-\-title  <title>
-sets the application title (caption).
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root.
-.TP
-.B  \-\-im  <XIM server>
-set XIM server.
-.TP
-.B  \-\-noxim  
-disable XIM.
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets.
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar.
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon.
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar.
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file.
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'.
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps.
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager.
-.TP
-.B  \-\-style  <style>
-sets the application GUI style.
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget.
-.SS 
-.SS Arguments:
-URL(s)                    Files/URLs to Open
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-previous  
-Skip backwards in playlist
-.TP
-.B \-p,  \-\-play  
-Start playing current playlist
-.TP
-.B \-s,  \-\-stop  
-Stop playback
-.TP
-.B  \-\-pause  
-Pause playback
-.TP
-.B \-f,  \-\-next  
-Skip forwards in playlist
-.SS 
-.SS Additional options:
-.TP
-.B \-e,  \-\-enqueue  
-Enqueue Files/URLs
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/amarok/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/amarok/'"
-from the command-line.
-.BR
-.SH AUTHORS
-.nf
-Christian Muehlhaeuser <chris@chris.de>
-.BR
-Mark Kretschmann <markey@web.de>
-.BR
-Max Howell <max.howell@methylblue.com>
-.BR
-Stanislav Karchebny <berk@upnet.ru>
-.BR
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.BR
-.SH OTHER
-This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian
-system (but may be used by others).
-.BR
diff --git a/debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
deleted file mode 100644
index c932b9b0c..000000000
--- a/debian/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
+++ /dev/null
@@ -1,14 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok"
-.SH NAME
-amarok_libvisual \- LibVisual support utility for Amarok
-.SH SYNOPSIS
-amarok_libvisual
-.SH DESCRIPTION
-This is LibVisual support helper utility for Amarok. It's used internally by Amarok 
-itself when needed and is not supposed to be invoked manually by user.
-.SS 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
deleted file mode 100644
index 91ff8b6aa..000000000
--- a/debian/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for TDE"
-.SH NAME
-amarokapp
-\- A direct executable for Amarok.
-.SH SYNOPSIS
-amarokapp [Qt-options] [TDE-options] [URL(s)] 
-.SH DESCRIPTION
-Amarok is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.P
-This is direct Amarok executable. The recommend way to run Amarok is using
-\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're
-debugging Amarok with gdb, valgrind or similar program, you will probably want to
-run it against this binary directly.
-.P
-\fBamarokapp(1)\fP takes the same command line options and arguments as
-\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP.
-.SH SEE ALSO
-amarok(1)
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 b/debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
deleted file mode 100644
index c67cd917f..000000000
--- a/debian/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok"
-.SH NAME
-amarokcollectionscanner \- Collection Scanner for Amarok
-.SH SYNOPSIS
-amarokcollectionscanner [Qt\-options] [TDE\-options] Folder(s) 
-.SH DESCRIPTION
-This Amarok helper utility scans folder(s) given on the command line or
-restarts previous scan if \fB\-\-restart\fP option was given and writes a
-specially structured XML file to standard output with extensive information
-(including tags) about audio files it was able to find. XML file schema used
-by this utility is Amarok specific.
-.P
-You may find his utility useful if you need to retreive and/or display extended
-information about collection of audio files.
-.SH OPTIONS
-.SS
-.SS Arguments:
-Folder(s)                 Folders to scan
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-recursive  
-Scan folders recursively
-.TP
-.B \-i,  \-\-incremental  
-Incremental Scan (modified folders only)
-.TP
-.B \-p,  \-\-importplaylists  
-Import playlist
-.TP
-.B \-s,  \-\-restart  
-Restart the scanner at last position, after a crash []
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/debian/_base/applications/multimedia/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..55c147b76 100755
--- a/debian/_base/applications/multimedia/amarok/debian/rules
+++ b/debian/_base/applications/multimedia/amarok/debian/rules
@@ -15,4 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
  -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
  -DWITH_IFP="OFF"
diff --git a/debian/_base/applications/multimedia/codeine/debian/docs b/debian/_base/applications/multimedia/codeine/debian/docs
new file mode 100644
index 000000000..6f7727790
--- /dev/null
+++ b/debian/_base/applications/multimedia/codeine/debian/docs
@@ -0,0 +1,2 @@
+README.md
+TODO
diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/multimedia/k3b-i18n/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/multimedia/k3b-i18n/debian/docs b/debian/_base/applications/multimedia/k3b-i18n/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/rules b/debian/_base/applications/multimedia/k3b-i18n/debian/rules
index 440fce6c1..6a65ab1bb 100755
--- a/debian/_base/applications/multimedia/k3b-i18n/debian/rules
+++ b/debian/_base/applications/multimedia/k3b-i18n/debian/rules
@@ -2,16 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-
-# 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
+include debian/cdbs/debian-tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/debian/_base/applications/multimedia/k3b-i18n/debian/watch b/debian/_base/applications/multimedia/k3b-i18n/debian/watch
deleted file mode 100644
index cdaaf355a..000000000
--- a/debian/_base/applications/multimedia/k3b-i18n/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/k3b/k3b-i18n-([\d.]*).tar.bz2
diff --git a/debian/_base/applications/multimedia/k3b/debian/control b/debian/_base/applications/multimedia/k3b/debian/control
index 03e35f4a6..8cc2b03b8 100644
--- a/debian/_base/applications/multimedia/k3b/debian/control
+++ b/debian/_base/applications/multimedia/k3b/debian/control
@@ -5,8 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
 Build-Depends:
- cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
- tdelibs14-trinity-dev, libdbus-tqt-1-dev,
+ cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
  libdvdread-dev, libasound2-dev, lame, libmp3lame-dev,
  libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev,
  libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev
diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.1 b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.1
deleted file mode 100644
index 08ca27b5f..000000000
--- a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.1
+++ /dev/null
@@ -1,207 +0,0 @@
-.TH K3B "1" "December 2002" TDE "TDE Application"
-.SH NAME
-k3b \- TDE CD burning program
-.SH SYNOPSIS
-.B k3b
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B k3b
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-K3b is a CD burning program that has two aims:
-usability and as many features as possible.
-.P
-This program is part of the official TDE extra gear #1 module.
-.SH OPTIONS
-.SS "Arguments:"
-.TP
-File(s)
-file(s) to open
-.SS "General Options"
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Options:"
-.B \-\-datacd
-Create a new data CD project and add all given files
-.TP
-.B \-\-audiocd
-Create a new audio CD project and add all given files
-.TP
-.B \-\-videocd
-Create a new video CD project and add all given files
-.TP
-.B \-\-mixedcd
-Create a new mixed mode CD project and add all given files
-.TP
-.B \-\-emovixcd
-Create a new eMovix CD project and add all given files
-.TP
-.B \-\-datadvd
-Create a new data DVD project and add all given files
-.TP
-.B \-\-emovixdvd
-Create a new eMovix DVD project and add all given files
-.TP
-.B \-\-copycd
-Open the CD copy dialog
-.TP
-.B \-\-clonecd
-Open the CD cloning dialog
-.TP
-.B \-\-cdimage
-Write an ISO image or Bin/Cue image to cd
-.TP
-.B \-\-erasecd
-Erase a CDRW
-.TP
-.B \-\-formatdvd
-Format a DVD-RW or DVD+RW
-.TP
-.BI \-\-lang \ language
-Set the GUI language
-.SS "Qt options:"
-.TP
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-title \ title
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options:"
-.TP
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-K3b was written by
-.nh
-.ad l
-Sebastian Trueg <trueg@informatik.uni-freiburg.de>
-and Thomas Froescher <tfroescher@gmx.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/k3b
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/k3b
-
diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install
index a72c0b374..8c6643cf2 100644
--- a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install
+++ b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.install
@@ -1,5 +1,7 @@
 debian/tmp/opt/trinity/bin/*
-debian/tmp/opt/trinity/share/applications/*
-debian/k3b.xpm /opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.so
 debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.la
+debian/tmp/opt/trinity/share/applications/*
+debian/tmp/opt/trinity/share/man/man1/k3b.1
+
+debian/k3b.xpm /opt/trinity/share/pixmaps/
diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages b/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
deleted file mode 100644
index 328f16efe..000000000
--- a/debian/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/k3b-trinity.1
diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.files b/debian/_base/applications/multimedia/k3b/debian/k3b.files
deleted file mode 100644
index d6388a5b6..000000000
--- a/debian/_base/applications/multimedia/k3b/debian/k3b.files
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/applications/*
-usr/share/mimelnk/*
-usr/share/pixmaps/*
-usr/share/services/*
-usr/bin/*
-etc/*
diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.install b/debian/_base/applications/multimedia/k3b/debian/k3b.install
deleted file mode 100644
index 134bb0bf2..000000000
--- a/debian/_base/applications/multimedia/k3b/debian/k3b.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/bin/*
-debian/tmp/usr/share/applications/*
-debian/k3b.xpm usr/share/pixmaps/
-debian/tmp/usr/lib/trinity/tdefile_k3b.so
-debian/tmp/usr/lib/trinity/tdefile_k3b.la
diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.manpages b/debian/_base/applications/multimedia/k3b/debian/k3b.manpages
deleted file mode 100644
index 60dde70bc..000000000
--- a/debian/_base/applications/multimedia/k3b/debian/k3b.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/k3b.1
diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.menu b/debian/_base/applications/multimedia/k3b/debian/k3b.menu
deleted file mode 100644
index e3ec0ef1f..000000000
--- a/debian/_base/applications/multimedia/k3b/debian/k3b.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(k3b-trinity):\
-	needs="X11"\
-	section="Applications/File Management"\
-	title="K3b"\
-	command="/opt/trinity/bin/k3b"\
-	icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/_base/applications/multimedia/k3b/debian/k3b.postinst b/debian/_base/applications/multimedia/k3b/debian/k3b.postinst
deleted file mode 100644
index 3807d55e6..000000000
--- a/debian/_base/applications/multimedia/k3b/debian/k3b.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-	configure)
-
-	# Remove bad files 
-	if dpkg --compare-versions "$2" eq "0.10.3-1"; then
-		rm -rf /usr/share/applnk/.hidden
-		rm -rf /usr/share/applnk/System/k3b.desktop
-	fi
-	
-	if dpkg --compare-versions "$2" lt "0.10.3-1"; then
-		rm -rf /usr/share/applnk/System/k3b.desktop
-		rm -rf /usr/share/applnk/System/k3bsetup.desktop
-	fi
-
-	;;	
-abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-
-*)
-	echo "postinst called with unknown argument \`$1'" >&2
-	exit 1
-	;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/debian/_base/applications/multimedia/k3b/debian/watch b/debian/_base/applications/multimedia/k3b/debian/watch
deleted file mode 100644
index 7e3c554ae..000000000
--- a/debian/_base/applications/multimedia/k3b/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/k3b/k3b-([\d.]*).tar.bz2
diff --git a/debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook b/debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
deleted file mode 100644
index 96001a6ad..000000000
--- a/debian/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Mercatante</firstname>
-      <surname>Anthony</surname>
-      <email>anthony.mercatante@laposte.net</email>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Anthony Mercatante</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2005-07-28</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>k9copy</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>k9copy</refname>
-    <refpurpose>DVD copy tool for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>k9copy</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      DVD copy tool for TDE.
-    </para>
-    <para>
-      k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options. k9copy has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to keep it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Anthony Mercatante
-      <email>anthony.mercatante@laposte.net</email> for the
-      <productname>Debian</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
-
diff --git a/debian/_base/applications/multimedia/k9copy/debian/rules b/debian/_base/applications/multimedia/k9copy/debian/rules
index aca7b475b..6219a645e 100755
--- a/debian/_base/applications/multimedia/k9copy/debian/rules
+++ b/debian/_base/applications/multimedia/k9copy/debian/rules
@@ -10,8 +10,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1
-
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --enable-k3bdevices
 
 post-patches:: debian/stamp-bootstrap
@@ -30,14 +28,3 @@ endif
 	
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
-
-install/k9copy-trinity::
-	dh_installman k9copy.1
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-	dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
-
-build/k9copy-trinity::
-	docbook2x-man debian/k9copy.1.docbook
-
-clean::
-	rm -f k9copy.1
diff --git a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs
index e845566c0..0b6e0f321 100644
--- a/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs
+++ b/debian/_base/applications/multimedia/kaffeine-mozilla/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/debian/_base/applications/multimedia/kaffeine/debian/docs b/debian/_base/applications/multimedia/kaffeine/debian/docs
index b7c0e782e..0ca805e45 100644
--- a/debian/_base/applications/multimedia/kaffeine/debian/docs
+++ b/debian/_base/applications/multimedia/kaffeine/debian/docs
@@ -1,5 +1,5 @@
-README
-TODO
+README.md
 README.atsc
 README.dvb
 README.gstreamer
+TODO
diff --git a/debian/_base/applications/multimedia/kmplayer/debian/docs b/debian/_base/applications/multimedia/kmplayer/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/multimedia/kmplayer/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/multimedia/mplayerthumbs/debian/docs b/debian/_base/applications/multimedia/mplayerthumbs/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/multimedia/mplayerthumbs/debian/docs
+++ b/debian/_base/applications/multimedia/mplayerthumbs/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
deleted file mode 100644
index b420ba197..000000000
--- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" This is free documentation; 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.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual 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 manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
-.\"
-.TH ROSEGARDEN-AUDIOFILE-IMPORTER 1 "19 March 2006"
-
-.SH NAME
-
-rosegarden-audiofile-importer - Helper application to convert and
-import audio files for Rosegarden.
-
-.SH SYNOPSIS
-
-rosegarden-audiofile-importer -t [<version>]
-rosegarden-audiofile-importer --conftest [<version>]
-rosegarden-audiofile-importer -l [<version>]
-rosegarden-audiofile-importer [-r <rate>] -w <inputfile>
-rosegarden-audiofile-importer [-r <rate>] -c <inputfile> <outputfile>
-
-
-.SH OPTIONS
-
-.BR -t " " [<version>], 
-.BR --conftest " " [<version>]
-
-Exit successfully if the importer is available and working [and is
-of at least version <version>].  If some of the required helper
-applications are missing, also print to stdout a line saying
-"Required: application1, application2", listing the missing
-programs.
-
-.BR \-l " " [<version>]
-
-List known file extensions (e.g. ogg wav flac).  Return code is same
-as for -t (so can combine two calls into one)
-
-.BR \-r " " <rate>
-
-Test whether any work is needed to convert the input, either because
-it isn't in a Rosegarden-compatible format or because its samplerate
-differs from <rate>.  Exit successfully if no work is required; return
-error code 2 if conversion required, 3 if resampling required, 4 if
-both required, 1 for other error.
-
-.SH DESCRIPTION
-
-Helper application to convert and import audio files for Rosegarden.
-
-Can take audio files of various kinds as input, always produces WAV
-files that are compatible with Rosegarden as output.
-
-Not actually specific to Rosegarden in any way, except that
-Rosegarden needs to know it can rely on its presence and calling
-interface.
-
-.SH SEE ALSO
-     rosegarden(1), rosegarden-lilypondview(1), rosegarden-project-page(1)
-
-
-
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
deleted file mode 100644
index e2aa9f951..000000000
--- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\" This is free documentation; 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.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual 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 manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
-.\"
-.TH ROSEGARDEN-LILIPONDVIEW 1 "10 February 2006"
-i
-.SH NAME
-
-rosegardern-lilypondview - display a lilypond file in a postscript
-viewer.
-
-.SH SYNOPSIS
-
-rosegarden-lilypondview [-g] [FILE].ly
-
-.SH DESCRIPTION
-
-This script takes a Lilypond file as input.  It creates a temporary
-sandbox, runs Lilypond against the input file, then opens a PostScript
-viewer against the results in order to provide a graphical, printable
-preview.
-
-This script is used internally by Rosegarden, as the backend for the File -> 
-Export -> Preview Lilypond file feature.
-
-.SH OPTIONS
-.BR \-g " " Use graphical mode
-
-.SH REQUIREMENTS
-
-Working installation of Lilypond 2.0 or later KGhostView or KPDF or
-XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for
-graphical mode only]
-
-.SH AUTHOR
-Chris Cannam
-
-.SH COPYRIGHT
-2005-2006 Fervent Software.
-
-
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
deleted file mode 100644
index 0da30c2a5..000000000
--- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" This is free documentation; 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.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual 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 manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
-.\"
-.TH ROSEGARDEN-PROJECT-PACKAGE 1 "10 February 2006"
-
-.SH NAME
-
-rosegarden-project-package - converts between Rosegarden (.rg) files
-and Rosegarden Project (.rgp) files.
-
-.SH SYNOPSIS
-
-orosegarden-project-package [--quiet] [--pack] [--unpack] [--conftest] [FILE] [.rg|.rgp]
-
-.SH OPTIONS
-.BR \-\-quiet " " Be silent
-.BR \-\-unpack " " Unpack .rgp file
-.BR \-\-pack " " Pack .rg file plus associated external data files into .rgp file
-.BR \-\-conftest " " Test environment for necessary installed components
-
-.SH DESCRIPTION
-
-This program converts between Rosegarden (.rg) files and Rosegarden
-Project (.rgp) files.  It is primarily intended to be used internally and 
-transparently by the Rosegarden application.
-
-A Rosegarden file (.rg) is a single file (in gzipped XML format)
-that defines a Rosegarden composition in terms of events, segments,
-programs, plugin data, references to audio files, and so on.  Some
-of these types of information depend on the presence of external
-files such as the audio files or plugin preset data, without which
-the file cannot be used.
-
-A Rosegarden Project (.rgp) file is a bundle of files, including the
-Rosegarden file itself, as well as any audio file or other external
-data it requires, in compressed form.  A Rosegarden Project file is
-intended to be portable and self-contained, but the Rosegarden
-program itself does not (at the time of writing) understand these
-files directly.
-
-This program can take a Rosegarden file, examine it to find out
-which other data files it uses, and pack it to create the
-corresponding Rosegarden Project file.  Conversely, it can also take
-a Rosegarden Project file and unpack it as a project directory for
-use with Rosegarden.
-
-.SH REQUIREMENTS
-
-Working installation of Lilypond 2.0 or later KGhostView or KPDF or
-XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for
-graphical mode only]
-
-.SH AUTHOR
-Chris Cannam
-
-.SH COPYRIGHT
-2005-2006 Fervent Software.
-
-
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
index 50a0bcdaa..ac05f6185 100644
--- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
@@ -1,4 +1,8 @@
 debian/tmp/opt/trinity/bin/rosegarden*
 debian/tmp/opt/trinity/bin/rosegardensequencer*
-debian/tmp/opt/trinity/share/mimelnk
 debian/tmp/opt/trinity/share/applications
+debian/tmp/opt/trinity/share/mimelnk
+debian/tmp/opt/trinity/share/man/man1/rosegarden.1
+debian/tmp/opt/trinity/share/man/man1/rosegarden-lilypondview.1
+debian/tmp/opt/trinity/share/man/man1/rosegarden-project-package.1
+debian/tmp/opt/trinity/share/man/man1/rosegarden-audiofile-importer.1
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
deleted file mode 100644
index 6e3b96ee0..000000000
--- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/rosegarden.1
-debian/rosegarden-lilypondview.1
-debian/rosegarden-project-package.1
-debian/rosegarden-audiofile-importer.1
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1 b/debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1
deleted file mode 100644
index fe750e0b2..000000000
--- a/debian/_base/applications/multimedia/rosegarden/debian/rosegarden.1
+++ /dev/null
@@ -1,155 +0,0 @@
-.TH ROSEGARDEN 1 "23 July 2006"
-
-.SH NAME
-
-rosegarden, rosegarden-sequencer - MIDI and audio sequencer and
-musical notation editor.
-
-.SH SYNOPSIS
-
-rosegarden [Qt-options] [TDE-options] [options] [File]
-
-rosegardensequencer [Qt-options] [TDE-options] [playback_1 playback_2 capture_1 capture_2]
-
-.SH DESCRIPTION
-
-This manual page documents briefly the rosegarden and rosegardensequencer commands.
-
-rosegarden is a MIDI and audio sequencer, notation editor, and general-purpose music composition and editing application for Unix and Linux. It is a TDE application, which means to build it you need the TDE libraries. However, once installed it can be run within the TDE environment or any other desktop or window manager environment.
-
-rosegardensequencer is part of the rosegarden application, the part which knows about and audio MIDI devices, and about real time. rosegardensequencer is executed automatically when rosegarden starts, so you will probably never need to execute it directly. You may want to specify command line options, though, to change the JACK ports used for audio capture and playback. In order to do that, you can invoque rosegardensequencer directly before running rosegarden, or you can specify the sequencer command line arguments using the rosegarden configuration dialog, and restarting the application. This program follows the usual GNU command line syntax, with long options starting with two dashes ('-'). A summary of options is included below.
-
-.SH OPTIONS
-.BR \-\-author " "
-     Show author information.
-
-.BR \-\-help " "
-     Show help about options.
-
-.BR \-\-help-all
-     Show all options.
-
-.BR \-\-help-tde
-     Show TDE specific options.
-
-.BR \-\-help-qt
-     Show Qt specific options.
-
-.BR \-\-license 
-     Show license information.
-
-.BR \-v, \-\-version
-     Show version information.
-
-
-.SH OPTIONS for rosegarden
-
-.BR \-\-nosplash
-     Don\'t show splash screen.
-	
-
-.BR \-\-nosequencer
-     Don\'t use an external sequencer.
-
-.BR \-\-nofork
-     Don\'t automatically run in the background.
-
-.BR \ \--existingsequencer
-     Attach to a running sequencer process, if found.
-
-.BR File
-     File to load at startup. Typically a rosegarden (.rg) file, but it can also be a rosegarden2.1 file or a MIDI file.
-
-.SH OPTIONS
-.BR \-g " " Use graphical mode>
-     
-.SH QT OPTIONS
-.BR \-\-bg, --background color
-     Sets the default background color and an application palette (light and dark shades are calculated).
-
-.BR \-\-btn, --button color
-     Sets the default button color.
-
-.BR \-\-cmap
-     Causes the application to install a private color map on an 8-bit display.
-
-.BR \-\-display displayname
-     Use the X-server display 'displayname'.
-
-.BR \-\-dograb
-     Running under a debugger can cause an implicit --nograb, use --dograb to override.
-
-.BR \-\-fg, \-\-foreground color
-     Sets the default foreground color.
-
-.BR \-\-fn, \-\-font fontname
-     Defines the application font.
-
-.BR \-\-im XIMserver
-     Set XIM server.
-
-.BR \-\-inputstyle inputstyle
-     Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.
-
-.BR \-\-name name
-     Sets the application name.
-
-.BR \-\-ncols count
-     Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.
-
-.BR \-\-nograb
-     Tells Qt to never grab the mouse or the keyboard.
-
-.BR \-\-noxim
-     Disable XIM.
-
-.BR \-\-reverse
-     Mirrors the whole layout of widgets.
-
-.BR \-\-session sessionId
-     Restore the application for the given 'sessionId'.
-
-.BR \-\-sync
-     Switches to synchronous mode for debugging.
-
-.BR \-\-title title
-     Sets the application title (caption).
-
-.BR \-\-visual TrueColor
-     Forces the application to use a TrueColor visual on an 8-bit display.
-
-
-.SH TDE OPTIONS
-.BR \-\-caption caption
-     Use 'caption' as name in the titlebar.
-
-.BR \-\-config filename
-     Use alternative configuration file.
-
-.BR \-\-dcopserver server
-     Use the DCOP Server specified by 'server'.
-
-.BR \-\-geometry geometry
-     Sets the client geometry of the main widget.
-
-.BR \-\-icon icon
-     Use 'icon' as the application icon.
-
-.BR \-\-miniicon icon
-     Use 'icon' as the icon in the titlebar.
-
-.BR \-\-nocrashhandler
-     Disable crash handler, to get core dumps.
-
-.BR \-\-style style
-     Sets the application GUI style.
-
-.BR \-\-waitforwm
-     Waits for a WM_NET compatible windowmanager.
-
-.SH SEE ALSO
-     jackd(1), rosegarden-lilypondview(1), rosegarden-project-package(1), rosegarden-audiofile-importer(1)
-
-
-.SH AUTHOR
-This manual page was written by Enrique Robledo Arnuncio <era@debian.org> and later ammended by Mike O'Connor <stew@vireo.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front Cover Texts and no Back Cover Texts.
diff --git a/debian/_base/applications/multimedia/rosegarden/debian/rules b/debian/_base/applications/multimedia/rosegarden/debian/rules
index 94fe8c0a8..1372a08f8 100755
--- a/debian/_base/applications/multimedia/rosegarden/debian/rules
+++ b/debian/_base/applications/multimedia/rosegarden/debian/rules
@@ -26,8 +26,6 @@ DEB_COMPRESS_EXCLUDE += .rg .wav .docbook
 binary-install/rosegarden-trinity::
 	dh_testdir
 	find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \;
-	cp -Rp debian/rosegarden-trinity/usr/share/man/* debian/rosegarden-trinity/opt/trinity/share/man/
-	rm -rf debian/rosegarden-trinity/usr/share/man
 
 clean::
 	dh_testdir
diff --git a/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk b/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/multimedia/tderadio/debian/cdbs/versions.pl b/debian/_base/applications/multimedia/tderadio/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/multimedia/tderadio/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/multimedia/tderadio/debian/control b/debian/_base/applications/multimedia/tderadio/debian/control
index a8dc3df43..2c44da7f2 100644
--- a/debian/_base/applications/multimedia/tderadio/debian/control
+++ b/debian/_base/applications/multimedia/tderadio/debian/control
@@ -2,9 +2,9 @@ Source: tderadio-trinity
 Section: sound
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), tdelibs14-trinity-dev, liblircclient-dev, libsndfile1-dev, imagemagick, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+               liblircclient-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev
 Standards-Version: 3.8.4
-Homepage: http://tderadio.sourceforge.net/
 
 Package: tderadio-trinity
 Architecture: any
diff --git a/debian/_base/applications/multimedia/tderadio/debian/convert-presets.1 b/debian/_base/applications/multimedia/tderadio/debian/convert-presets.1
deleted file mode 100644
index 0a96aa40e..000000000
--- a/debian/_base/applications/multimedia/tderadio/debian/convert-presets.1
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH CONVERT\-PRESETS 1 "Dec 2005" "Trinity Desktop Environment" "convert-presets"
-.SH NAME
-convert\-presets
-\- convert-presets
-.SH SYNOPSIS
-convert\-presets [Qt\-options] [TDE\-options] [options] [preset files] 
-.SH DESCRIPTION
-convert-presets
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B preset
-files              preset file to convert
-.SS Options:
--q                        be quiet
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/convert\-presets/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/convert\-presets/'"
-from the command-line.
-.br
-.SH AUTHORS
-Ernst Martin Witte, Klas Kalass
-.nf
diff --git a/debian/_base/applications/multimedia/tderadio/debian/docs b/debian/_base/applications/multimedia/tderadio/debian/docs
index 0ecc1e4f1..76c3076c9 100644
--- a/debian/_base/applications/multimedia/tderadio/debian/docs
+++ b/debian/_base/applications/multimedia/tderadio/debian/docs
@@ -1,2 +1,3 @@
-tderadio3/README
-tderadio3/TODO
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/multimedia/tderadio/debian/manpages b/debian/_base/applications/multimedia/tderadio/debian/manpages
deleted file mode 100644
index 4760e939e..000000000
--- a/debian/_base/applications/multimedia/tderadio/debian/manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tderadio.1
-debian/convert-presets.1
diff --git a/debian/_base/applications/office/kile/debian/patches/.gitignore b/debian/_base/applications/multimedia/tderadio/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/applications/office/kile/debian/patches/.gitignore
+++ b/debian/_base/applications/multimedia/tderadio/debian/patches/series
diff --git a/debian/_base/applications/multimedia/tderadio/debian/rules b/debian/_base/applications/multimedia/tderadio/debian/rules
index 4bef8d0a0..a6797f19a 100755
--- a/debian/_base/applications/multimedia/tderadio/debian/rules
+++ b/debian/_base/applications/multimedia/tderadio/debian/rules
@@ -1,142 +1,17 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-# 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
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png
-	convert $< $@
-
-configure:
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cat /usr/share/aclocal/libtool.m4 > admin/libtool.m4.in
-	cp -f /usr/share/misc/config.sub admin/config.sub
-	cp -f /usr/share/misc/config.guess admin/config.guess
-
-	make -f admin/Makefile.common
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/opt/trinity --with-qt-dir=/usr/share/qt3 \
-		--with-qt-includes=/usr/include/qt3 \
-		--with-qt-libraries=/usr/share/qt3/lib \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--disable-rpath --disable-debug \
-		kde_htmldir=\$${prefix}/share/doc/tde/HTML
-															
-
-
-build: build-stamp debian/tderadio.xpm
-
-build-stamp:  config.status
-	dh_testdir
-	# Add here commands to compile the package.
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	rm -f debian/debiandirs 
-	rm -f debian/tderadio.xpm 
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-#	[ ! -tderadio3/src && $(MAKE) clean
-	for i in `find | grep .gmo` ; do rm -f $$i ; done
-	find -name Makefile.in -delete
-	rm -f config.sub config.guess configure
-	rm -f acinclude.m4
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	# Add here commands to install the package into debian/tderadio.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tderadio-trinity
-	install -D -m 644 debian/tderadio.xpm debian/tderadio-trinity/opt/trinity/share/pixmaps/tderadio.xpm
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libalsa-sound.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimeshifter.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstandard-display.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liblirc.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstreaming.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libradio.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libquickbar.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/librecording.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libv4lradio.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimecontrol.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libdocking-menu.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liboss-sound.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liberror-log.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libsoundserver.so
-#	chrpath -d debian/tderadio/usr/bin/convert-presets
-#	chrpath -d debian/tderadio/usr/bin/tderadio
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs tderadio3/ChangeLog
-	dh_installdocs 
-	dh_installmenu
-	dh_installman
-	mv debian/tderadio-trinity/usr/share/man debian/tderadio-trinity/opt/trinity/share/
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/multimedia/tderadio/debian/tderadio.1 b/debian/_base/applications/multimedia/tderadio/debian/tderadio.1
deleted file mode 100644
index 2648970c2..000000000
--- a/debian/_base/applications/multimedia/tderadio/debian/tderadio.1
+++ /dev/null
@@ -1,147 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "Trinity Desktop Environment" "TDERadio"
-.SH NAME
-tderadio
-\- TDERadio
-.SH SYNOPSIS
-tderadio [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-TDERadio
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tderadio/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/tderadio/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Martin Witte <witte@kawo1.rwth-aachen.de>
-.br
-Marcus Camen <mcamen@mcamen.de>
-.br
-Klas Kalass <klas.kalass@gmx.de>
-.br
-
diff --git a/debian/_base/applications/multimedia/tderadio/debian/watch b/debian/_base/applications/multimedia/tderadio/debian/watch
deleted file mode 100644
index 033fb78b0..000000000
--- a/debian/_base/applications/multimedia/tderadio/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
-version=2
-tderadio.sourceforge.net /download	tderadio-(.*)\.tar\.gz	debian	uupdate
diff --git a/debian/_base/applications/office/basket/debian/docs b/debian/_base/applications/office/basket/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/office/basket/debian/docs
+++ b/debian/_base/applications/office/basket/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/office/kbibtex/debian/docs b/debian/_base/applications/office/kbibtex/debian/docs
index c17f03764..960f99591 100644
--- a/debian/_base/applications/office/kbibtex/debian/docs
+++ b/debian/_base/applications/office/kbibtex/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 NEWS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/office/kbookreader/debian/docs b/debian/_base/applications/office/kbookreader/debian/docs
index 7d96d4e7e..76c3076c9 100644
--- a/debian/_base/applications/office/kbookreader/debian/docs
+++ b/debian/_base/applications/office/kbookreader/debian/docs
@@ -1,2 +1,3 @@
 AUTHORS
+README.md
 TODO
diff --git a/debian/_base/applications/office/kile/debian/README.Debian b/debian/_base/applications/office/kile/debian/README.Debian
deleted file mode 100644
index 5339affff..000000000
--- a/debian/_base/applications/office/kile/debian/README.Debian
+++ /dev/null
@@ -1,10 +0,0 @@
-kile for Debian
----------------
-
-Kile no longer comes with a Gnuplot front end. The Gnuplot front end that used
-to be part of Kile is now a separate application named Qgfe maintained by
-Pascal Brachet at http://www.xm1math.net/qgfe/ .
-
-Syntax files bibtex.xml and latex.xml are provided by tdelibs-data package.
-
- -- Ben Burton <bab@debian.org>, Sat, 23 Oct 2004 12:56:57 +1000
diff --git a/debian/_base/applications/office/kile/debian/control b/debian/_base/applications/office/kile/debian/control
index 696646d5a..e6c22beb3 100644
--- a/debian/_base/applications/office/kile/debian/control
+++ b/debian/_base/applications/office/kile/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kile.sourceforge.net
 
diff --git a/debian/_base/applications/office/kile/debian/docs b/debian/_base/applications/office/kile/debian/docs
index 724e08449..76c3076c9 100644
--- a/debian/_base/applications/office/kile/debian/docs
+++ b/debian/_base/applications/office/kile/debian/docs
@@ -1,2 +1,3 @@
-README
+AUTHORS
+README.md
 TODO
diff --git a/debian/_base/applications/office/kile/debian/kile-trinity.install b/debian/_base/applications/office/kile/debian/kile-trinity.install
index eb1b59da1..fdbee1056 100644
--- a/debian/_base/applications/office/kile/debian/kile-trinity.install
+++ b/debian/_base/applications/office/kile/debian/kile-trinity.install
@@ -6,3 +6,4 @@ opt/trinity/bin/kile
 /opt/trinity/share/doc/tde/HTML/en/kile
 /opt/trinity/share/icons
 /opt/trinity/share/mimelnk/text/x-kilepr.desktop
+/opt/trinity/share/man/man1/kile.1
diff --git a/debian/_base/applications/office/kile/debian/kile.1 b/debian/_base/applications/office/kile/debian/kile.1
deleted file mode 100644
index d7609722c..000000000
--- a/debian/_base/applications/office/kile/debian/kile.1
+++ /dev/null
@@ -1,64 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KILE 1 "June 22, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kile \- the TDE Integrated LaTeX Environment
-.SH SYNOPSIS
-.B kile [ \fIgeneric-options\fP ]
-[ \fB\-\-line\fP \fIline\fP ] [ \fB\-\-new\fP ]
-[ \fIfile\fP ]
-.SH DESCRIPTION
-\fBKile\fP (the TDE Integrated LaTeX Environment) is a user-friendly
-LaTeX source editor and TeX shell for TDE.
-.PP
-The source editor is a multi-document editor designed for .tex and .bib
-files.  Menus, wizards and auto-completion are provided to assist with
-tag insertion and code generation.  A structural view of the document
-assists with navigation within source files.
-.PP
-The TeX shell integrates the various tools required for TeX processing.
-It assists with LaTeX compilation, DVI and postscript document viewing,
-generation of bibliographies and indices and other common tasks.
-.PP
-Kile can support large projects consisting of several smaller files.
-.SH OPTIONS
-Below are the kile-specific options.
-For a full summary of options, run \fIkile \-\-help\fP.
-.TP
-\fB\-\-line\fP \fIline\fP
-Jump to the given line in the file that is opened.
-.TP
-\fB\-\-new\fP
-Start a new Kile main window.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kile/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kile/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can
-read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kile/\fP.
-.SH AUTHOR
-Kile was written by Pascal Brachet <pascal.brachet_at_club-internet.fr> and
-Jeroen Wijnhout <Jeroen.Wijnhout_at_kdemail.net> with contributions from
-many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/libraries/python-trinity/debian/patches/.gitignore b/debian/_base/applications/office/kile/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/_base/libraries/python-trinity/debian/patches/.gitignore
+++ b/debian/_base/applications/office/kile/debian/patches/series
diff --git a/debian/_base/applications/office/kile/debian/rules b/debian/_base/applications/office/kile/debian/rules
index bd5478578..59bca7cd4 100755
--- a/debian/_base/applications/office/kile/debian/rules
+++ b/debian/_base/applications/office/kile/debian/rules
@@ -1,60 +1,39 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kile := debian/kile.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-install/kile-trinity-i18n-br::
-	-for language in `cd translations; ls -1d */`; do \
-		cd $(CURDIR)/$(DEB_BUILDDIR)/translations/$$language; \
-		$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-$$language; \
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
+
+common-install-indep::
+	# Install translations into individual packages
+	-for language in `cd debian/tmp/opt/trinity/share/locale; ls -1d */`; do \
+		pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+		install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale; \
+		cp -a $(CURDIR)/debian/tmp/opt/trinity/share/locale/$$language \
+		    $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale/$$language; \
+	done
+	-for language in `cd debian/tmp/opt/trinity/share/doc/tde/HTML; ls -1d */ | grep -v '^en/'`; do \
+		pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+		install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML; \
+		cp -a $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/$$language \
+		    $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML/$$language; \
 	done
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/en_GB/; \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-engb
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/pt_BR/; \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-ptbr
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/sr@Latn/;\
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-srlatin
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/zh_CN/; \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-zhcn
 
 install/kile-trinity::
 	# Install pixmap
 	install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm
 
-	chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh
-
 clean::
 	rm -rf debian/kile-trinity-i18n-*
diff --git a/debian/_base/applications/office/kile/debian/watch b/debian/_base/applications/office/kile/debian/watch
deleted file mode 100644
index e372a7062..000000000
--- a/debian/_base/applications/office/kile/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/debian/_base/applications/office/kmymoney/debian/control b/debian/_base/applications/office/kmymoney/debian/control
index 8074d6ba6..96d794392 100644
--- a/debian/_base/applications/office/kmymoney/debian/control
+++ b/debian/_base/applications/office/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3, recode, html2ps
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3
 Standards-Version: 3.8.4
 
 Package: kmymoney2-trinity
diff --git a/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
index f8c5dc4e3..9c50137ba 100644
--- a/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
@@ -1,3 +1,3 @@
-opt/trinity/include/tde/kmymoney/*
+opt/trinity/include/kmymoney/*
 opt/trinity/lib/lib*.la
 opt/trinity/lib/lib*.so
diff --git a/debian/_base/applications/office/kmymoney/debian/rules b/debian/_base/applications/office/kmymoney/debian/rules
index 0f794b445..ba37f1c35 100755
--- a/debian/_base/applications/office/kmymoney/debian/rules
+++ b/debian/_base/applications/office/kmymoney/debian/rules
@@ -1,35 +1,18 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include --disable-pdf-docs
-
-LDFLAGS += -Wl,--as-needed
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-clean::
-	rm -f po/*.gmo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DBUILD_DEVELOPER_DOCS="OFF"
diff --git a/debian/_base/applications/office/kmymoney/debian/watch b/debian/_base/applications/office/kmymoney/debian/watch
deleted file mode 100644
index b80efc65c..000000000
--- a/debian/_base/applications/office/kmymoney/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kmymoney2/kmymoney2-([\d].[\d].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/debian/_base/applications/office/knowit/debian/docs b/debian/_base/applications/office/knowit/debian/docs
index 5502ed8f4..960f99591 100644
--- a/debian/_base/applications/office/knowit/debian/docs
+++ b/debian/_base/applications/office/knowit/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
 NEWS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/office/koffice-i18n/debian/control b/debian/_base/applications/office/koffice-i18n/debian/control
index 8f7bb1a23..e30b5aae7 100644
--- a/debian/_base/applications/office/koffice-i18n/debian/control
+++ b/debian/_base/applications/office/koffice-i18n/debian/control
@@ -2,397 +2,15 @@ Source: koffice-i18n-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org>
-Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: debhelper (>= 9~), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
 
-Package: koffice-i18n-bg-trinity
+Package: koffice-i18n-trinity
 Architecture: all
 Section: tde
-Recommends: tde-i18n-bg-trinity
+Recommends: tde-i18n-trinity
 Suggests: koffice-trinity
 Provides: koffice-i18n-trinity
-Description: Bulgarian (bg) translations for KOffice
- This package contains the Bulgarian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ca-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ca-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Catalan (ca) translations for KOffice
- This package contains the Catalan translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-cs-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-cs-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Czech (cs) translations for KOffice
- This package contains the Czech translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-cy-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-cy-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Welsh (cy) translations for KOffice
- This package contains the Welsh translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-da-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-da-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Danish (da) translations for KOffice
- This package contains the Danish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-de-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-de-trinity
-Suggests: koffice-trinity, openthesaurus-de-kword
-Provides: koffice-i18n-trinity
-Description: German (de) translations for KOffice
- This package contains the German translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-el-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-el-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Greek (el) translations for KOffice
- This package contains the greek translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-engb-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-engb-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: British English (en_GB) translations for KOffice
- This package contains the British English (en_GB) translations
- for all applications in the Trinity Office Suite.
- 
-Package: koffice-i18n-es-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-es-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Spanish (es) translations for KOffice
- This package contains the Spanish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-et-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-et-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Estonian (et) translations for KOffice
- This package contains the Estonian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-eu-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-eu-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Basque (eu) translations for KOffice
- This package contains the Basque translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fa-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fa-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Farsi (fa) translations for KOffice
- This package contains the Farsi translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fi-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fi-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Finnish (fi) translations for KOffice
- This package contains the Finnish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: French (fr) translations for KOffice
- This package contains the French translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ga-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ga-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Irish Gaelic (ga) translations for KOffice
- This package contains the Irish Gaelic translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-gl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-gl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Galician (gl) translations for KOffice
- This package contains the Galician translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-hu-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-hu-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Hungarian (hu) translations for KOffice
- This package contains the Hungarian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-it-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-it-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Italian (it) translations for KOffice
- This package contains the Italian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ja-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ja-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Japanese (ja) translations for KOffice
- This package contains the Japanese translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-km-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-km-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Khmer (km) translations for KOffice
- This package contains the Khmer translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-lv-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-lv-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Latvian (lv) translations for KOffice
- This package contains the Latvian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ms-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ms-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Malay (ms) translations for KOffice
- This package contains the Malay translations for all applications
- in the Trinity Office Suite.
- 
-Package: koffice-i18n-nb-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nb-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Norwegian Bookmal (nb) translations for KOffice
- This package contains the Norwegian Bookmal translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-nds-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nds-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Low Saxon (nds) translations for KOffice
- This package contains the Low Saxon translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ne-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ne-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Nepali (ne) translations for KOffice
- This package contains the Nepali translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-nl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Dutch (nl) translations for KOffice
- This package contains the Dutch translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-pl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-pl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Polish (pl) translations for KOffice
- This package contains the Polish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-pt-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-pt-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Portuguese (pt) translations for KOffice
- This package contains the Portuguese translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ptbr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ptbr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Brazilian Portuguese (pt_BR) translations for KOffice
- This package contains the Brazilian Portuguese translations for all
- applications in the Trinity Office Suite.
- 
-Package: koffice-i18n-ru-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ru-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Russian (ru) translations for KOffice
- This package contains the Russian translations for all applications
- in the Trinity Office Suite.
- 
-Package: koffice-i18n-sk-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sk-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Slovak (sk) translations for KOffice
- This package contains the Slovak translations for all applications
- in the Trinity Office Suite.
- 
-Package: koffice-i18n-sl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Slovenian (sl) translations for KOffice
- This package contains the Slovenian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Serbian (sr) translations for KOffice
- This package contains the Serbian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-srlatin-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-srlatin-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Latin Serbian (sr@Latn) translations for KOffice
- This package contains the Latin Serbian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sv-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sv-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Swedish (sv) translations for KOffice
- This package contains the Swedish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-tr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-tr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Turkish (tr) translations for KOffice
- This package contains the Turkish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-uk-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-uk-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Ukrainian (uk) translations for KOffice
- This package contains the Ukrainian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-zhcn-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-zhcn-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Chinese Simplified (zh_CN) translations for KOffice
- This package contains the Chinese Simplified translations for all
- applications in the Trinity Office Suite.
-
-Package: koffice-i18n-zhtw-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-zhtw-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Chinese Traditional (zh_TW) translations for KOffice
- This package contains the Chinese Traditional translations for all
- applications in the Trinity Office Suite.
+Description: All languages (all) internationalized (i18n) files for KOffice
+ This package contains the All languages (all) internationalized (i18n)
+ files for all applications in Trinity Office Suite.
diff --git a/debian/_base/applications/office/koffice-i18n/debian/control-lang b/debian/_base/applications/office/koffice-i18n/debian/control-lang
new file mode 100644
index 000000000..f75b7d747
--- /dev/null
+++ b/debian/_base/applications/office/koffice-i18n/debian/control-lang
@@ -0,0 +1,10 @@
+
+Package: koffice-i18n-@pkg_lang@-trinity
+Architecture: all
+Section: tde
+Recommends: tde-i18n-@pkg_lang@-trinity
+Suggests: koffice-trinity
+Provides: koffice-i18n-trinity
+Description: @lang_desc@ (@lang@) internationalized (i18n) files for KOffice
+ This package contains the @lang_desc@ (@lang@) internationalized (i18n)
+ files for all applications in Trinity Office Suite.
diff --git a/debian/_base/applications/office/koffice-i18n/debian/control-source b/debian/_base/applications/office/koffice-i18n/debian/control-source
new file mode 100644
index 000000000..c1a3a089b
--- /dev/null
+++ b/debian/_base/applications/office/koffice-i18n/debian/control-source
@@ -0,0 +1,6 @@
+Source: koffice-i18n-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
diff --git a/debian/_base/applications/office/koffice-i18n/debian/debiandirs b/debian/_base/applications/office/koffice-i18n/debian/debiandirs
deleted file mode 100644
index 90247b9a0..000000000
--- a/debian/_base/applications/office/koffice-i18n/debian/debiandirs
+++ /dev/null
@@ -1,10 +0,0 @@
-export kde_prefix=/opt/trinity
-export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/tde
-export infodir=/opt/trinity/share/info
-export mandir=/opt/trinity/share/man
-export qtdir=/opt/trinity/share/qt3
-export kde_cgidir=/opt/trinity/lib/cgi-bin
-export kde_confdir=/etc/trinity
-export kde_htmldir=/opt/trinity/share/doc/tde/HTML
-configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/debian/_base/applications/office/koffice-i18n/debian/rules b/debian/_base/applications/office/koffice-i18n/debian/rules
index 8fb58ece9..2a292557e 100755
--- a/debian/_base/applications/office/koffice-i18n/debian/rules
+++ b/debian/_base/applications/office/koffice-i18n/debian/rules
@@ -3,11 +3,36 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+I18N_DIR_PREFIX := koffice-i18n
+I18N_DEST_PREFIX := $(I18N_DIR_PREFIX)
+I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%
+I18N_DIRS := $(wildcard $(I18N_DIR_PREFIX)-*)
+
+# Stamps and support variables
+cur_lang = $(word 2,$(subst __, ,$@))
+cur_lang_target = $(subst @,_,$(cur_lang))
+cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%,$(cur_lang))
+cur_pkg_lang = $(subst _,,$(subst @,,$(subst @latn,latin,$(shell echo $(cur_lang) | tr '[:upper:]' '[:lower:]'))))
+cur_pkg = $(I18N_DEST_PREFIX)-$(cur_pkg_lang)-trinity
+
+STAMP_BUILD := $(patsubst $(I18N_DIR_PAT),debian/stamp__%__build,$(I18N_DIRS))
+I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
+I18N_CLEAN := $(patsubst $(I18N_DIR_PAT),clean__%,$(I18N_DIRS))
+
+DEB_BUILD_PARALLEL ?= true
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS))
 
+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
+
 # 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| .*||" | \
@@ -18,91 +43,124 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
-languages = `ls -1d *i18n*`
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON"
+
 
-build-stamp:
+build::
 	dh_testdir
+	dh_prep
+
+ifneq "$(wildcard /usr/bin/ninja)" ""
+
+build:: debian/stamp__build
+
+debian/stamp__build:
+	[ -d build ] || \
+	mkdir build
+	cd build && \
+	cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \
+	$(MAKE) $(DEB_MAKE_PARALLEL)
+	touch $@
+
+else
+
+build:: $(STAMP_BUILD)
+
+$(STAMP_BUILD):
+	# Building the '$(cur_lang)' language ...
+	[ -d $(cur_lang_dir)/build ] || \
+	mkdir $(cur_lang_dir)/build
+	[ -e $(cur_lang_dir)/CMakeLists.txt ] || \
+	ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt
+	cd $(cur_lang_dir)/build && \
+	cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \
+	$(MAKE) $(DEB_MAKE_PARALLEL)
+	touch $@
 
-	# Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
 endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+
+install::
+	dh_testdir
+	dh_testroot
+
+install:: $(I18N_INSTALL)
+	dh_testdir
+	cat debian/control-source > debian/control
+	find debian -name "control-lang-*" | LANG=C sort | xargs -r cat >> debian/control
+
+$(I18N_INSTALL): build
+ifneq "$(wildcard /usr/bin/ninja)" ""
+	[ ! -e $(cur_lang_dir)/CMakeLists.txt ] || \
+	DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) -C build install-$(cur_lang_target)
+else
+	cd $(cur_lang_dir)/build && \
+	DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) install $(DEB_MAKE_PARALLEL)
 endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	#Configure languages.
-	-for i in $(languages); do \
-	  cd  $$i && \
-	  autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && \
-	  ./configure $(configkde); \
-	  $(MAKE) $(DEB_MAKE_PARALLEL); \
-	  cd ..; \
-	done
-
-	touch build-stamp
-
-build: build-stamp
--include debian/debiandirs
-
-clean: 
-	dh_clean
+	sed -e "s|@lang@|$(cur_lang)|g" \
+	    -e "s|@pkg_lang@|$(cur_pkg_lang)|g" \
+	    -e "s|@lang_desc@|$$(sed -n '/^\[$(cur_lang)\]/,/^\[/s#^Name=##p' /opt/trinity/share/locale/all_languages)|" \
+	    < debian/control-lang > debian/control-lang-$(cur_pkg_lang); \
+
+ifneq "$(wildcard /usr/bin/ninja)" ""
+
+clean: debian-clean
+
+else
+
+clean: $(I18N_CLEAN) debian-clean
+
+$(I18N_CLEAN):
 	dh_testdir
-	
-	# Remove all language directories.
-	rm -rf build-stamp 
-	rm -rf debian/*18n*
+	rm -rf $(cur_lang_dir)/build
+
+endif
 
-binary-indep: build
+debian-clean:
 	dh_testdir
+	rm -rf build
+	rm -rf debian/$(I18N_DEST_PREFIX)-*
+	rm -f debian/stamp__*
+	rm -f debian/control-lang-*
+	cat debian/control-source > debian/control
+	sed -e "s|@lang@|all|g" \
+	    -e "s|-@pkg_lang@||g" \
+	    -e "s|@lang_desc@|All languages|" \
+	    < debian/control-lang >> debian/control
+	dh_clean
+
+
+binary-arch: build
 	dh_testroot
-	dh_clean -k
-	
-	-for i in $(languages); do \
-	  ( \
-	   cd $$i && \
-	   echo $$(install_dir) && \
-	   $(MAKE) install DESTDIR=`pwd`/../debian/$$i-trinity $(DEB_MAKE_PARALLEL); \
-	   cd .. \
-	  ) \
-	done
-	
-
-	mkdir debian/koffice-i18n-engb-trinity
-	cp -aR debian/koffice-i18n-en_GB-trinity/* debian/koffice-i18n-engb-trinity/
-	
-	mkdir debian/koffice-i18n-ptbr-trinity
-	cp -aR debian/koffice-i18n-pt_BR-trinity/* debian/koffice-i18n-ptbr-trinity/
-	
-	mkdir debian/koffice-i18n-srlatin-trinity
-	cp -aR debian/koffice-i18n-sr@Latn-trinity/* debian/koffice-i18n-srlatin-trinity/
-	
-	mkdir debian/koffice-i18n-zhcn-trinity
-	cp -aR debian/koffice-i18n-zh_CN-trinity/* debian/koffice-i18n-zhcn-trinity/
-
-	mkdir debian/koffice-i18n-zhtw-trinity
-	cp -aR debian/koffice-i18n-zh_TW-trinity/* debian/koffice-i18n-zhtw-trinity/
-	
-
-	#Removing duplicate kdgantt.mo files.
-	-rm -f `find . -name "kdgantt.mo"`
+	dh_testdir
 
+
+binary-indep: build install
+	dh_testroot
+	dh_testdir
 	dh_installdocs
 	dh_installmenu
 	dh_installchangelogs
-	dh_strip
 	dh_link
+	dh_strip
+	$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
+	dh_strip_nondeterminism)
 	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
 	dh_fixperms
 	dh_installdeb
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
 
-binary:	binary-indep 
 
-.PHONY: binary binary-indep clean
+# Below here is fairly generic really
+binary: binary-indep binary-arch
+
+.PHONY: binary binary-arch binary-indep clean build install $(I18N_INSTALL)
diff --git a/debian/_base/applications/office/koffice/debian/karbon-trinity.install b/debian/_base/applications/office/koffice/debian/karbon-trinity.install
index a03e53a02..8b0b8b25c 100644
--- a/debian/_base/applications/office/koffice/debian/karbon-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/karbon-trinity.install
@@ -57,6 +57,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/karbon.svgz
+debian/tmp/opt/trinity/share/man/man1/karbon.1
 debian/tmp/opt/trinity/share/services/karbon_ai_import.desktop
 debian/tmp/opt/trinity/share/services/karbondefaulttools.desktop
 debian/tmp/opt/trinity/share/services/karbon_eps_export.desktop
diff --git a/debian/_base/applications/office/koffice/debian/karbon-trinity.manpages b/debian/_base/applications/office/koffice/debian/karbon-trinity.manpages
deleted file mode 100644
index 8a212a2b2..000000000
--- a/debian/_base/applications/office/koffice/debian/karbon-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/karbon.1
diff --git a/debian/_base/applications/office/koffice/debian/karbon.1 b/debian/_base/applications/office/koffice/debian/karbon.1
deleted file mode 100644
index 6a4cbb8ef..000000000
--- a/debian/_base/applications/office/koffice/debian/karbon.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KARBON 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-karbon \- a vector graphics application for the Trinity Office Suite
-.SH SYNOPSIS
-.B karbon
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKarbon\fP is a vector graphics application.
-.PP
-Note that the Trinity Office Suite comes with two graphics applications \-
-Kontour (which is vector-based) and Chalk (which is raster-based).
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the karbon-specific options.
-For a full summary of options, run \fIkarbon \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH AUTHOR
-Karbon was written by Rob Buis <buis@kde.org>, Lennart Kudling
-<kudling@kde.org>, Tomislav Lukman <tomislav.lukman@ck.hinet.hr> and
-Benoit Vautrin <benoit.vautrin@free.fr>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kchart-trinity.install b/debian/_base/applications/office/koffice/debian/kchart-trinity.install
index c5d3596c2..a6a595a2b 100644
--- a/debian/_base/applications/office/koffice/debian/kchart-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kchart-trinity.install
@@ -32,6 +32,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kchart.png
+debian/tmp/opt/trinity/share/man/man1/kchart.1
 debian/tmp/opt/trinity/share/services/kchart_bmp_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_jpeg_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_mng_export.desktop
diff --git a/debian/_base/applications/office/koffice/debian/kchart-trinity.manpages b/debian/_base/applications/office/koffice/debian/kchart-trinity.manpages
deleted file mode 100644
index 38c864763..000000000
--- a/debian/_base/applications/office/koffice/debian/kchart-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kchart.1
diff --git a/debian/_base/applications/office/koffice/debian/kchart.1 b/debian/_base/applications/office/koffice/debian/kchart.1
deleted file mode 100644
index 367f2e7ab..000000000
--- a/debian/_base/applications/office/koffice/debian/kchart.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KCHART 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kchart \- a chart drawing program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kchart
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKChart\fP is a chart drawing application.  It can be used to embed charts
-into KOffice documents.  KChart is easy to use and highly configurable.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kchart-specific options.
-For a full summary of options, run \fIkchart \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kchart/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kchart/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kchart/\fP.
-.SH AUTHOR
-KChart was written by Kalle Dalheimer <kalle@kde.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Karl-Heinz Zimmer <khz@kde.org> and
-Reginald Stadlbauer <reggie@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kformula-trinity.install b/debian/_base/applications/office/koffice/debian/kformula-trinity.install
index c97a73fa5..c73fd674a 100644
--- a/debian/_base/applications/office/koffice/debian/kformula-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.install
@@ -18,5 +18,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kformula.png
+debian/tmp/opt/trinity/share/man/man1/kformula.1
 debian/tmp/opt/trinity/share/services/kformulapart.desktop
 debian/tmp/opt/trinity/share/services/kformula_svg_export.desktop
diff --git a/debian/_base/applications/office/koffice/debian/kformula-trinity.manpages b/debian/_base/applications/office/koffice/debian/kformula-trinity.manpages
deleted file mode 100644
index 35c78eaa9..000000000
--- a/debian/_base/applications/office/koffice/debian/kformula-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kformula.1
diff --git a/debian/_base/applications/office/koffice/debian/kformula.1 b/debian/_base/applications/office/koffice/debian/kformula.1
deleted file mode 100644
index ebbd55afb..000000000
--- a/debian/_base/applications/office/koffice/debian/kformula.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFORMULA 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kformula \- a formula editor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kformula
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKFormula\fP is an easy to use formula editor. It provides the basic
-input facilities and the support functionality you come to expect of a
-KOffice application. But there is more. Some of its most exciting
-features are:
-.PP
-.RS
-Easy Greek letter insertion
-.PP
-Intelligent cursor movement
-.PP
-Advanced syntax highlighting
-.PP
-Multi-level undo support
-.PP
-LaTeX export (copy and paste into a text editor)
-.RE
-.PP
-KFormula uses the KOffice formula drawing library. If you have to deal
-with many formulae you may wish to use a KFormula object embedded in
-KWord or KSpread.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kformula-specific options.
-For a full summary of options, run \fIkformula \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kword (1),
-.BR kspread (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kformula/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kformula/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kformula/\fP.
-.SH AUTHOR
-KFormula was written by Andrea Rizzi <rizzi@kde.org>,
-Stephan Kulow <coolo@kde.org>, Ulrich Kuettler <ulrich.kuettler@gmx.de>,
-Heinrich Kuettler <heinrich.kuettler@gmx.de> and
-Claus O. Wilke <wilke@caltech.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kivio-trinity.install b/debian/_base/applications/office/koffice/debian/kivio-trinity.install
index 289580d09..b1fa9d81d 100644
--- a/debian/_base/applications/office/koffice/debian/kivio-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kivio-trinity.install
@@ -19,3 +19,4 @@ debian/tmp/opt/trinity/lib/trinity/straight_connector.la
 debian/tmp/opt/trinity/lib/trinity/straight_connector.so
 debian/tmp/opt/trinity/lib/libtdeinit_kivio.so
 debian/tmp/opt/trinity/lib/libkiviocommon.so.*
+debian/tmp/opt/trinity/share/man/man1/kivio.1
diff --git a/debian/_base/applications/office/koffice/debian/kivio-trinity.manpages b/debian/_base/applications/office/koffice/debian/kivio-trinity.manpages
deleted file mode 100644
index 1f348c0ca..000000000
--- a/debian/_base/applications/office/koffice/debian/kivio-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kivio.1
diff --git a/debian/_base/applications/office/koffice/debian/kivio.1 b/debian/_base/applications/office/koffice/debian/kivio.1
deleted file mode 100644
index b6557f54f..000000000
--- a/debian/_base/applications/office/koffice/debian/kivio.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KIVIO 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kivio \- a flowcharting program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kivio
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKivio\fP is a flowcharting program that offers basic flowcharting
-abilities, but with a twist.  Objects are scriptable, and a backend plugin
-system offers the ability to make objects do just about anything.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kivio-specific options.
-For a full summary of options, run \fIkivio \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Some documentation from the program author
-is available in \fI/usr/share/doc/kivio/\fP.
-.SH AUTHOR
-Kivio was written by Dave Marotti <lndshark@speakeasy.net>,
-Max Judin <max@thekompany.com>, Dmitry Poplavsky <dima@kde.org>,
-Peter Simonsson <psn@linux.se>, Ian Reinhart Geiser <geiseri@kde.org>,
-Laurent Montel <montel@kde.org> and theKompany.com <info@thekompany.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/koconverter.1 b/debian/_base/applications/office/koffice/debian/koconverter.1
deleted file mode 100644
index 07529ada9..000000000
--- a/debian/_base/applications/office/koffice/debian/koconverter.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOCONVERTER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koconverter \- convert between office suite file formats
-.SH SYNOPSIS
-.B koconverter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-mimetype\fP \fImime\fP ]
-\fIinput\fP \fIoutput\fP
-.SH DESCRIPTION
-\fBKOConverter\fP is the KOffice file format converter.  It uses the
-KOffice import and export filters to convert from any file format
-that is understood by KOffice to any other.
-.PP
-This tool is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koconverter-specific options.  For a full summary of options,
-run \fIkoconverter \-\-help\fP.
-.TP
-\fB\-\-mimetype\fP \fImime\fP
-Use \fImime\fP as the mime type for the output file.  This option should be
-used when the desired type of output file cannot be determined from its
-name alone.
-.SH EXAMPLES
-The following line will convert an Excel spreadsheet to a native KSpread
-file.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.ksp
-.RE
-.PP
-The following line will convert an Excel spreadsheet to a plain text
-file.  Note that this conversion is done internally by first importing
-to a KSpread spreadsheet and then exporting as plain text.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.txt
-.RE
-.SH AUTHOR
-KOConverter was written by David Faure <faure@kde.org>.
-.br
-This manual page was written by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
index 4be4f26eb..317098e2f 100644
--- a/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
@@ -51,3 +51,5 @@ debian/tmp/opt/trinity/lib/libkstore.so.*
 debian/tmp/opt/trinity/lib/libkwmailmerge_interface.so.*
 debian/tmp/opt/trinity/lib/libkwmf.so.*
 debian/tmp/opt/trinity/lib/libkwordexportfilters.so.*
+debian/tmp/opt/trinity/share/man/man1/koconverter.1
+debian/tmp/opt/trinity/share/man/man1/koscript.1
diff --git a/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
deleted file mode 100644
index 52c63b5d7..000000000
--- a/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/koconverter.1
-debian/koscript.1
diff --git a/debian/_base/applications/office/koffice/debian/koscript.1 b/debian/_base/applications/office/koffice/debian/koscript.1
deleted file mode 100644
index 419c52df0..000000000
--- a/debian/_base/applications/office/koffice/debian/koscript.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOSCRIPT 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koscript \- a script interpreter for the Trinity Office Suite
-.SH SYNOPSIS
-.B koscript
-[ \fIgeneric-options\fP ]
-\fIscript\fP [ \fB\-\-\fP \fIscript-options\fP ]
-.SH DESCRIPTION
-\fBKOScript\fP is the KOffice script interpreter.  It is used to run the
-given KOffice script.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koscript-specific options.  For a full summary of options,
-run \fIkoscript \-\-help\fP.
-.TP
-\fB\-\-\fP \fIscript-options\fP
-Pass \fIscript-options\fP as options to the script.
-.SH AUTHOR
-KOScript was written by Torben Weis <weis@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/koshell-trinity.install b/debian/_base/applications/office/koffice/debian/koshell-trinity.install
index 4b63bd352..dd3561570 100644
--- a/debian/_base/applications/office/koffice/debian/koshell-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/koshell-trinity.install
@@ -17,3 +17,4 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/koshell.svgz
+debian/tmp/opt/trinity/share/man/man1/koshell.1
diff --git a/debian/_base/applications/office/koffice/debian/koshell-trinity.manpages b/debian/_base/applications/office/koffice/debian/koshell-trinity.manpages
deleted file mode 100644
index fc332a5cc..000000000
--- a/debian/_base/applications/office/koffice/debian/koshell-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/koshell.1
diff --git a/debian/_base/applications/office/koffice/debian/koshell.1 b/debian/_base/applications/office/koffice/debian/koshell.1
deleted file mode 100644
index d1dc76870..000000000
--- a/debian/_base/applications/office/koffice/debian/koshell.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOSHELL 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koshell \- the Trinity Office Suite workspace
-.SH SYNOPSIS
-.B koshell
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBKOShell\fP (the KOffice workspace) is a desktop with easy one-click
-launchers for KOffice applications.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkoshell \-\-help\fP.
-.SH AUTHOR
-KOShell was written by Torben Weis <weis@kde.org>, Simon Hausmann
-<hausmann@kde.org>, David Faure <faure@kde.org> and Sven Lüppken
-<sven@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kprconverter.pl.1 b/debian/_base/applications/office/koffice/debian/kprconverter.pl.1
deleted file mode 100644
index 635cc9556..000000000
--- a/debian/_base/applications/office/koffice/debian/kprconverter.pl.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPRCONVERTER.PL 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kprconverter.pl \- converts a KPresenter document from old to new format
-.SH SYNOPSIS
-.B kprconverter.pl
-.I old-XML new-XML
-.SH DESCRIPTION
-This Perl script converts the XML data within a KPresenter document from the
-old format (v1) to the new format (v2), which is necessary due to the new
-text object.  It reads the old XML data from \fIold-XML\fP and writes new
-converted XML data to \fInew-XML\fP.
-.PP
-The XML data stored in a KPresenter document can be accessed by passing
-the \fB.kpr\fP document through gunzip.
-.PP
-This utility is part of the Trinity Office Suite.
-.SH NOTES
-Be aware that \fIold-XML\fP should not be the
-original \fB.kpr\fP document, but should
-instead be just the extracted XML data.
-.PP
-This script is automatically called by KPresenter when an old format
-document is opened.  Ordinary users should not need to run this script
-themselves.
-.SH SEE ALSO
-.BR kpresenter (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
index 5aada1cab..44d61cc4c 100644
--- a/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
@@ -27,3 +27,5 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so
 debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
 debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kpresenter.1
+debian/tmp/opt/trinity/share/man/man1/kprconverter.pl.1
diff --git a/debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
deleted file mode 100644
index 3357e6954..000000000
--- a/debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kpresenter.1
-debian/kprconverter.pl.1
diff --git a/debian/_base/applications/office/koffice/debian/kpresenter.1 b/debian/_base/applications/office/koffice/debian/kpresenter.1
deleted file mode 100644
index 08eddd41e..000000000
--- a/debian/_base/applications/office/koffice/debian/kpresenter.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPRESENTER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpresenter \- a presentation program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kpresenter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKPresenter\fP is a fully-featured presentation program.  Presentations can
-be edited directly within KPresenter, and many advanced features for
-screen presentations are available.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kpresenter-specific options.
-For a full summary of options, run \fIkpresenter \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kpresenter/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kpresenter/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kpresenter/\fP.
-.SH AUTHOR
-KPresenter was written by Reginald Stadlbauer <reggie@kde.org>,
-Werner Trobin <trobin@kde.org>, David Faure <dfaure@kde.org>,
-Toshitaka Fujioka <fujioka@kde.org>, Lukas Tinkl <lukas@kde.org>,
-Laurent Montel <montel@kde.org>, Thorsten Zachmann <t.zachmann@zagge.de> and
-Ariya Hidayat <ariya@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kspread-trinity.install b/debian/_base/applications/office/koffice/debian/kspread-trinity.install
index ee708351b..915f71c19 100644
--- a/debian/_base/applications/office/koffice/debian/kspread-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.install
@@ -49,6 +49,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kspread.png
+debian/tmp/opt/trinity/share/man/man1/kspread.1
 debian/tmp/opt/trinity/share/services/kspread_applixspread_import.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_export.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_import.desktop
diff --git a/debian/_base/applications/office/koffice/debian/kspread-trinity.manpages b/debian/_base/applications/office/koffice/debian/kspread-trinity.manpages
deleted file mode 100644
index 833228aec..000000000
--- a/debian/_base/applications/office/koffice/debian/kspread-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kspread.1
diff --git a/debian/_base/applications/office/koffice/debian/kspread.1 b/debian/_base/applications/office/koffice/debian/kspread.1
deleted file mode 100644
index 0cf7e8861..000000000
--- a/debian/_base/applications/office/koffice/debian/kspread.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSPREAD 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kspread \- a spreadsheet for the Trinity Office Suite
-.SH SYNOPSIS
-.B kspread
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKSpread\fP is a powerful spreadsheet application.  It is scriptable and
-provides both table-oriented sheets and support for complex mathematical
-formulae and statistics.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kspread-specific options.
-For a full summary of options, run \fIkspread \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kspread/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kspread/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kspread/\fP.
-.SH AUTHOR
-KSpread was written by Torben Weis <weis@kde.org>, Laurent Montel
-<montell@club-internet.fr>, David Faure <faure@kde.org> and many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
index 1ce19b21c..4fb9550bd 100644
--- a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
@@ -8,5 +8,6 @@ debian/tmp/opt/trinity/share/apps/thesaurus
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.docbook
+debian/tmp/opt/trinity/share/man/man1/kthesaurus.1
 debian/tmp/opt/trinity/share/services/thesaurustool.desktop
 debian/kthesaurus.xpm opt/trinity/share/pixmaps
diff --git a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
deleted file mode 100644
index 4fb6feb79..000000000
--- a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kthesaurus.1
diff --git a/debian/_base/applications/office/koffice/debian/kthesaurus.1 b/debian/_base/applications/office/koffice/debian/kthesaurus.1
deleted file mode 100644
index 32f929bb8..000000000
--- a/debian/_base/applications/office/koffice/debian/kthesaurus.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KTHESAURUS 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kthesaurus \- a thesaurus for the Trinity Office Suite
-.SH SYNOPSIS
-.B kthesaurus
-[ \fIgeneric-options\fP ] [ \fIterm\fP ]
-.SH DESCRIPTION
-\fBKThesaurus\fP is a thesaurus tool.  It lists words related to a search
-term and offers a user interface to WordNet, an online lexical reference
-system.
-.PP
-Only the English language is supported.
-.PP
-A term to search for may be optionally specified on the command-line.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkthesaurus \-\-help\fP.
-.SH SEE ALSO
-.BR kword (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/thesaurus/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/thesaurus/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/thesaurus/\fP.
-.SH AUTHOR
-KThesaurus was written by Daniel Naber <daniel.naber@t-online.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kudesigner.1 b/debian/_base/applications/office/koffice/debian/kudesigner.1
deleted file mode 100644
index bb08bb355..000000000
--- a/debian/_base/applications/office/koffice/debian/kudesigner.1
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUDESIGNER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kudesigner \- a report template designer for Kugar
-.SH SYNOPSIS
-.B kudesigner
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKuDesigner\fP is a tool for creating report templates to use with
-Kugar, the business report maker for KOffice.  Templates (which describe
-the layout of the data within a report) can be created in a visual
-drag-and-drop manner and then saved to file.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kudesigner-specific options.
-For a full summary of options, run \fIkudesigner \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kugar (1).
-.PP
-Full user documentation for Kugar is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-KuDesigner was written by Alexander Dymo <cloudtemple@mksat.net> and
-Joseph Wenninger <jowenn@jowenn.at>.
-.br
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kugar-trinity.install b/debian/_base/applications/office/koffice/debian/kugar-trinity.install
index 0cda2bece..b1b014203 100644
--- a/debian/_base/applications/office/koffice/debian/kugar-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.install
@@ -32,5 +32,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kudesigner.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kudesigner.png
+debian/tmp/opt/trinity/share/man/man1/kugar.1
+debian/tmp/opt/trinity/share/man/man1/kudesigner.1
 debian/tmp/opt/trinity/share/services/kugar_kugar_import.desktop
 debian/tmp/opt/trinity/share/services/kugarpart.desktop
diff --git a/debian/_base/applications/office/koffice/debian/kugar-trinity.manpages b/debian/_base/applications/office/koffice/debian/kugar-trinity.manpages
deleted file mode 100644
index 2a72a7d1b..000000000
--- a/debian/_base/applications/office/koffice/debian/kugar-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kugar.1
-debian/kudesigner.1
diff --git a/debian/_base/applications/office/koffice/debian/kugar.1 b/debian/_base/applications/office/koffice/debian/kugar.1
deleted file mode 100644
index 134747aa2..000000000
--- a/debian/_base/applications/office/koffice/debian/kugar.1
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUGAR 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kugar \- a business report maker for the Trinity Office Suite
-.SH SYNOPSIS
-.B kugar
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIxml-data-file\fP ... ]
-.SH DESCRIPTION
-\fBKugar\fP is a tool for generating business quality reports that can
-be viewed and printed.  It includes a standalone report viewer and a
-KPart report viewer.  The latter means that any TDE application can
-embed the report viewing functionality and that reports can be viewed
-using the Konqueror browser.
-.PP
-Kugar will create a report for the data stored in the data file
-\fIxml-data-file\fP.  Data files typically end in \fB.kud\fP.
-Note that simply clicking on a data file in Konqueror will cause Kugar
-to create a report.
-.PP
-The data will be displayed according to the layout described in a template
-file.  This template file is generally named in the data file.
-Template files typically end in \fB.kut\fP.  See
-.BR kudesigner (1)
-for a tool for creating template files.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kugar-specific options.
-For a full summary of options, run \fIkugar \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kudesigner (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kword-trinity.install b/debian/_base/applications/office/koffice/debian/kword-trinity.install
index dfeb77b97..29ea06866 100644
--- a/debian/_base/applications/office/koffice/debian/kword-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.install
@@ -69,3 +69,4 @@ debian/tmp/opt/trinity/lib/trinity/libwpimport.la
 debian/tmp/opt/trinity/lib/trinity/libwpimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kword.so
 debian/tmp/opt/trinity/lib/libkwordprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kword.1
diff --git a/debian/_base/applications/office/koffice/debian/kword-trinity.manpages b/debian/_base/applications/office/koffice/debian/kword-trinity.manpages
deleted file mode 100644
index a9bf36729..000000000
--- a/debian/_base/applications/office/koffice/debian/kword-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kword.1
diff --git a/debian/_base/applications/office/koffice/debian/kword.1 b/debian/_base/applications/office/koffice/debian/kword.1
deleted file mode 100644
index e55e7f5f3..000000000
--- a/debian/_base/applications/office/koffice/debian/kword.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KWORD 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kword \- a word processor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kword
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKWord\fP is a FrameMaker-like word processing and desktop publishing
-application.  KWord is capable of creating demanding and professional
-looking documents.  It can be used for desktop publishing, but also for
-"normal" word processing, like writing letters, reports and so on.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kword-specific options.
-For a full summary of options, run \fIkword \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1),
-.BR kthesaurus (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kword/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kword/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kword/\fP.
-.SH AUTHOR
-KWord was written by Reginald Stadlbauer <reggie@kde.org>, Torben Weis
-<weis@kde.org>, David Faure <dfaure@kde.org>, Thomas Zander
-<zander@kde.org>, Shaheed Haque <srhaque@iee.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Sven Lüppken <sven@kde.org>
-and many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/tellico/debian/docs b/debian/_base/applications/office/tellico/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/office/tellico/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/office/tellico/debian/rules b/debian/_base/applications/office/tellico/debian/rules
index 0c4cf46b6..e0960f0b5 100755
--- a/debian/_base/applications/office/tellico/debian/rules
+++ b/debian/_base/applications/office/tellico/debian/rules
@@ -26,6 +26,3 @@ binary-install/tellico-data-trinity::
 	[ ! -d debian/tmp/opt/trinity/share/mime ] || \
 	mv debian/tmp/opt/trinity/share/mime debian/$(cdbs_curpkg)/usr/share/
 	mv debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico.xml debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico-trinity.xml
-
-binary-install/tellico-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/debian/_base/applications/office/tellico/debian/tellico-trinity.install b/debian/_base/applications/office/tellico/debian/tellico-trinity.install
index a45d88c99..c20347b59 100644
--- a/debian/_base/applications/office/tellico/debian/tellico-trinity.install
+++ b/debian/_base/applications/office/tellico/debian/tellico-trinity.install
@@ -1,3 +1,5 @@
 debian/tmp/opt/trinity/bin/*
-debian/tellico.xpm /opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/share/applications/*
+debian/tmp/opt/trinity/share/man/man1/tellico.1
+
+debian/tellico.xpm /opt/trinity/share/pixmaps/
diff --git a/debian/_base/applications/office/tellico/debian/tellico-trinity.manpages b/debian/_base/applications/office/tellico/debian/tellico-trinity.manpages
deleted file mode 100644
index 68831ac30..000000000
--- a/debian/_base/applications/office/tellico/debian/tellico-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tellico.1x
diff --git a/debian/_base/applications/office/tellico/debian/tellico.1x b/debian/_base/applications/office/tellico/debian/tellico.1x
deleted file mode 100644
index 29a569a0b..000000000
--- a/debian/_base/applications/office/tellico/debian/tellico.1x
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH TELLICO: "1x" "March 2008"
-.SH NAME
-Tellico \- a collection manager for TDE
-.SH SYNOPSIS
-.B tellico
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfilename\fR]
-.SH DESCRIPTION
-Tellico \- a collection manager for TDE
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-nofile\fR
-Do not reopen the last open file
-.TP
-\fB\-\-bibtex\fR
-Import <filename> as a bibtex file
-.TP
-\fB\-\-mods\fR
-Import <filename> as a MODS file
-.TP
-\fB\-\-ris\fR
-Import <filename> as a RIS file
-.SS "Arguments:"
-.TP
-filename
-File to open
-.SH "SEE ALSO"
-The full documentation for
-.B Qt:
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Qt:
-programs are properly installed at your site, the command
-.IP
-.B info Qt:
-.PP
-should give you access to the complete manual.
diff --git a/debian/_base/applications/settings/kdpkg/debian/docs b/debian/_base/applications/settings/kdpkg/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/applications/settings/kdpkg/debian/docs
+++ b/debian/_base/applications/settings/kdpkg/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/debian/_base/applications/settings/kima/debian/docs b/debian/_base/applications/settings/kima/debian/docs
index 1a4f0317f..1a960e71b 100644
--- a/debian/_base/applications/settings/kima/debian/docs
+++ b/debian/_base/applications/settings/kima/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 FAQ
-README
+README.md
 TODO
diff --git a/debian/_base/applications/settings/kiosktool/debian/docs b/debian/_base/applications/settings/kiosktool/debian/docs
index 724e08449..6f7727790 100644
--- a/debian/_base/applications/settings/kiosktool/debian/docs
+++ b/debian/_base/applications/settings/kiosktool/debian/docs
@@ -1,2 +1,2 @@
-README
+README.md
 TODO
diff --git a/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs b/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
+++ b/debian/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/settings/klcddimmer/debian/docs b/debian/_base/applications/settings/klcddimmer/debian/docs
index 6f83607c1..46a4ca718 100644
--- a/debian/_base/applications/settings/klcddimmer/debian/docs
+++ b/debian/_base/applications/settings/klcddimmer/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 NEWS
-README
+README.md
diff --git a/debian/_base/applications/settings/tde-systemsettings/debian/docs b/debian/_base/applications/settings/tde-systemsettings/debian/docs
index 0eb1e7d11..76c3076c9 100644
--- a/debian/_base/applications/settings/tde-systemsettings/debian/docs
+++ b/debian/_base/applications/settings/tde-systemsettings/debian/docs
@@ -1,4 +1,3 @@
-AUTHOR
-
-
-
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/settings/tdenetworkmanager/debian/docs b/debian/_base/applications/settings/tdenetworkmanager/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/settings/tdenetworkmanager/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/_base/applications/settings/tdesudo/debian/docs b/debian/_base/applications/settings/tdesudo/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/settings/tdesudo/debian/docs
+++ b/debian/_base/applications/settings/tdesudo/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
index 8fa4b0c87..960f99591 100644
--- a/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
+++ b/debian/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
@@ -1,4 +1,4 @@
-doc/AUTHORS
-doc/NEWS
-doc/README
-doc/TODO
+AUTHORS
+NEWS
+README.md
+TODO
diff --git a/debian/_base/applications/system/dolphin/debian/docs b/debian/_base/applications/system/dolphin/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/system/dolphin/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/system/katapult/debian/docs b/debian/_base/applications/system/katapult/debian/docs
index 777273e59..a2b373b4d 100644
--- a/debian/_base/applications/system/katapult/debian/docs
+++ b/debian/_base/applications/system/katapult/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 
diff --git a/debian/_base/applications/system/kcmautostart/debian/docs b/debian/_base/applications/system/kcmautostart/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/applications/system/kcmautostart/debian/docs
+++ b/debian/_base/applications/system/kcmautostart/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/debian/_base/applications/system/kdbusnotification/debian/docs b/debian/_base/applications/system/kdbusnotification/debian/docs
index e845566c0..b43bf86b5 100644
--- a/debian/_base/applications/system/kdbusnotification/debian/docs
+++ b/debian/_base/applications/system/kdbusnotification/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/_base/applications/system/klamav/debian/docs b/debian/_base/applications/system/klamav/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/system/klamav/debian/docs
+++ b/debian/_base/applications/system/klamav/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/system/knemo/debian/docs b/debian/_base/applications/system/knemo/debian/docs
index c17f03764..960f99591 100644
--- a/debian/_base/applications/system/knemo/debian/docs
+++ b/debian/_base/applications/system/knemo/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 NEWS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/system/knetload/debian/docs b/debian/_base/applications/system/knetload/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/system/knetload/debian/docs
+++ b/debian/_base/applications/system/knetload/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/system/knetstats/debian/docs b/debian/_base/applications/system/knetstats/debian/docs
index e845566c0..b43bf86b5 100644
--- a/debian/_base/applications/system/knetstats/debian/docs
+++ b/debian/_base/applications/system/knetstats/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/_base/applications/system/kshutdown/debian/docs b/debian/_base/applications/system/kshutdown/debian/docs
index 9341bcf45..d70cd6976 100644
--- a/debian/_base/applications/system/kshutdown/debian/docs
+++ b/debian/_base/applications/system/kshutdown/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
-README
+README.md
 TODO
 VERSION
diff --git a/debian/_base/applications/system/ksystemlog/debian/docs b/debian/_base/applications/system/ksystemlog/debian/docs
index 5502ed8f4..0b6e0f321 100644
--- a/debian/_base/applications/system/ksystemlog/debian/docs
+++ b/debian/_base/applications/system/ksystemlog/debian/docs
@@ -1,3 +1,2 @@
-NEWS
-README
-TODO
+AUTHORS
+README.md
diff --git a/debian/_base/applications/system/kvkbd/debian/docs b/debian/_base/applications/system/kvkbd/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/applications/system/kvkbd/debian/docs
+++ b/debian/_base/applications/system/kvkbd/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/system/polkit-agent-tde/debian/cdbs/versions.pl b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/system/polkit-agent-tde/debian/changelog b/debian/_base/applications/system/polkit-agent-tde/debian/changelog
new file mode 100644
index 000000000..434ce69fc
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/changelog
@@ -0,0 +1,67 @@
+polkit-agent-tde (0.99.1-2) unstable; urgency=low
+
+  * Port to TDE and package renaming
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sun, 19 Dec 2021 18:12:00 +0900
+
+polkit-kde-1 (0.99.1-1) unstable; urgency=low
+
+  * Team upload.
+
+  [ Felix Geyer ]
+  * New upstream release.
+    - Drop fix_dialog_focus.diff, applied upstream.
+    - Remove non-functional checkbox "Remember password". (Closes: #691104)
+  * Remove obsolete /etc/xdg/autostart/polkit-kde-authentication-agent-1.desktop
+    on upgrade. (Closes: #645440)
+  * Bump Standards-Version to 3.9.4, no changes needed.
+
+  [ Pino Toscano ]
+  * The rebuild changes the tdebase-runtime dependency to kde-runtime.
+    (Closes: #716849)
+  * Update Vcs-* headers
+
+ -- Felix Geyer <fgeyer@debian.org>  Mon, 12 Aug 2013 11:58:57 +0200
+
+polkit-kde-1 (0.99.0-3) unstable; urgency=low
+
+  [ Scott Kitterman ]
+  * Add debian/patches/fix_dialog_focus.diff from Kubuntu
+    - Prevents the auth dialog from popping up in the background where it can't
+      be seen
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 23 Jun 2011 11:38:30 +0300
+
+polkit-kde-1 (0.99.0-2) unstable; urgency=low
+
+  [ Modestas Vainius ]
+  * Bump Standards-Version to 3.9.2: no changes needed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 May 2011 00:28:45 +0300
+
+polkit-kde-1 (0.99.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+  [ Modestas Vainius ]
+  * Add Vcs fields to debian/control.
+  * Switch to dhmk based debian-qt-kde.mk.
+
+  [ José Manuel Santamaría Lema ]
+  * Bump Standards-Version to 3.9.1, no changes needed.
+  * Bump libpolkit-qt-1-dev build depend to 0.99.0.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 23 Mar 2011 01:30:52 +0200
+
+polkit-kde-1 (0.95.1-2) unstable; urgency=low
+
+  * Update debian/control: add policykit-1 dependency.
+
+ -- Fathi Boudra <fabo@debian.org>  Mon, 22 Mar 2010 09:08:17 +0100
+
+polkit-kde-1 (0.95.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #571531)
+
+ -- Fathi Boudra <fabo@debian.org>  Thu, 25 Feb 2010 20:43:18 +0100
diff --git a/debian/_base/dependencies/python-tqt/debian/compat b/debian/_base/applications/system/polkit-agent-tde/debian/compat
index ec635144f..ec635144f 100644
--- a/debian/_base/dependencies/python-tqt/debian/compat
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/compat
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/control b/debian/_base/applications/system/polkit-agent-tde/debian/control
new file mode 100644
index 000000000..645e7ec1e
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/control
@@ -0,0 +1,25 @@
+Source: polkit-agent-tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Fathi Boudra <fabo@debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libpolkit-tqt-dev
+Standards-Version: 3.9.4
+Section: libs
+
+Package: polkit-agent-tde
+Architecture: any
+Provides: polkit-1-auth-agent
+Replaces: tde-ubuntu-integration
+Breaks: tde-ubuntu-integration
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1
+Conflicts: tde-ubuntu-integration
+Description: TDE dialogs for PolicyKit
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ PolicyKit-agent-tde provides a D-Bus session bus service that is used to
+ bring up authentication dialogs used for obtaining privileges.
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/copyright b/debian/_base/applications/system/polkit-agent-tde/debian/copyright
new file mode 100644
index 000000000..a9cebd94f
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/copyright
@@ -0,0 +1,52 @@
+This code was ported to TDE and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+    https://snapshot.debian.org/package/polkit-kde-1/0.99.1-1/
+
+Original polkit-kde-1 code was packaged for Debian by:
+
+    Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+    Jaroslav Reznik <jreznik@redhat.com>
+    Gökçen Eraslan <gokcen@pardus.org.tr>
+    Dario Freddi <drf@kde.org>
+    Daniel Nicoletti <dantti85-pk@yahoo.com.br>
+    Dirk Mueller <mueller@kde.org>
+
+Copyright:
+
+    Copyright (C) 2009 Jaroslav Reznik
+    Copyright (C) 2007-2008 Gökçen Eraslan
+    Copyright (C) 2008-2009 Dario Freddi
+    Copyright (C) 2008 Daniel Nicoletti
+    Copyright (C) 2008 Dirk Mueller
+
+License:
+
+    This package 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 package 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, 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' and
+`/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/docs b/debian/_base/applications/system/polkit-agent-tde/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/dilos/libraries/python-trinity/debian/patches/.gitignore b/debian/_base/applications/system/polkit-agent-tde/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/dilos/libraries/python-trinity/debian/patches/.gitignore
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/patches/series
diff --git a/debian/_base/applications/system/polkit-agent-tde/debian/rules b/debian/_base/applications/system/polkit-agent-tde/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/rules
@@ -0,0 +1,17 @@
+#!/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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/dependencies/python-tqt/debian/source/format b/debian/_base/applications/system/polkit-agent-tde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/dependencies/python-tqt/debian/source/format
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/source/format
diff --git a/debian/_base/dependencies/python-tqt/debian/source/options b/debian/_base/applications/system/polkit-agent-tde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/dependencies/python-tqt/debian/source/options
+++ b/debian/_base/applications/system/polkit-agent-tde/debian/source/options
diff --git a/debian/_base/applications/system/smartcardauth/debian/control b/debian/_base/applications/system/smartcardauth/debian/control
index d370c6f02..f1db4e038 100644
--- a/debian/_base/applications/system/smartcardauth/debian/control
+++ b/debian/_base/applications/system/smartcardauth/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.4
 
 Package: smartcardauth
 Architecture: any
-Depends: ${shlibs:Depends}, pcsc-tools, pcscd-nodbus | pcscd (>= 1.7~), initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu
+Depends: ${shlibs:Depends}, pcsc-tools, pcscd-nodbus | pcscd (>= 1.7~), initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu, psmisc, xxd
 Replaces: smartcardauth (<< 4:14.0.0~)
 Breaks: smartcardauth (<< 4:14.0.0~)
 Conflicts: openct
diff --git a/debian/_base/applications/system/smartcardauth/debian/docs b/debian/_base/applications/system/smartcardauth/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/system/smartcardauth/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/_base/applications/system/tastymenu/debian/docs b/debian/_base/applications/system/tastymenu/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/system/tastymenu/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/system/tdepowersave/debian/docs b/debian/_base/applications/system/tdepowersave/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/system/tdepowersave/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/system/tdepowersave/debian/rules b/debian/_base/applications/system/tdepowersave/debian/rules
index 01e5357b6..58af3504b 100755
--- a/debian/_base/applications/system/tdepowersave/debian/rules
+++ b/debian/_base/applications/system/tdepowersave/debian/rules
@@ -4,8 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
-
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
@@ -20,4 +18,3 @@ DEB_CMAKE_EXTRA_FLAGS := \
 
 install/tdepowersave-trinity::
 	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
-	install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
diff --git a/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda b/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/debian/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk b/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..5b4e8bfd7
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
@@ -0,0 +1,237 @@
+# -*- 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
+
+# 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),+$(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 .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/cdbs/versions.pl b/debian/_base/applications/system/tdesshaskpass/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/system/tdesshaskpass/debian/changelog b/debian/_base/applications/system/tdesshaskpass/debian/changelog
new file mode 100644
index 000000000..6d6634085
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/changelog
@@ -0,0 +1,11 @@
+tdesshaskpass-trinity (4:14.0.11~pre0+0debian8.0.0+0) unstable; urgency=low
+
+  * Initial TDE release
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Thu, 26 Aug 2021 03:00:00 +0200
+
+ksshaskpass (0.4.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #413109)
+
+ -- Armin Berres <trigger+debian@space-based.de>  Tue, 10 Jun 2008 23:40:01 +0200
diff --git a/debian/_base/libraries/python-trinity/debian/compat b/debian/_base/applications/system/tdesshaskpass/debian/compat
index ec635144f..ec635144f 100644
--- a/debian/_base/libraries/python-trinity/debian/compat
+++ b/debian/_base/applications/system/tdesshaskpass/debian/compat
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/control b/debian/_base/applications/system/tdesshaskpass/debian/control
new file mode 100644
index 000000000..dd6674b51
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/control
@@ -0,0 +1,14 @@
+Source: tdesshaskpass-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+X-Original-Maintainer: Armin Berres <trigger+debian@space-based.de>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Standards-Version: 3.8.0
+
+Package: tdesshaskpass-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, openssh-client
+Provides: ssh-askpass
+Description: interactively prompt users for a passphrase for ssh-add
+ A TDE version of ssh-askpass with TDEWallet support.
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/copyright b/debian/_base/applications/system/tdesshaskpass/debian/copyright
new file mode 100644
index 000000000..b5f032375
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/copyright
@@ -0,0 +1,35 @@
+This package was debianized by Armin Berres <trigger+debian@space-based.de> on
+Mon, 28 May 2007 15:33:02 +0200.
+
+It was downloaded from http://www.kde-apps.org/content/show.php/show.php?content=50971
+
+Upstream Author:
+
+    Armin Berres <trigger@space-based.de>
+
+Copyright: 
+
+    Copyright (C) 2006 Hans van Leeuwen
+    Copyright (C) 2008 Armin Berres
+
+License:
+
+    This package 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 package 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, 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'.
+
+The Debian packaging is (C) 2008, Armin Berres <trigger+debian@space-based.de> and
+is licensed under the GPL, see above.
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/docs b/debian/_base/applications/system/tdesshaskpass/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore b/debian/_base/applications/system/tdesshaskpass/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore
+++ b/debian/_base/applications/system/tdesshaskpass/debian/patches/series
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/postinst b/debian/_base/applications/system/tdesshaskpass/debian/postinst
new file mode 100644
index 000000000..7b881b29b
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/postinst
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postinst script for tdesshaskpass
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+        update-alternatives --quiet \
+            --install /usr/bin/ssh-askpass ssh-askpass \
+            /opt/trinity/bin/tdesshaskpass 35
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/prerm b/debian/_base/applications/system/tdesshaskpass/debian/prerm
new file mode 100644
index 000000000..48eb7bfd7
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/prerm
@@ -0,0 +1,43 @@
+#!/bin/sh
+# prerm script for tdesshaskpass
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|deconfigure)
+      update-alternatives --quiet \
+          --remove ssh-askpass /opt/trinity/bin/tdesshaskpass
+    ;;
+
+    upgrade)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/_base/applications/system/tdesshaskpass/debian/rules b/debian/_base/applications/system/tdesshaskpass/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/debian/_base/applications/system/tdesshaskpass/debian/rules
@@ -0,0 +1,17 @@
+#!/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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/tdeio/tdeio-appinfo/debian/changelog b/debian/_base/applications/tdeio/tdeio-appinfo/debian/changelog
new file mode 100644
index 000000000..39785e5c7
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/changelog
@@ -0,0 +1,6 @@
+tdeio-appinfo-trinity (0.1.5-0) testing; urgency=low
+
+  * First TDE release
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sat, 25 Aug 2018 21:56:00 +0900
+
diff --git a/dilos/dependencies/python-tqt/debian/compat b/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat
index ec635144f..ec635144f 100644
--- a/dilos/dependencies/python-tqt/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/compat
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/control b/debian/_base/applications/tdeio/tdeio-appinfo/debian/control
new file mode 100644
index 000000000..b5c61299d
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/control
@@ -0,0 +1,16 @@
+Source: tdeio-appinfo-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Robert Hogan <robert@roberthogan.net>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+
+Package: tdeio-appinfo-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: TDEIO slave for the appinfo protocol
+ Adds support for the "appinfo:" protocol
+ to Konqueror and other TDE applications.
+ .
+ This enables you to perform appinfo: searches in TDE.
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright b/debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright
new file mode 100644
index 000000000..f64b4fdd9
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/copyright
@@ -0,0 +1,11 @@
+This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on
+Sat, 08 May 2022 20:11:00 +0900
+
+Copyright:
+    This program was initially written by Robert Hogan <robert@roberthogan.net>
+
+License:
+    You are free to distribute this software under the terms of
+    the GNU General Public License 2 or higher.
+    On Debian systems, the complete text of the GNU General Public
+    License can be found in the file `/usr/share/common-licenses/GPL'.
diff --git a/ubuntu/_base/libraries/python-trinity/debian/patches/.gitignore b/debian/_base/applications/tdeio/tdeio-appinfo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/patches/.gitignore
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/patches/series
diff --git a/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules b/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules
new file mode 100755
index 000000000..16f2fa011
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
+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="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/debian/_base/libraries/python-trinity/debian/source/format b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/_base/libraries/python-trinity/debian/source/format
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/format
diff --git a/debian/_base/libraries/python-trinity/debian/source/options b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/_base/libraries/python-trinity/debian/source/options
+++ b/debian/_base/applications/tdeio/tdeio-appinfo/debian/source/options
diff --git a/debian/_base/applications/tdeio/tdeio-apt/debian/docs b/debian/_base/applications/tdeio/tdeio-apt/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/tdeio/tdeio-apt/debian/docs
+++ b/debian/_base/applications/tdeio/tdeio-apt/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/tdeio/tdeio-ftps/debian/docs b/debian/_base/applications/tdeio/tdeio-ftps/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/debian/_base/applications/tdeio/tdeio-ftps/debian/docs
+++ b/debian/_base/applications/tdeio/tdeio-ftps/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 INSTALL
-README
+README.md
diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk b/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl b/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/tdeio/tdeio-gopher/debian/changelog b/debian/_base/applications/tdeio/tdeio-gopher/debian/changelog
new file mode 100644
index 000000000..42dfe20d9
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/changelog
@@ -0,0 +1,6 @@
+tdeio-gopher-trinity (0.1.4-1debian0) buster; urgency=low
+
+  * Buster rebuild
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sat, 25 Aug 2018 21:56:00 +0900
+
diff --git a/dilos/libraries/python-trinity/debian/compat b/debian/_base/applications/tdeio/tdeio-gopher/debian/compat
index ec635144f..ec635144f 100644
--- a/dilos/libraries/python-trinity/debian/compat
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/compat
diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/control b/debian/_base/applications/tdeio/tdeio-gopher/debian/control
new file mode 100644
index 000000000..2752551e6
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/control
@@ -0,0 +1,19 @@
+Source: tdeio-gopher-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Albert Astals Cid <aacid@kde.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+
+Package: tdeio-gopher-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kio-gopher-trinity (<< 4:14.0.0~)
+Breaks: kio-gopher-trinity (<< 4:14.0.0~)
+Conflicts: kdebase-kio-plugins-trinity (<< 4:14.0.11~), tdebase-tdeio-plugins-trinity (<< 4:14.0.11~)
+Description: tdeio-slave for the gopher protocol [Trinity]
+ Adds support for the "gopher:" protocol
+ to Konqueror and other TDE applications.
+ .
+ This enables you to perform gopher searches in Konqueror.
diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/copyright b/debian/_base/applications/tdeio/tdeio-gopher/debian/copyright
new file mode 100644
index 000000000..31f347396
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/copyright
@@ -0,0 +1,16 @@
+This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on
+Sat, 25 Aug 2018 21:56:00 +0900
+
+Copyright:
+    This program was initially written by Albert Astals Cid.
+    Copyright (C) 2003-2008 by Albert Astals Cid
+    aacid@kde.org
+
+Upstream Authors:
+    Albert Astals Cid <aacid@kde.org>
+
+License:
+    You are free to distribute this software under the terms of
+    the GNU General Public License.
+    On Debian systems, the complete text of the GNU General Public
+    License can be found in the file `/usr/share/common-licenses/GPL'.
diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/patches/series b/debian/_base/applications/tdeio/tdeio-gopher/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/patches/series
diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/rules b/debian/_base/applications/tdeio/tdeio-gopher/debian/rules
new file mode 100755
index 000000000..5a24d4563
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/rules
@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_KDE_APIDOX := yes
+
+CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DLIB_SUFFIX="" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+DEB_INSTALL_DOCS_tdeio-gopher-trinity := -XREADME -XNEWS -XTODO -XAUTHORS
diff --git a/dilos/dependencies/python-tqt/debian/source/format b/debian/_base/applications/tdeio/tdeio-gopher/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/dilos/dependencies/python-tqt/debian/source/format
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/source/format
diff --git a/dilos/dependencies/python-tqt/debian/source/options b/debian/_base/applications/tdeio/tdeio-gopher/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/dilos/dependencies/python-tqt/debian/source/options
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/source/options
diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/docs b/debian/_base/applications/tdeio/tdeio-locate/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/tdeio/tdeio-locate/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/tdeio/tdeio-locate/debian/rules b/debian/_base/applications/tdeio/tdeio-locate/debian/rules
index c9e6b78b0..b9e54f6a9 100755
--- a/debian/_base/applications/tdeio/tdeio-locate/debian/rules
+++ b/debian/_base/applications/tdeio/tdeio-locate/debian/rules
@@ -31,5 +31,3 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS
diff --git a/debian/_base/applications/tdeio/tdeio-sword/debian/docs b/debian/_base/applications/tdeio/tdeio-sword/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/tdeio/tdeio-sword/debian/docs
+++ b/debian/_base/applications/tdeio/tdeio-sword/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
+++ b/debian/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
deleted file mode 100644
index 6bc424f8e..000000000
--- a/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file was written by TDE
-# You can edit it in the Trinity control center, under "GTK Styles and Fonts"
-
-include "/usr/share/themes/Qt/gtk-2.0/gtkrc"
-
-style "user-font"
-{
-	font_name="Sans Serif 9"
-}
-widget_class "*" style "user-font"
-
-gtk-theme-name="Qt"
-gtk-font-name="Sans Serif 9"
diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
deleted file mode 100644
index e25e89fd4..000000000
--- a/debian/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file was written by TDE
-# You can edit it in the Trinity control center, under "GTK Styles and Fonts"
-
-include "/usr/share/themes/Qt/gtk-2.0/gtkrc"
-
-style "user-font"
-{
-	font_name="Tahoma 10"
-}
-widget_class "*" style "user-font"
-
-gtk-theme-name="Qt"
-gtk-font-name="Tahoma 10"
diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
index 5502ed8f4..76c3076c9 100644
--- a/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
@@ -1,3 +1,3 @@
-NEWS
-README
+AUTHORS
+README.md
 TODO
diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
deleted file mode 100644
index b477f5ce2..000000000
--- a/debian/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Make sure our customised gtkrc file is loaded.
-export GTK2_RC_FILES=$HOME/.gtkrc-2.0-kde4
diff --git a/debian/_base/applications/themes/gtk-qt-engine/debian/rules b/debian/_base/applications/themes/gtk-qt-engine/debian/rules
index 4cc7515a2..a6797f19a 100755
--- a/debian/_base/applications/themes/gtk-qt-engine/debian/rules
+++ b/debian/_base/applications/themes/gtk-qt-engine/debian/rules
@@ -1,43 +1,17 @@
 #!/usr/bin/make -f
 
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DLIB_SUFFIX="" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-binary-install/gtk-qt-engine-trinity::
-	mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
-	cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
-	cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
-	cp -Rp $(CURDIR)/debian/gtk-qt-engine.rc.sh $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/themes/gtk3-tqt-engine/debian/cdbs/versions.pl b/debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/themes/gtk3-tqt-engine/debian/control b/debian/_base/applications/themes/gtk3-tqt-engine/debian/control
index 8b7033112..f8fb914e5 100644
--- a/debian/_base/applications/themes/gtk3-tqt-engine/debian/control
+++ b/debian/_base/applications/themes/gtk3-tqt-engine/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev
 Standards-Version: 3.8.4
 
 Package: gtk3-tqt-engine-trinity
diff --git a/debian/_base/applications/themes/gtk3-tqt-engine/debian/docs b/debian/_base/applications/themes/gtk3-tqt-engine/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/themes/gtk3-tqt-engine/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/themes/gtk3-tqt-engine/debian/rules b/debian/_base/applications/themes/gtk3-tqt-engine/debian/rules
index 1a185d594..a6797f19a 100755
--- a/debian/_base/applications/themes/gtk3-tqt-engine/debian/rules
+++ b/debian/_base/applications/themes/gtk3-tqt-engine/debian/rules
@@ -1,39 +1,17 @@
 #!/usr/bin/make -f
 
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-# 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
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/themes/ksplash-engine-moodin/debian/docs b/debian/_base/applications/themes/ksplash-engine-moodin/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/themes/ksplash-engine-moodin/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs b/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
index c17f03764..0b6e0f321 100644
--- a/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
+++ b/debian/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
@@ -1,4 +1,2 @@
 AUTHORS
-NEWS
-README
-TODO
+README.md
diff --git a/debian/_base/applications/themes/tde-style-domino/debian/docs b/debian/_base/applications/themes/tde-style-domino/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-domino/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/themes/tde-style-ia-ora/debian/docs b/debian/_base/applications/themes/tde-style-ia-ora/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/themes/tde-style-ia-ora/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/themes/tde-style-lipstik/debian/docs b/debian/_base/applications/themes/tde-style-lipstik/debian/docs
index 0948b8ef4..4c9a51eb2 100644
--- a/debian/_base/applications/themes/tde-style-lipstik/debian/docs
+++ b/debian/_base/applications/themes/tde-style-lipstik/debian/docs
@@ -1,4 +1,4 @@
+AUTHORS
 BUGS
-README
+README.md
 TODO
-AUTHORS
diff --git a/debian/_base/applications/themes/twin-style-crystal/debian/docs b/debian/_base/applications/themes/twin-style-crystal/debian/docs
index e845566c0..0b6e0f321 100644
--- a/debian/_base/applications/themes/twin-style-crystal/debian/docs
+++ b/debian/_base/applications/themes/twin-style-crystal/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/themes/twin-style-dekorator/debian/cdbs/versions.pl b/debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/themes/twin-style-dekorator/debian/changelog b/debian/_base/applications/themes/twin-style-dekorator/debian/changelog
new file mode 100644
index 000000000..1383a9a15
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/changelog
@@ -0,0 +1,12 @@
+twin-style-dekorator-trinity (0.3-2) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Mavridis Philippe <mavridisf@gmail.com>  Fri, 30 Jul 2021 12:35:19 +0900
+
+kwin-style-dekorator (0.3-1) unstable; urgency=low
+
+  * Initial release (Closes: #374869)
+
+ -- Sune Vuorela <debian@pusling.com>  Wed, 21 Jun 2006 20:04:02 +0200
+
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/compat b/debian/_base/applications/themes/twin-style-dekorator/debian/compat
index ec635144f..ec635144f 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/compat
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/compat
diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/control b/debian/_base/applications/themes/twin-style-dekorator/debian/control
new file mode 100644
index 000000000..4625fc1f0
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/control
@@ -0,0 +1,17 @@
+Source: twin-style-dekorator-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Standards-Version: 3.7.2
+
+Package: twin-style-dekorator-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Window decorations for TDE using user-supplied PNG files
+ Make your own window decorations easy with deKorator.
+ Dekorator uses your own made images for buttons, borders
+ and so on, so go ahead and be creative.
+ .
+ This is a window decoration, not a style
diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/copyright b/debian/_base/applications/themes/twin-style-dekorator/debian/copyright
new file mode 100644
index 000000000..832fc1bd9
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/copyright
@@ -0,0 +1,30 @@
+This package was debianized by Sune Vuorela <debian@pusling.com> on
+Wed, 21 Jun 2006 20:04:02 +0200.
+
+It was downloaded from http://www.kde-look.org/content/show.php?content=31447
+
+Copyright 2005-2006: moty rahamim <moty.rahamim (at) gmail.com>
+
+
+
+License:
+
+   This package 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 package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, 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'.
+
+The Debian packaging is (C) 2006, Sune Vuorela <debian@pusling.com> and
+is licensed under the GPL, see above.
diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/docs b/debian/_base/applications/themes/twin-style-dekorator/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/patches/series b/debian/_base/applications/themes/twin-style-dekorator/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/patches/series
diff --git a/debian/_base/applications/themes/twin-style-dekorator/debian/rules b/debian/_base/applications/themes/twin-style-dekorator/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/rules
@@ -0,0 +1,17 @@
+#!/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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/dilos/libraries/python-trinity/debian/source/format b/debian/_base/applications/themes/twin-style-dekorator/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/dilos/libraries/python-trinity/debian/source/format
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/source/format
diff --git a/dilos/libraries/python-trinity/debian/source/options b/debian/_base/applications/themes/twin-style-dekorator/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/dilos/libraries/python-trinity/debian/source/options
+++ b/debian/_base/applications/themes/twin-style-dekorator/debian/source/options
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk b/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl b/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/themes/twin-style-machbunt/debian/changelog b/debian/_base/applications/themes/twin-style-machbunt/debian/changelog
new file mode 100644
index 000000000..b58d7112d
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/changelog
@@ -0,0 +1,6 @@
+twin-style-machbunt-trinity (0.1-1) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Mavridis Philippe <mavridisf@gmail.com>  Sun, 16 Oct 2022 11:07:15 +0900
+
diff --git a/ubuntu/_base/libraries/python-trinity/debian/compat b/debian/_base/applications/themes/twin-style-machbunt/debian/compat
index ec635144f..ec635144f 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/compat
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/compat
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/control b/debian/_base/applications/themes/twin-style-machbunt/debian/control
new file mode 100644
index 000000000..0960aefca
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/control
@@ -0,0 +1,15 @@
+Source: twin-style-machbunt-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Adrian Schroeter <adrian@suse.de>, Gerd Fleischer <gerdfleischer@web.de>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
+Standards-Version: 3.6.2
+
+Package: twin-style-machbunt-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TDE window decoration from SUSE 9.1/9.2
+ This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+ .
+ An example color scheme is provided too.
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/copyright b/debian/_base/applications/themes/twin-style-machbunt/debian/copyright
new file mode 100644
index 000000000..dfd1f265b
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/copyright
@@ -0,0 +1,31 @@
+This code was ported to TDE by:
+    Mavridis Philippe <mavridisf@gmail.com>
+and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+
+Original authors and copyright:
+  Adrian Schroeter <adrian@suse.de>
+  Gerd Fleischer   <gerdfleischer@web.de>
+
+On Debian systems, the complete text of the GNU Library General Public
+License can be found in `/usr/share/common-licenses/LGPL'.
+
+For the rest of the package this license applies:
+
+   This package 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; version 2 dated June, 1991.
+
+   This package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02111-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/patches/series b/debian/_base/applications/themes/twin-style-machbunt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/patches/series
diff --git a/debian/_base/applications/themes/twin-style-machbunt/debian/rules b/debian/_base/applications/themes/twin-style-machbunt/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/rules
@@ -0,0 +1,17 @@
+#!/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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/source/format b/debian/_base/applications/themes/twin-style-machbunt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/source/format
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/source/format
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/source/options b/debian/_base/applications/themes/twin-style-machbunt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/source/options
+++ b/debian/_base/applications/themes/twin-style-machbunt/debian/source/options
diff --git a/debian/_base/applications/utilities/abakus/debian/abakus-trinity.manpages b/debian/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
deleted file mode 100644
index 0737a321e..000000000
--- a/debian/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/abakus.1
diff --git a/debian/_base/applications/utilities/abakus/debian/abakus.1 b/debian/_base/applications/utilities/abakus/debian/abakus.1
deleted file mode 100644
index 1411beebd..000000000
--- a/debian/_base/applications/utilities/abakus/debian/abakus.1
+++ /dev/null
@@ -1,143 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH ABAKUS 1 "Oct 2005" "Trinity Desktop Environment" "A simple keyboard-driven calculator"
-.SH NAME
-abakus
-\- A simple keyboard-driven calculator
-.SH SYNOPSIS
-abakus [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-A simple keyboard-driven calculator
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/abakus/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/abakus/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Michael Pyne <michael.pyne@kdemail.net>
-.br
-
diff --git a/debian/_base/applications/utilities/abakus/debian/rules b/debian/_base/applications/utilities/abakus/debian/rules
index 3c72c1e14..aaf4d4db4 100755
--- a/debian/_base/applications/utilities/abakus/debian/rules
+++ b/debian/_base/applications/utilities/abakus/debian/rules
@@ -41,8 +41,5 @@ common-install-arch::
 	install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm
 	dh_icons -pabakus-trinity
 
-binary-install/abakus-trinity::
-	mv debian/abakus-trinity/usr/share/man debian/abakus-trinity/opt/trinity/share/
-
 clean::
 	rm -f debian/abakus.xpm
diff --git a/debian/_base/applications/utilities/filelight/debian/docs b/debian/_base/applications/utilities/filelight/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/debian/_base/applications/utilities/filelight/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/debian/_base/applications/utilities/kchmviewer/debian/docs b/debian/_base/applications/utilities/kchmviewer/debian/docs
index 1ed9b5bd5..b72409e5a 100644
--- a/debian/_base/applications/utilities/kchmviewer/debian/docs
+++ b/debian/_base/applications/utilities/kchmviewer/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 FAQ
-README
+README.md
diff --git a/debian/_base/applications/utilities/kdirstat/debian/docs b/debian/_base/applications/utilities/kdirstat/debian/docs
index 7f03542b1..871711684 100644
--- a/debian/_base/applications/utilities/kdirstat/debian/docs
+++ b/debian/_base/applications/utilities/kdirstat/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 CREDITS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/utilities/keep/debian/docs b/debian/_base/applications/utilities/keep/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/utilities/keep/debian/docs
+++ b/debian/_base/applications/utilities/keep/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/utilities/knutclient/debian/docs b/debian/_base/applications/utilities/knutclient/debian/docs
index e845566c0..0b6e0f321 100644
--- a/debian/_base/applications/utilities/knutclient/debian/docs
+++ b/debian/_base/applications/utilities/knutclient/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/debian/_base/applications/utilities/krename/debian/docs b/debian/_base/applications/utilities/krename/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/utilities/krename/debian/docs
+++ b/debian/_base/applications/utilities/krename/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/utilities/ksensors/debian/docs b/debian/_base/applications/utilities/ksensors/debian/docs
index ca0272abf..76c3076c9 100644
--- a/debian/_base/applications/utilities/ksensors/debian/docs
+++ b/debian/_base/applications/utilities/ksensors/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/debian/_base/applications/utilities/mathemagics/debian/docs b/debian/_base/applications/utilities/mathemagics/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/debian/_base/applications/utilities/mathemagics/debian/docs
+++ b/debian/_base/applications/utilities/mathemagics/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/control b/debian/_base/applications/utilities/qalculate-tde/debian/control
index 56889bd5c..dc6bfaba3 100644
--- a/debian/_base/applications/utilities/qalculate-tde/debian/control
+++ b/debian/_base/applications/utilities/qalculate-tde/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 X-Original-Maintainer: Vincent Legout <vincent@legout.info>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, libqalculate-dev (>= 0.9.6), libcln-dev, libgmp3-dev, libxml2-dev, tdelibs-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6)
 Standards-Version: 3.8.4
 Homepage: http://qalculate.sourceforge.net/
 
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/docs b/debian/_base/applications/utilities/qalculate-tde/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/applications/utilities/qalculate-tde/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1 b/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1
deleted file mode 100644
index 90682e55b..000000000
--- a/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH QALC 1 "28 December 2008"
-.SH NAME
-qalculate-tde \- Powerful and easy to use desktop calculator
-.SH SYNOPSIS
-.B qalculate-tde
-.SH DESCRIPTION
-Qalculate! is a small and simple to use calculator but with much power and
-versatility underneath. Features include customizable functions, units,
-arbitrary precision using a one-line fault-tolerant expression entry.
-.PP
-\fBqalculate-tde\fP is the TDE version of Qalculate!.
-.SH AUTHORS
-Original qalculate-kde was written by Niklas Knutsson <nq@altern.org>.
-.PP
-This manual page was originally written by Vincent Legout <vincent@legout.info>,
-for the Debian system (but may be used by others).
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages b/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages
deleted file mode 100644
index f3d6ef522..000000000
--- a/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/qalculate-tde.1
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/rules b/debian/_base/applications/utilities/qalculate-tde/debian/rules
index d03dd383d..a6797f19a 100755
--- a/debian/_base/applications/utilities/qalculate-tde/debian/rules
+++ b/debian/_base/applications/utilities/qalculate-tde/debian/rules
@@ -1,15 +1,17 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-install/qalculate-trinity::
-	rm debian/qalculate-trinity/opt/trinity/bin/qalculate
-
-clean::
-	rm -f po/*.gmo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/watch b/debian/_base/applications/utilities/qalculate-tde/debian/watch
deleted file mode 100644
index c98cd4d96..000000000
--- a/debian/_base/applications/utilities/qalculate-tde/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/qalculate/ qalculate-kde-(.*).tar.gz
diff --git a/debian/_base/common/cmake/debian/control b/debian/_base/common/cmake/debian/control
index 1363e01ee..50ea830ef 100644
--- a/debian/_base/common/cmake/debian/control
+++ b/debian/_base/common/cmake/debian/control
@@ -2,7 +2,7 @@ Source: cmake-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
 Standards-Version: 3.8.4
 
 Package: cmake-trinity
diff --git a/debian/_base/core/tde-i18n/debian/rules b/debian/_base/core/tde-i18n/debian/rules
index 0daf98a6d..900b2d86e 100755
--- a/debian/_base/core/tde-i18n/debian/rules
+++ b/debian/_base/core/tde-i18n/debian/rules
@@ -150,6 +150,7 @@ binary-indep: build install
 	dh_installdocs
 	dh_installmenu
 	dh_installchangelogs
+	dh_link
 	dh_strip
 	$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
 	dh_strip_nondeterminism)
diff --git a/debian/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install b/debian/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install
index aff5ed18a..e01f62f5d 100644
--- a/debian/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install
+++ b/debian/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install
@@ -5,3 +5,4 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/atlantikdesigner
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/atlantikdesigner.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/atlantikdesigner.png
 debian/icons/atlantikdesigner.xpm /opt/trinity/share/pixmaps
+debian/tmp/opt/trinity/share/man/man1/atlantikdesigner.1
diff --git a/debian/_base/core/tdeaddons/debian/atlantikdesigner-trinity.manpages b/debian/_base/core/tdeaddons/debian/atlantikdesigner-trinity.manpages
deleted file mode 100644
index f0b5385f4..000000000
--- a/debian/_base/core/tdeaddons/debian/atlantikdesigner-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/atlantikdesigner-trinity.1
diff --git a/debian/_base/core/tdeaddons/debian/konq-plugins-trinity.install b/debian/_base/core/tdeaddons/debian/konq-plugins-trinity.install
index 22bc62c71..de806109c 100644
--- a/debian/_base/core/tdeaddons/debian/konq-plugins-trinity.install
+++ b/debian/_base/core/tdeaddons/debian/konq-plugins-trinity.install
@@ -164,6 +164,10 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/metabar.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/metabar.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/metabar.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
+debian/tmp/opt/trinity/share/man/man1/exif.py.1
+debian/tmp/opt/trinity/share/man/man1/fsview.1
+debian/tmp/opt/trinity/share/man/man1/jpegorient.1
+debian/tmp/opt/trinity/share/man/man1/orient.py.1
 debian/tmp/opt/trinity/share/services/akregator_konqplugin.desktop
 debian/tmp/opt/trinity/share/services/ark_plugin.desktop
 debian/tmp/opt/trinity/share/services/fsview_part.desktop
diff --git a/debian/_base/core/tdeaddons/debian/konq-plugins-trinity.manpages b/debian/_base/core/tdeaddons/debian/konq-plugins-trinity.manpages
deleted file mode 100644
index b33b9ee5a..000000000
--- a/debian/_base/core/tdeaddons/debian/konq-plugins-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/exif-trinity.py.1
-debian/man/fsview-trinity.1
-debian/man/jpegorient-trinity.1
-debian/man/orient-trinity.py.1
diff --git a/debian/_base/core/tdeaddons/debian/ksig-trinity.install b/debian/_base/core/tdeaddons/debian/ksig-trinity.install
index 10959a93a..94b1c6d7f 100644
--- a/debian/_base/core/tdeaddons/debian/ksig-trinity.install
+++ b/debian/_base/core/tdeaddons/debian/ksig-trinity.install
@@ -8,3 +8,4 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/screenshot.png
+debian/tmp/opt/trinity/share/man/man1/ksig.1
diff --git a/debian/_base/core/tdeaddons/debian/ksig-trinity.manpages b/debian/_base/core/tdeaddons/debian/ksig-trinity.manpages
deleted file mode 100644
index 2b3ef735d..000000000
--- a/debian/_base/core/tdeaddons/debian/ksig-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ksig-trinity.1
diff --git a/debian/_base/core/tdeaddons/debian/man/atlantikdesigner-trinity.1 b/debian/_base/core/tdeaddons/debian/man/atlantikdesigner-trinity.1
deleted file mode 100644
index 41a1aeb2b..000000000
--- a/debian/_base/core/tdeaddons/debian/man/atlantikdesigner-trinity.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ATLANTIKDESIGNER 1 "October 14, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-atlantikdesigner \- game board designer for Atlantik
-.SH SYNOPSIS
-.B atlantikdesigner
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBAtlantik Designer\fP is a game board designer for Atlantik.
-.PP
-Atlantik is a TDE client for playing Monopoly-like board games on the
-monopd network.  It can play any board supported by the network
-server, including the classic Monopoly game as well as the Atlantik
-game in which the properties include several major cities in North
-America and Europe.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-For a full summary of options, run \fIatlantikdesigner \-\-help\fP.
-.SH SEE ALSO
-.BR atlantik (6).
-.SH AUTHOR
-Atlantik Designer was written by Jason Katz-Brown <jason@katzbrown.com>
-and Rob Kaper <cap@capsi.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/man/exif-trinity.py.1 b/debian/_base/core/tdeaddons/debian/man/exif-trinity.py.1
deleted file mode 100644
index 73179046f..000000000
--- a/debian/_base/core/tdeaddons/debian/man/exif-trinity.py.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXIF.PY 1 "February 4, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-exif.py \- extract EXIF information from digital camera image files
-.SH SYNOPSIS
-.B exif.py
-\fIimage-file\fP ...
-.SH DESCRIPTION
-This is a Python library for extracting EXIF tags from digital camera
-image files.  It contains a command-line testing and debugging interface,
-which reads EXIF tags from the given files and dumps them to the
-console.
-.PP
-This library is provided with the image conversion and transformation
-plugins for Konqueror.  The JPEG rotation/reflection tool \fBjpegorient\fP,
-part of the same set of plugins, makes use of this library.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH SEE ALSO
-.BR jpegorient (1),
-.BR konqueror (1),
-.BR orient.py (1).
-.SH AUTHOR
-The EXIF extraction library was written by Thierry Bousch
-<bousch@topo.math.u-psud.fr>, Gene Cash <gcash@cfl.rr.com> and
-Leif Jensen <jensen@math.columbia.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/man/fsview-trinity.1 b/debian/_base/core/tdeaddons/debian/man/fsview-trinity.1
deleted file mode 100644
index a1dd43b20..000000000
--- a/debian/_base/core/tdeaddons/debian/man/fsview-trinity.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FSVIEW 1 "February 4, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fsview \- a filesystem viewer that graphically shows disk usage
-.SH SYNOPSIS
-.B fsview
-.RI "[ " generic-options " ]"
-[ \fIfolder\fP ]
-.SH DESCRIPTION
-\fBFSView\fP is a tool for showing disc utilization in a graphical form, much
-like the UNIX command 'du'.  The visualisation type chosen is a
-treemap.  Each directory is represented by a rectangle whose area is
-proportional to its size.  Each directory rectangle contains smaller
-rectangles for its contents, and so on down.
-.PP
-FSView is provided both as a Konqueror plugin for viewing directories,
-and as a standalone executable.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the fsview-specific options.
-For a full summary of options, run \fIfsview \-\-help\fP.
-.TP
-\fIfolder\fP
-View the filesystem starting from this folder.
-.SH SEE ALSO
-.BR du (1),
-.BR kdirstat (1),
-.BR konqueror (1).
-.PP
-For a full featured graphical 'du', see KDirStat.  It's quite similar
-to FSView, but allows for lot of cleanup actions.
-.SH AUTHOR
-FSView was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/man/jpegorient-trinity.1 b/debian/_base/core/tdeaddons/debian/man/jpegorient-trinity.1
deleted file mode 100644
index 3317c868c..000000000
--- a/debian/_base/core/tdeaddons/debian/man/jpegorient-trinity.1
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH JPEGORIENT 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-jpegorient \- change the orientations of JPEG images
-.SH SYNOPSIS
-.B jpegorient
-{ \fB\-90\fP | \fB\-180\fP | \fB\-270\fP | \fB\-v\fP | \fB\-h\fP }
-\fIimage-file\fP ...
-.SH DESCRIPTION
-This is a simple utility for changing the orientations of one or more
-JPEG images.
-It is provided as part of the image conversion and transformation
-plugins for Konqueror.
-.PP
-A single option must be passed before any filenames to specify how the
-orientations of the images are to be changed.  Each new image will be
-saved over the old one.
-.PP
-This utility makes use of
-.BR orient.py (1),
-which is designed to work with certain types of digital camera image
-files.  Instead of modifying the image data, it alters the EXIF
-tags stored with the image to reflect the new orientation.  For this
-reason only images with the correct types of EXIF tags can be changed
-using this tool.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH OPTIONS
-.TP
-\fB\-90\fP
-Rotate each image by 90 degrees clockwise.
-.TP
-\fB\-180\fP
-Rotate each image by a half turn (i.e., 180 degrees).
-.TP
-\fB\-270\fP
-Rotate each image by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
-.TP
-\fB\-v\fP
-Flip each image vertically.
-.TP
-\fB\-h\fP
-Flip each image horizontally.
-.SH SEE ALSO
-.BR exif.py (1),
-.BR konqueror (1),
-.BR orient.py (1).
-.SH AUTHOR
-The image transformation plugins were written by
-Leif Jensen <jensen@math.columbia.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/man/ksig-trinity.1 b/debian/_base/core/tdeaddons/debian/man/ksig-trinity.1
deleted file mode 100644
index 5c0ec94b5..000000000
--- a/debian/_base/core/tdeaddons/debian/man/ksig-trinity.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSIG 1 "February 4, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ksig \- a graphical tool for managing multiple email signatures
-.SH SYNOPSIS
-.B ksig
-.RI "[ " generic-options " ]"
-[ \fB\-\-random\fP | \fB\-\-daily\fP ]
-.SH DESCRIPTION
-\fBKSig\fP is a graphical tool for keeping track of many different email
-signatures.  The signatures themselves can be edited through KSig's
-graphical user interface.  This is done by starting KSig in the usual way
-through the menus, or by running KSig without either of the special
-options \-\-random or \-\-daily.
-.PP
-A direct command-line interface is then available for generating random
-or daily signatures from this list.  This is achieved by running KSig
-with one of the options \-\-random or \-\-daily, both of which are
-described below.
-.PP
-The command-line interface makes a suitable plugin for generating
-signatures in external mail clients such as KMail.  See
-\fI/opt/trinity/share/doc/ksig/README.Debian\fP for details on how this can be
-done.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the ksig-specific options.
-For a full summary of options, run \fIksig \-\-help\fP.
-.TP
-\fB\-\-random\fP
-Write a random signature from the list to the console.
-.TP
-\fB\-\-daily\fP
-Write a signature for the day to the console.  The signature will change
-from day to day, but multiple calls on the same day will always return
-the same signature.
-.SH SEE ALSO
-.BR kmail (1).
-.SH AUTHOR
-KSig was written by Scott Wheeler <wheeler@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/man/lnkforward-trinity.1 b/debian/_base/core/tdeaddons/debian/man/lnkforward-trinity.1
deleted file mode 100644
index 692d6182a..000000000
--- a/debian/_base/core/tdeaddons/debian/man/lnkforward-trinity.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH LNKFORWARD 1 "October 23, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-lnkforward \- open an URL in a Windows .lnk file under TDE
-.SH SYNOPSIS
-.B lnkforward
-[ \fIgeneric-options\fP ]
-[ \fB\-\-map\fP \fIdrive\fP=\fIpath\fP ... ]
-\fIURL\fP
-.SH DESCRIPTION
-\fBlnkforward\fP examines a Windows .lnk file, determines its target and
-then opens this target file.  In deciding how to open the target file,
-the usual TDE file associations will be used.
-.PP
-The given URL must include a protocol.  Specifically, if it is simply a
-file on the local filesystem, it must be given in the form
-\fIfile:/path/to/file.lnk\fP.
-.PP
-Drive mappings must be supplied (via \-\-map) for any Windows drive
-referred to in the .lnk file.  See the OPTIONS section below for details.
-.PP
-This utility is used by the .lnk tdefile plugin, and is
-part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the lnkforward-specific options.
-For a full summary of options, run \fIlnkforward \-\-help\fP.
-.TP
-\fB\-\-map\fP \fIdrive\fP=\fIpath\fP
-Map the given Windows drive to the given path on the local filesystem
-(generally its mount point).
-This option may be passed multiple times.
-.SH EXAMPLE
-Suppose that the Windows file \fIc:\\readme.txt.lnk\fP is a link to
-\fId:\\foo\\bar.txt\fP.  Then the following command will open the file
-\fI/mnt/data/foo/bar.txt\fP in the usual TDE text editor:
-.PP
-.RS
-\fIprompt$\fP
-lnkforward \-\-map c=/mnt/windows \-\-map d=/mnt/data /mnt/windows/readme.lnk
-.RE
-.SH AUTHOR
-This utility was written by Martin Koller <m.koller@surfeu.at>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1 b/debian/_base/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
deleted file mode 100644
index fe860f1f8..000000000
--- a/debian/_base/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NOATUNSYNAESCOPE.BIN 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-noatunsynaescope.bin \- start the Synaescope visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatunsynaescope.bin
-.SH DESCRIPTION
-This program starts the Synaescope visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Synaescope plugin was written by Charles Samuels <charles@kde.org>,
-Paul Francis Harrison <pfh@yoyo.cc.monash.edu.au> et al.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1 b/debian/_base/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
deleted file mode 100644
index b33eb3b16..000000000
--- a/debian/_base/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NOATUNTIPPECANOE.BIN 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-noatuntippecanoe.bin \- start the Tippecanoe visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatuntippecanoe.bin
-.SH DESCRIPTION
-This program starts the Tippecanoe visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Tippecanoe plugin was written by Neil Stevens <multivac@fcmail.com>,
-Charles Samuels <charles@kde.org> and
-Paul Francis Harrison <pfh@yoyo.cc.monash.edu.au>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1 b/debian/_base/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1
deleted file mode 100644
index 5a4001047..000000000
--- a/debian/_base/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NOATUNTYLER.BIN 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-noatuntyler.bin \- start the Tyler visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatuntyler.bin
-.SH DESCRIPTION
-This program starts the Tyler visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Tyler plugin was written by Neil Stevens <multivac@fcmail.com>,
-Julien Carme <julien.carme@acm.org>, Charles Samuels <charles@kde.org>
-and Mitja Horvat <Mitja.Horvat@hermes.si>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/man/orient-trinity.py.1 b/debian/_base/core/tdeaddons/debian/man/orient-trinity.py.1
deleted file mode 100644
index 024ec11d7..000000000
--- a/debian/_base/core/tdeaddons/debian/man/orient-trinity.py.1
+++ /dev/null
@@ -1,88 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ORIENT.PY 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-orient.py \- change the orientation of a digital camera image file
-.SH SYNOPSIS
-.B orient.py
-.I image-file
-.br
-.B orient.py
-[1-8]
-.I image-file
-.SH DESCRIPTION
-This is a small script for changing the orientation of certain types
-of digital camera image files.  The image data is not modified, but
-rather the EXIF tags stored with the image are altered to reflect the
-new orientation.  For this reason only images with the correct types of
-EXIF tags can be changed using this script.
-.PP
-When called with with a numeric argument from 1 to 8, the orientation
-will be changed as described in the options section below.  When called
-with only a filename, the current orientation will be written to the
-console (also as a number from 1 to 8).
-.PP
-If the image contains no EXIF information or if the EXIF information is not
-of the correct type, an error will be displayed and this script will
-exit immediately.
-.PP
-This script is provided with the image conversion and transformation
-plugins for Konqueror.  For a more general-purpose JPEG rotation/reflection
-tool, see
-.BR jpegorient (1)
-which is also a part of this same set of plugins.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH OPTIONS
-The possible orientations are represented by the numbers 1 to 8 as
-follows.
-.TP
-.B 1
-No change of orientation.
-.TP
-.B 2
-Flip horizontally.
-.TP
-.B 3
-Rotate by a half turn (i.e., 180 degrees).
-.TP
-.B 4
-Flip vertically.
-.TP
-.B 5
-Transpose image (i.e., reflect across the upper-left to lower-right
-diagonal axis).
-.TP
-.B 6
-Rotate by 90 degrees clockwise.
-.TP
-.B 7
-Transverse transpose image (i.e., reflect across the upper-right to
-lower-left diagonal axis).
-.TP
-.B 8
-Rotate by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
-.SH SEE ALSO
-.BR exif.py (1),
-.BR jpegorient (1),
-.BR konqueror (1).
-.SH AUTHOR
-The image transformation plugins were written by
-Leif Jensen <jensen@math.columbia.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeaddons/debian/noatun-plugins-trinity.install b/debian/_base/core/tdeaddons/debian/noatun-plugins-trinity.install
index 843bdf15c..7ae7d70de 100644
--- a/debian/_base/core/tdeaddons/debian/noatun-plugins-trinity.install
+++ b/debian/_base/core/tdeaddons/debian/noatun-plugins-trinity.install
@@ -51,6 +51,9 @@ debian/tmp/opt/trinity/share/apps/noatun/tylerstates
 debian/tmp/opt/trinity/share/apps/noatun/wakeup.plugin
 debian/tmp/opt/trinity/share/apps/noatun/wavecapture.plugin
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/synaescope.png
+debian/tmp/opt/trinity/share/man/man1/noatunsynaescope.bin.1
+debian/tmp/opt/trinity/share/man/man1/noatuntippecanoe.bin.1
+debian/tmp/opt/trinity/share/man/man1/noatuntyler.bin.1
 noatun-plugins/dub/AUTHORS /opt/trinity/share/doc/noatun-plugins/dub
 noatun-plugins/dub/BUGS /opt/trinity/share/doc/noatun-plugins/dub
 noatun-plugins/dub/ChangeLog /opt/trinity/share/doc/noatun-plugins/dub
diff --git a/debian/_base/core/tdeaddons/debian/noatun-plugins-trinity.manpages b/debian/_base/core/tdeaddons/debian/noatun-plugins-trinity.manpages
deleted file mode 100644
index 76a3fc35b..000000000
--- a/debian/_base/core/tdeaddons/debian/noatun-plugins-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/noatunsynaescope-trinity.bin.1
-debian/man/noatuntippecanoe-trinity.bin.1
-debian/man/noatuntyler-trinity.bin.1
diff --git a/debian/_base/core/tdeaddons/debian/rules b/debian/_base/core/tdeaddons/debian/rules
index d70a2693f..ddfb7596f 100755
--- a/debian/_base/core/tdeaddons/debian/rules
+++ b/debian/_base/core/tdeaddons/debian/rules
@@ -29,16 +29,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg
 
 DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter
 
-binary-install/konq-plugins-trinity::
-	mkdir -p debian/konq-plugins-trinity/opt/trinity/share/
-#	mv -f debian/konq-plugins-trinity/opt/trinity/share/man debian/konq-plugins-trinity/opt/trinity/share/
-#	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man
-#	mv -f debian/konq-plugins-trinity/opt/trinity/share/man/py/man1/exif.1 \
-#		debian/konq-plugins-trinity/opt/trinity/share/man/man1/exif.py.1; \
-#	mv -f debian/konq-plugins-trinity/opt/trinity/share/man/py/man1/orient.1 \
-#		debian/konq-plugins-trinity/opt/trinity/share/man/man1/orient.py.1; \
-#	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man/py;
-
 binary-install/tdeaddons-tdefile-plugins-trinity::
 	install -p -D -m644 renamedlgplugins/README \
 		debian/tdeaddons-tdefile-plugins-trinity/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins
diff --git a/debian/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install b/debian/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
index 70f735948..a666d9166 100644
--- a/debian/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
+++ b/debian/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.so
 debian/tmp/opt/trinity/lib/trinity/librenimageplugin.la
 debian/tmp/opt/trinity/lib/trinity/librenimageplugin.so
 debian/tmp/opt/trinity/share/applnk/.hidden/lnkforward.desktop
+debian/tmp/opt/trinity/share/man/man1/lnkforward.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-win-lnk.desktop
 debian/tmp/opt/trinity/share/services/tdefile_cert.desktop
 debian/tmp/opt/trinity/share/services/tdefile_desktop.desktop
diff --git a/debian/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages b/debian/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
deleted file mode 100644
index eda9949fb..000000000
--- a/debian/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/lnkforward-trinity.1
diff --git a/debian/_base/core/tdeartwork/debian/man/kbanner-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kbanner-trinity.kss.1
deleted file mode 100644
index d8cc7f4f6..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kbanner-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBANNER.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbanner.kss \- Banner screen saver for TDE
-.SH SYNOPSIS
-.B kbanner.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBanner\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkbanner.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Martin R. Jones <mjones@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kblob-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kblob-trinity.kss.1
deleted file mode 100644
index d3d2b9394..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kblob-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBLOB.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kblob.kss \- Blob screen saver for TDE
-.SH SYNOPSIS
-.B kblob.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBlob\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkblob.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Tiaan Wessels <tiaan@netsys.co.za>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kclock-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kclock-trinity.kss.1
deleted file mode 100644
index 03c795709..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kclock-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KCLOCK.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kclock.kss \- Clock screen saver for TDE
-.SH SYNOPSIS
-.B kclock.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBClock\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkclock.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Melchior Franz <mfranz@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/keuphoria-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/keuphoria-trinity.kss.1
deleted file mode 100644
index c8fb549b8..000000000
--- a/debian/_base/core/tdeartwork/debian/man/keuphoria-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KEUPHORIA.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-keuphoria.kss \- Euphoria screen saver for TDE
-.SH SYNOPSIS
-.B keuphoria.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBEuphoria\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkeuphoria.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1
deleted file mode 100644
index 58f427ba4..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFIRESAVER.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kfiresaver.kss \- Fireworks 3D screen saver for TDE
-.SH SYNOPSIS
-.B kfiresaver.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBFireworks 3D\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkfiresaver.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Enrico Ros <asy@libero.it> and
-David Sansome.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kflux-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kflux-trinity.kss.1
deleted file mode 100644
index 3556a7bc3..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kflux-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFLUX.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kflux.kss \- Flux screen saver for TDE
-.SH SYNOPSIS
-.B kflux.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBFlux\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkflux.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kfountain-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kfountain-trinity.kss.1
deleted file mode 100644
index 9aa452ded..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kfountain-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFOUNTAIN.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kfountain.kss \- Particle Fountain screen saver for TDE
-.SH SYNOPSIS
-.B kfountain.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBParticle Fountain\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkfountain.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>,
-Jeff Molofee <nehe@connect.ab.ca> and Nick Betcher <nbetcher@usinternet.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kgravity-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kgravity-trinity.kss.1
deleted file mode 100644
index f7789052b..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kgravity-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KGRAVITY.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kgravity.kss \- Particle Gravity screen saver for TDE
-.SH SYNOPSIS
-.B kgravity.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBParticle Gravity\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkgravity.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>,
-Jeff Molofee <nehe@connect.ab.ca> and Nick Betcher <nbetcher@usinternet.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/klines-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/klines-trinity.kss.1
deleted file mode 100644
index 6121f8e2d..000000000
--- a/debian/_base/core/tdeartwork/debian/man/klines-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KLINES.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-klines.kss \- Lines screen saver for TDE
-.SH SYNOPSIS
-.B klines.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBLines\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIklines.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by
-Dirk Staneker <dirk.stanerker@student.uni-tuebingen.de>,
-Martin R. Jones <mjones@kde.org> and Mario Weilguni <mweilguni@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/klorenz-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/klorenz-trinity.kss.1
deleted file mode 100644
index 3df447a64..000000000
--- a/debian/_base/core/tdeartwork/debian/man/klorenz-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KLORENZ.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-klorenz.kss \- Lorenz Attractor screen saver for TDE
-.SH SYNOPSIS
-.B klorenz.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBLorenz Attractor\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIklorenz.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Nicolas Brodu <brodu@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kpendulum-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kpendulum-trinity.kss.1
deleted file mode 100644
index d253f4189..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kpendulum-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPENDULUM.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpendulum.kss \- Pendulum screen saver for TDE
-.SH SYNOPSIS
-.B kpendulum.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBPendulum\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It simulates a two-part pendulum.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkpendulum.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Georg Drenkhahn
-<georg-d@users.sourceforge.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kpolygon-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kpolygon-trinity.kss.1
deleted file mode 100644
index bc7e56868..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kpolygon-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPOLYGON.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpolygon.kss \- Polygons screen saver for TDE
-.SH SYNOPSIS
-.B kpolygon.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBPolygons\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkpolygon.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Martin R. Jones <mjones@kde.org> and
-Mario Weilguni <mweilguni@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/krotation-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/krotation-trinity.kss.1
deleted file mode 100644
index 6bc0c172b..000000000
--- a/debian/_base/core/tdeartwork/debian/man/krotation-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KROTATION.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-krotation.kss \- Rotation screen saver for TDE
-.SH SYNOPSIS
-.B krotation.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBRotation\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It simulates a force free rotating asymmetric body.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkrotation.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Georg Drenkhahn
-<georg-d@users.sourceforge.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kscience-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kscience-trinity.kss.1
deleted file mode 100644
index 061374a15..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kscience-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSCIENCE.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kscience.kss \- Science screen saver for TDE
-.SH SYNOPSIS
-.B kscience.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBScience\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkscience.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Rene Beutler <rbeutler@g26.ethz.ch>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kslideshow-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kslideshow-trinity.kss.1
deleted file mode 100644
index c8b208e0d..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kslideshow-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSLIDESHOW.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kslideshow.kss \- Slide Show screen saver for TDE
-.SH SYNOPSIS
-.B kslideshow.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSlide Show\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkslideshow.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Stefan Taferner <taferner@kde.org>,
-Martin R. Jones <mjones@kde.org>, Chris Howells <howells@kde.org>
-and Sven Leiber <s.leiber@web.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
deleted file mode 100644
index 8555d6209..000000000
--- a/debian/_base/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSOLARWINDS.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ksolarwinds.kss \- Solar Winds screen saver for TDE
-.SH SYNOPSIS
-.B ksolarwinds.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSolar Winds\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIksolarwinds.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kspace-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kspace-trinity.kss.1
deleted file mode 100644
index 1e39ff18e..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kspace-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSPACE.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kspace.kss \- Space screen saver for TDE
-.SH SYNOPSIS
-.B kspace.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSpace\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkspace.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Bernd Johannes Wuebben
-<wuebben@math.cornell.edu> and Silicon Graphics, Inc.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kswarm-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kswarm-trinity.kss.1
deleted file mode 100644
index ea1e0d653..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kswarm-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSWARM.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kswarm.kss \- Swarm screen saver for TDE
-.SH SYNOPSIS
-.B kswarm.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSwarm\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkswarm.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Patrick J. Naughton,
-Emanuel Pirker <epirker@edu.uni-klu.ac.at>,
-Jeff Butterworth <butterwo@ncsc.org> and Mario Weilguni <mweilguni@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kvm-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kvm-trinity.kss.1
deleted file mode 100644
index a7e037cbe..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kvm-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KVM.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kvm.kss \- Virtual Machine screen saver for TDE
-.SH SYNOPSIS
-.B kvm.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBVirtual Machine\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkvm.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Artur Rataj <art@zeus.polsl.gliwice.pl>,
-Eric Plante and Jamie Zawinski <jwz@jwz.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kwave-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/kwave-trinity.kss.1
deleted file mode 100644
index 8ad59b9c1..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kwave-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KWAVE.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kwave.kss \- Bitmap Wave screen saver for TDE
-.SH SYNOPSIS
-.B kwave.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBitmap Wave\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkwave.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>
-and Jeff Molofee <nehe@connect.ab.ca>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kxsconfig-trinity.1 b/debian/_base/core/tdeartwork/debian/man/kxsconfig-trinity.1
deleted file mode 100644
index f4cd67694..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kxsconfig-trinity.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KXSCONFIG 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kxsconfig \- TDE X screen saver configuration tool
-.SH SYNOPSIS
-.B kxsconfig
-.RI "[ " generic-options " ]"
-\fIscreensaver\fP
-[ \fIsavername\fP ]
-.SH DESCRIPTION
-\fBkxsconfig\fP is a screen saver configuration tool
-for the Trinity Desktop Environment (TDE).  It is used to configure generic
-X screen savers, i.e., screen savers that have not been written explicitly
-for TDE.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the kxsconfig-specific options.
-For a full summary of options, run \fIkxsconfig \-\-help\fP.
-.TP
-\fIscreensaver\fP
-The filename of the screen saver to configure.
-.TP
-\fIsavername\fP
-An optional human-readable screen saver name to use in messages.
-.SH EXAMPLES
-\fIexample$\fP kxsconfig /usr/lib/xscreensaver/bouboule Bouboule
-.SH SEE ALSO
-.BR kxsrun (1).
-.SH AUTHOR
-This tool was written by Martin R. Jones <mjones@kde.org>.  It also
-makes use of xscreensaver code written by Jamie Zawinski <jwz@jwz.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/kxsrun-trinity.1 b/debian/_base/core/tdeartwork/debian/man/kxsrun-trinity.1
deleted file mode 100644
index 9e45a775c..000000000
--- a/debian/_base/core/tdeartwork/debian/man/kxsrun-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KXSRUN 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kxsrun \- TDE X screen saver launcher
-.SH SYNOPSIS
-.B kxsrun
-.RI "[ " generic-options " ]"
-\fIscreensaver\fP
-[ \fB\-\-\fP \fIoptions\fP ]
-.SH DESCRIPTION
-\fBkxsrun\fP is a screen saver launcher
-for the Trinity Desktop Environment (TDE).  It is used to launch generic
-X screen savers, i.e., screen savers that have not been written explicitly
-for TDE.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the kxsrun-specific options.
-For a full summary of options, run \fIkxsrun \-\-help\fP.
-.TP
-\fIscreensaver\fP
-The filename of the screen saver to launch.
-.TP
-\fB\-\-\fP \fIoptions\fP
-Additional options to pass to the screen saver.
-.SH EXAMPLES
-\fIexample$\fP kxsrun /usr/lib/xscreensaver/bouboule
-.SH SEE ALSO
-.BR kxsconfig (1).
-.SH AUTHOR
-This tool was written by Martin R. Jones <mjones@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1
deleted file mode 100644
index 2eb943ee2..000000000
--- a/debian/_base/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDEASCIIQUARIUM.KSS 1 "May 21, 2021"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdeasciiquarium.kss \- TDE screensaver to draw an ASCII art aquarium
-.SH SYNOPSIS
-.B tdeasciiquarium.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBTDEAsciiquarium\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It draws an ASCII art aquarium.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fItdeasciiquarium.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-Native TDE Screensaver based on the Asciiquarium program
-from Kirk Baucom <kbaucom@schizoid.com>, available at
-http://www.robobunny.com/projects/asciiquarium.
-.br
-Ported to TDE by Maksim Orlovich <maksim@kde.org> and
-Michael Pyne <michael.pyne@kdemail.net>.
-.br
-This manual page was prepared by Michele Calgaro <michele.calgaro@yahoo.it>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 b/debian/_base/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
deleted file mode 100644
index 00b4d4c58..000000000
--- a/debian/_base/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPARTSAVER.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdepartsaver.kss \- Media screen saver for TDE
-.SH SYNOPSIS
-.B tdepartsaver.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBMedia\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fItdepartsaver.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Stefan Schimanski <1Stein@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdeartwork/debian/tdescreensaver-trinity.install b/debian/_base/core/tdeartwork/debian/tdescreensaver-trinity.install
index 1ae8e4bf3..b5a29f45c 100644
--- a/debian/_base/core/tdeartwork/debian/tdescreensaver-trinity.install
+++ b/debian/_base/core/tdeartwork/debian/tdescreensaver-trinity.install
@@ -44,3 +44,25 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdeasciiquarium.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop
 debian/tmp/opt/trinity/share/apps/kfiresaver
 debian/tmp/opt/trinity/share/apps/tdescreensaver
+debian/tmp/opt/trinity/share/man/man1/kbanner.kss.1
+debian/tmp/opt/trinity/share/man/man1/kblob.kss.1
+debian/tmp/opt/trinity/share/man/man1/kclock.kss.1
+debian/tmp/opt/trinity/share/man/man1/keuphoria.kss.1
+debian/tmp/opt/trinity/share/man/man1/kfiresaver.kss.1
+debian/tmp/opt/trinity/share/man/man1/kflux.kss.1
+debian/tmp/opt/trinity/share/man/man1/kfountain.kss.1
+debian/tmp/opt/trinity/share/man/man1/kgravity.kss.1
+debian/tmp/opt/trinity/share/man/man1/klines.kss.1
+debian/tmp/opt/trinity/share/man/man1/klorenz.kss.1
+debian/tmp/opt/trinity/share/man/man1/tdepartsaver.kss.1
+debian/tmp/opt/trinity/share/man/man1/kpendulum.kss.1
+debian/tmp/opt/trinity/share/man/man1/kpolygon.kss.1
+debian/tmp/opt/trinity/share/man/man1/krotation.kss.1
+debian/tmp/opt/trinity/share/man/man1/kscience.kss.1
+debian/tmp/opt/trinity/share/man/man1/kslideshow.kss.1
+debian/tmp/opt/trinity/share/man/man1/ksolarwinds.kss.1
+debian/tmp/opt/trinity/share/man/man1/kspace.kss.1
+debian/tmp/opt/trinity/share/man/man1/kswarm.kss.1
+debian/tmp/opt/trinity/share/man/man1/kvm.kss.1
+debian/tmp/opt/trinity/share/man/man1/kwave.kss.1
+debian/tmp/opt/trinity/share/man/man1/tdeasciiquarium.kss.1
diff --git a/debian/_base/core/tdeartwork/debian/tdescreensaver-trinity.manpages b/debian/_base/core/tdeartwork/debian/tdescreensaver-trinity.manpages
deleted file mode 100644
index dad73c192..000000000
--- a/debian/_base/core/tdeartwork/debian/tdescreensaver-trinity.manpages
+++ /dev/null
@@ -1,22 +0,0 @@
-debian/man/kbanner-trinity.kss.1
-debian/man/kblob-trinity.kss.1
-debian/man/kclock-trinity.kss.1
-debian/man/keuphoria-trinity.kss.1
-debian/man/kfiresaver-trinity.kss.1
-debian/man/kflux-trinity.kss.1
-debian/man/kfountain-trinity.kss.1
-debian/man/kgravity-trinity.kss.1
-debian/man/klines-trinity.kss.1
-debian/man/klorenz-trinity.kss.1
-debian/man/tdepartsaver-trinity.kss.1
-debian/man/kpendulum-trinity.kss.1
-debian/man/kpolygon-trinity.kss.1
-debian/man/krotation-trinity.kss.1
-debian/man/kscience-trinity.kss.1
-debian/man/kslideshow-trinity.kss.1
-debian/man/ksolarwinds-trinity.kss.1
-debian/man/kspace-trinity.kss.1
-debian/man/kswarm-trinity.kss.1
-debian/man/kvm-trinity.kss.1
-debian/man/kwave-trinity.kss.1
-debian/man/tdeasciiquarium-trinity.kss.1
diff --git a/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install b/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
index 739e7c772..b0ee1f2c5 100644
--- a/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
+++ b/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
@@ -64,9 +64,10 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/lockward.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/cwaves.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/topblock.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/voronoi.desktop
-
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/cubicgrid.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/hypnowheel.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/lcdscrub.desktop
+debian/tmp/opt/trinity/share/man/man1/kxsconfig.1
+debian/tmp/opt/trinity/share/man/man1/kxsrun.1
 
 
diff --git a/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages b/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
deleted file mode 100644
index 356af4f32..000000000
--- a/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kxsconfig-trinity.1
-debian/man/kxsrun-trinity.1
diff --git a/debian/_base/core/tdebase/debian/control b/debian/_base/core/tdebase/debian/control
index cc0260172..c86acb117 100644
--- a/debian/_base/core/tdebase/debian/control
+++ b/debian/_base/core/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharutils, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~)
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssh-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-trinity (<< 4:14.0.0~)
 Breaks: kdebase-trinity (<< 4:14.0.0~)
-Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib
+Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib | argyll
 Recommends: tdm-trinity (>= ${source:Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${source:Version})
 Description: base components from the official TDE release
@@ -474,7 +474,7 @@ Replaces: ksmserver-trinity (<< 4:14.0.0~)
 Breaks: ksmserver-trinity (<< 4:14.0.0~)
 Provides: x-session-manager
 Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${source:Version}) | x-window-manager
-Recommends: kpersonalizer-trinity (= ${source:Version})
+Recommends: kpersonalizer-trinity (= ${source:Version}), polkit-agent-tde
 Description: session manager for TDE
  This package contains the TDE session manager. It is responsible for
  restoring your TDE session on login. It is also needed to properly
diff --git a/debian/_base/core/tdebase/debian/img/cr128-app-energy_star.png.uu b/debian/_base/core/tdebase/debian/img/cr128-app-energy_star.png.uu
deleted file mode 100644
index 0d74bb8ef..000000000
--- a/debian/_base/core/tdebase/debian/img/cr128-app-energy_star.png.uu
+++ /dev/null
@@ -1,299 +0,0 @@
-begin 644 cr128-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```(````"`"`8```##/F'+````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CL!!M^7Q```(`!)1$%4>)SMO7FT'=5]Y_O9
-M56>\Y\Z#KJZD*Y"$L"20$`*$31@LBT$!@V/2V-@$&T*,$XAC>Z7?RWK]5EZ_
-M7MV=[L3N7MTO3MSNV&UBM_-B;#\SV`8S3P)+0@BPL)!`\WCG\9Q[IJK]_JC:
-M5;N&<^ZY5]AQ._>W5MU3M6NX>^_O]S?MO4\=6)`%69`%69`%69`%69`%69`%
-M69`%69`%69`%69`%69`%69#?9!&-7'3;;;>9N5QN'=!O&,8B(/7+K=:"S%/*
-MMFT/`L?S^?POOO>][UFSW5"7`/?<<\_5MFW_/G`CT/,>57)!?C4R!#PFI?SF
-M`P\\\%RMBV()<-===ZT'OBR$N#Z7R[%BQ0K./?=<VMK::&IJPC1-[UHIY7M=
-M\5^Y_#JV83YULFV;?#[/Y.0DQXX=X]"A0Q0*!8`GI91_^L`##_P\?$^$`'??
-M??<G@*\W-34U;=Z\F?7KUY-*I6AN;J:EI854*D4BD<`PC/FTZS=>%'#AS]G.
-MU[MOMGTI);9M8UD6E4J%F9D9BL4BE4J%M]YZBYT[=U(H%&:`>[_YS6_^3[T^
-M`0+<???=_SOPE\N7+^>FFVXBE\O1W=U-=W?W`N#SD+EJ\5RN#U]KVS:V;5.M
-M5JE4*EB6Q>3D)%-34Q0*!1Y[[#&.'S\.\&??_.8W_TK=Y]GRN^ZZZW>$$'^W
-M9LT:<<LMM]#2TL**%2MH;6U%B(9BQ04)B1!BUFVNU]?:#,/`-$V2R23I=-H[
-MSF:SV+;-^>>?S_CX.",C(]=NVK1IWYX]>]X"EP!WW7778B'$LTN6+$GKX"<2
-MB7^";OO-E5]%K*'^1R*1()5*(:4DF\U2J53H[^_GU*E38G)R\K<W;][\P.[=
-MNZ>57?]WIFDV;]NVC::F)I8O7[Y@\M\CD5)ZVR_CF>%-%\,P:&YN)IE,TM[>
-M3B:3X=IKK\4TS>9*I?+O`<Q[[[VWS[;M;VW:M,E8MVX=_?W]I-/I]ZRR_YSE
-M;$%_+T@CA""93%*I5#R+/C,SPYDS9R[:L&'#-XQJM7HK8*Y?OYZ6EA9RN=Q9
-M_]-_KE)/&^?SG/>J+D((FIJ:O/A@PX8-`(9IFA\UI)0WMK>WT]/30UM;VUG]
-MTW_.\EX"-M_[ZCTCE4IY06%75Q<='1T`'S:`53T]/9Z_6)"YRWS`GX^U:`3H
-M>M>GTVD2B01""+J[NQ%"K$@`2YJ;FQ<&=^8H\P7]EWG/;-<J\`W#H*6E!2GE
-MT@30HIBQ((W)>PG*V=PSUWH8AH&4$M,T%=XY#_6Y:/^__JMOD$L4&[Y^07ZY
-M<L?MMY)*9^EH:ZY+BKA!J(1^HE$QA472E!P:KCTK;&,P+KJ]Y^K_0PCG&/=3
-M>.<!!,)PQZA599UB;5^XSW"?@WNO`.'MJ^=ZK??'O06@]9,$D-+]U(XE2+=`
-MNL?@EDO_'BG=:[QSZAY5)KWG2ML?OP\^3[M7.R^1=!NC&-@U^UJ8:6_09S8)
-M7S,ONR^$(%].\)7GVV//&T*P]L*E=/4TNSY'WPR$VA<"PU2?1N!:H=\C0O>I
-M\\*_3C]6SQ'>L5.G.)*K#K%5A]O2G5R12%LZY5J95Z[*+-N[QM+.>>=MVSL.
-MWF]KUZC-#MWK;*^/=?/N@0%L.Q[@>^\VR62C4#9""&.NV@_,>OWY:Q?3WMGD
-M5B!^-LS3"._3N=;3#'?SSKL'7E1K^QKK7:<!&+C.[4@K!@Q;`SL`?CCBMI4F
-MA\K=.MA2:Q/1MNA82*U/O'IK_:)]`)+6MBPK5BV:=?5.O0PA/"Y@&*["S6>B
-MIQYI^L_IHJ.K.=@8SZQYM8ET0K"39-!T:IO^'-4@.]!PYWP$:$VCO<VV`QJK
-M:Y\#.#6W8+VE5V>T.ONMT?I!<P=A462/]!O0UIYER;+..JC$/:\V&<#!<5XQ
-M@+HG+&T=32Q9ZKH%"5(XC1*A3PD(Y4-5.8Z/5GTDO/NEPWQU;`.&V\$V2,,]
-M9X-M@(%3CL`]4(U6\4"TZP.^V/:)I(@5)%C,IIX1(4C0:O@60K]6LQ2J/AJ#
-M].?V]+8P-37#Y,1,35QJF7T]MM"Q\US`7`A@&$8D:S!-@Q4K>]1_BS%SBHE:
-M1P0ZS3\OPQUF.R:VGD8J/VQK'1KUQU'P(GY8LQ"1>P+WJ[J'R1!C_E4_J#]Z
-M7X1!"ED(W15(*5G:WXEIQF=L]<R^+KH+2+Q7<_U]2]M)),V:&J[6GBBP/0T/
-M:7[`4NB=X?=-P,0J2X`AL)$8KB5PDP*G'L+Y7Z'@']2QE-ISHQ8@WAW4T'X[
-M9`4T()1B^"Y!:Z>N&'H;0Q8BD3!8M+B5TR?'8W&8S0+HXKD`=="H&(:!T!Z8
-M2B7H6=3BH@=(X8+KFG*OPT3$#:C&":%UH@:N<)_E/4=UE.L*;!L,@P`)A`V&
-M`ETH$KA4"S=3?Z;;43[@&AGB`L.ZVB\#[B30MHC5"Y);MQ`Z;.K>CHX<(T/3
-ME,O5NB#'@1XN2^CF8+[2O:@%(80?U2L-ER"%KN&:S[=!FD(CB(.A6<\*V&`;
-M`L,[EE$2N*IONY\>$5R+4ROZDN!E%GXP&4,&+4BT0QH?K_VZM9":1DO]W]>T
-M$''!,0(ZNG(,G)X(-6-VP"'D`F:'-RI.^N#X(0%T=.9<;74[&5_#=3?@U$5H
-MQS)@);QK0E8@$#5K9#$0`1)X@T/*!4BPA/0'D)`1HNNIG&<)=`*$P%?C!0[X
-M=:R!=B[BQK2V1>*=6`L1M"1(:&MK8O#,9,.@USJ7F'<&X#ZGJ3E-(F'XVJW`
-M5&Y`:Y`0CBDUC-K7V.!HN$X`&VQ#.D&]]#4^3`)/;`=,80B/E%X8$M<Y'D":
-M)7`14T#8>G:@@3MKAA"S!=Q$P%KX%D(W_P'7X9XQ#,AFDQ0*Y9K@QI6K+$!M
-M\R:`TJE<+NV!ZS=$<P.Z_Y9^K!$Q[ZX)52E>(-T#L(63\H7,OF?U=0O@;@X1
-M7,OBFO^8$,`CLP](#0N@@Q_(#C0WH(@LHV71S873&V3R+9TWL*1?IT7"4D*V
-M*1T@0!S@<67Z\/R\@D"=`)EL4NNPH%9[K`V00'K@*>WV<GFT1FO[2IS[HF;?
-M\$)^O/Q?)Z5P4P'-<(4Z!Z\-JK.DRV2=`+;:5ZFC!WZ\Z=?]>D"S-4(%V@K$
-MC3AZ==3)`Z0RN@</QA6J'7&BER?F,PZ@$R"1-)$V"#.HU:C!GQJ`2JG'`GX'
-MA%V!<AE*`B10`9\A$$B?`Y:O]>%!J%H2B,8]+=.#PB#88?#CLX0&M#]TCU<'
-M]+Y"JX_/A*09C6?4IVW;2"FQ+`O+LKPOCMBV'1T'.)N10%,(QSAIP`KIN^4X
-M*^`%@+J&ZP0(I'C"TU"=!,+0W+[M@^U%_1#P_T[T7*.-,B801*^CC.['@:\R
-M`[7531U#5E+]?\V21`CB7>/VHZ894L+DY*0'/OC/"A-$QW#>68"R`);M^R0=
-MV+E8`0=$&70%6@S@:;UNP&V!;6A:[_X_VWV&,]LL_6E@-P`4H2C`"[6\^BFM
-M#UF"&F2(@A]T`W;XN.;(HO9<#[`Z!(DQ^4KKG7OCP5=!H)*S#@*KEJ5UE'-.
-M@1ZQ`EXC_$KY=13>=38Q$;_R]Z%H7S'`T_J0^?<47VJ6("1ZAZ,%@!$W$/#W
-M06W5P0]D!I%1Q!H6H08QP`<[0!`)5C6X1J`1\!5^@7&`LR%`I6PYRJXUT.M,
-MSY3Z^^%HWQO$4=>Y(WJ.%9#!8,\0V+:,1/O"S?4](K@L=\8D@B.`X:9Z_10R
-M_[XET*U`B`!>,!@#?@#XQN*"V,S!UOHO]"S+CBX2F0W\L-5(Z"E!HZ*/`\P4
-MRK1W-,5H-UZ$K^_'60)=RPWWFD".[T;VMJU%_#$S?8H(*MY0N,N`!8B*U![D
-MU4V1(0"\UI%Q$T\AD.TYF'[5(;6"P[@XH%P*OO^A4?`#::#^Y<)&11\)S$^7
-M')9JT[)Z_JZ8'><*]`@_G!JBY?C>%&^=O%_]+W4LT?-_QPI(J#$0X`.NGA,T
-MI^X52NNUS@X#'9U'J#\;J:Z/T_ZPLH3O+94JP:8T`+Z*`2)#P?.="ZA4+$JE
-M,IEL*AAURVB*%VB4,O6JA8"4PB>%A[X[P4,4=&4-I%:F_B](C>DNP#77U*C_
-M'^X\YUS8`D1<04"KZVA^31=01^-K:+^44"I6(VT(UK^^^0?F9P$,PW`ML//`
-MT9$"?4M2-:R`C+@";^&&=ZT#C&W;&(;A^?GP!$]XL,=VGV'4($&`A&Y]=:+'
-M=8@..O@:C_1]O5<>(H-MQQV'SL6M2:CA%NIMY5*%:C7Z"J#9P-?;/.\T,"R3
-M$P6Z>UI(I<R(V5):I[L"/>6S`<,E#`AMH*+&!(_:M'.*"-ZU$!@$\AM<#W2U
-M+[4V2,]R!8"GE@6(!S^LZ1'`PYE":(8QSCWDITLQ[9@;^##/D4#?`EA>!XX,
-M3[&XKRU`@$B$+_W@SK$&TM-DGP2.Z/>B!X.A+:KYCJG7QP'<)_A&4C55!][O
-M1=]=Q5@"+]"JXP["X$?F#P+9PQS<@!9+3.>C!(#&21"9##K;-8'C8P5:6K/.
-MY)"!QP*O`UWSC^&<BHSKHTC@0Q4D@?\<?;I7S_G#FB]4,((?"S@/B3Y3G8BU
-M!E+WO[X_CELX$@W^B("GK&'8[#>TZ$3"]'0Q,@;@U;>!S\ADT+S&`6)N.7-Z
-MG'-7]B"$X0=YWK"N']RI&"".!,JTZ]E!W"Q?8/!'@E3S_A)O38+P_DAO@*J6
-M>.8Q9/XC*2%$OMP1!"]$B)@XP*X+>FW3[_2'S<1X8=9VS&;^`RY`?^U;(R)$
-MP*!Z4BE;G#XQQM+^3B^?EQ"-^&N1P`OPP@,^TB-=N$P2-^_OIGV!_%\2RUJG
-M=T!OD0ZZ>UX!JSK3!SILOHD$B+[/#Z\SU,T[H7NCIE]*R?A8(5;[5;WJ?>K[
-MG@L`YKPD3!\)#,OT=(F!,^,L[FO7?#Y:3."B$B*!"O0"R[HC`SXJA_5-O!`@
-M+6U?$%C^Y5'5<P=X=9<Q08`"W-_W@58NHI;OK[D?,V(8<!'V;%;!V8K%:MTE
-MX:J/XC[#^TK.>BX@3L;'9C!-TUDH:NA6()X$#LZ.%;#K1/NJFFH$5">"\^GX
-M>WT<P`=?C_V"'2%#.W[GN5=KY3K`@;*X["`P*13O#FK-`7A?57,WRY(,#TW5
-MQ:41\)42O6<K@FK)R/`TEB59W-?F+^>J00(O"%37Q.7]@8C?:81E!5U#D`RJ
-MT7Z\4B<$0(98(&/($`N\[AYBM#\<&P2.]84E86+HYVW)T,`DU<JLK_Z=%?R:
-M+F"NT@AIQL?R6)9%WY(.2!`A07BPQPX%>Y'<W\$S-O731_WT_#\\%E!/@IT6
-MIU$0=@/H1$`W\4$R1,RZK<4'[CU^T!>T!B-#DQ2+E4A]:]5_-O!UF?=D4*.7
-M3TT6*16'6-K?02:;#'UU*V9VSW,)!*R!GNIY`5]L_N\SW.V"AMH6[IR:;D`;
-M&91NL!AG`8+^GL;`#\T9*,V/6_?72#OBP(]U`7.U`',A`$"Y7.7(X6%Z>UOI
-MZ,I%)G@"4LL:A(F@6P.(6?[EF_\XYL>)[@;T6P+@.J<]X`,6H('`,#Q<7`M\
-MR[(9')BB.%-&".C,V4@)8P6CID5K!'PE`1>@"AJ5N1(`G`:>.3W!Y,0,BY>V
-MD\DD`T&>X0X%J\X/6P.O3">"Q$GY:N3_<S'_7CT]5:?V>``A4NB`0JP+:"0X
-M5."7BA4&!R>I5FRN.;_$K9LJM+0X[UHH%HL\OC?)HWL$MHP'83;P=9G_]P+J
-MAE2UI5`H<_C=(3J[<O0L:L5,.`,&X0$?P+,&EEL6)H*>\CF@A_-_&<C]:[72
-M5WP9.@Z"C@:PNCSL^R&&%#56$NG60($_,3'#V,@T4L+O;"SPT<MS?.QW;R.3
-MR0!0*I4X]_GM;#IG@'_[B$EX/F@V\,-6X*Q7!,U5U+\:&\TS-5FDLRM'1V?.
-M^<:KJ^XZR+K6*R((+?"3U,G_!2#]=8#U*.NEAOJ'3@@]\-,#0:@!?`T+$"*#
-M&B0J%2N,#$]1=*=X;UX_Q2V7YKCC]EL#`W6)1((/??!*DJD=W#-^@J\]&_WM
-MAMG`CXP$SE7T!2%SO<\!U/?-HR-Y)B8*M'<VT]Z6Q4P8#ERQ*WX(F7\W*(S+
-M_W4B*%1G&0ET[L8G@=>)3J&L:0FT0%`=U]+Z$#&J%<M1AHD9CZ`WKAOGEDMS
-M?.J.VSSPP\N[+]FXGL.'C_'=)GUB?G;P:P:!O\P8(`R\7P%`.$/$XR-Y)L<+
-MY)HSM+9FR&23@9S?KWB\YN-9AE``&*C)7()!S<R[._4L@7.)"SPUM![?WU<K
-M%N-C>28FB@&@MJT9Y>9+LOS^IS_A!>=22N\W`!0!+,MBZ9)>+E@RH-5[=O!]
-M/$)!X%RD40*$P0X#'R8%0"%?8J90(I5.T)Q+TY1+DTB:_F".YM:]6`#_TUO_
-MJ5D`O3YQHL='M4R_7ZREA#H1-.")T7I55BR6F9PHD9\N>NOWE5RW>H@/;\IR
-M[SUW!C(SI0"52B5`@*9,DN:T'P0T`GXX&$SHVM6H-$*`".A&'!F"_LAP$WTA
-M!%;59G*RR.1DD70Z03:;(I--DDR9'@GT>D>__A4:"G:*:HM.@D`'.B=5D;"J
-M+!I^AXZQX[1.G2%5+H*`DIEFO+F7B9;%#':NH&0V>02H5&T*^1+YZ1*5<M4A
-MK`$&_I=J/[3B##=N3/&'G_ET)"V74E(JE2($.'EFE-/CT6O#^W73P/ED`>H!
-M\>5!$S,;\`[F\59!`5JMVDQ-%YF>+F(F#-+I)*ET@E0J@6D:7KJGIWVZ*]#K
-M%B=!I9"!,BDE0MJL//PR5^[^GW2-'*)="!972[172Z@7ZY>`<3/-2"+-*%`T
-M4QSI6L/S?1]D;_MZ2D8:\-_6*<%;)G?5LI-LNRC)?9^].W9,9FIJBE*I%'`!
-MP\/#'#D^R%NG_5?U-0)^V`W,ZR51M2R`*O?>T3>;%5`K=PRAW>\_6QCJ6SW^
-M]5)"J5BA5*HZ28,A2*1,DDF39,+YF10SH0^6^%9"UK$`8=.H#L\YL8N;G_SW
-M+"]-LZF<K__;>5;)V8`J,%AXB0^>WLU)87*P_7Q^O.(CO-VQ`5N9*0F_U7>,
-MZ]<;_/$?W4,RF8S496)B@IF9&4_K+<MB9&2$IY_?R5\_UX%E1X&8#7Q=/!<P
-M%PF/`S2F]?Z^(7S@]:'H@/8+X4;X0O/K;IDB!CCI8<7&JMH4\?7=3)@8AL`T
-MG9=0&H!P7S;I_!_#)5H\\,*VN>&%_\SF_4]P77F:N;Y(/P$L`994G>G;,T.O
-ML7E\/Z>,%#]:^2]XOO\Z-O8>9^M:^-Q]]Y),)B,XC(^/4R@4`F9_>'B8)Y[]
-M&7_[4@\#4[5?#EGO,Q($ZM%C(Q+0TA#XAE%;ZPT=W-@`40-<A+3?.W8L09@4
-M"+]NJDV6);$L$*+V+)H>5'IEMLW=S_PY5PV\P0>K,Y'1:@20<BO0:D!.0-J`
-MLH2BA"G;,0$`1><E!8N!FRIYBN19>^!;7-IU`./\Z_C\'W^>=#H=Z?^QL3$*
-MA4(@_1L>'N;QI[?SM5?Z&)Q.QK1E=O##<E9I8*S)#Q$@0H@ZP(?!]UU`B!!:
-MF5OD(5/+-<6)HPWA,OC(JU_EMP;?Y$/5T.(+`20%K#+APA1TF'XJXI@T?]\6
-M,%B%(V4X4(2*A*)-1L+PYDUD/W0-]W[^<V0RF8CO#H-O619#0T,\_O1VOKYS
-M&4/YVN]HGK,%.)LLP`-7(X!10^O]:^+)0(0,H>#0!2`<(.IU\O?#.WHHJ'66
-M7NIVT-HC+W+M^"X^9(=6W2:`=@.N34.+&04\3(*$@*5I6):!J]I@S()7IWBX
-M8R/O?G`K?_#%+WK@ZP08'1TEG\\'S/[@X""//?42#[QV+D/YVK_GU*@%B'4!
-M<Q,-9`/O1<QA"V#4`KTN&30+$"*&#GI`^\-NP-_1:ASJK'"9%&1+D]RV^V_8
-M]A?_%\;]]_OG3*#7A!LR8`IGYBJB]7%DT+9NDX>OO8IWNB[G[C_Z$[+9;&3@
-M1H&O1_L#`P/\^(D7^,[/SV.X4.?'O+2LI=YG6,[.!>C@!][278,`C0"OF?_`
-M_ZH!>#@><(O1#L.U]WM+]9W+AH^^]&4^_'_^2Y)#0\%;F@1<GW6T6AB02$)[
-M%^1:()N#9-)9SFY+J%:A4H)B`?+34"V#$#Q<6<N!KLNYZ[-_3%-34UWP%0$&
-M!@9X]/'G>/#MM8R5LJBU#K7`;`1\]7\C+F`NXIAV8E_/'C7Y,7%"@!!1X'5M
-M;R@KT-3?N5:K:ZSQ#Y9))(N&W^&2Y`B=7_P"W'JK?S(MX)J,X_N3:5BR'+I[
-MP=#\OYI[]C;\LG*1AP]G.="ZED_?>[\'OOX6CY&1D8C/'Q@8X$<_>9H?'MG(
-M>*4)X2ZK<UX97QLS'73+LCAUZI3WYI#FYF9:6UOI[^_W<)R7"]!]OQ'Q_S4`
-M#Q.B#AE4Y;QCS2W@DL]S!T(#66C0AJQ!/9$(/OK\7['USS[C%.S?[Y]L$K`D
-M`2UML'(M)%/U37V(#`\/+&)_=CF?NN>SGMG7W^0Q,C(2,?MGSISAV8<>HO.1
-MQ^CODXSU7NE\_<U;11U/`AW\2J7"WKU[6;-F#==<<PV93(;!P4'>>.,-=NW:
-MY=TS+Q?@7&\'P8]Q`2)L%4)`*\(X>(6NT<IT[0^`'K($83*XI^J#+V'9Z9^S
-M?.H,33??#)4*G#CAG#0%O"_I@+_Z0C!-W]='M#Y*A(>/Y=@O^[GCKC_P?L-7
-M`11G]I7F/_O00]SX]),TE2=I>ON_T9L_SI,K/Q%#@NC@E@+_]==?YXHKKF#M
-MVK7>N;Z^/GI[>]F]>S='CQ[U+8`"8&XR._C!^"`<+\3$`3'`&[H5B,L*%!'"
-M;D"O:9VV22FY[I6O<LWR7NCL=`A0<+]YDP)69!W--Q,UP#8"H'N:?[2)MZU^
-M/OGI>VAJ:@IHO6W;L='^P,``S__T1]RX^TDZ1X<@E65KLR1YXB=DJM,\>OYG
-M'!((_X4:>CPCI:1<+K-[]VZNO/+*`/@ZR=:M6\?)DR?)9#)GL1[`]$$/F_O@
-MS[6$`L-Z!`CL^V5!%Z`1)"8K"!(@GA!^AT'WZ!&6C1ZA<_,6)X";T7)_"9RW
-M'%+I*-AUMH>/-K'/6L8G[KR;;#:+Y;Y'21&@5K3_XI,_X4;Q&IU7M4"V#'O'
-M,;,YKFE-DQA\B4QUAN^O^QR6(<".MJM<+K-CQPZV;-G"NG7K/%*$)Y$LRV+E
-MRI4,#@Z>C0N0$?##XP+>;_I$7$#M0-"(`UYIOQ$%/4R$`!GTLC@"`!_8_6TN
-M+TY`;Z^C_4EMA$T(6+8T"+PQN^;OJRSE8W=\.@`^.)H?-\(W.#C(2\_\E!LS
-M^^BT2L[S+N^!SC2\,(#1U,R5;6G,L=U4]_TW?KCVCP+?J@*8*138OGT[6[=N
-M]<#7^T*M)U!;+I=S?CZN8=1#XIOJ*/A&H"SD]VNDAC6!USYK@1Z7&2C\:E-`
-MDJB6.._PRRR7$G(YAP``K:TP.0EITTGY:IG\4/G#1[+\HKR$VSYY)YE,AFK5
-M&0]6@=_8V%AD8F=H:(CMSS_%3?UC=*87PU@")D:=9Y[?`4D3GCZ%:&[A_>U9
-MRB,_(W^HC9^N_*3'NU*QP`\>_1X?VK*%"RZX(()5M5J-$&!Z>MKY0>GYN``E
-M$=]?`_SH_$`X$Q`-K1>(9`8:X'&6P"-''`>D8/4[S[*J6G:*;=LGP*)%#@$2
-M<0,^\<=/G,BPM]3';9_X/=+I=,#LJ^'=F9F9@"D>&AKBE1>?X:9E8W1F`0PG
-MQ<QF8?B,8Z)6M3GU>.($1FL[5W4U43WY&%.I=EY>=B.Y1(6G'OT.VVZXEO7K
-MUT<L>;E<CL0:EF6Q?_]^IJ:FSN[W`GQ`8L"/"PQ#%J#1:6,%;,VL@!`I\!A1
-M.PT4<.FK_\B&<MXYGIIR8@"`_GXX=`@R)HQ,0D]'//"N.YBJ&#QU,LNG[ODX
-MJ53*`U\%?N$I7=NV&1H:8L=+SW'3\G$7?.5*@.8V2*1A^!14+5C1#EN`%TZ3
-M:&OGYL7MM!U^D/&.Y6S>7.6Z:V]1OP@>2`W+Y3+CX^.1I61OOOFFM\#DK%X2
-MY8%8%_P:@:$6*]0.!+68(D"XD#M09M]S_4+;CY=T<9+.B5.TJ()3IWP+L'8M
-MO/0BY%)P9`P6=:K&QA+AP)C!LOYS2"025-QG*`),3DY2+!8#VC<\/,RNEU_@
-MIG,F-/"]7G4^LEGH.P<&3B*L"JT;>V@'VE\9(M'30_LY&8ZL/<9'/O8';-RX
-M$2'\<0$A!*52B;&QL<ABTM=??QTI)4N6+.'X\>/SS0*<>@8U>!;P`V,"HNX<
-M0CSP(?.O@:X`#\0`NN6/:>/*=YYC=47[^=L3)QP""`$77^SF60*.3<#EAA;\
-MA<V_054*$LD4Q6+1F]J54GK@A^?S=__L)6XZ=Y+.C-)6K_+^H1"TMC?3T;>.
-M]K'3F%89;FB&O,7TP1F^?MV-W/+I3W/999<@A/]N)2DEQ6*1T='1P/^U;9O7
-M7GN-?#[/K;?>RIX]>Q#B+%\2Y?GX&N#'906!(#`N@ZAK$713']5^WS)X-0P=
-M^[+AM1_ROHJ6\AT^!&5GW)X+UD$R`=,6O#L>'_EK^TM:!3_>?YQBL4BI5,(P
-M#(K%(N5R.:!]HZ.C&O@JC_/!-X2@-9>FHR5-6R[M_SI8:PY.'H)*A>E;UO*?
-MWNQEZ^_=R:6;-WO@`P'PPYJ_>_=N"H4"%UUT46#9V9S7!/H^)JR]4<U7(-?*
-M"L(6)$B6.IH?`EW$!(!ZF\+M,ZPJ[:/':/4*A)/_O_VV`WXZ`^>MAH/O@EV%
-M8@6:,D'P-5+TMPF,RC1'CQZEM[<W$G"I(-`!?XK.K`0<`AE"T-:<IJ,E0VLN
-MC6GHI'`;F4K!LI5,'SG*EX_VL?53MW/9^]\?`!]@9F8F`+XBP*Y=N\CG\UQZ
-MZ:4A]SG'7PX-@`^!WP`.1OMU8@,C;`E"ORTL!*;A!*;Z[P2+4)EA^L?^,PQ,
-MT]F<Y6#^OK[UG-I+CQI!,PQ_>^-UJ%0=5[!YLP-R=PYV'ZD)OBK_S$:+G=N?
-M9V!@@$JE0J52H5JM!L%?X8!O&"8=K1E6+FGGHM6+6+FDG8YY[=-!```3E$E$
-M0536K/OM*/5\;=\03)/FRX?ZV7++Q[ET\^4>^&K+Y_,,#0UY_UMM.W;L8')R
-MT@,_=DG87,!W/E6P$;<%W4$D-HBS`&&M#X\5Q+D!@N?4L:I7/?._<O]SG%\8
-M=X$7/@&V;X=;?]>YZ>JKX7O?A8J`UP;AFG4UP4<8+&T5W'=)E:^^]`S=BY?0
-MW;L4PS`8&QWFY)&#_,YY><[IRM#1DJ8UE_;-<,@-A&,!$$R7)%]^=H9KMGV4
-MRS3P%28S,S.,C(Q$HOT=.W90*!2XXHHK//#U?H(&78`.OK_46@:#N)@M$AO4
-M`%^?&6QDVAC4&T;B78!R%UI7:IT-RP^\2)\00?`-`P[LAX$SL'@QK%CII(.G
-M3T,Z!6<F8&EG%'PM,UC5;?(7U\/.$V?8>VJ0B@WK.B1_N"U-+I7U[PD`+@)U
-M"W].ER1??J;(U==_A$LOB_?YP\/#$9__RBNO4"@4N/KJJP/@1Y:%ST:`*/AZ
-M?X;-OP]XF!RS@1^WO"S.`JA[=?#]P!`_*%3]&TH$!9*FZ1$R8?`-U]=6J\XF
-M!-SPV_#M!Z`Y!=N/P<>[:H#OEZ42@BM7.%O`-"I0/0+,3@('_!FNO.[#7'+I
-M90@AL"SU<DX9T'R=`-NW;V=F9H8M6[;$@J\3H.XW/./`]QZBP-(!JY$6QH&O
-M_'W$SPN]W/??RI_'Q0U^7&'XQ^[]P@A>VSIZC!81`[YAP/4W0%N;3X*M6R&3
-M@1,S<+($T\6ZX-?=#,._-LZ-A)XW788O/U7@B@_=R"677.9IO@(ZG\\S.#A(
-MN5P.^/SGGWJ*\=.GZX*O2\T@L![X84)'VAIUD1'P8P-#(0*DTDD0`-X,@1\A
-M@G"^"Z`'C.[6<>H7+*O,:,"[G9]M@FW;P+)\`J33L&6+T]A<`IXZ$@*N#OA&
-MC7)A$`^\>\Y0X.?YP);?]L`/C^,/#@YZH"L2O/SLLTSMV<WB'SU:$WP=SYI!
-M8%W-QS,`?/'6E:B4+)BFA<PSFJ_6K@\?^Y91>Y:R-C4'>_1]14Z!5H3N!<2.
-M_?1:14@D@E;@_9?[+D`'[,.WP(O/P^$)2&1A>!H6M<VB\?JB$4U3"%WG5=B_
-M;KHD^=(3TWS@@]NX>-,E`(%YA;A4S[(L=K[X`C-OOL&'CQS@Q5,GR1\^3-.Y
-MY]8$7XGW\_&-@A_P(U[GQX"O]?S9@2^"9?J]ZO^Y<P?!969NOX;<DGGH;5H,
-M,PB^:<!55X%5A6K%(<'DA'/<W@Y;MCI?Y*N4X;F3,2:NAG8'RHR0MFOGW.=-
-MER5?^ND4EU]S`QLOWN1I?K5:]31_:&@H8O9_]O*+S!Q]BQM>?@YA"%9UM7'B
-M&U^O"W[L.,!<P/?P]8!3F\]LW0*H,W,!7P<S%O@(*?3C\'7.)D\?H]G4?+$A
-MX)QSH:W=-?\6'#L"?_D7SLJ@:A5^^R9HRL*)*6=X^/63M;6^EK;'D42+!:;+
-MDB\]/L7FJZYCX\:+`6<:5VW3T],,#P]'\_R?;:<T=)`;SIU`3.?!MNGKZ>3,
-MSEU4IZ;JXAD;!,X&?M`"!`$GU&[_'\6`2*B?"(,6U7I!//#Q@(>)X#*^6,!4
-M6J\LP/KUKO97H5R"[WP;QL;@QX\ZI&ANAEL^XEQ[:`3VS00#PKEL@0#0(<),
-M!;[T^`277KF5]1LN0DK9$/B[=KQ">>P8-UQ@(A(FO/\<F)S&,`UZVW(,//%$
-M73<.(1?0,/B^4D<U5KL@'`\$B.-ILZ_Y==V`3@C"P,>!CN<:O$U*A%6-!FBK
-M5SO@6U5X^248&G*N>>D%.'G"(<'56V#)4IBI0F4&GCU%X&6%NN;7U/XX0AA\
-M9\<T[]NPF0LOW.`MX5+;]/0T(R,C$?!?W?DSRN/'N&&=@4@D(-<*%R^#J4DP
-M3/HZ6QG]Z>.U8SBW3P*S@8V`KY^;+%11OC>BK6K?(`28!KRZ!OS!GI"_#Q+,
-MH8]Z?9QBE2(?ZJO@&MD"7P";&J/#<%?V*NWO7>2D>M4J%(OPPG-^9B`E_,.W
-MX?-_"MD,W'X'_.U_A8/CT-$*+Q^%JU;XH-<U^Z!5W#MG(_CY\2*?_?`E'OA*
-M$4NE$A,3$]$IW==>I3IYPM%\U;A<,W05W"EM24=[*V_L>1MK9@;#?<-8&+]`
-M%C`7\"_;L)I,*L'241F,P'50O%X/:;]V0[!<A*Y1'17"4Y$D4A8GP1/%HX.<
-M21K.Z\:4_U_6[X!O&+!KA].!^OC`P!EX[$=PRT=A^7*X]GIXYBG8>QHNZH<#
-M@[!F<1TMKY$JNG4K522I9))*I8)IFMXZ@E*IQ-345&20YXT]N[&F3G'#!8E`
-M_V$F'"*?UPW3!41'*QWM+8SMW$G7U5<'\-,E,!+8"/A22B0F&`DZFO4'!H$.
-M`NF"$2D+`A^Z-`2JJ%$>O<^K3^BT+$Z35N`J8+J['=,_4W4F@_0`35W[LY?A
-M_/-AW86P]7IX]QTX=0+>'7+(U#8.2[L:!]\C@""3$A1+)0J%`M5J%<,PJ%0J
-ML<NX]O[\=:SI4]QP82+2CP!D<K"JFZ;71^G(94EWM7'\G0-P]=6UAX+C^K$>
-M^`"M329@TY&-3S,:)1(0>-5:H\^R9WMFC6<5IX9P?NK<!=@TH+/#B?S?.>!J
-MOP@&B(9+O.\_"'_8`[V+X1._!U_[&R=+&)F`%R1<FX+>V<8'H@000K!^>8X#
-M^]]FY:KS(AJOQ@#V_OQU1_,O3,:"G\NF:%_40L?&Y:1?'X)<EF1W!X???#,6
-M?"6&$&*R7"Y'K$"CGV<%_C_!LZJ6Y6MW(@%-.2?(>W>_7^X%:)H5J)3A'[[E
-M!%FM;4X\D$S`R`SD9^")8S`UO\S@ULO;>/VU79%(7TTGUP(_ETVQK+>=]:O[
-M6+-B$8M[VDBO7@*3>3!-.KK:*!X[%NF?I.MRA!#3AA#B5#Z?_[4%;+9[3_SW
-M_\[)?_B'QI^%!G)3#FP+QD=A>#@X+Z!;`46&B7'XP8-.JGC.N7#CS<[YP8+C
-M1G[P-HSG&P->(UIW:Y(_NJ&'%YY]DK?W[:-0*'A!X)[=NZ@J\`UHSJ7I[^M@
-M_?E+6+.RE][N%E(I[5M+;2U0+(-A8"23X))(]8-IFJ33:?+Y/$*(4PG@X/#P
-M\!H`PS`"LTV_[N"//?\\DW_S-U0OO92^VV^?]5EF<[/SK1H%:%.38_Y/G-"`
-MCAFQT\EPXBC\X+MPVR=@TV50G(&7GH.!&5B4A7_\!?R+M=#;7C\P!#\@$H+S
-MES3Q?]^^C(=W'N?E%]ZF6+9()0TN6I[@`Y>TTM&2I;TE0S)I4C,*DH`T_#J[
-M@,MRV?O"2T='!T((AH>'`=Y-""$>G9J:NFEH:(BNKJ[_9<"O3DPP^A_^`U<,
-M#_.,TYA9GY7LZ2%?J3KO\Q'"F>RQ+#ASRL\*=)`B92Y!CAR$'SX(MWX<KKS&
-MB2MVO`PC9>?;/-_>`Q]=`ZN7NF#5`E\%MLYG6U."3VU9Y)[W_L1%SM0484(J
-MZ7R154J2V0S6Q`1F=S=22A8O7LS(R`B3DY,8AO%CPS3-AX40U7W[]J%_/^#7
-M&7R`@U_X`IOV[2,-5-T7.LSV+)%,8AL:N`G#&?L?'X_Z??4FD/"<@3I_^!`\
-M\GTHE>#JK;#Y`\[Y*<MY:<2#>^'E_<&@+P"H#KZ^Z>?K!)!QFQ!P9`!:F[WZ
-M5LL5C%P.*24='1UT=G;RUEMO(82PJM7J#XW[[[__C!#B&WOW[F5L;(Q$(A'I
-MN%\W\(>?>X[FG3O)5:N8@)R>;OA9(IW!%K@IFNGX=?4+E8'(/QP,:AHL7((<
-M.00/?L<)##]X+;S_2C=@!-HZX-E#\/5GHC.,*"YHH"-J`Z](T\BV]QATMGEN
-MRZI4(),AF4RR>O5JQL?'V;MW+\#_^.(7OWC:`+!M^\^EE)-//_TTEF4%WEGW
-MZP:^E!)9+F.H;_$`AFUC:]_#J_>L[*I5C%74<#`.`>+F[B,KAG1+H)T;/`/_
-M^/<P-`!7?A"VW>SX6TM`2P],6O!G#\*1,PKU$-`Z^(0^0UK?"`&>^06L[`?3
-M0`H#:9J8ILD%%UQ`,IGDJ:>>0DHY:5G6GP/.9-"?_,F?#$DI[QP8&+">?/))
-M`-+IX`N)?EW`!T@O6<)TRG]56J>43+[V6D//:KKR2@8M=RS`LB"?#P$>\OMZ
-MT.B=TZR#:4`A#]__?^'@`5A[(?SN)YVAV80)Z4Y8N1S^S</PC2?<GUM6ICX&
-M_+`[B"5!W+4"]AV'JNVL:C)-AH=&R*X^CXLOOIB6EA:>>>89!@8&+"GEG5_X
-MPA<&/`(`?.YSGWL$^-SAPX?E(X\\0K%8))O-1EY?^D\-OI22W/O>QZCT?@6`
-ME1,3G/G;OVWH62V;-S.@7O."A%(QF.J%5^MX+B'&.IC:M58%'G\$GG\*>GKA
-M]D_#TG[WNF;8?"D<&H<[_Q_8_@L"?EL'7^W/94))W?<?'X+++W("0,/@U.DA
-MSKO]DQB&P2.//,*[[[XK@7_I8@TX+T#SY"<_^<FK-]]\\]ZIJ:D;]^_?GS(,
-M@T6+%I%.^\N8PZ\QG^W36<9E>`&F.@Z7U_L,7V<F$DSMVD7VX$%:@%;#X)W1
-M4=)KU]*T:E7D7M,TO<]45Q>'O_I5UF33B'3:&>#Q8@`13/G,L.D/EXGH=<.#
-M<.B`,TYPV6\YX_.#IQQ`.WJ@?S$\\2H\]AHL[X3%G37`1R.(IO6UB/&7/P"1
-M@/X5'DEW[]A+\HX[>6;'#L;'QZ>%$'?>?__]_T/'7!`C7_G*5\XW#.-+P"V9
-M3(;ERY>S?/ER6EM;:6IJ(I6J_:;*7Y6,O?$&;V[;QO43XY!(D#=-GLIDN>@;
-MWZ#OQAOKWKO[SCLYYY476-K7Z[@!J^II380`LQ$B'"NH:Q(FK-\$FW_+&2MX
-MX4D8/.U;FYD)V/.6$T_<?@5LW>AD)1&P(1@[$-RW;/BWWX5#@[#E&N=:*3EY
-M\!@OO3O`Z+V?!7@4^-_NN^\^[>U7[F/J==37OO:URZ64OR^EO`E8VA`ROT)I
-M_>N_YO)WWV%5PG1(8`B>L213O8LI7'45=G>W,]P;$N/$"<YY[,=<MZP7IPMD
-M$.SPIV&X!!&USP>.75=B&LY@TV57P`4;X<01>/5EF!CSB5":@@/OPL%3L/D\
-MV+81+EGMOI`*8@-$<`:PGM@#7_TI7+@2UJUWRJ7S&T0/_?W#]M#O?NPA:^W:
-M+]UWWWT_J]6'=0F@1$HI_N[O_FZU95E+@*52REQ#"/V219PYD^OXR__XKZ]+
-MF&V=Z90#=L+D5+7*T7*U-&E;54N"-Q>OS2CF\X6F#Z\^1V23B:CV!SY-1TM-
-M?1VA?BRB1`A;!R&@JPLV7`:KU\+1@_#SW2X1%,`21@?@T#$X.@`=.5C=!_W=
-MT-WLU*-8@>%)>.LX[#L)%YP+&RZ`K/J2NP1;LO/Q%XM'?G'P^Q_/S]PY:Q_^
-M<J#YU<G?PX:,$$]=W=;<O;@I*S!-Y[4JINF8X43"WS==338-#@V-,C`TQ@?Z
-M^X(`1TA@1D&/Q`(QY_4!)W6M$,[\PYH+X<)-,%.`=]Z"PP<<-Z0"3P&4BS`]
-M"5/3SMQ#J>RL6F[*.E/8N78?/15,2\D[N_967WOJE0,3Q=)EGX7";/WWOSP!
-M`+X#*TTAGN[/9;HO[FQOSJ93SDQ=0B.":7K@8YI(P^#QG6_R_J6]=#0WU08^
-MCARU]F-)H1VKM%&XS^SIA>4K8>FY3D.&3L.9$S`VY("N`FYE^@WA@ZV+!&S)
-MGB>W%PZ\^M;^Z<+,M7\`HXWTW6\$`0">A<1IP_B\`7_6DDXE>EN:LLVI5,9(
-M:.!YJ9WS.5DH,C@XPK8U*YQU=35)4`/HP'4U@D&]7+<$@7/">0-I9S>T=T)[
-MMU-6FG&&F@O3SO[TI#-TK8N4Y">F>/$[/YZ8&AE[@OS,[WT,&OZQX=\8`BB1
-M(+X%EPFXR#2,<X6!&Z\8L=<;L'5E5]N:RU8L2_@6(L;W-^H:PO%!+?##A/3,
-MOR`X[@"!`2"]K;;-_NU[2F\^^<IDM53^S!V6]?!<^^LWC@!SE0<A92<2VS<N
-M[]OPOB4]*8\$NF;'^7[3B)*CIDNH81UTEQ#>5T0(I(7NIX1C/]\O7WWHF;%J
-MJ?1@H5#\/^Z&\?FT_Y\]`0`>A#:93+Q\8?_B5>N6]Z6C)*@!?$3[:P2(<?&"
-M`CSL$B(6P-^D;7-DSS[KC<=>&*\42R\5I@I_>A<</)NV+Q#`E6]!+IU,_*2O
-MH^WB#ZP[KR612@1),)OVUPP075<2FR;J+D%`^!M#;D8P,S'-@>U[\N^\\OJ,
-M7;4>K>8+_^8../I>M'N!`)I($-]-)/Z5F1!_>NG[5K2>NW2Q&0MXG&O0M3_.
-M0M0=,]!21I<4E4J%$WO?M0]LWSTR.3`Z7BV6_TNB4OG.QV#BO6SS`@%BY-O0
-METFGOI).);=L6K>JHZ^W&T.-+31"@D8R"!U\%_3\Q!2G#ARM'MJU=W1R8*0H
-MI?U@*3_S]Y^"O;^LMBX0H(Y\&R[*9%+_RK;E=>?T]R97K>AO[NKN<+Z'%VL9
-MZ@2/(=,OA6!B9)S1DX/VJ7>.C`X>.FY+R;'R3.G_JY;+#WT*]OTJVKA`@`;D
-M0<B63//6IG3R3LN6&[+9=')QWZ)T>V=K2U-SCEQK,YF6)H1A8"03)-(IJK:D
-M7*E0+E<H5ZKDI_),C(Q-3PR-%2:&QB@72V5AB+?+,^5GJN7RBQG8.9?\_;V2
-M!0+,0[X)BTVX+)$P5B=3J;6&(59*1`^`M&462`K#F,%@`F=$;J12K.RKELN_
-CL.%0%@Y]#*;_21OARO\/`@Q9S<[?68P`````245.1*Y"8((`
-`
-end
diff --git a/debian/_base/core/tdebase/debian/img/cr16-app-energy_star.png.uu b/debian/_base/core/tdebase/debian/img/cr16-app-energy_star.png.uu
deleted file mode 100644
index 174f00947..000000000
--- a/debian/_base/core/tdebase/debian/img/cr16-app-energy_star.png.uu
+++ /dev/null
@@ -1,21 +0,0 @@
-begin 644 cr16-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CL,>&[K>0```KM)1$%4.(VEDSUHG64`A9_W
-MY_N[W[TW]]+$$A.31K&-UJ:5"`Z"(!V=Q"Y.P460$L'%01$W=SN(.KDX%!<1
-MJRY"Q4$:+7H+QE+2>IN6VG)S\_?U^__>]W4(U-&"!\YX#N?`.?`_(5975Z>6
-MEY??ZO?[O8<16&L!&(_'NX/!X!P;&QO7W4/"6NNLM<X8X^JZ=NOKZW^)-$V+
-MBY=O!9]=V,1$'<+0(P@]PL##\Q7&.JJRIBP:BJ*B*&ITE?+!RA(+A[U*`VSO
-MEUS;BYAN=U!12-`)47&`\A7".)J\PJB2PA8D><[=44-6@3'&:2$$4DJ$%)1E
-MC9<KI!188U%:X9RC*AORK*+(*\JJ06E!FF:DJ3`:0$K)O;O[A*&'$`)K'55E
-M4$K@'-2UH2SJ!R;;XPQK#<8(M!#"22D9CQ)PCIG9/DUC\`J%E!+G'*:QE%5S
-MD""YS\NG6EAK<4[R;P4AR+**V[>VB>.0,/+0GF(BW^6-7S]AVF[QS:$7./OY
-M.UP?WJ$Q!I!(*:532M+IA'2[$9UN1-CR\#R%%/#^[G>\_N*?O/1FG_<^/D.Z
-M?HEW/_P)3SJ44IX60J"5(FX'Q.V`J.43A`<&O73,Z7H()Y_AZORKC&X,F=CX
-MBB^.5,P]N\+-FT-Y4$$)CBU,$+=\HCAXL('G?OZ!X)%)2'9X-/^=6>7PEY?8
-M?^4,5[[]FOZ)4Z6VUKK);LC*Z1E\3Z-]A=82I27S@QVX,X;M&::.YG!HDK7R
-M.*-?+O+8']]CCSV-3I+D]HG'NT>?FFMHF@.6E]=HQF/\*0]^^QO*^]!:A),I
-M"_VK'']"$3?S#+:V[JG%Q<7S4LHJS_,K29*L95FVEF?9P#OW49QNWMCOE7E/
-MM2-!Y2!M$;L:?Z]@="T=_B@[SXO_>M_FTI.O]6:GW]:')X_8B?:."8-+>SN[
-<%^8^_?(\P#\DY761`2R&E`````!)14Y$KD)@@@``
-`
-end
diff --git a/debian/_base/core/tdebase/debian/img/cr32-app-energy_star.png.uu b/debian/_base/core/tdebase/debian/img/cr32-app-energy_star.png.uu
deleted file mode 100644
index 77c6322f4..000000000
--- a/debian/_base/core/tdebase/debian/img/cr32-app-energy_star.png.uu
+++ /dev/null
@@ -1,48 +0,0 @@
-begin 644 cr32-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CL;^[UNO@``!W9)1$%46(7MEUMH'-<=QG_G
-M,KLCK;2R;BM'DNW*L7R1&LM)(6EJNTG;AY)`Z4.@.(&Z-DTI%!L$@4*A#VEH
-M"Z6!4DJ<EX9":*&%/ABGD-(\)*5N3>WZ(ODB2W+DM:V+94FVM*O5[FCFG-.'
-MF5U);EY*3?O2`\.<96?F^\[W??__X<#_Q_]X"(!CQXZ]U-?7]_WN[NY6(<0C
-M^;"UMC9WSM7NSCEF9F86KEZ]^J,3)T[\7@\.#KYZ_/CQG_?T]-0_*O#UH)]$
-M(@S#+?E\_EW/\YK5X.#@R0,'#K3]-\`!A!!(*6EL;/26EY?WZ6W;MF6JX+\^
-M=8[9N26,A<`IA!`(07+?.(\_!LZ!BU&PSL:_$ZF=`V?C>UH9E("!W5OXXF=W
-MH+6FJZNK42NE:NS.#$_S]@<!?4]TD^O(XOL>:=\CG=:DTYI4.IY[*87G*804
-M6..((D.X:@B"D""(""H1JT%()8@(*B%!$#)_;YGQT1E^^=W'L=;BG$,I);24
-M<H,\;;DLV:R/M0YK'<98C+%$QJ(B0RCCU5OK$$+@DF?"T!!%%A-9K+48Z[#&
-MUKZ3:4C3W-J`<ZY&0`C!!@)22II;ZC$F?KD*;B)+)"U"F!JXBF(KG'.8J@JA
-M(8K6B!AC8Q(F!FUJJ@/`&%/#^Q<"6BJ,358=&:042"$0R<J=<VACD5+6,F!M
-MK%`4QB2J1*K*51<BI<`8P^+B(L:83U:@7%DEY6LB:9$R?J@&;AW62HR2""D0
-MQ`&LVA!%,8DJD2@TF&B-3!`8K'5$482U-B:@E*K5GQ""A?DBF4P:*==27P-W
-M#F4D2LG:?\ZYF(!UL571F@KQE5@869:+Y<1"NT;@804*2Q4>W%^FI:UQ0QW'
-MX7$H)1-R@JH$<0YLLCJST8KD'E1"BDL5P&TDL+X,JV2FIY8PQM'>D4T(Q,$S
-MD44F!*1<:US5I%>#&ZM0S41$$(3<FUG").VY2@!`K^^`50+..>[.++%<J+"Y
-MLXF&;!W&2I24*!5G0HAU&:C:8%R-@(GBTBP4RNQJJ?#;-P<X>V6F5H;6QD'6
-MK!OKR6BMB(QE9F:)S&*93&,=F08/+^4A50Q>+0/GP"L7&9CX"YE*B3N9#LYE
-M^WFPM,J^KI!3/WD13PNT"SCWL<%:U@@\G`$I!=J+.YW6"JTE2$&YLLIJ&**D
-M0'D*I135&#Q]\R.^=^8M^OQY:%&X`,:*39PZ^`I'?_P#M(+K8Q.\_JMKO/A<
-M_T8+I)2UG4)I12JUUFJU5FA/H91,+E&K?Q*U<H5)?ECZD&V=]^&KW9#=A'`6
-MGVT<.?H:2CF&AR[S^KLW^.,5S0N?CRVH5"JD4JF-%GA:D4IKO$0!STL(:(E6
-M:HV`7+-KL'"!;8T*#NZ!W=M!:?*B&[G_.X1*,S9\B;E?_)2NR_7HKD-)5@Q[
-M]^[EVK5K]1LLJ"G@J5B%E,;3$JUC$DK)N`J2G=$/BAP,IZ"U$7;4@Y<B[SHH
-M[3U,R@C&K@Q3'#[%UNT/^/;'EXAF?79NWL'`P`"%0H$P#.5#&1!X7J)"2I'R
-M--J+<^`E5LA:'X`#E_]$;G8,GML/=X=A9Y:IU1SIT'+S^C56QS^@M[%`<U<_
-MFSZ5XS4SP*YG^IB?GV=\?!RE5+EF@7,.*43-_S4E=)*'1(EUC:A_;A3&Q^!;
-MK\+P:>COX0DUS9E+?Z!9EMBW4Y"I?PPG)%?:#M+S[$O,SLXR.C*"U)K.SDZC
-MJ^W46DLZK7FVKZ56!5X20NTIM))(+9%2HF0<PKYB'OK[84LWG,U!8,AN4GRY
-M:1&4!I7!"<FEE1UT/?4"4U-33)P]37A^B-RA5^*-;7UGJDLI#GRZ&:WENN17
-MO1<H&6]"U2[8LEJ`)[\$;[\%^_?#Y;_"%UIB<*U!:?YQOX/6_N>9G)PD/SK$
-MIML?XE^^B?W:H9C`^L[TY*X<*Z$$(39L1G'J01`7OA`.&U3(K*Y`>05NC$)#
-M'6S9`5=GX*D>T!YHS<(*E"<GF<Y?I\.,T-770>9\GAMW[F"S6:<7%A9*[>WM
-M+=9:^K8V8(S9T"ZM-;7YZL6+E(:'R;S\,DX[HN8FN',;TBG(3T![&\RVP/!M
-M>'H7*,WGMA2Y,/DW/I,+Z-G<B582MK8Q,3-->?OVHAP:&GHCBJ)2O*,]#+[Q
-M,N^]AS\Z6GO&='3`TH.80,J#L1$(#"QTP/O#L+A"ML'C^;X4O5N;T.D4+`=$
-MD22W9T]E9&3D#77RY,D+O;V]UX(@V!F&850L%@O%8K&PO+Q<*)5*A5*I5"B7
-MRX5RN5P(C`F:WGG'7R@L%BNW;ZV8?%ZTK10UZ134I<%/0Z4$2D)N-XQ/P^P<
-M+)=C#_/S<'&2B?M>Z4RV]?"1HT=_\V\?!LYE_,.;FS=]PVMJ>*PLA-^JQ=;&
-MYDV*.A_JZZ#>ASH?_!2TYR";!1M!N0C.,3UVZ_S$T/@W#UZ\.@3)T>P_&1>Z
-M<E]_?&OGF]E<2X[Z.LC4Q6K4^^#[X*<Q`C<W>??*O5O3O[M]_J.??66:E>K[
-MC^0X].?V]M[-6UJ/-+0T/Z,R?H>LJ_>-IY:,5%.E<OGJW*VIT_O_?OE]D9QA
-8UH]_`NO&3=99UCY]`````$E%3D2N0F""
-`
-end
diff --git a/debian/_base/core/tdebase/debian/img/cr48-app-energy_star.png.uu b/debian/_base/core/tdebase/debian/img/cr48-app-energy_star.png.uu
deleted file mode 100644
index 0be925842..000000000
--- a/debian/_base/core/tdebase/debian/img/cr48-app-energy_star.png.uu
+++ /dev/null
@@ -1,81 +0,0 @@
-begin 644 cr48-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CLFH]4BKP``#3M)1$%4:('MF7N,7-5]QS_G
-M<>_,[,R^7_8^[%T;L`UU@(``EU@0`I22A$I])(@*E`8JE**@0A0E?U1J6A)5
-MZ1]5%;7_1)2V4+>-*B(@)+9I"R&$IX!B'L$8O+;7Z_'N>G=G=G9F]C'WG-,_
-M[F,>NQ@BT?!'<Z2K>^^Y>^_Y?G^_[^]Q=N#7X]?C__<0C3>WWGKK@._[.YUS
-M_L<%Z&Q#"+&VMK9V^*&''IJ-YS3`'7?<,9C+Y?YA]^[=-^[:M:O6UM9F/NK%
-MG7,?.!]?O]]<M5I51XX<\?KZ^O8O+2U]^?[[[Y\1M]UV6^_6K5M?N_WVVS>-
-MCHYJ*>5'C?T#QX<A!V"MI5JMDL_GS;Y]^TY/3DY>I/;LV?/7=]YYY]7;MV_7
-M0H@-/_1QC58\0@A\WZ>MK4T.#0VU'3ITJ%V/C8W=/#(RHC\.@!_6\JWWZ72:
-M@8$!O67+EB_J;#;;FTZGDX>UP/#,2T<^>K2-@#@[P(U&KBW%I;O'DOMT.DTV
-MF^W5M&2BQ?(*CQU\AI<G4P"(;!\JUX%6$J4D2D=G)=%:(I4,GVF)DA*I)5(*
-MI!0Q6HRU&&.QQF*,PP3AO3&6(+!8:PD"D\P'QF("BUTNHU86`/C&E_9L%.1B
-MPZ"=6?)X]FB&WKX<.T>&$)Y">AKM*;2G\#R%]B2>I_!T.*=U.!>3BPDX1P0P
-M!%4+#$'-$`266BV\KM4,1(>M&:@%N)HA4#D.YR7%0H79LH=S+@%OK44(P8:!
-M*Z5$:\76\=[D)><<-CY;B[,":QQ&.H0)/X8(+>ZL2^Y==!];UAH;OF="RUOK
-ML-;AK&M8B^08'NVFO+2<@&Z4G922#3T@I:2W/XN4$A<M8*T+%Y<"*P7&.(2T
-M"",0HIXQG'5(*1!2A'P<T?N1;`*+L74B-B;B7/)WC6M*(>CJSH4?BH#'1CPK
-M@8Z.3!UX]&%K!<:&%I<B(B)LHO70*@(A0@+QO(VL&^L^U'ITWV"<T"LN(11[
-M/9OS$_#6VH3$AA(2(@2@/=5$P$0RD5)@A2`0MA[^+@(:$9`-!)R+%XZ]$`>Q
-M20A98UN,5?>,LPZE%0"52H5:K1:]:\[N@:!F\;P0N(QD$P(0B;YC[K%%I`V!
-MAP%<-XQS+I%%XH7$$W$V,I&L&KT2D@YJ`0Y865G!&%-?3TJT4FI=Q9-24BFO
-MD$KK)MF$WFD(6.K!9B/MU_4?>0"'LQMXH8%$F$KCN8:XL`YC'6NK09.AFB3D
-M>=XZ#P@A*!2J='5G,1%@*<`(T50TDLQA'5()I)1)0(<V"=-2G(GB0*W7A"B]
-MMG@C)A+_7;F\NHY`$L1:K^\BI)0L5]<H%*KT]+2%P!N0N\CR6LO0^BJ4CY2N
-MA4"#EQH(Q)IO]H()"UA#7!AKJ:U9*BT$XD`^:PR`8?IT$4]+VCLS38!BW3CG
-M4`EXV42@,<!=2QRT>J&Q^K96X[DSI:8*W)B%-B009Z%8(B=/+C#B>NCHRK3B
-M1T86#;5OFR04?BM)WPTQX!)]6[,^'DP#D<)"A6IU+5FW$?P'5N($K'6<G)RG
-M:RG+YN$N/(\D/RLKD:HQ==H6_=?!AP!<74IQMC%V76:JU0SS9Y;XK0L<_5T=
-M[/MIZ?TE]$$$XE$L5%A>7J.W-T=W3QO:4[A$/B*I$4F*;<A"<9%+JK)S#;F_
-MGGD"8ZDLK;(PM\1=UVF^??<->)[FD]N?#;/9AY'01@2D%"@5SA4*%9:65NCL
-MS)#-I4AG="2=*'U&&:MQN!8"SCGDVC*!]+'&$1A#N;Q*J;A,I;S"O3?Z?/=K
-MGT,(*)5*7'9^/R\>7<5:O5Y"&_7B=0V+J+L4R+B=EN'U\O(:*ZLUM)+X:4TJ
-MY:&UQ/-U**?6+.0<>U_[#SXU\3.V+9P@Y2PEE6(JT\_+N7%^O/EJ%MJV\-7K
-MX*_N_2Q2"DJE$J52B4=_^@Z;QG;C7/#A)22E:.K]&]MDJ>H]OY0"9QRKRS76
-MI(#*&E*"0(*,*X'@*T]_ASN//46[-K!)0H\"48:E.6Y>>).OGGR"_5_Y4VZ[
-M]\^04C(_/T^A4.!??_PJW_V1XWOWB(TEU)AU8JM+&?9"C1L7I<+-BXKD%!.I
-M:[\A@S6E7/CBB4?XD]7#M&4-[$W#6!K2&9`:3(!#,M%^$[=\[1LH)9F9F0G!
-M/_X*?W/08R50D2<WJ,3KS`\HK=!:HI4*O1#MML)S@P?B\[H`KH_,2I&[/G<N
-M;4_FX=(47+D3^H=`:Y`*)^#)ZDXN^H-[$$)P^O1I"H4"S_[@A_SS2UL(:`-L
-M4G>JU2J^[]<K\48$M(YV6+&$M$JVC7%`Q]Z(>Y^$0$,,`?SN<P^RZ0_O!&7A
-MFIVP:12D`J5P4O'?U5V<?],?`X)\/D^Q6.2M)Q[FDH?_B:\O=O*]<^YB,CT"
-MA`$]/#S,R,@(JZNKE$HEY+I"!B@9R28BXFF)]L(Y+]I2>M'V,MQBZNA0^+[&
-M]Q6^KTAKQU5S;T!W-^0TC(^`TJ`U3FH.EG>P_=I;<<Z1S^>9G9WEC6?WLRMX
-M%?_:?C[57>#KQ_Z.OMH\K!48'1UE='0T`2^$"+O1UB&D2*P>QT+=&^L#6LEZ
-M"A4-->#"-PYPZ:EW0"GH[8"Y,HP.@%*\6>YB^#=_#V,L^7R>Q<5%)E[[&;O5
-M$?R^7LAE\-)I;CQX"L\]RMX+KV=H:(C5U57FYN:8GIZF6"QN("$1:EI'H'44
-M`W$\:"V1&\5#0J">0B\Y_@*^L_#>NS!\/DP587PS*(V0,#<WAU2:<KG,R5^\
-MP"?T>^0RFJ[V--WM`^1V#C,YN(VK/GTO8V.C5"H5SIPY0SZ?IU0JD4JEUJ?1
-MN$"H2$(Q^(2(5G5/-!&03=D(8-O<!'@:GGD&+KL<CCP22DAI?J.OQH'#3S`K
-M!K#5!:X=F&&PNY=<FP]"@A"<6.JD>L.7&-]Y$4M+2\S,S)#/YZE4*@P,#(0>
-M:(R!.,>**%!#\`U>\.K!W%P;9+@?:/!`;F&*'<63X'L0!'#--?#B8U!:@;Y.
-M4)H;QLH@ET%*D!WA64B0DA,EG^+0]8QO.Y]2J<3,S`R31]YA%<'PR$B]#K2"
-M=\[1W9'F]_?VH)2H@U3K):.40`A9WX4)D"+<3G;O?YQ-&.CJ@BNN`*U@VV7P
-MRC&XL3>,BR@;(55$(CR.+VKF>JYF;&P'BXN+H>6/O\?:0P_2?L&%N.'AI$'4
-M0H@F\,XZ4IYBZV`F_$^;$DT2:9)+D_:;6_&.M2+"UW#AA5!:A`?_$6Z_`Q[Z
-M6S@Q#^=L;B$A02I.EA13F<L9VW(NA4*!V=E9ID]-(DX]Q_C"!*<.&=SG;ZKW
-M0E+*I@8)YQ@?[N+X@DJVB5(*E)2AM&+@0B"40`H9>ETT=Z*9Y5)8K,:VPG\>
-M@&-'X;F?PZ77P9LOAC+J[UI'XHVY+.=<OIU"H<#<W!RSTU/H^?]A:[^#H0[T
-MR3G6BD54>WO22CCGG(B]T);1#/6W,S0@HW(=2BQV6=.]LR`L.!MM7**^WSD,
-MRZ%L,ADX_'88"S]_&O[H#C@]#"_/P/4Y\/P&$I*L7F%R\@3&6.9G\Z26WF);
-MGZ4CEZ5[SWE<L#3)\Z^_CK=W+T((IZO5ZKQSKB]ID`1L[4^OV_W46V*W[MG:
-M\>/,[]O'P#>_F3PKMWG0EH&IDR$QK4$*^.$/X`NWP'-/PW\=A4^?!UWMB0?V
-M[A`\^?8+%*H>@ZDE+M[=06='*&>P\/0T\LPTV6R68K$X+_/Y_+\%01"T[O@W
-MNGZ_9\%]]Y$]<:+IF4FG(96"V9DPE6H-G@?6P$\>A:L^`Z5../@V')])`EA*
-MQ;6[T]Q\A<=G/ME+3T\[2NOP^8DYZ.K`2<7@X&`P-37U[[)<+G_KP($#TU+*
-MH#4;?1CPSCE6EY;01X]B@R"98VR<&@[*42QX.I24UA#40A*?N!@Z=L%3Q^"Q
-ME\"8IE1:/R*)'9NGXFDV77*)>?[YYZ<KE<J?JX,'#RY?>>65_S(Q,;$+.-?S
-MO,!::X(@,$$0&&.,L=8:8XQQSAEKK7'.&>><`8P0PE0G)QD[<$!.S4S;S-Z]
-M-9U.&V_+%E-Y_#'9:0.!5B$!3X>QX'DAF5.3,#@(YUT,IQ;AE5_`Z7D8Z85,
-MJIY>'?#P"[":X>ABX%[=LGW_0K'XV;OOOGNNJ0P_\,`#_;5:;8<0(LTO,ZI5
-MM?O;]WWG8BTNF=;>PHJG5_$4U<IRU\6#O1E\#](^^'Y((.75KWT/,FG8<4$X
-MMS`#T^]!FP)?@@6J`:3[F)M9J+[\\MOW_/:K;WP_Z7Q^*:!G&4^!5NUM?]G3
-MGKU"^7X:SZ.&3>4L%XQO[DN1B@"G4W7@*;_NE=@S?7V0:P\_NKH,*Q6PCHE7
-MWGKOV*$CW[KVG8E]C>O^G_\L^617U^_L&!WX^Z'-?<.D4G7KMYY]KRXS3X?[
-M!2$X=7AB:NJM=W]T[-"[?W%+I3+3^OU?R>^J^]O;]PQMZKYO^_CPWFQ7IT_*
-M)SEB3Z1"#Q@IF3\]6YR?FGUE_N3IITX?/O[]+Y3+9][OV[_2'X9_TM-Y?7]?
-MS^=S7>UC*N5WR;2?12GEE)RO&5-<7EDY59PNO'[B\-%'O@SO"[IQ_"\KGJJI
-04E_IW0````!)14Y$KD)@@@``
-`
-end
diff --git a/debian/_base/core/tdebase/debian/img/cr64-app-energy_star.png.uu b/debian/_base/core/tdebase/debian/img/cr64-app-energy_star.png.uu
deleted file mode 100644
index 0691c9b78..000000000
--- a/debian/_base/core/tdebase/debian/img/cr64-app-energy_star.png.uu
+++ /dev/null
@@ -1,117 +0,0 @@
-begin 644 cr64-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```$````!`"`8```"J:7'>````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CLT4&Q3YP``$ZE)1$%4>)SMFGN,7-5]QS_G
-MG'MG9G=V]FWC]=K>M1V\`=N8APTQ)0T$8I,$"N)1$DB":5,2H@8I;:/^4:4B
-ME:I655,I2/FCJ"IITL0(DI`0'FF:$($;.8`Q:VSC]]I>K_<U.[.[L[/SON?T
-MC_N8.[.SWJ20!*D<Z?C<>^?ZGOO]_KZ_QSEWX;WV7GNOO=?>:_]_FPB?//C@
-M@VWE<OEN8#NP`HC\7M[JG6\E8!S8:]OV4X\]]MBL_T-`P`,//'!_=W?WUZ^\
-M\LJVC1LW.FUM;5)**1H][7?1C#&+7@O_UNA:_77'<<S<W)P^=NR8&AP<S$Q-
-M33W\^../_P=X!.S:M>LOMFS9\K7;;KO-]/;VBDCDW6OX1L0L=8\QAG*YS/S\
-M/,EDTKSPP@OBX,&#7W[\\<?_6>W:M6OSVK5K?W#OO?>*OKX^H93Z;;W[.]*$
-M6%J40HB@^^=**9J:FHC%8J*GIX?SY\_?U-?7][040OSE33?=9%:N7/G;?O>W
-MU8PQ0?]U[FETKS&&YN9F.CL[N?[ZZXT0XJ^LUM;6'>O6K5/O9LLO!GHI=UCL
-M]^;F9GIZ>E1[>_L.*Y%(7!2+Q=[V2_XVVF\*_$*!,]QLV\:R+.+Q^')+""$;
-M6?^Q)UYB>O0PQ4K5YPHZ0EE$:GQ+"'!/_6,!WB@(G>-?]X[]%_3^-08P!F]P
-MCPT8#!A?WN'SVDCOGT<I$5/EX/E;K]A(3V\?FRZN=7$/@[06"RH51_/<H3A[
-M3C8!$(O97'Y5'[$F&\M2*$MB28FR%)8EL2R)4M5SI<+7O%%)I))(CS@\L%IK
-MM#8X%8WC:"J..SH5MU<<QQW]WRN.>[S@W*&0+_/6X5&*!9>$AZPXGU_;VE`)
-M4DJDE+)A9`U'4:4DEVQ>B67)*O,A*U0MX)UK]YK6H>Z8*BC'!>-V)[CNWVMT
-MZ!G&8#3N&#R;D"I,S3LH6W'QP$4H)6OP-`J.0@AD/?!&!*Q:W4DT8H<`USTP
-M!-1H]Z7#X!U'XVC/JDX(=-C2NMK#I&E=):%F/N\]=`-"+$NQHJ>M"I[%LX,E
-M96,.?`*B48ONY8D%#]#:(*7W,A)DZ+IP#$(8!-H7&QB-D0(C31`7O+=;H!;'
-MT6A'>ZX1[AZY]9;7(15ZQQV=<9+)N<#-&J5$I91+P(5<H*,K7@O88UU*#ZPT
-M"*W1#D%`%`)P/.`>"<8(C!%H+1H3$%:2HW&TP0F[1.CWL(L$!JEQ1?>XM:VI
-M!G#]L1""18.@WYJ;HS6`I3886:L`(PQ:5BWOQO:J]0TZ`.\O+_QYZU_:E;U+
-M@':T%SN\&**K+E$37VK<HAHSFILBH3D6(2#\,N'F14AL2]4H0!N#T"Y0[8U"
-MN.#!@!.2/=JUL!(8+1#25T#M7&'I.IYU':T#,O1BL4'K6C74!4YIN1,YCD,^
-MGT=K3:52P7&<8.Y%%>"[@`X%$->_=2!SQ_'O,R"T]_^JL@?A65>@I4!H@72+
-M@[`'@#%HCX2J*VC7\O[HD^$TB`DA=PD'8HP[2Z52(9]WT-IW1Q,8V5)*77"!
-M42I6B$:LP-(ULA=NP'*Q2@0&*AJCO*"GA!<S7.D+`3I<&+&PT-%!"M55V7M9
-MI&KYA;U1G*A4JI8.@S?&#<122M<%+J2`[%R!>$LTD+WCC7A=".W>ZQ%A`MNZ
-M0<\H]UG&^-+WQIH@6%M/^-*N6E57ZPA?`8ZN<X?:M*F-H9`O>Z!KP=>D09^)
-MQ0B8G<G3O2P12%TX!L>3N(O#E[QT)_*M[\E>&I`"UP5$'0EX92^A0-@HR'E@
-M??".$[X>ZJ8V2^1RQ0!/?1H/%+!4'5"I.*12698M3X32G/2L7_5]%X3T)O,L
-M;H17)[C^'ZP=W`D"!OSZO[[0"?RY'KQ?0&D3(L/4D%$J5\CG2@')BU6"2]8!
-M8$@EL[2T1&F.1Q'XJ4Z[J=XO<CP%N`6&=`G0`E,'/@B`81?PB6A0$[A;6GJ!
-M$IRP`AR?I*IJ9E+SA&N?10GX=?8!C#&,#*?I6]M-+&;7%#D&4$9X(#R_-R"E
-M&_BJ`;"Z2JS#7U6!KJL)PC&@KDCR5>`&RMK,,)\MDLT6PP`:$A!D@48MO!8`
-MJ%0T9\],L7IU%\UQ?\_0S_6^G#W9^ZE/5TGPE\K51U8I\"U5$P1]-3A5WZ[*
-MW-2"=ZJILI`O,S4Y5VO`!@KPX\"B=8!?"'GF=DDH:\Z<F6+%16UT=L>K18YQ
-MJSWERUX1*GS">W2-BZ[JNK[!@F=!RJM&_S!XQ]'D\T4FQC-82E.JB`5S-'2!
-M7V>3L>9!VC`V-D,FDZ=G50>QF!58W'BR-\:@157Z->"]Z<*E<*,XX+O`@F5U
-M*"WZ0=%Q-+,S.:S*'/_RZ00;+U[!B;-IOO[C&1_]A6/`4OL!C5H^7^+,J21M
-M'4UT=2>(1BW""Y[%_+^!!RP:!WP%+"2A*O]"OD(JF2&N"OS]ISKYTWMWHK7F
-M@U>7B5A[V#]J%ET.2RF7+H4;79=2()5`"D$N6R*?FR;>$B&1B!&/1Y!*+O!_
-MA%<&XR^&`N,0U`$A%?C6#Y3@IT;/\OE\B9ETCKEL@:[F"O_@@7>-DZ=4*G'%
-MP'*.3&0NG`;#<KP0`4+X<<$C0$I$<"PHERI,I^>9F<X1:XK0U&01:XI@63)P
-M`;V$N[GN8.@_^RI;C_Z4SF(6NU*@K&Q2T7:&6OOYQ<H;F"K;E$H5M-8LBU?X
-MZCT)_N03.P!WX9/+Y2@6BQP^,49)=P3/7I2`I100!BV5J".B*G,IW<#G.`[S
-M\YI<KH22$F5++*50ML)2`B%!XM[KUP7&0%?J#)]^\1_Y</(H:RI%ZNDJ`*_%
-M=K,_T<]/>ZYCL/\#_/4M$?[LOH\BA*!<+C,U-46Q6&3?FR?YUY],<=FF[H8Q
-M(,@"BQ5"?I-2N)N94K@;FE*@`B)"2A`B4(00>!N?7M`SKF4<1U-NL!06PM"6
-MG>)+/_TRMV9&W!\Z)'1+6*9`2BA!+&/XX$R&#T[MYV9GF%<_LY9[[G\((03%
-M8I%D,DFA4&#?@9,\^LPDOSK3Q&6;&J?!)1=#4DHLRW)W=$.65R$B_!W>0`4A
-M(L*1?T$&"*\$`:DU7YG^'K?,G7=OZ%=P?0QB%DB/`"F#X]1XC*-;/\==GW_0
-M54:AP,3$!,5BD5<'C_&-9].\=JZECNA%7,!GHZ'E96@[.U!"K?55&'S8%7PB
-M"!=`"S=#`&YY<S>W/K`3\?.GX"()'XG#\A70N0R:XMYJRD`A1VK.8<_`'=SX
-MR<]AC"&?SS,Q,4&A4&!P_R&^\;,\;XRU(41HU1<"/COK?AF/1J-+U`'"]56E
-MJ@H(]O7#;B&K,:'&%;S_']0!+OZ:CR(`JE+@DYMBV%FO>ML8@_=OAM:.6NL+
-M22K6S4OM'^"&VS\5@!\?'Z=8+'+BE5^1_>9W6#W3SX$U=P)NC>`KS7$<)B8F
-MN.JJJT@D$AP\>!#+LA:/`5)(I%(+%:`DJCX0^F2(:GH4#5S!X[6F[7CUVUSV
-MJ2M@?!R:!7SH_=#662-YI"15CO"BWLJ';KT'K36%0H')R4D*A0(G#[Y.Y+4G
-MN6;D$*L*QVDK3?.=]WT6CW.TUHR,C+!CQPXLRZ)<+C,P,,#HZ.CBWP5\P$'W
-MO_:$KKE?A!16<.Q%>__+D56]QS]WOQSY77+U\"NH[FY0RO7YWE[W6%G>J)BJ
-M1/AYY4JV[[P3QW'(9K.</W^>N;DYCA]Z@\BYEUG7/@,WKZ`W4>$3N=?XQ*E_
-M1RJ)D)`\=X2=.W<2B4306I/+Y<CE<DMLB^-&<M?J7CRP9$U&4'X<4`OK`M_Z
-MLBX(AF=:<_8UKDD-P?0T)!+0'L7=S8P$UG>$Y+F9#?SA']WN[>WE@U1W^O@A
-MXLE]K.O2T+X.HJ/P\1A=SX]P=V&0[/D?T1_]&+?=<CN69:&U)I/)D,OEF)F9
-M(95*+1T#&H$/NX):I#:H"8;U>P%>VW[P67K+!9B8@,V;H2SAS#1<LBIP@61>
-MTKUV,Z52B7*Y3#J=IE@L,GSJ"(GT&ZQOS0,2["C6ZK6TSZ?HN*^9RYX>)GU3
-M)W=]YE9LV\9Q'%*I%/E\GG0ZS>CH*,:8"R^&I)`UF:!&#2H4&$.*$**:'H4,
-MI\)J!O#GO#AYW+UP]`C<>@L4(W`R!1O[`@*Z6R13YX[3UME-L5BD6"PR>N8$
-MK3.#K&\M8-LV[2TQ.A(Q6IHB"-E#9?@,/[[W6F[_\[\E$HU0J51()I/D<CG2
-MZ31#0T-LV[:-O7OW-B;`38T$"@C27E@-=9E!-<H(=4KPA`4(6J?.LF%F%"P%
-MK[\.Q2)<>RVDWW3!*P5284G)QN@(@X._HJ5[%=/CPUQ4.L&V/DE[HI.6IEA0
-M42*@HN&9\I5<_]!#1&,Q2J52`'YJ:HK3IT\S,#`0&&(!`4&QX,>`L`(:@`]G
-MB2`;A(GP8X`,I4/@DJ,_H[^2!\N"R0E(I^'&F^!;;\!P"M;W!$1L[:FPH72:
-M$]/GZ.^'KGB+EQI]X.YQQ8%GAA+\P6V?)1J-!=7A_/P\J:DIADZ?9M.F32$O
-M%\@P`36E(NY+NPKP?;X!>*O61=SLX/V-@)\%[&K4MVR%92O63)[$LBQ7`5NW
-MNH`V;H1R&[R9K%$!4M+:K+AJE:"K1872HPIZQ4A^>+*%:SZVBV@TZKK*Z"BS
-ML[.,CXRP;_=W`_`-=X06U,K`I?T=;-K04HWNHK&TERJ!&U6!O4]D7/"6!3MV
-MNBX`<-==\-+WX&P*WM=36P8+_UA4CX6@H@5/'XNQ;>=]1"(1"H5"5?;)2<Y]
-M?S>7[!\DNVT;\<NVU*X'W(\6#59+F%IP-0`;@P^O"\)N4+^,EE(2R<VY!*SL
-M@67+X,0Q^/8W8=LU8#KAR(R[&U=7$-5:7J*%XOMO1=ERP]W8=H1\/A]8?G)B
-MC.$W7V1K[A@],8OTCWZT8"T@%U6`$&AC*)8UQ8JAY'>G.I;KNW;'BL;KICH:
-MJ&CAC@:LW)PK\0T;(#<//W@*]N^#HV_!G7?#H12\<BYD:5E+@G*)>/F49L,U
-M'\>R;'*Y'&-C8V0R&28GQQDYO(=MJTN([>NA4L"9FL`XSD(7:*2`E<M;V?+^
-M5G)%:O^XJ:ZHJ4;W4*'C2]X[#C;"/1<HIU,H7705T-L+1PZ[0=!2\.1N^-*7
-M8?N'X?CKT#D&5ZQ9L"+T29DN:-J%))O-DLEDR.?SS$RGF1IZE6UK2@@AH;T#
-MU6+15S;,'SM&+)P%C/OA3-83<&E?NRN5%G^;VC142L.N&U\'[UGI<931K@+B
-M<?CEGJ#L93X+3_PG[/HL/'$>CDQ#2Q0NZ:US`Y>`;6LCO+C_%5:N64^I5&(N
-MDR%]9A_;UE2P+$5;2XR.1!>MO1TXE59>.G``LV$#2BF,,5KF\_F)Q8`%+_R;
-M@`_U\O0TIQY^>,&S5',S%2F@J<F5?W+2"X@>"2/#\-P/X<X_AFD+#B3AP+F%
-M!$C)JBZ+C>UC#!W>R^EC;Y`;?9V;MT2YN'\96P9Z6;NJF_:V%F1+#+LYAIQ-
-M8XS[%Z/Y?'["RF0R/YF9F;D_'H_+=Q*\,8;L(X_0.CR\X%DR'B??U.Q^81X=
-MK0(/DW#D$$2C<-_]\-1WX$`*YHIPXV8O[_M=<-6Z9JY:[_OIBH5+3G#OM2U$
-M1:*40BFEY^;F_DLJI;ZV9\\>8]NV>2?!YTZ?IOVYYXA,3N*42K7/`LJ)A/NB
-MZ2E/_K*.!`N.'H*7?@9WWPNJ$TYFX5LO0ZY8+8*D:.`:#:YEBQ"QT5(R,#!@
-M]N[=BS'F:^KYYY]/7G?==<GY^?E;UJU;9[36XNV"-\8@+(O\DT_2/3%!:LL6
-MHOW]-;_/__*7K)Q)`P:TX]8#?K?]8P79#$R.P4<^#OD23,W#OL-0*+K5HEA8
-M$099P[_^ZC%(5TC-E;$_>KLYE<N)H:&AA[_XQ2\^JP">?_[Y?=NW;Q\:&AJZ
-M(1J--B42"<>V;:241BD5=,NR@M&V[6"T;=M$(I&@1Z-1TY1(F.2++[+NU"DQ
-M,3QLVF^]U;0L6V9BL9AI:FHR^9%SM!T<%):2;G;P+>\#MY1+A&U!J0A#QV#3
-M%MAP":2S,)F!_WD32F58<Y%7-8JJ:_A*>&L8_OLMZ%S)\;%9#FVX='9D;.S!
-M+WSA"_\6)"R_/?KHHZVV;=\!7"N$:%_H2+]9BQXXT/6!W=_=/B!I&FQJSDZV
-MM<]IR])(@7&T7)V>6K9Y>8?E@K6K@.TZ%=@A970O@RNOALP,'#\,^5G(34-K
-M!#H3\+X5+AECTW!J`K0%';UDTK/Z%P?//CM\USV??OCAAS-!:'B[()=J+RBU
-M:U4\]M5+N]K7R*881"-NC]B\-3+.AM86K%BT%J1M0<0F(*:&!$\E'9VP?L"U
-M<F'>=9-"%O+S[L21*,3B`,R,IXJO_^3E9VX\.7R/\#Y`_<X(`-@-_5TML;^)
-M1Z)KA+*B6`*DPL%8D8J^_.KUJ^.UUK<A4A</`E5X9"A_E-#4#!U=8$>@5(#\
-M')0K&&,X\<J;8T/[#S_VT3.CCS1ZM]\)`1=JSS0W;^OK;GOJLO5K^FJL7^\*
-M857XYS59PZ\2!2`X,W@T>6;PR,O3Y\]_Y8Y4]LAB\__>"0!X.AZ_?'E;\^-7
-M#*S=TI2(BT`%844TB@]U)&2G,\[0OD/'I\]/[$L/3_[3'=/3AY::^UU!`,"3
-M$&GO:ON[SL[VG6O[5U[:N:PK4@,X4D>(I2@[FO&SYZ?38\FS<ZG,R9FQB1^/
-MGI_<_3DH+SVCV]XU!/CM$9"7MS;?G&AIN26>B/?:L4B'%8TT(Q5&4:EH,ULJ
-JE6=+I<I,/C-W-'EV['N?@>'_ZWS_"^RYW^\E9("T`````$E%3D2N0F""
-`
-end
diff --git a/debian/_base/core/tdebase/debian/kappfinder-trinity.install b/debian/_base/core/tdebase/debian/kappfinder-trinity.install
index d99c8f055..eac5c8e50 100644
--- a/debian/_base/core/tdebase/debian/kappfinder-trinity.install
+++ b/debian/_base/core/tdebase/debian/kappfinder-trinity.install
@@ -211,6 +211,7 @@ debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.
 debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
 debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kappfinder.png
+debian/tmp/opt/trinity/share/man/man1/kappfinder.1
 
 debian/icons/kappfinder.xpm		/opt/trinity/share/pixmaps
 debian/icons/kappfinder-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kappfinder-trinity.manpages b/debian/_base/core/tdebase/debian/kappfinder-trinity.manpages
deleted file mode 100644
index b83ec9565..000000000
--- a/debian/_base/core/tdebase/debian/kappfinder-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kappfinder-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kate-trinity.install b/debian/_base/core/tdebase/debian/kate-trinity.install
index 93c4a1b87..4ab5fb474 100644
--- a/debian/_base/core/tdebase/debian/kate-trinity.install
+++ b/debian/_base/core/tdebase/debian/kate-trinity.install
@@ -60,6 +60,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kate.png
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kwrite.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kate2.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kwrite2.svgz
+debian/tmp/opt/trinity/share/man/man1/kate.1
+debian/tmp/opt/trinity/share/man/man1/kwrite.1
 debian/tmp/opt/trinity/share/servicetypes/kateplugin.desktop
 
 debian/icons/kate-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kate-trinity.manpages b/debian/_base/core/tdebase/debian/kate-trinity.manpages
deleted file mode 100644
index 56b772103..000000000
--- a/debian/_base/core/tdebase/debian/kate-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kate-trinity.1
-debian/man/kwrite-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kfind-trinity.install b/debian/_base/core/tdebase/debian/kfind-trinity.install
index 3c02d8aae..b17c5eebb 100644
--- a/debian/_base/core/tdebase/debian/kfind-trinity.install
+++ b/debian/_base/core/tdebase/debian/kfind-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kfind.png
+debian/tmp/opt/trinity/share/man/man1/kfind.1
 debian/tmp/opt/trinity/share/services/kfindpart.desktop
 debian/tmp/opt/trinity/share/servicetypes/findpart.desktop
 
diff --git a/debian/_base/core/tdebase/debian/kfind-trinity.manpages b/debian/_base/core/tdebase/debian/kfind-trinity.manpages
deleted file mode 100644
index f0e6d9c78..000000000
--- a/debian/_base/core/tdebase/debian/kfind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfind-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kicker-trinity.install b/debian/_base/core/tdebase/debian/kicker-trinity.install
index 839bdc565..c9cd96420 100644
--- a/debian/_base/core/tdebase/debian/kicker-trinity.install
+++ b/debian/_base/core/tdebase/debian/kicker-trinity.install
@@ -259,6 +259,10 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/systemtray.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/taskbar.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/kbinaryclock.svgz
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/systemtray.svgz
+debian/tmp/opt/trinity/share/man/man1/appletproxy.1
+debian/tmp/opt/trinity/share/man/man1/extensionproxy.1
+debian/tmp/opt/trinity/share/man/man1/kasbar.1
+debian/tmp/opt/trinity/share/man/man1/kicker.1
 
 debian/tmp/opt/trinity/share/apps/kicker/icons/crystalsvg/16x16/actions/modified.png
 debian/tmp/opt/trinity/share/apps/kicker/icons/crystalsvg/16x16/actions/suspend2disk.png
diff --git a/debian/_base/core/tdebase/debian/kicker-trinity.manpages b/debian/_base/core/tdebase/debian/kicker-trinity.manpages
deleted file mode 100644
index 399a3843c..000000000
--- a/debian/_base/core/tdebase/debian/kicker-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/appletproxy-trinity.1
-debian/man/extensionproxy-trinity.1
-debian/man/kasbar-trinity.1
-debian/man/kicker-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kmenuedit-trinity.install b/debian/_base/core/tdebase/debian/kmenuedit-trinity.install
index ec5672f01..039265b1b 100644
--- a/debian/_base/core/tdebase/debian/kmenuedit-trinity.install
+++ b/debian/_base/core/tdebase/debian/kmenuedit-trinity.install
@@ -30,6 +30,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/kmenueditmain.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/new.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selecticon.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selectinternet.png
+debian/tmp/opt/trinity/share/man/man1/kmenuedit.1
 
 debian/icons/kmenuedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmenuedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kmenuedit-trinity.manpages b/debian/_base/core/tdebase/debian/kmenuedit-trinity.manpages
deleted file mode 100644
index e657bdffb..000000000
--- a/debian/_base/core/tdebase/debian/kmenuedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kmenuedit-trinity.1
diff --git a/debian/_base/core/tdebase/debian/konqueror-trinity.docs b/debian/_base/core/tdebase/debian/konqueror-trinity.docs
index c023d564b..e00f630aa 100644
--- a/debian/_base/core/tdebase/debian/konqueror-trinity.docs
+++ b/debian/_base/core/tdebase/debian/konqueror-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/debian/_base/core/tdebase/debian/konqueror-trinity.install b/debian/_base/core/tdebase/debian/konqueror-trinity.install
index 6b8800fe4..0d6a2b0eb 100644
--- a/debian/_base/core/tdebase/debian/konqueror-trinity.install
+++ b/debian/_base/core/tdebase/debian/konqueror-trinity.install
@@ -207,6 +207,9 @@ debian/tmp/opt/trinity/share/services/konq_sidebartng.desktop
 debian/tmp/opt/trinity/share/services/konq_textview.desktop
 debian/tmp/opt/trinity/share/services/konq_treeview.desktop
 debian/tmp/opt/trinity/share/servicetypes/konqaboutpage.desktop
+debian/tmp/opt/trinity/share/man/man1/keditbookmarks.1
+debian/tmp/opt/trinity/share/man/man1/kfmclient.1
+debian/tmp/opt/trinity/share/man/man1/konqueror.1
 
 debian/icons/keditbookmarks.xpm		/opt/trinity/share/pixmaps
 debian/icons/keditbookmarks-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/konqueror-trinity.manpages b/debian/_base/core/tdebase/debian/konqueror-trinity.manpages
deleted file mode 100644
index 8097ed067..000000000
--- a/debian/_base/core/tdebase/debian/konqueror-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/konqueror-trinity.1
-debian/man/kfmclient-trinity.1
-debian/man/keditbookmarks-trinity.1
diff --git a/debian/_base/core/tdebase/debian/konqueror-trinity.postinst b/debian/_base/core/tdebase/debian/konqueror-trinity.postinst
index 4c62f6bf2..a68978a50 100644
--- a/debian/_base/core/tdebase/debian/konqueror-trinity.postinst
+++ b/debian/_base/core/tdebase/debian/konqueror-trinity.postinst
@@ -26,7 +26,7 @@ case "$1" in
         divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
 
         update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/trinity/bin/konqueror 100 \
-          --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
+          --slave /usr/share/man/man1/x-www-browser.1 x-www-browser.1 /opt/trinity/share/man/man1/konqueror.1
     ;;
 
     install)
diff --git a/debian/_base/core/tdebase/debian/konsole-trinity.install b/debian/_base/core/tdebase/debian/konsole-trinity.install
index ee966a5c1..b7fd05d0c 100644
--- a/debian/_base/core/tdebase/debian/konsole-trinity.install
+++ b/debian/_base/core/tdebase/debian/konsole-trinity.install
@@ -82,6 +82,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/konsole.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/tabbar.png
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/konsole.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/konsole.svgz
+debian/tmp/opt/trinity/share/man/man1/konsole.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-konsole.desktop
 debian/tmp/opt/trinity/share/services/kded/kwrited.desktop
 debian/tmp/opt/trinity/share/services/konsolepart.desktop
diff --git a/debian/_base/core/tdebase/debian/konsole-trinity.manpages b/debian/_base/core/tdebase/debian/konsole-trinity.manpages
deleted file mode 100644
index 8c33f637e..000000000
--- a/debian/_base/core/tdebase/debian/konsole-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/konsole-trinity.1
diff --git a/debian/_base/core/tdebase/debian/konsole-trinity.postinst b/debian/_base/core/tdebase/debian/konsole-trinity.postinst
index d8be0590f..532e028bd 100644
--- a/debian/_base/core/tdebase/debian/konsole-trinity.postinst
+++ b/debian/_base/core/tdebase/debian/konsole-trinity.postinst
@@ -20,7 +20,7 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
-          --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
+          --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /opt/trinity/share/man/man1/konsole.1
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/debian/_base/core/tdebase/debian/kpager-trinity.install b/debian/_base/core/tdebase/debian/kpager-trinity.install
index 8e7ee184a..17d32c189 100644
--- a/debian/_base/core/tdebase/debian/kpager-trinity.install
+++ b/debian/_base/core/tdebase/debian/kpager-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/settings.png
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kpager.png
+debian/tmp/opt/trinity/share/man/man1/kpager.1
 
 debian/icons/kpager.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpager-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kpager-trinity.manpages b/debian/_base/core/tdebase/debian/kpager-trinity.manpages
deleted file mode 100644
index b34d67959..000000000
--- a/debian/_base/core/tdebase/debian/kpager-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpager-trinity.1
diff --git a/debian/_base/core/tdebase/debian/kpersonalizer-trinity.install b/debian/_base/core/tdebase/debian/kpersonalizer-trinity.install
index 1b0039191..749090dab 100644
--- a/debian/_base/core/tdebase/debian/kpersonalizer-trinity.install
+++ b/debian/_base/core/tdebase/debian/kpersonalizer-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step3.png
 debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step4.png
 debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step5.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/kpersonalizer.png
+debian/tmp/opt/trinity/share/man/man1/kpersonalizer.1
 
 debian/icons/kpersonalizer.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpersonalizer-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdebase/debian/kpersonalizer-trinity.manpages b/debian/_base/core/tdebase/debian/kpersonalizer-trinity.manpages
deleted file mode 100644
index bcd309b73..000000000
--- a/debian/_base/core/tdebase/debian/kpersonalizer-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpersonalizer-trinity.1
diff --git a/debian/_base/core/tdebase/debian/ksmserver-trinity.install b/debian/_base/core/tdebase/debian/ksmserver-trinity.install
index fbbd61ab4..de0b2623f 100644
--- a/debian/_base/core/tdebase/debian/ksmserver-trinity.install
+++ b/debian/_base/core/tdebase/debian/ksmserver-trinity.install
@@ -7,3 +7,4 @@ debian/tmp/opt/trinity/share/apps/tdeconf_update/ksmserver.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/move_session_config.sh
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdown.png
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
+debian/tmp/opt/trinity/share/man/man1/starttde.1
diff --git a/debian/_base/core/tdebase/debian/ksmserver-trinity.manpages b/debian/_base/core/tdebase/debian/ksmserver-trinity.manpages
deleted file mode 100644
index 354e23800..000000000
--- a/debian/_base/core/tdebase/debian/ksmserver-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/starttde-trinity.1
diff --git a/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst b/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst
index 7983daa09..14e203a41 100644
--- a/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst
+++ b/debian/_base/core/tdebase/debian/ksmserver-trinity.postinst
@@ -21,8 +21,8 @@ case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
 	x-session-manager /opt/trinity/bin/starttde 40 \
-	--slave /usr/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
+	--slave /usr/share/man/man1/x-session-manager.1 \
+	x-session-manager.1 "/opt/trinity/share/man/man1/starttde.1"
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/debian/_base/core/tdebase/debian/libkonq4-trinity.docs b/debian/_base/core/tdebase/debian/libkonq4-trinity.docs
index c023d564b..e00f630aa 100644
--- a/debian/_base/core/tdebase/debian/libkonq4-trinity.docs
+++ b/debian/_base/core/tdebase/debian/libkonq4-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/debian/_base/core/tdebase/debian/libtqt3-integration-trinity.install b/debian/_base/core/tdebase/debian/libtqt3-integration-trinity.install
index b1bb45962..9fe1dee4f 100644
--- a/debian/_base/core/tdebase/debian/libtqt3-integration-trinity.install
+++ b/debian/_base/core/tdebase/debian/libtqt3-integration-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/kded/kdeintegration.desktop
 debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.la
 debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.so
-debian/tmp/usr/lib/tqt3/plugins/integration/libqtkde.*
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/integration/libqtkde.*
diff --git a/debian/_base/core/tdebase/debian/man/appletproxy-trinity.1 b/debian/_base/core/tdebase/debian/man/appletproxy-trinity.1
deleted file mode 100644
index 3ab13208f..000000000
--- a/debian/_base/core/tdebase/debian/man/appletproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH APPLETPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel applet proxy"
-.SH NAME
-appletproxy
-\- TDE kicker panel applet proxy
-.SH SYNOPSIS
-\fBappletproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The applet's desktop file
-.SS 
-.SS Options:
-.TP
-.B  \-\-configfile  <file>
-The config file to be used
-.TP
-.B  \-\-callbackid  <id>
-DCOP callback id of the applet container
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-.SH FILES
-\fI/usr/share/apps/kicker/applets\fP
-kicker applets directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBextensionproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/drkonqi-trinity.1 b/debian/_base/core/tdebase/debian/man/drkonqi-trinity.1
deleted file mode 100644
index 987164834..000000000
--- a/debian/_base/core/tdebase/debian/man/drkonqi-trinity.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH DRKONQI 1 "June 2006" "Trinity Desktop Environment" "TDE crash handler"
-.SH NAME
-drkonqi
-\- TDE crash handler gives the user feedback if a program crashed
-.SH SYNOPSIS
-\fBdrkonqi\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-The TDE crash handler gives the user feedback if a program crashed.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-signal  <number>
-The signal number that was caught
-.TP
-.B  \-\-appname  <name>
-Name of the program
-.TP
-.B  \-\-apppath  <path>
-Path to the executable
-.TP
-.B  \-\-appversion  <version>
-The version of the program
-.TP
-.B  \-\-bugaddress  <address>
-The bug address to use
-.TP
-.B  \-\-programname  <name>
-Translated name of the program
-.TP
-.B  \-\-pid  <pid>
-The PID of the program
-.TP
-.B  \-\-startupid  <id>
-Startup ID of the program
-.TP
-.B  \-\-tdeinit  
-The program was started by tdeinit
-.TP
-.B  \-\-safer  
-Disable arbitrary disk access
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Hans Petter Bieker <bieker@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/extensionproxy-trinity.1 b/debian/_base/core/tdebase/debian/man/extensionproxy-trinity.1
deleted file mode 100644
index 4ea041189..000000000
--- a/debian/_base/core/tdebase/debian/man/extensionproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH EXTENSIONPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel extension proxy"
-.SH NAME
-extensionproxy
-\- TDE kicker panel extension proxy
-.SH SYNOPSIS
-\fBextensionproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBextensionproxy\fP is a small application that allows you to run a kicker extension outside of \fBkicker\fP itself.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The extension's desktop file
-.SS 
-.SS Options:
-.TP
-.B  \-\-configfile  <file>
-The config file to be used
-.TP
-.B  \-\-callbackid  <id>
-DCOP callback id of the extension container
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-.SH FILES
-\fI/usr/share/apps/kicker/extensions\fP
-kicker extensions directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBappletproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/gentdmconf-trinity.1 b/debian/_base/core/tdebase/debian/man/gentdmconf-trinity.1
deleted file mode 100644
index d98e166c2..000000000
--- a/debian/_base/core/tdebase/debian/man/gentdmconf-trinity.1
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH GENTDMCONF 1 "June 2006" "Trinity Desktop Environment" "generate configuration files for tdm"
-.SH NAME
-gentdmconf
-\- generate configuration files for tdm
-.SH SYNOPSIS
-\fBgentdmconf\fP
-.RB [ \-\-in
-.IR /path/to/new/tdm\-config\-dir ]
-.RS 11
-.RB [ \-\-old\-xdm
-.IR /path/to/old/xdm\-dir ]
-.br
-.RB [ \-\-old\-kde
-.IR /path/to/old/kde\-config\-dir ]
-.br
-.RB [ \-\-no\-old ]
-.RB [ \-\-no\-old\-xdm ]
-.RB [ \-\-no\-old\-kde ]
-.RB [ \-\-old\-scripts ]
-.br
-.RB [ \-\-no\-old\-scripts ]
-.RB [ \-\-old\-confs ]
-.RB [ \-\-no\-backup ]
-.br
-.RB [ \-\-no\-in\-notice ]
-.RE
-
-.SH DESCRIPTION
-\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP.
-.br
-If an older xdm/tdm configuration is found, its config files are "absorbed";
-if it lives in the new target directory, its scripts are reused (and possibly
-modified) as well, otherwise the scripts are ignored and default scripts are
-installed.
-.SH OPTIONS
-.TP
-.BI \-\-in \ /path/to/new/tdm\-config\-dir
-In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected.
-.br
-Default is \fI/etc/trinity/tdm\fP.
-.TP
-.BI \-\-old\-xdm \ /path/to/old/xdm\-dir
-Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan
-.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ;
-there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP.
-.br
-Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect.
-.TP
-.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir
-Where to look for the \fItdmrc\fP of an older \fBtdm\fP.
-.br
-.RI Default\ is\ to\ scan\  /etc/trinity \ and\ { /usr,/usr/local ,
-.RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config .
-.TP
-.B \-\-no\-old
-Don't look at older xdm/tdm configurations, just create default config.
-.TP
-.B \-\-no\-old\-xdm
-Don't look at older xdm configurations.
-.TP
-.B \-\-no\-old\-kde
-Don't look at older tdm configurations.
-.TP
-.B \-\-old\-scripts
-Directly use all scripts from the older xdm/tdm configuration.
-.TP
-.B \-\-no\-old\-scripts
-Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory.
-.TP
-.B \-\-old\-confs
-Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea.
-.TP
-.B \-\-no\-backup
-Overwrite/delete old config files instead of backing them up.
-.TP
-.B \-\-no\-in\-notice
-Don't put the notice about \fB\-\-in\fP being used into the generated README.
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kappfinder-trinity.1 b/debian/_base/core/tdebase/debian/man/kappfinder-trinity.1
deleted file mode 100644
index ec8eae964..000000000
--- a/debian/_base/core/tdebase/debian/man/kappfinder-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KAPPFINDER 1 "August, 24 2003"
-.SH NAME
-kappfinder \- searches for program to add to the Kde menu
-.SH SYNOPSIS
-.B kappfinder
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kappfinder
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the TDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-dir directory
-Use this option to set where the .desktop files will be installed (default is $(HOME)/.trinity/share/applnk
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kappfinder was written by the KDE project
diff --git a/debian/_base/core/tdebase/debian/man/kasbar-trinity.1 b/debian/_base/core/tdebase/debian/man/kasbar-trinity.1
deleted file mode 100644
index 7d57958d2..000000000
--- a/debian/_base/core/tdebase/debian/man/kasbar-trinity.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KASBAR 1 "June 2006" "Trinity Desktop Environment" "An alternative task manager"
-.SH NAME
-kasbar
-\- An alternative task manager
-.SH SYNOPSIS
-\fBkasbar\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-The \fBKasBar\fP is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the left mouse button. The active window is highlighted, minimized windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-test  
-Test the basic kasbar code
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-\fBkicker\fP(1)
-.SH AUTHORS
-.nf
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kate-trinity.1 b/debian/_base/core/tdebase/debian/man/kate-trinity.1
deleted file mode 100644
index e48268d6f..000000000
--- a/debian/_base/core/tdebase/debian/man/kate-trinity.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.TH KATE 1 "May 2006"
-.SH NAME
-kate \- TDE Advanced Text Editor
-.SH SYNOPSIS
-.B kate
-.RI [ options ] [file(s)]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kate
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkate\fP is a powerful text editor for TDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ...
-
-It is able to expand or collapse parts of code (C functions, ...), can handle complete projects, and includes a terminal emulator.
-
-Kate is primarily intended for developers but can be used by anyone. It will for example be very useful to edit configuration files for example.
-
-It can handle plugins to expand its capabilities (more languages support, vim/Emacs compatibility, ...)
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-s, \-\-start <name>
-Start Kate with a given session
-.TP
-.B \-u, \-\-use
-Use a already running kate instance (if possible)
-.TP
-.B \-p, \-\-pid <pid>
-Only try to reuse kate instance with this pid
-.TP
-.B \-e, \-\-encoding <name>
-Set encoding for the file to open
-.TP
-.B \-l, \-\-line <line>
-Navigate to this line
-.TP
-.B \-c, \-\-column <column>
-Navigate to this column
-.TP
-.B \-i, \-\-stdin
-Read the contents of stdin
-.TP
-.B file(s)
-is the file or the files to open
-
-.SH SEE ALSO
-.BR kwrite (1)
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, for Debian GNU/Linux, but may be used by others.
-.PP
-kate was written by the KDE project
diff --git a/debian/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1 b/debian/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1
deleted file mode 100644
index 46b2d4e1a..000000000
--- a/debian/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KBLANKSCRN.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
-.SH NAME
-kblankscrn.kss
-\- TDE screensaver which shows a blank screen
-.SH SYNOPSIS
-\fBkblankscrn.kss\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBKBlankScreen\fP is a screensaver which shows a blank screen.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-setup  
-Setup screen saver
-.TP
-.B  \-\-window\-id  wid
-Run in the specified XWindow
-.TP
-.B  \-\-root  
-Run in the root XWindow
-.TP
-.B  \-\-demo  
-Start screen saver in demo mode [default]
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-The KDE Project <www.kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kcheckpass-trinity.1 b/debian/_base/core/tdebase/debian/man/kcheckpass-trinity.1
deleted file mode 100644
index fa5a4c817..000000000
--- a/debian/_base/core/tdebase/debian/man/kcheckpass-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  KCHECKPASS 1 "June 2006" "Trinity Desktop Environment" "authentication software"
-.SH NAME
-kcheckpass
-\- The KCheckPass authentication software
-.SH SYNOPSIS
-\fBkcheckpass\fP
-.SH DESCRIPTION
-\fBKCheckPass\fP is TDE's authentication program. It is meant to be
-used by any software in need of user authentication, most
-notably screensavers.
-.sp 1
-It enhances security be the following means:
-.br
-.IP "     \-"
-It's only a small program, which is hopefully simple enough to
-allow it to be SUID root. Setting it to SUID root is necessary
-on Shadow Password systems.
-.IP "     \-"
-No other program in need of user authentication, must be
-SUID root.
-.IP "     \-"
-It provides a single implementation to check passwords. So one only must take a closer look at \fBKCheckPass\fP to ensure password security. It's much easier for programs using \fBKCheckPass\fP to preserve security.
-.PP
-.br
-\fBTechnique:\fP
-.sp 1
-\fBKCheckPass\fP is a simple password checker. Just invoke and send it the password on stdin.
-.sp 1
-If the password was accepted, the program exits with 0;
-.br
-if it was rejected, it exits with 1. Any other exit code signals an error.
-
-.SH AUTHORS
-.nf
-Olaf Kirch <okir@caldera.de>
-.br
-Christian Esken <esken@kde.org>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kcminit-trinity.1 b/debian/_base/core/tdebase/debian/man/kcminit-trinity.1
deleted file mode 100644
index 4c557456e..000000000
--- a/debian/_base/core/tdebase/debian/man/kcminit-trinity.1
+++ /dev/null
@@ -1,153 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCMINIT 1 "June 2006" "Trinity Desktop Environment" "Trinity Control Modules initialization"
-.SH NAME
-kcminit
-\- runs startups initialization for Control Modules.
-.SH SYNOPSIS
-\fBkcminit\fP [Qt\-options] [TDE\-options] [options] module 
-.SH DESCRIPTION
-\fBkcminit\fP runs startups initialization for Control Modules.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B module
-Configuration module to run
-.SS Options:
-.TP
-.B  \-\-list  
-List modules that are run at startup
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kdcop-trinity.1 b/debian/_base/core/tdebase/debian/man/kdcop-trinity.1
deleted file mode 100644
index 1c01dcc47..000000000
--- a/debian/_base/core/tdebase/debian/man/kdcop-trinity.1
+++ /dev/null
@@ -1,159 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDCOP 1 "June 2006" "Trinity Desktop Environment" "A graphical DCOP browser/client"
-.SH NAME
-kdcop
-\- A graphical DCOP browser/client
-.SH SYNOPSIS
-\fBkdcop\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBkdcop\fP is a browser/executor for DCOP. It queries the DCOP clients in a system,
-their interfaces, and the interfaces' arguments. You can even execute DCOP
-calls by double\-clicking on a call. If the method has parameters, \fBkdcop\fP will
-open a dialog and prompt you for them. If the method returns a return value,
-you will see it in a message box after the call.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdcop/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdcop/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Matthias Kalle Dalheimer <kalle@kde.org>
-.br
-Rik Hemsley <rik@kde.org>
-.br
-Ian Reinhart Geiser <geiseri@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kdialog-trinity.1 b/debian/_base/core/tdebase/debian/man/kdialog-trinity.1
deleted file mode 100644
index 243709ed1..000000000
--- a/debian/_base/core/tdebase/debian/man/kdialog-trinity.1
+++ /dev/null
@@ -1,209 +0,0 @@
-.TH KDIALOG "1" "December 2002" "TDE" "TDE Application"
-.SH NAME
-kdialog \- Show TDE dialog boxes from shell scripts
-.SH SYNOPSIS
-.B kdialog
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIarg\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kdialog
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B kdialog
-allows to display dialog boxes from shell scripts.
-The syntax is very much inspired from the 
-.B dialog
-command
-(which shows text mode dialogs).
-.SH OPTIONS
-.TP
-.BI \-\-yesno " text"
-Question message box with yes/no buttons
-.TP
-.BI \-\-yesnocancel " text"
-Question message box with yes/no/cancel buttons
-.TP
-.BI \-\-warningyesno " text"
-Warning message box with yes/no buttons
-.TP
-.BI \-\-warningcontinuecancel " text"
-Warning message box with continue/cancel buttons
-.TP
-.BI \-\-warningyesnocancel " text"
-Warning message box with yes/no/cancel buttons
-.TP
-.BI \-\-sorry " text"
-\&'Sorry' message box
-.TP
-.BI \-\-error " text"
-\&'Error' message box
-.TP
-.BI \-\-msgbox " text"
-Message Box dialog
-.TP
-.BI \-\-inputbox " text init"
-Input Box dialog
-.TP
-.BI \-\-password " text"
-Password dialog
-.TP
-.RI \fB\-\-textbox\fP \ file " [" width "] [" height ]
-Text Box dialog
-.TP
-.RI \fB\-\-menu\fP \ text " [" "tag item" "] [" "tag item" "] ..."
-Menu dialog
-.TP
-.RI \fB\-\-checklist\fP \ text " [" "tag item status" "] ..."
-Check List dialog
-.TP
-.RI \fB\-\-radiolist\fP " text" " [" "tag item status" "] ..."
-Radio List dialog
-.TP
-.BI \-\-title " text"
-Dialog title
-.TP
-.B \-\-separate\-output
-Return list items on separate lines (for checklist option)
-.SS "Arguments:"
-.TP
-arg
-Arguments - depending on main option
-.SS "Generic options:"
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options:"
-.TP
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-title \ title
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options:"
-.TP
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-KDialog was written by
-.nh
-.ad l
-David Faure <faure@kde.org>,
-Nick Thompson,
-Nick Thompson,
-Matthias Hoelzer <hoelzer@kde.org> and
-David Gumbel <david.guembel@gmx.net>.
-.br
-.hy
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdebase/debian/man/keditbookmarks-trinity.1 b/debian/_base/core/tdebase/debian/man/keditbookmarks-trinity.1
deleted file mode 100644
index 23606dccb..000000000
--- a/debian/_base/core/tdebase/debian/man/keditbookmarks-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KEDITBOOKMARKS 1 "Jan 2005" "Trinity Desktop Environment" "Konqueror Bookmarks Editor"
-.SH NAME
-keditbookmarks
-- Konqueror Bookmark Editor
-.SH SYNOPSIS
-keditbookmarks [Qt-options] [TDE-options] [options] [file] 
-.SH DESCRIPTION
-Bookmark editor for TDE.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File to edit
-.SS Options:
-.TP
-.B  --importmoz  <filename>
-Import bookmarks from a file in Mozilla format
-.TP
-.B  --importns  <filename>
-Import bookmarks from a file in Netscape (4.x and earlier) format
-.TP
-.B  --importie  <filename>
-Import bookmarks from a file in Internet Explorer's Favorites format
-.TP
-.B  --importopera  <filename>
-Import bookmarks from a file in Opera format
-.TP
-.B  --exportmoz  <filename>
-Export bookmarks to a file in Mozilla format
-.TP
-.B  --exportns  <filename>
-Export bookmarks to a file in Netscape (4.x and earlier) format
-.TP
-.B  --exporthtml  <filename>
-Export bookmarks to a file in a printable HTML format
-.TP
-.B  --exportie  <filename>
-Export bookmarks to a file in Internet Explorer's Favorites format
-.TP
-.B  --exportopera  <filename>
-Export bookmarks to a file in Opera format
-.TP
-.B  --address  <address>
-Open at the given position in the bookmarks file
-.TP
-.B  --customcaption  <caption>
-Set the user readable caption for example "Konsole"
-.TP
-.B  --nobrowser  
-Hide all browser related functions
-.SS 
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
-.SS 
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-Alexander Kellett <lypanov@kde.org>
-.br
-
diff --git a/debian/_base/core/tdebase/debian/man/kfind-trinity.1 b/debian/_base/core/tdebase/debian/man/kfind-trinity.1
deleted file mode 100644
index 55542fd66..000000000
--- a/debian/_base/core/tdebase/debian/man/kfind-trinity.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH KFIND 1 "August, 25 2003"
-.SH NAME
-kfind \- TDE find tool
-.SH SYNOPSIS
-.B kfind
-.RI [ options ]  [searchpath]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kfind
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkfind\fP is a find tool for TDE. It allows fine tuning of the search options (name, path, type, plain text search, meta search, modification date, size, user, group, ...)
-
-It also permits to save the results of the search in a file, which is a plain-text list of file URIs. (file:/path_to_file)
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.TP
-.B searchpath
-is the path in which the search must be done
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kfind was written by the KDE project
diff --git a/debian/_base/core/tdebase/debian/man/kfmclient-trinity.1 b/debian/_base/core/tdebase/debian/man/kfmclient-trinity.1
deleted file mode 100644
index 67cbed380..000000000
--- a/debian/_base/core/tdebase/debian/man/kfmclient-trinity.1
+++ /dev/null
@@ -1,222 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added.
-.TH KFMCLIENT 1 "Jan 2005" "Trinity Desktop Environment" "TDE tool for opening URLs from the command line"
-.SH NAME
-kfmclient
-- TDE tool for opening URLs from the command line
-.SH SYNOPSIS
-kfmclient [Qt-options] [TDE-options] [options] command [URL(s)] 
-.SH DESCRIPTION
-kfmclient is a tool for opening local and remote URLs in Konqueror from
-the command line.
-.SH COMMANDS
-.SS
-.SS openURL
-.TP
-kfmclient openURL \fIurl\fR [ \fImimetype\fR ]
-Opens a window showing \fIurl\fR. \fIurl\fR may be a relative path or file name,
-such as . or subdir/. If \fIurl\fR is omitted, $HOME is used instead.
-
-If \fImimetype\fR is specified, it will be used to determine the component
-that Konqueror should use. For instance, set it to text/html for a web
-page, to make it appear faster.
-.SS newTab
-.TP
-kfmclient newTab \fIurl\fR [ \fImimetype\fR ]
-Same as above but opens a new tab with \fIurl\fR in an existing Konqueror
-window on the current active desktop if possible.
-.SS openProfile
-.TP
-kfmclient openProfile \fIprofile\fR [ \fIurl\fR ]
-Opens a window using the given profile. \fIprofile\fR is a file under
-~/.trinity/share/apps/konqueror/profiles. \fIurl\fR is an optional URL to open.
-.SS openProperties
-.TP
-kfmclient openProperties \fIurl\fR
-Opens a properties menu.
-.SS exec
-.TP
-kfmclient exec [ \fIurl\fR [ \fIbinding\fR ] ]
-Tries to execute \fIurl\fR. \fIurl\fR may be a usual URL, this URL will
-be opened. You may omit \fIbinding\fR. In this case the default binding
-is tried. Of course URL may be the URL of a document, or it may be a
-*.desktop file.
-This way you could for example mount a device by passing 'Mount default'
-as binding to 'cdrom.desktop'.
-.SS move
-.TP
-kfmclient move \fIsrc\fR \fIdest\fR
-Moves the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
-.SS copy
-.TP
-kfmclient copy \fIsrc\fR \fIdest\fR
-Copies the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
-.SS download
-.TP
-kfmclient download [ \fIsrc\fR ]
-Copies the URL \fIsrc\fR to a user specified location. \fIsrc\fR may be
-a list of URLs, if not present then a URL will be requested.
-.SS sortDesktop
-.TP
-kfmclient sortDesktop
-Rearranges all icons on the desktop.
-.SS configure
-.TP
-kfmclient configure
-Re-read Konqueror's configuration.
-.SS configureDesktop
-.TP
-kfmclient configureDesktop
-Re-read kdesktop's configuration.
-.SH OPTIONS
-.SS
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
-.SH EXAMPLES
-.TP
-kfmclient exec file:/root/Desktop/cdrom.desktop "Mount default"
-Mounts the CD-ROM.
-.TP
-kfmclient exec file:/home/weis/data/test.html
-Opens the file with default binding.
-.TP
-kfmclient exec file:/home/weis/data/test.html Netscape
-Opens the file with netscape.
-.TP
-kfmclient exec ftp://localhost/
-Opens new window with URL.
-.TP
-kfmclient exec file:/root/Desktop/emacs.desktop
-Starts emacs.
-.TP
-kfmclient exec file:/root/Desktop/cdrom.desktop
-Opens the CD-ROM's mount directory.
-.TP
-kfmclient exec .
-Opens the current directory. Very convenient.
-.SH OTHER
-This manual page was written by Adeodato Simo <asp16@alu.ua.es> for the
-Debian system (but may be used by others).
-
-This manual page can be redistribute and/or modified it under the terms
-of the GNU General Public License as published by the Free Software
-Foundation; version 2 dated June, 1991.
-.nf
diff --git a/debian/_base/core/tdebase/debian/man/khotkeys-trinity.1 b/debian/_base/core/tdebase/debian/man/khotkeys-trinity.1
deleted file mode 100644
index 34d754b05..000000000
--- a/debian/_base/core/tdebase/debian/man/khotkeys-trinity.1
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHOTKEYS 1 "June 2006" "Trinity Desktop Environment" "KHotKeys daemon"
-.SH NAME
-khotkeys
-\- daemon to bind actions to triggers and conditions
-.SH SYNOPSIS
-\fBkhotkeys\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKHotKeys\fP is a utility that allows you to bind actions to triggers and conditions. The most common case is where action means launching some  command/application/URL, the trigger is some key combination pressed and condition is some window being (not) active/existing.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS
-
-.SH FILES
-.I ~/.trinity/share/config/khotkeysrc
-\fBkhotkeys\fP configuration file
-
-.SH AUTHORS
-.nf
-Lubos Lunak <l.lunak@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kicker-trinity.1 b/debian/_base/core/tdebase/debian/man/kicker-trinity.1
deleted file mode 100644
index 1d17fa199..000000000
--- a/debian/_base/core/tdebase/debian/man/kicker-trinity.1
+++ /dev/null
@@ -1,171 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KICKER 1 "June 2006" "Trinity Desktop Environment" "The TDE panel"
-.SH NAME
-kicker
-\- The TDE panel
-.SH SYNOPSIS
-\fBkicker\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKicker\fP is the TDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-
-.SH SEE ALSO
-\fBkasbar\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kicker/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kicker/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Aaron J. Seigo <aseigo@kde.org>
-.br
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-Wilco Greven <greven@kde.org>
-.br
-Rik Hemsley <rik@kde.org>
-.br
-Daniel M. Duley <mosfet@kde.org>
-.br
-Preston Brown <pbrown@kde.org>
-.br
-John Firebaugh <jfirebaugh@kde.org>
-.br
-Waldo Bastian <bastian@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kjobviewer-trinity.1 b/debian/_base/core/tdebase/debian/man/kjobviewer-trinity.1
deleted file mode 100644
index 6dae2692e..000000000
--- a/debian/_base/core/tdebase/debian/man/kjobviewer-trinity.1
+++ /dev/null
@@ -1,202 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KJOBVIEWER 1 "June 2006" "Trinity Desktop Environment" "A print job viewer"
-.SH NAME
-kjobviewer
-\- a print job viewer
-.SH SYNOPSIS
-\fBkjobviewer\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBKJobViewer\fP is a powerful queue and spool manager. You can view jobs in the different queues waiting for print as well as manipulate jobs in many ways.
-.sp 1
-The details are, again, as with all other modules of \fBTDEPrint\fP, dependent on the print subsystem in use. \fBCUPS\fP, as is usual now, in this field is the most feature\-complete system for "doing something with jobs that are sent away already and wait for print, possibly on a remote print server".
-.sp 1
-With kjobviewer you can...
-.IP "     \-"
-see an overview for a certain queue or see all jobs on all queues;
-.IP "     \-"
-filter the list to see your "own" jobs only;
-.IP "     \-"
-sort the pending jobs according to different criteria (size, ownership, job\-ide, job\-name; billing\-tags);
-.IP "     \-"
-stop a job from printing, putting it into a "held" state;
-.IP "     \-"
-re\-start a held job;
-.IP "     \-"
-manually release a job that was sent to "hold" from the client already;
-.IP "     \-"
-reschedule a job for printing at a specified time;
-.IP "     \-"
-increase or decrease the job\-priorities (allowed values are 1\-100) to re-arrange the order of automatic printing;
-.IP "     \-"
-move a job to a different print\-queue;
-.IP "     \-"
-stop jobs from leaving the queue (while still accepting incoming ones);
-.IP "     \-"
-reject new incoming jobs (while still printing all the pending ones until the queue is empty);
-.IP "     \-"
-check and re\-set all job options \-\- even adapt them to another target printet which might have a complete different set of commands;
-.IP "     \-"
-view the existing and re\-assign a new job\-billing tag to a job;
-.IP "     \-"
-pop up on screen a nicely formatted report of IPP attributes for any job and also print it;
-.IP "     \-"
-increase or decrease the number of required copies;
-.IP "     \-"
-cancel and delete a no-longer\-required job.
-.PP
-Note, that some of these manipulations require job ownership or root access.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-d  
-<printer\-name>         The printer for which jobs are requested
-.TP
-.B  \-\-noshow  
-Show job viewer at startup
-.TP
-.B  \-\-all  
-Show jobs for all printers
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kjobviewer/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kjobviewer/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kmenuedit-trinity.1 b/debian/_base/core/tdebase/debian/man/kmenuedit-trinity.1
deleted file mode 100644
index fd5c7daf5..000000000
--- a/debian/_base/core/tdebase/debian/man/kmenuedit-trinity.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH KMENUEDIT 1 "August, 24 2003"
-.SH NAME
-kmenuedit \- editor for the TDE menu
-.SH SYNOPSIS
-.B kmenuedit
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmenuedit
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkmenuedit\fP is a powerful editor for the TDE menu. It allows you to add, remove, or move items in the menu, add sub-menus, ...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmenuedit was written by the KDE project
diff --git a/debian/_base/core/tdebase/debian/man/knetattach-trinity.1 b/debian/_base/core/tdebase/debian/man/knetattach-trinity.1
deleted file mode 100644
index 84bc38fcf..000000000
--- a/debian/_base/core/tdebase/debian/man/knetattach-trinity.1
+++ /dev/null
@@ -1,164 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KNETATTACH 1 "June 2006" "Trinity Desktop Environment" "TDE Network Wizard"
-.SH NAME
-knetattach
-\- TDE Network Wizard
-.SH SYNOPSIS
-\fBknetattach\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-The \fBTDE Network Wizard\fP is an application which makes it easier to integrate your network resources with your Trinity Desktop.
-.sp 1
-The program, also known as the \fBNetwork Folder Wizard\fP, allows easy addition and integration of various network folders with your Trinity desktop.
-.sp 1
-The \fBNetwork Folder Wizard\fP currently allows you to add four types of network folders:
-.br
-.RS 3
-\- WebDav
-.br
-\- FTP
-.br
-\- Microsoft(R) Windows(R) (Samba) network drives
-.br
-\- SSH
-.RE
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/knetattach/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/knetattach/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-George Staikos <staikos@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/konqueror-trinity.1 b/debian/_base/core/tdebase/debian/man/konqueror-trinity.1
deleted file mode 100644
index 0515c4f87..000000000
--- a/debian/_base/core/tdebase/debian/man/konqueror-trinity.1
+++ /dev/null
@@ -1,245 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KONQUEROR 1 "Jan 2005" "Trinity Desktop Environment" "Web browser, file manager, ..."
-.SH NAME
-konqueror
-- Web browser, file manager, ...
-.SH SYNOPSIS
-konqueror [Qt-options] [TDE-options] [options] [URL] 
-.SH DESCRIPTION
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view
-documents without ever launching another application.
-
-This package is part of the official TDE base module.
-
-
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Location to open
-.SS Options:
-.TP
-.B  --silent  
-Start without a default window
-.TP
-.B  --preload  
-Preload for later use
-.TP
-.B  --profile  <profile>
-Profile to open
-.TP
-.B  --profiles  
-List available profiles
-.TP
-.B  --mimetype  <mimetype>
-Mimetype to use for this URL (e.g. text/html or inode/directory)
-.TP
-.B  --select  
-For URLs that point to files, opens the directory and selects the file, instead of opening the actual file
-.SS 
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/konqueror/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/konqueror/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-Simon Hausmann <hausmann@kde.org>
-.br
-Michael Reiher <michael.reiher@gmx.de>
-.br
-Matthias Welk <welk@fokus.gmd.de>
-.br
-Alexander Neundorf <neundorf@kde.org>
-.br
-Michael Brade <brade@kde.org>
-.br
-Lars Knoll <knoll@kde.org>
-.br
-Dirk Mueller <mueller@kde.org>
-.br
-Peter Kelly <pmk@post.com>
-.br
-Waldo Bastian <bastian@kde.org>
-.br
-Germain Garand <germain@ebooksfrance.org>
-.br
-Leo Savernik <l.savernik@aon.at>
-.br
-Stephan Kulow <coolo@kde.org>
-.br
-Antti Koivisto <koivisto@kde.org>
-.br
-Apple Safari Developers
-.br
-Harri Porten <porten@kde.org>
-.br
-Koos Vriezen <koos.vriezen@xs4all.nl>
-.br
-Matt Koss <koss@miesto.sk>
-.br
-Alex Zepeda <zipzippy@sonic.net>
-.br
-Richard Moore <rich@kde.org>
-.br
-Dima Rogozin <dima@mercury.co.il>
-.br
-Wynn Wilkes <wynnw@calderasystems.com>
-.br
-Stefan Schimanski <schimmi@kde.org>
-.br
-George Staikos <staikos@kde.org>
-.br
-Dawit Alemayehu <adawit@kde.org>
-.br
-Carsten Pfeiffer <pfeiffer@kde.org>
-.br
-Torsten Rahn <torsten@kde.org>
-.br
-Torben Weis <weis@kde.org>
-.br
-Joseph Wenninger <jowenn@kde.org>
-.br
-
diff --git a/debian/_base/core/tdebase/debian/man/konsole-trinity.1 b/debian/_base/core/tdebase/debian/man/konsole-trinity.1
deleted file mode 100644
index 5de5500b4..000000000
--- a/debian/_base/core/tdebase/debian/man/konsole-trinity.1
+++ /dev/null
@@ -1,179 +0,0 @@
-.\" The draft of this file was generated by kdemangen.pl and edited after.
-.TH Konsole 1 "Nov 2005" "Trinity Desktop Environment" ""
-.SH NAME
-.BR Konsole
-\- X terminal emulator for TDE.
-.SH SYNOPSIS
-.BR Konsole 
-[Qt\-options] [TDE\-options] [options] [args] 
-.SH DESCRIPTION
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-.PP
-Konsole advanced features include simple configuration and the ability to use
-multiple terminal shells in a single window, making for a less
-cluttered desktop.
-.PP
-Using Konsole, a user can open:
-.PP
-.RS
-Linux console sessions
-.PP
-Shell sessions
-.PP
-Screen sessions
-.PP
-Midnight Commander file manager sessions
-.PP
-Root console sessions
-.PP
-Root Midnight Commander sessions
-.PP
-User created sessions
-.RE
-
-These sessions can be renamed to help you keep track of all your shells,
-or signaled (STOP, CONT, HUP, INT, TERM, KILL).
-.PP
-For more control over konsole, a user can:
-hide/show the menubar and/or frame;
-select the size of a konsole window, fonts, color
-schemes, and key mapping;
-change location of the scrollbar or hide the scrollbar;
-change location of the tabbar or hide the tabbar.
-.PP
-All chosen settings can be made the default for forthcoming sessions by
-saving them.
-.SH OPTIONS
-.SS
-.SS Konsole specific options:
-.TP
-.B  \-\-name  <name>
-Set window class
-.TP
-.B  \-\-ls  
-Start login shell
-.B \-T <title>                
-Set the window title
-.TP
-.B  \-\-tn  <terminal>
-Specify terminal type as set in the TERM [xterm]
-environment variable
-.TP
-.B  \-\-noclose  
-Do not close Konsole when command exits
-.TP
-.B  \-\-nohist  
-Do not save lines in history
-.TP
-.B  \-\-nomenubar  
-Do not display menubar
-.TP
-.B \-\-notabbar,  \-\-notoolbar  
-Do not display tab bar
-.TP
-.B  \-\-noframe  
-Do not display frame
-.TP
-.B  \-\-noscrollbar  
-Do not display scrollbar
-.TP
-.B  \-\-noxft  
-Do not use Xft (anti-aliasing)
-.TP
-.B  \-\-vt_sz CCxLL             
-Terminal size in columns x lines
-.TP
-.B  \-\-noresize  
-Terminal size is fixed
-.TP
-.B  \-\-type  <type>
-Start with given session type
-.TP
-.B  \-\-types  
-List available session types
-.TP
-.B  \-\-keytab  <name>
-Set keytab to 'name'
-.TP
-.B  \-\-keytabs  
-List available keytabs
-.TP
-.B  \-\-profile  <name>
-Start with given session profile
-.TP
-.B  \-\-profiles  
-List available session profiles
-.TP
-.B  \-\-schema  <name>
-| <file>  Set schema to 'name' or use 'file'
-.TP
-.B \-\-schemas,  \-\-schemata  
-List available schemata
-.TP
-.B  \-\-script  
-Enable extended DCOP Qt functions
-.TP
-.B  \-\-workdir  <dir>
-Change working directory to 'dir'
-.TP
-.B \-e <command> [ arguments ]
-Execute 'command' instead of shell. It also sets the window title and 
-icon name to be the basename of the program being executed if neither 
--T nor -n are given on the command line. 
-This must be the last option on the command line.
-.SS 
-.SS Arguments:
-.TP
-.B args
-Arguments for 'command'
-.SS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/konsole/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/konsole/'"
-from the command-line.
-.BR
-
-Konsole homepage: 
-.BR http://konsole.kde.org/
-.SH AUTHORS
-Kurt V. Hindenburg <kurt.hindenburg@kdemail.net>
-
-Lars Doelle <lars.doelle@on-line.de>
-.BR
-.SH OTHER
-This manual page was written by Ana Beatriz Guerrero Lopez <ana@ekaia.org> for the Debian
-system (but may be used by others).
-.BR
-
diff --git a/debian/_base/core/tdebase/debian/man/kpager-trinity.1 b/debian/_base/core/tdebase/debian/man/kpager-trinity.1
deleted file mode 100644
index 63a24f267..000000000
--- a/debian/_base/core/tdebase/debian/man/kpager-trinity.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.TH KPAGER 1 "August, 24 2003"
-.SH NAME
-kpager \- Trinity desktop pager
-.SH SYNOPSIS
-.B kpager
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kpager
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkpager\fP is a desktop pager for the Trinity desktop. It creates mini-views of the different Trinity desktops. These views show the real content of the desktop, or only icons. 
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-hidden
-Create the preview of the desktops, but hide the window
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kpager was written by the KDE project
diff --git a/debian/_base/core/tdebase/debian/man/kpersonalizer-trinity.1 b/debian/_base/core/tdebase/debian/man/kpersonalizer-trinity.1
deleted file mode 100644
index 01dc0b3cc..000000000
--- a/debian/_base/core/tdebase/debian/man/kpersonalizer-trinity.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.TH KPERSONALIZER 1
-.SH NAME
-kpersonalizer - TDE basic settings wizard
-
-.SH SYNOPSIS
-
-.B kpersonalizer [OPTION...]
-
-.SH DESCRIPTION
-
-The TDE Personalizer (KPersonalizer) is a wizard to configure TDE, and should automatically be run the first time a user runs TDE, to allow the user to configure basic TDE settings.
-.PP
-KPersonalizer allows the user to set locales, desktop behavior, enable accessibility features, and so forth. The options can be changed later by the Trinity Control Center application.
-
-.SH OPTIONS
-
-KPersonalizer accepts the following options:
-.PP
-.B Help options
-.TP
-.B \-\-help
-Show help about options.
-.TP
-.B \-\-help-qt
-Show Qt specific options.
-.TP
-.B \-\-help-tde 
-Show TDE specific options.
-.TP
-.B \-\-help-all 
-Show all options.
-.TP
-.B \-\-author
-Show author information.
-.TP
-.B \-v, \-\-version
-Show version information.
-.TP
-.B \-\-license 
-Show license information. 
-
-.PP
-.B Options
-.TP
-.B \-r 
-KPersonalizer is restarted by itself. 
-.TP
-.B \-\-before-session 
-KPersonalizer is started before the TDE session.
-
-.SH EXAMPLES
-.TP
-.B kpersonalizer
-Run kpersonalizer to set (or reset) TDE preferences.
-.TP
-.B kpersonalizer --before-session
-Run kpersonalizer before the first TDE session. 
-
-.SH AUTHORS
-
-Kpersonalizer was written by Ralf Nolden <nolden@kde.org>, Carsten Wolff <wolff@kde.org>, qwertz <kraftw@gmx.de>, and Bernhard Rosenkraenzer <bero@redhat.com>.
-.PP
-This  manual page was written by Joe Brockmeier <jzb@zonker.net>, for the Debian GNU/Linux project, but may be used by others.
-.SH "SEE ALSO"
-.TP
-.BR khelpcenter (1)
diff --git a/debian/_base/core/tdebase/debian/man/kprinter-trinity.1 b/debian/_base/core/tdebase/debian/man/kprinter-trinity.1
deleted file mode 100644
index a3ecdc88b..000000000
--- a/debian/_base/core/tdebase/debian/man/kprinter-trinity.1
+++ /dev/null
@@ -1,209 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPRINTER 1 "June 2006" "Trinity Desktop Environment" "A printer tool for TDE"
-.SH NAME
-kprinter
-\- a printer tool for TDE
-.SH SYNOPSIS
-\fBkprinter\fP [Qt\-options] [TDE\-options] [options] file(s) 
-.SH DESCRIPTION
-\fBKPrinter\fP opens automatically when you click on the "Print" icon of any TDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
-.sp 1
-\fBkprinter\fP is a very versatile tool. Depending on the actual features and power of the print subsystem of your computer, \fBkprinter\fP translates the former's abilities into a nice and easy\-to\-understand GUI. If your print subsystem does not support duplexing, \fBkprinter\fP will not show the option. If your print subsystem is CUPS, kprinter is at its peak shape.
-.sp 1
-With \fBKPrinter\fP you can...
-.IP "     \-"
-switch "on the fly" the print subsystem\-to\-use,
-.IP "     \-"
-start the Add Printer Wizard,
-.IP "     \-"
-choose the target printer,
-.IP "     \-"
-possibly select one or more files to print,
-.IP "     \-"
-drag'n'drop files for print,
-.IP "     \-"
-check for or set the print options,
-.IP "     \-"
-schedule the job for later printing,
-.IP "     \-"
-tag the print job with accounting information for billing purposes,
-.IP "     \-"
-set the job priority for a higher or lower level to influence the order of the job queue,
-.IP "     \-"
-access the TDEPrint configurator,
-.IP "     \-"
-and activate (or disable) a viewing filter that shows all or just the selected few printers relevant to the user.
-.SP
-.SH OPTIONS
-.SS
-.SS Arguments:
-file(s)                   Files to load
-.SS Options:
-.TP
-.B  \-c  
-Make an internal copy of the files to print
-.TP
-.B \-P,  \-d  <printer>
-Printer/destination to print on
-.TP
-.B \-J,  \-t  <title>
-Title/Name for the print job
-.TP
-.B \-#, \-n <number>
-Number of copies
-.TP
-.B  \-o  
-<option=value>         Printer option
-.TP
-.B  \-j  <mode>
-Job output mode (gui, console, none) [gui]
-.TP
-.B  \-\-system  <printsys>
-Print system to use (lpd, cups)
-.TP
-.B  \-\-stdin  
-Allow printing from STDIN
-.TP
-.B  \-\-nodialog  
-Do not show the print dialog (print directly)
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\fB\-\-nograb\fP, use \fB\-\-dograb\fP to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kprinter/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kprinter/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/krandom.kss-trinity.1 b/debian/_base/core/tdebase/debian/man/krandom.kss-trinity.1
deleted file mode 100644
index 4a13d95ec..000000000
--- a/debian/_base/core/tdebase/debian/man/krandom.kss-trinity.1
+++ /dev/null
@@ -1,152 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KRANDOM.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
-.SH NAME
-krandom.kss
-\- Start a random TDE screen saver
-.SH SYNOPSIS
-\fBkrandom.kss\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBkrandom.kss\fP starts a random TDE screen saver.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-setup  
-Setup screen saver
-.TP
-.B  \-\-window\-id  wid
-Run in the specified XWindow
-.TP
-.B  \-\-root  
-Run in the root XWindow
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kreadconfig-trinity.1 b/debian/_base/core/tdebase/debian/man/kreadconfig-trinity.1
deleted file mode 100644
index 3bb6c4d0b..000000000
--- a/debian/_base/core/tdebase/debian/man/kreadconfig-trinity.1
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "Trinity Desktop Environment" "Read TDEConfig entries"
-.SH NAME
-kreadconfig
-\- Read TDEConfig entries (for use in shell scripts)
-.SH SYNOPSIS
-\fBkreadconfig\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBkreadconfig\fP is a command line tool to retrieve values from TDE configuration files.
-.sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
-.SS Example:
-.TP
-\fBkreadconfig \-\-group\fP Directories \fB--key\fP dir_tmp
-read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from TDE's main configuration file
-
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-file  <file>
-Use <file> instead of global config
-.TP
-.B  \-\-group  <group>
-Group to look in [TDE]
-.TP
-.B  \-\-key  <key>
-Key to look for
-.TP
-.B  \-\-default  <default>
-Default value
-.TP
-.B  \-\-type  <type>
-Type of variable
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS
-
-.SH FILES
-.I /etc/trinity/system.kdeglobals
-global TDE configuration file
-.I ~/.trinity/share/config
-standard configuration directory
-
-.SH AUTHORS
-.nf
-Bernhard Rosenkraenzer <bero@redhat.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/krootimage-trinity.1 b/debian/_base/core/tdebase/debian/man/krootimage-trinity.1
deleted file mode 100644
index e9b19a604..000000000
--- a/debian/_base/core/tdebase/debian/man/krootimage-trinity.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KROOTIMAGE 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-krootimage
-\- set desktop background for tdm
-.SH SYNOPSIS
-\fBkrootimage\fP [Qt\-options] [TDE\-options] config 
-.SH DESCRIPTION
-\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B config
-Name of the configuration file
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kstart-trinity.1 b/debian/_base/core/tdebase/debian/man/kstart-trinity.1
deleted file mode 100644
index 9d3a77ddc..000000000
--- a/debian/_base/core/tdebase/debian/man/kstart-trinity.1
+++ /dev/null
@@ -1,215 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSTART 1 "June 2006" "Trinity Desktop Environment" "application launch utility"
-.SH NAME
-kstart
-\- Utility to launch applications with special window properties 
-.SH SYNOPSIS
-\fBkstart\fP [Qt\-options] [TDE\-options] [options] command 
-.SH DESCRIPTION
-Utility to launch applications with special window properties.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B command
-Command to execute
-.SS 
-.SS Options:
-.TP
-.B  \-\-window  <regexp>
-A regular expression matching the window title
-.TP
-.B  \-\-windowclass  <class>
-A string matching the window class (WM_CLASS property)
-The window class can be found out by running
-'xprop | grep WM_CLASS' and clicking on a window
-(use either both parts separated by a space or only the right part).
-NOTE: If you specify neither window title nor window class,
-then the very first window to appear will be taken;
-omitting both options is NOT recommended.
-.TP
-.B  \-\-desktop  <number>
-Desktop on which to make the window appear
-.TP
-.B  \-\-currentdesktop  
-Make the window appear on the desktop that was active
-when starting the application
-.TP
-.B  \-\-alldesktops  
-Make the window appear on all desktops
-.TP
-.B  \-\-iconify  
-Iconify the window
-.TP
-.B  \-\-maximize  
-Maximize the window
-.TP
-.B  \-\-maximize\-vertically  
-Maximize the window vertically
-.TP
-.B  \-\-maximize\-horizontally  
-Maximize the window horizontally
-.TP
-.B  \-\-fullscreen  
-Show window fullscreen
-.TP
-.B  \-\-type  <type>
-The window type: Normal, Desktop, Dock, Tool, 
-Menu, Dialog, TopMenu or Override
-.TP
-.B  \-\-activate  
-Jump to the window even if it is started on a 
-different virtual desktop
-.TP
-.B \-\-ontop,  \-\-keepabove  
-Try to keep the window above other windows
-.TP
-.B \-\-onbottom,  \-\-keepbelow  
-Try to keep the window below other windows
-.TP
-.B  \-\-skiptaskbar  
-The window does not get an entry in the taskbar
-.TP
-.B  \-\-skippager  
-The window does not get an entry on the pager
-.TP
-.B  \-\-tosystray  
-The window is sent to the system tray in Kicker
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Matthias Ettrich <ettrich@kde.org>
-.br
-David Faure <faure@kde.org>
-.br
-Richard J. Moore <rich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/ksystraycmd-trinity.1 b/debian/_base/core/tdebase/debian/man/ksystraycmd-trinity.1
deleted file mode 100644
index 4807276c0..000000000
--- a/debian/_base/core/tdebase/debian/man/ksystraycmd-trinity.1
+++ /dev/null
@@ -1,189 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSYSTRAYCMD 1 "June 2006" "Trinity Desktop Environment" "system tray utility"
-.SH NAME
-ksystraycmd
-\- Allows any application to be kept in the system tray
-.SH SYNOPSIS
-\fBksystraycmd\fP [Qt\-options] [TDE\-options] [options] command 
-.SH DESCRIPTION
-The system tray is an area in which an application can display a small window.
-It may be used to display status information or provide quick access to commands.
-Normally tray icons are developed as part of an application.
-\fBksystraycmd\fP allows any application to be kept in the system tray.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B command
-Command to execute
-.SS 
-.SS Options:
-.TP
-.B  \-\-window  <regexp>
-A regular expression matching the window title
-If you do not specify one, then the very first window
-to appear will be taken \- not recommended.
-.TP
-.B  \-\-wid  <int>
-The window id of the target window
-Specifies the id of the window to use. If the id starts with 0x
-it is assumed to be in hex.
-.TP
-.B  \-\-hidden  
-Hide the window to the tray on startup
-.TP
-.B  \-\-startonshow  
-Wait until we are told to show the window before
-executing the command
-.TP
-.B  \-\-tooltip  <text>
-Sets the initial tooltip for the tray icon
-.TP
-.B  \-\-keeprunning  
-Keep the tray icon even if the client exits. This option
-has no effect unless startonshow is specified.
-.TP
-.B  \-\-ownicon  
-Use ksystraycmd's icon instead of window's icon in systray
-(should be used with \-\-icon to specify ksystraycmd icon)
-.TP
-.B  \-\-ontop  
-Try to keep the window above other windows
-.TP
-.B  \-\-quitonhide  
-Quit the client when we are told to hide the window.
-This has no effect unless startonshow is specified and implies keeprunning.
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Richard Moore <rich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/ktrash-trinity.1 b/debian/_base/core/tdebase/debian/man/ktrash-trinity.1
deleted file mode 100644
index 0094c84fa..000000000
--- a/debian/_base/core/tdebase/debian/man/ktrash-trinity.1
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KTRASH 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-ktrash
-\- Helper program to handle the TDE trash can
-.SH SYNOPSIS
-\fBktrash\fP [Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-\fBktrash\fP is a helper program to handle the TDE trash can.
-.sp 1
-Note: to move files to the trash, do not use \fBktrash\fP, but "\fBkfmclient\fP move 'url' trash:/"
-.SH OPTIONS
-.SS
-.SS Options:
-.TP
-.B  \-\-empty  
-Empty the contents of the trash
-.TP
-.B  \-\-restore  <file>
-Restore a trashed file to its original location
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-.SH SEE ALSO
-\fBkfmclient\fP(1)
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kwrite-trinity.1 b/debian/_base/core/tdebase/debian/man/kwrite-trinity.1
deleted file mode 100644
index f7d39f61d..000000000
--- a/debian/_base/core/tdebase/debian/man/kwrite-trinity.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.TH KWRITE 1 "August, 25 2003"
-.SH NAME
-kwrite \- TDE text editor
-.SH SYNOPSIS
-.B kwrite
-.RI [ options ]  [file]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kwrite
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkwrite\fP is a text editor for TDE, that is a light version of \fIkate\fP.
-It allows syntax coloration for many langages.
-
-It is able to expand or collapse parts of code (C functions, ...).
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.B file
-is the file to open
-
-.SH SEE ALSO
-.BR kate (1)
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kwrite was written by the KDE project
diff --git a/debian/_base/core/tdebase/debian/man/kwriteconfig-trinity.1 b/debian/_base/core/tdebase/debian/man/kwriteconfig-trinity.1
deleted file mode 100644
index b347b9849..000000000
--- a/debian/_base/core/tdebase/debian/man/kwriteconfig-trinity.1
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "Trinity Desktop Environment" "Write TDEConfig entries"
-.SH NAME
-kwriteconfig
-\- Write TDEConfig entries (for use in shell scripts)
-.SH SYNOPSIS
-\fBkwriteconfig\fP [Qt\-options] [TDE\-options] [options] value 
-.SH DESCRIPTION
-\fBkwriteconfig\fP is a command line tool to write values in TDE configuration files.
-Nonexisting files/groups/keys will be created.
-.sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
-.SS Example:
-.TP
-\fBkwriteconfig \-\-file\fP \fImyrc\fP \fB\-\-group\fP Directories \fB\-\-key\fP dir_tmp /tmp
-writes the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories in configuration \fBfile\fP \fImyrc\fP
-
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B value
-The value to write. Mandatory, on a shell use '' for empty
-.SS Options:
-.TP
-.B  \-\-file  <file>
-Use <file> instead of global config
-.TP
-.B  \-\-group  <group>
-Group to look in [TDE]
-.TP
-.B  \-\-key  <key>
-Key to look for
-.TP
-.B  \-\-type  <type>
-Type of variable. Use "bool" for a boolean, otherwise it is treated as a string
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Luis Pedro Coelho <luis_pedro@netcabo.pt>
-.br
-Bernhard Rosenkraenzer <bero@redhat.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/kxkb-trinity.1 b/debian/_base/core/tdebase/debian/man/kxkb-trinity.1
deleted file mode 100644
index 9a6a6bcf6..000000000
--- a/debian/_base/core/tdebase/debian/man/kxkb-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KXKB 1 "June 2006" "Trinity Desktop Environment" "A utility to switch keyboard maps"
-.SH NAME
-kxkb
-\- A utility to switch keyboard maps
-.SH SYNOPSIS
-\fBkxkb\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKxkb\fP is a keyboard layout switching utility based on X11 xkb extension. It allows to use different keyboard layouts for inputing text. \fBKxkb\fP features keyboard layout indicator.
-.sp 1
-\fBKxkb\fP starts automatically and stays in system tray as a flag with 2 or 3 letter abbreviation of layout name on top of it if more than one layout is defined or Show indicator for single layout option is turned on.
-.sp 1
-When \fBKxkb\fP is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can right mouse button click the \fBKxkb\fP icon and select layout from the list.
-.sp 1
-Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBtdecmshell keyboard_layout\fP in a terminal.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kxkb/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kxkb/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Andriy Rysin <rysin@kde.org>
-.br
-Shaheed Haque <srhaque@iee.org>
-.br
-Ilya Konstantinov <kde\-devel@future.galanet.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/starttde-trinity.1 b/debian/_base/core/tdebase/debian/man/starttde-trinity.1
deleted file mode 100644
index 73ab27b9c..000000000
--- a/debian/_base/core/tdebase/debian/man/starttde-trinity.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH starttde 1 "Jan 17, 2005"
-.SH NAME
-starttde \- Starts up the Trinity Desktop Environment 
-.SH SYNOPSIS
-.B starttde
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B starttde
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-The \fBstarttde\fP script starts up the Trinity Desktop Environment and
-is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from
-your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
-will load your last session, or a default session that includes the standard
-TDE programs if no saved session is available.
-
-\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
-any X11R6 SM compliant program.
-
-\fBstarttde\fP and ksmserver use the contents of the ~/.trinity directory
-for starting previously saved sessions. Source scripts found in ~/.trinity/env/*.sh
-can be used to define environment variables that will be available to all TDE 
-programs.
-
-For anything else (that doesn't set env vars, or that needs a window manager),
-better use the ~/.trinity/Autostart folder.
-
-At the end of a session, the scripts found in ~/.trinity/shutdown will be executed.
-
-
-.SH OPTIONS
-\fBstarttde\fP takes no command line options.
-
-.SH AUTHOR
-\fBstarttde\fP is written by the KDE Project.
-
-This manual page was written by Philipp Grau.
-
-.SH "REPORTING BUGS"
-Report bugs of this modified Debian version of starttde to the Bug
-Tracking System at: http://bugs.debian.org
-.SH COPYRIGHT
-Copyright \(co 2005 Philipp Grau.
diff --git a/debian/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1 b/debian/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1
deleted file mode 100644
index af48f59e6..000000000
--- a/debian/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1
+++ /dev/null
@@ -1,200 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEDEBUGDIALOG 1 "June 2006" "Trinity Desktop Environment" "control debug output"
-.SH NAME
-tdedebugdialog
-\- A dialog box for setting preferences for debug output
-.SH SYNOPSIS
-\fBtdedebugdialog\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
-.sp 1
-If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
-.sp 1
-If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
-.sp 1
-In full mode, first you should select the debug area you are interested in from the drop down list at the top.
-.sp 1
-You may independently set the output for various types of messages:
-.sp 1
-.RS 3
-\- Information
-.br
-\- Warning
-.br
-\- Error
-.br
-\- Fatal Error
-.RE
-.PP
-For each of these types, you can set the following:
-.sp 1
-\fBOutput to\fP:
-.br
-In this Combobox, you can choose where the messages should be output. The choices are: \fBFile\fP?, \fBMessage Box\fP, \fBShell\fP (meaning stderr), \fBSyslog\fP an \fBNone\fP. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is ?Message Box?.
-.sp 1
-\fBFilename:\fP
-.br
-This is only enabled when you have chosen \fBFile\fP as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is \fIkdebug.dbg\fP.
-Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level TDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message.
-.sp 1
-When you close the dialog by pressing OK, your entries apply immediately and are saved in \fIkdebugrc\fP. When you press Cancel, your entries are discarded and the old ones are restored.
-
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-fullmode  
-Show the fully\-fledged dialog instead of the default list dialog
-.TP
-.B  \-\-on  <area>
-Turn area on
-.TP
-.B  \-\-off  <area>
-Turn area off
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS
-
-.SH FILES
-.I ~/.trinity/share/config/kdebugrc
-\fBtdedebugdialog\fP configuration file
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdedebugdialog/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdedebugdialog/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 b/debian/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
deleted file mode 100644
index 1e7b055f6..000000000
--- a/debian/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-tdeio_media_mounthelper
-\- tdeio_media_mounthelper
-.SH SYNOPSIS
-\fBtdeio_media_mounthelper\fP [Qt\-options] [TDE\-options] [options] URL 
-.SH DESCRIPTION
-\fBtdeio_media_mounthelper\fP is a helper program to handle the mounting of media in TDE. It is part of the KIO subsystem.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-media:/ URL to mount/unmount/eject/remove
-.SS Options:
-.TP
-.B  \-u  
-Unmount given URL
-.TP
-.B  \-m  
-Mount given URL (default)
-.TP
-.B  \-e  
-Eject given URL via tdeeject
-.TP
-.B  \-s  
-Unmount and Eject given URL (necessary for some USB devices)
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-.SH AUTHORS
-.nf
-Waldo Bastian <bastian@kde.org>
-.br
-Kevin Ottens <ervin@ipsquad.net>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 b/debian/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
deleted file mode 100644
index 270dd86e6..000000000
--- a/debian/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  tdeio_system_documenthelper 1 "June 2006" "Trinity Desktop Environment" "helper script"
-.SH NAME
-tdeio_system_documenthelper
-\- TDE helper script used by document.desktop
-.SH SYNOPSIS
-\fBtdeio_system_documenthelper\fP
-
-.SH DESCRIPTION
-The script is used by document.desktop entry to determine if it must be shown or not.
-
-.SH AUTHORS
-.nf
-Kevin Ottens <ervin@ipsquad.net>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/tdepasswd-trinity.1 b/debian/_base/core/tdebase/debian/man/tdepasswd-trinity.1
deleted file mode 100644
index e09aff0e2..000000000
--- a/debian/_base/core/tdebase/debian/man/tdepasswd-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.TH TDEPASSWD 1
-
-.SH NAME
-tdepasswd \- graphical frontend to change the user's password
-
-.SH SYNOPSIS
-.B tdepasswd [ \fIQt-options\fR ] [ \fITDE-options\fR ] \fIoptions\fR
-
-.SH DESCRIPTION
-Changes a UNIX password.
-
-.SH OPTIONS
-.B Generic options:
-.TP
-.HP
-.B \-\-help
-Show help about options
-.TP
-.HP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.HP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.HP
-.B \-\-help\-all
-Show all options
-.TP
-.HP
-.B \-\-author
-Show author information
-.TP
-.HP
-.B \-v\fR, \fB \-\-version
-Show version information
-.TP
-.HP
-.B \-\-license
-Show license information
-.TP
-.B Qt options:
-.TP
-.HP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'.
-.TP
-.HP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'.
-.TP
-.HP
-.B \-\-cmap
-Causes the application to install a private 
-color map on an 8-bit display.
-.TP
-.HP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.HP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.HP
-.B \-\-dograb
-Running under a debugger can cause an implicit
--nograb, use -dograb to override.
-.TP
-.HP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.HP
-.B \-\-fn, \-\-font <fontname>
-Defines the application font.
-.TP
-.HP
-.B \-\-bg, \-\-background <color> 
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.HP
-.B \-\-fg, \-\-foreground <color> 
-Sets the default foreground color.
-.TP
-.HP
-.B \-\-btn, \-\-button <color>
-Sets the default button color.
-.TP
-.HP
-.B \-\-name <name>
-Sets the application name.
-.TP
-.HP
-.B \-\-title <title>
-Sets the application title (caption).
-.TP
-.HP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.HP
-.B \-\-inputstyle <inputstyle>
-Sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root.
-.TP
-.HP
-.B \-\-im <XIM server>
-Set XIM server.
-.TP
-.HP
-.B \-\-noxim
-Disable XIM.
-.TP
-.HP
-.B \-\-reverse
-Mirrors the whole layout of widgets.
-.TP
-.B TDE options:
-.TP
-.HP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar.
-.TP
-.HP
-.B \-\-icon <icon>
-Use 'icon' as the application icon.
-.TP
-.HP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar.
-.TP
-.HP
-.B \-\-config <filename>
-Use alternative configuration file.
-.TP
-.HP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'.
-.TP
-.HP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.HP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.HP
-.B \-\-style <style>
-Sets the application GUI style.
-.TP
-.HP
-.B \-\-geometry <geometry>
-Sets the client geometry of the main widget.
-
-.SH "SEE ALSO"
-.BR passwd (1).
-
-.SH AUTHOR
-Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/debian/_base/core/tdebase/debian/man/tdeprintfax-trinity.1 b/debian/_base/core/tdebase/debian/man/tdeprintfax-trinity.1
deleted file mode 100644
index e407c294e..000000000
--- a/debian/_base/core/tdebase/debian/man/tdeprintfax-trinity.1
+++ /dev/null
@@ -1,160 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEPRINTFAX 1 "June 2006" "Trinity Desktop Environment" "A fax utility"
-.SH NAME
-tdeprintfax
-\- a interface to fax-packages
-.SH SYNOPSIS
-\fBtdeprintfax\fP [Qt\-options] [TDE\-options] [options] [file] 
-.SH DESCRIPTION
-\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File to fax (added to the file list)
-.SS Options:
-.TP
-.B  \-\-phone  
-Phone number to fax to
-.TP
-.B  \-\-immediate  
-Send fax immediately
-.TP
-.B  \-\-batch  
-Exit after sending
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/tdesu-trinity.1 b/debian/_base/core/tdebase/debian/man/tdesu-trinity.1
deleted file mode 100644
index fa8c45e09..000000000
--- a/debian/_base/core/tdebase/debian/man/tdesu-trinity.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.TH TDESU 1 "May 2005" "Trinity Desktop Environment" "Runs a program with elevated privileges."
-.SH NAME
-tdesu \- Runs a program with elevated privileges.
-.SH SYNOPSIS
-\fBtdesu\fR [Qt\-options] [TDE\-options] [tdesu options] command 
-.SH DESCRIPTION
-Runs a program with elevated privileges.
-.PP
-TDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
-.PP
-\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
-.PP
-\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  --help
-Show help about options
-.TP
-.B  --help-qt
-Show Qt specific options
-.TP
-.B  --help-tde
-Show TDE specific options
-.TP
-.B  --help-all
-Show all options
-.TP
-.B  --author
-Show author information
-.TP
-.B -v,  --version
-Show version information
-.TP
-.B  --license
-Show license information
-.SS
-.SS tdesu Options:
-.TP
-.TP
-.B -c <command>
-Specifies the command to run
-.TP
-.B -f <file>
-Run command under target uid if <file> is not writable
-.TP
-.B -u <user>
-Specifies the target uid [default is root]
-.TP
-.B -n
-Do not keep password
-.TP
-.B -s
-Stop the daemon (forgets all passwords)
-.TP
-.B -t
-Enable terminal output (no password keeping)
-.TP
-.B -p <prio>
-Set priority value: 0 <= prio <= 100, 0 is lowest [default is 50]
-.TP
-.B -r
-Use realtime scheduling
-.TP
-.B  --nonewdcop
-Let command use existing dcopserver
-.TP
-.B -i <icon name>
-Specify icon to use in the password dialog
-.TP
-.B -d
-Do not show the command to be run in the dialog
-.SS 
-.SS Arguments:
-.TP
-.B command
-Specifies the command to run
-
-.SH CONFIGURATION FILES
-.PP
-\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .trinity/share/config/tdesurc. Alternative a section could be added to kdeglobals.
-.SH EXAMPLE
-The configuration item for the configuration files is the following:
-.br
-[super-user-command] 
-.br
-super-user-command=sudo
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center. You can also enter the URL
-.BR help:/tdesu/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/tdesu/'"
-from the command-line.
-.br
-.SH AUTHORS
-.br
-Geert Jansen <jansen@kde.org>
-.br
-Pietro Iglio <iglio@fub.it>
-.PP
-This manual page was written by Christopher Martin <chrsmrtn@debian.org> for Debian GNU/Linux, but may be used by others. It borrows from an earlier manpage by Karolina Lindqvist <pgd\-karolinali@algonet.se>.
diff --git a/debian/_base/core/tdebase/debian/man/tdm-trinity.1 b/debian/_base/core/tdebase/debian/man/tdm-trinity.1
deleted file mode 100644
index 1150fe5a8..000000000
--- a/debian/_base/core/tdebase/debian/man/tdm-trinity.1
+++ /dev/null
@@ -1,116 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDM 1 "June 2006" "Trinity Desktop Environment" "Trinity Display Manager"
-.SH NAME
-tdm
-\- Trinity Display Manager
-.SH SYNOPSIS
-\fBtdm\fP [options] [tty]
-.SH DESCRIPTION
-\fBtdm\fP is the Trinity display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session.
-.br
-\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network.
-.sp 1
-\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP.
-.SH OPTIONS
-.TP
-.B \-daemon
-Daemonize even when started by init
-.TP
-.B \-nodaemon
-Don't daemonize even when started from command line
-.TP
-.BI \-config\  file
-Use alternative master configuration file
-.TP
-.BR \-xrm \ res
-Override frontend\-specific resource
-.TP
-.BI \-error\  file
-Use alternative log file
-.TP
-.BR \-debug \ num
-Debug option bitfield:
-.RS 11
-0x1   \- core log
-.br
-0x2   \- config reader log
-.br
-0x4   \- greeter log
-.br
-0x8   \- IPC log
-.br
-0x10  \- session sub-daemon post-fork delay
-.br
-0x20  \- config reader post-start delay
-.br
-0x40  \- greeter post-start delay
-.br
-0x80  \- don't use syslog
-.br
-0x100 \- core Xauth log
-.br
-0x400 \- valgrind config reader and greeter
-.br
-0x800 \- strace config reader and greeter
-.RE
-.SH FILES
-.TP
-.I /etc/trinity/tdm/backgroundrc
-configuration file with background settings
-.TP
-.I /etc/trinity/tdm/tdm.options
-options for X display manager tdm
-.TP
-.I /etc/trinity/tdm/tdmrc
-the tdm configuration file
-.TP
-.I /etc/trinity/tdm/Xaccess
-access control file for XDMCP connections
-.TP
-.I /etc/trinity/tdm/Xservers
-list of local X-servers
-.TP
-.I /etc/trinity/tdm/Xreset
-script to run as root after session exits
-.TP
-.I /etc/trinity/tdm/Xsession
-script to run as user after login of user
-.TP
-.I /etc/trinity/tdm/Xsetup
-script to run as root before the login dialog appears
-.sp 1
-this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen
-.TP
-.I /etc/trinity/tdm/Xstartup
-script to run as root before session starts
-.TP
-.I /etc/trinity/tdm/Xwilling
-output of this script is displayed in the chooser window
-.SH SEE ALSO
-.BR tdm.options (5),\  tdmctl (1),\  tdm_config (1),\  tdm_greet (1),\  startx (1),\  X (7x),\  xconsole (1),\  xdm (1)
-.TP
-.I /opt/trinity/share/doc/tdm/README.gz
-Information about \fBtdm\fP and its options
-.sp 1
-.RE
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdm/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdm/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Steffen Hansen <hansen@kde.org>
-.br
-Thomas Tanghus <tanghus@earthling.net>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/tdm_config-trinity.1 b/debian/_base/core/tdebase/debian/man/tdm_config-trinity.1
deleted file mode 100644
index b8753b168..000000000
--- a/debian/_base/core/tdebase/debian/man/tdm_config-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_CONFIG 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-tdm_config
-\- helper programm for tdm to read configuration files
-.SH SYNOPSIS
-\fBtdm_config\fP
-.SH DESCRIPTION
-\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files.
-.SH SEE ALSO
-\fBtdm\fP(1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/tdm_greet-trinity.1 b/debian/_base/core/tdebase/debian/man/tdm_greet-trinity.1
deleted file mode 100644
index 10b7bde6e..000000000
--- a/debian/_base/core/tdebase/debian/man/tdm_greet-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_GREET 1 "June 2006" "Trinity Desktop Environment" "TDE greeter module"
-.SH NAME
-tdm_greet
-\- TDE greeter module for tdm
-.SH SYNOPSIS
-\fBtdm_greet\fP
-.SH DESCRIPTION
-\fBtdm_greet\fP is a TDE greeter module for \fBtdm\fP. It shows the login dialog.
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/man/tdmctl-trinity.1 b/debian/_base/core/tdebase/debian/man/tdmctl-trinity.1
deleted file mode 100644
index 82be6ae16..000000000
--- a/debian/_base/core/tdebase/debian/man/tdmctl-trinity.1
+++ /dev/null
@@ -1,220 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDMCTL 1 "June 2006" "Trinity Desktop Environment" "TDM remote control application"
-.SH NAME
-tdmctl
-\- tdm remote control application
-.SH SYNOPSIS
-\fBtdmctl\fP [options] [command [command arguments]]
-.SH DESCRIPTION
-\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets.
-.sp 1
-There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user).
-.sp 1
-The directory in which the sockets are located is determined this way:
-.RS 3
-\- the \fB\-s\fP option is examined
-.br
-\- the $DM_CONTROL variable is examined
-.br
-\- the tdm config file is searched for the FifoDir key
-.br
-.RI \- /var/run/xdmctl \ and\  /var/run \ are\ tried
-.RE
-.sp 1
-If $DISPLAY is set (or \fB\-d\fP was specified) and \fB\-g\fP was not specified, the
-display\-specific control socket will be used, otherwise the global one.
-.sp 1
-Tokens in the command and the reply are tab\-separated.
-Command arguments can be specified as separate command line parameters,
-in which case they are simply concatenated with tabs in between.
-.sp 1
-If the command is '\-', \fBtdmctl\fP reads commands from stdin.
-The default command is 'caps'.
-.SH OPTIONS
-.SS
-.SS Options:
-.TP
-.B \-h \-help
-print help message.
-.TP
-.B \-g \-global
-Use global control socket even if $DISPLAY is set
-.TP
-.B \-d \-display
-Override $DISPLAY
-.TP
-.B \-s \-sockets
-Override $DM_CONTROL
-.TP
-.B \-c \-config
-Use alternative tdm config file
-.SS Commands:
-.br
-.SS Global commands:
-.TP 
-.B login
-display (now|schedule) user password [session_arguments]
-.br
- login user at specified display. if "now" is specified, a possibly running session is killed, otherwise the login is done after the session exits.
-.br
-session_arguments are printf\-like escaped contents for \fI.dmrc\fP. Unlisted keys will default to previously saved values.
-.SS Per\-display commands:
-.TP 
-.B lock
-The display is marked as locked. If the X\-Server crashes in this state, no auto\-relogin will be performed even if the option is on.
-.TP 
-.B unlock
-Reverse the effect of "lock": re\-enable auto\-relogin.
-.TP 
-.B suicide
-The currently running session is forcibly terminated. No auto\-relogin is attempted, but a scheduled "login" command will be executed.
-.SS Commands for all sockets:
-.TP
-.B caps
-Returns a list of this socket's capabilities:
-.IP "    \- tdm"
-identifies tdm, in case some other DM implements this protocol, too.
-.IP "    \- list, activate, lock, suicide, login"
-the respective command is supported.
-.IP "    \- bootoptions"
-the "listbootoptions" command and the "=" option to "shutdown" are supported.
-.IP "    \- shutdown <list>"
-"shutdown" is supported and allowed to the listed users (comma\-separated). "*" means all authenticated users.
-.IP "    \- shutdown"
-"shutdown" is supported and allowed to everybody.
-.IP "    \- nuke <list>"
-forced shutdown is allowed to the listed users.
-.IP "    \- nuke"
-forced shutdown is allowed to everybody.
-.IP "    \- reserve <number>"
-reserve displays are configured and <number> are available at this time.
-.TP 
-\fBlist\fP [all|alllocal]
-.br
-Return a list of running sessions. By default all active sessions are listed. If "all" is specified, passive sessions are listed as well. If "alllocal" is specified, passive sessions are listed as well, but all incoming remote sessions are skipped.
-.sp 1
-Each session entry is a comma\-separated tuple of:
-.RS 7
-\- Display or TTY name
-.br
-\- VT name for local sessions
-.br
-\- Logged in user's name, empty for passive sessions and outgoing
-.br
-  remote sessions (local chooser mode)
-.br
-\- Session type or remote host for outgoing remote sessions,
-.br
-  empty for passive sessions
-.br
-\- A flag field:
-.RS 5
-\- "t" for tty sessions
-.br
-\- "*" for the display belonging to the requesting socket
-.br
-\- "!" for sessions that cannot be killed by the requesting
-.br
-  socket
-.br
-\- New flags might be added later
-.br
-.RE
-\- New fields might be added later
-.RE
-.TP
-\fBreserve\fP [timeout in seconds]
-.br
-Start a reserve login screen. If nobody logs in within the specified amount of time (one minute by default), the display is removed again. When the session on the display exits, the display is removed, too.
-.br
-Permitted only on sockets of local displays and the global socket.
-.TP
-\fBactivate\fP (vt|display)
-.br
-Switch to a particular VT (virtual terminal). The VT may be specified either directly (e.g., vt3) or by a display using it (e.g., :2).
-.br
-Permitted only on sockets of local displays and the global socket.
-.TP
-.B listbootoptions
-List available boot options.
-.br
-=> "ok" list default current default and current are indices into the list and are \-1 if unset or undeterminable.
-.TP
-\fBshutdown\fP (reboot|halt) [=bootchoice]
-.br
-  (ask|trynow|forcenow|schedule|start
-.br
-   (\-1|end (force|forcemy|cancel)))
-.br
-.RS 7
-Request a system shutdown, either a reboot or a halt/poweroff.
-.sp 1
-An OS choice for the next boot may be specified from the list returned by "listbootoptions".
-.sp 1
-Shutdowns requested from per\-display sockets are executed when the current session on that display exits. Such a request may pop up a dialog asking for confirmation and/or authentication.
-.sp 1
-start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately.
-.sp 1
-end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following:
-.RS 3
-- "cancel" \- give up the shutdown.
-.br
-- "force" \- shut down nonetheless.
-.br
-- "forcemy" \- shut down nonetheless if all active sessions
-.br
-   belong to the requesting user. Only for per\-display sockets.
-.RE
-.sp 1
-start and end are specified in seconds since the UNIX epoch.
-.sp 1
-"trynow" is a synonym for "0 0 cancel", "forcenow" for "0 0 force" and "schedule" for "0 \-1".
-.sp 1
-"ask" attempts an immediate shutdown and interacts with the user if active sessions are still running. Only for per\-display sockets.
-.RE
-.TP
-\fBshutdown cancel\fP [local|global]
-.br
-Cancel a scheduled shutdown. The global socket always cancels the currently pending shutdown, while per\-display sockets default to cancelling their queued request.
-.TP
-\fBshutdown status\fP
-Return a list with information about shutdowns.
-.br
-The entries are comma\-separated tuples of:
-.RS 10
-\- ("global"|"local") \- pending vs. queued shutdown. A local
-.br
-  entry can be returned only by a per\-display socket.
-.br
-\- ("halt"|"reboot")
-.br
-\- start
-.br
-\- end
-.br
-\- ("ask"|"force"|"forcemy"|"cancel")
-.br
-\- Numeric user ID of the requesting user, \-1 for the global
-.br
-  socket.
-.br
-\- The next boot OS choice or "\-" for none.
-.br
-\- New fields might be added later.
-.RE
-.SH SEE ALSO
-.BR tdm (1)
-.TP
-.I /opt/trinity/share/doc/tdm/README.gz
-Information about the command sockets (and \fBtdm\fP)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdebase/debian/prune-nonfree b/debian/_base/core/tdebase/debian/prune-nonfree
deleted file mode 100644
index 4fa832d5c..000000000
--- a/debian/_base/core/tdebase/debian/prune-nonfree
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-# Removes non-free files from the source tree. Must be done before
-# creating the orig.tar.gz.
-
-TOPLEVEL="$1"
-
-if [ "$TOPLEVEL" = "" ]; then
-	echo "Please provide the toplevel directory as the argument."
-	exit 1
-else
-	rm -f $TOPLEVEL/kcontrol/energy/pics/energybig.png
-	rm -f $TOPLEVEL/kcontrol/energy/pics/lo-energy.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr128-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr16-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr32-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr48-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr64-app-energy_star.png
-fi
-
-exit 0
diff --git a/debian/_base/core/tdebase/debian/rules b/debian/_base/core/tdebase/debian/rules
index 37fc4799b..edf12269d 100755
--- a/debian/_base/core/tdebase/debian/rules
+++ b/debian/_base/core/tdebase/debian/rules
@@ -82,15 +82,6 @@ PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-t
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
-makebuilddir::
-	touch kcontrol/energy/pics/energybig.png
-	touch kcontrol/energy/pics/lo-energy.png
-	uudecode -o kcontrol/pics/cr128-app-energy_star.png debian/img/cr128-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr16-app-energy_star.png debian/img/cr16-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr32-app-energy_star.png debian/img/cr32-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr48-app-energy_star.png debian/img/cr48-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr64-app-energy_star.png debian/img/cr64-app-energy_star.png.uu
-
 common-install-prehook-arch::
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-i386
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-amd64
@@ -99,7 +90,6 @@ common-install-prehook-arch::
 
 clean::
 	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-tdeio-plugins-trinity.install.kfreebs*
-	rm -f kcontrol/pics/cr*-app-energy_star.png kcontrol/energy/pics/energybig.png kcontrol/energy/pics/lo-energy.png
 
 binary-install/tdebase-data-trinity::
 	# hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time
diff --git a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install
index 5ffe84ca7..ffd4cc04a 100644
--- a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install
@@ -57,6 +57,8 @@ debian/tmp/opt/trinity/share/apps/kcontrol/pics/gamma2.2.gif
 debian/tmp/opt/trinity/share/apps/kcontrol/pics/gamma2.2.png
 debian/tmp/opt/trinity/share/apps/kcontrol/pics/gamma2.4.gif
 debian/tmp/opt/trinity/share/apps/kcontrol/pics/gamma2.4.png
+debian/tmp/opt/trinity/share/apps/kcontrol/pics/energybig.png
+debian/tmp/opt/trinity/share/apps/kcontrol/pics/lo-energy.png
 debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/AAAAAAGeneral.ad
 debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/AAAMotif.ad
 debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/AAATk.ad
diff --git a/debian/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/debian/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 40bc2dc02..0547eb7f9 100644
--- a/debian/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/debian/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -107,7 +107,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/floppy
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/fonts
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ftp
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ghelp
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gopher
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gzip
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/help
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/http
@@ -146,6 +145,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/xz
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/zeroconf
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/zip
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/mac.png
+debian/tmp/opt/trinity/share/man/man1/tdeio_media_mounthelper.1
+debian/tmp/opt/trinity/share/man/man1/ktrash.1
 debian/tmp/opt/trinity/share/mimelnk/inode/system_directory.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/audiocd.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/blankbluray.desktop
diff --git a/debian/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages b/debian/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
deleted file mode 100644
index 249292ad7..000000000
--- a/debian/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/tdeio_media_mounthelper-trinity.1
-debian/man/ktrash-trinity.1
diff --git a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install
index 49942d98a..c8666a793 100644
--- a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install
@@ -100,3 +100,20 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/layout.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/switching.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/xkb.png
 debian/tmp/opt/trinity/share/services/kxkb.desktop
+debian/tmp/opt/trinity/share/man/man1/drkonqi.1
+debian/tmp/opt/trinity/share/man/man1/kblankscrn.kss.1
+debian/tmp/opt/trinity/share/man/man1/kcheckpass.1
+debian/tmp/opt/trinity/share/man/man1/kcminit.1
+debian/tmp/opt/trinity/share/man/man1/kdcop.1
+debian/tmp/opt/trinity/share/man/man1/kdialog.1
+debian/tmp/opt/trinity/share/man/man1/khotkeys.1
+debian/tmp/opt/trinity/share/man/man1/knetattach.1
+debian/tmp/opt/trinity/share/man/man1/krandom.kss.1
+debian/tmp/opt/trinity/share/man/man1/kreadconfig.1
+debian/tmp/opt/trinity/share/man/man1/kstart.1
+debian/tmp/opt/trinity/share/man/man1/ksystraycmd.1
+debian/tmp/opt/trinity/share/man/man1/kwriteconfig.1
+debian/tmp/opt/trinity/share/man/man1/kxkb.1
+debian/tmp/opt/trinity/share/man/man1/tdedebugdialog.1
+debian/tmp/opt/trinity/share/man/man1/tdeio_system_documenthelper.1
+debian/tmp/opt/trinity/share/man/man1/tdesu.1
diff --git a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.links b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.links
index 975b98403..a384ff52d 100644
--- a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.links
+++ b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-usr/share/man/man1/tdesu-trinity.1.gz usr/share/man/man1/tdesud-trinity.1.gz
+opt/trinity/share/man/man1/tdesu.1 opt/trinity/share/man/man1/tdesud.1
diff --git a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.manpages b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.manpages
deleted file mode 100644
index 92b784172..000000000
--- a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.manpages
+++ /dev/null
@@ -1,17 +0,0 @@
-debian/man/drkonqi-trinity.1
-debian/man/kblankscrn.kss-trinity.1
-debian/man/kcheckpass-trinity.1
-debian/man/kcminit-trinity.1
-debian/man/kdcop-trinity.1
-debian/man/tdedebugdialog-trinity.1
-debian/man/tdesu-trinity.1
-debian/man/kdialog-trinity.1
-debian/man/khotkeys-trinity.1
-debian/man/tdeio_system_documenthelper-trinity.1
-debian/man/knetattach-trinity.1
-debian/man/krandom.kss-trinity.1
-debian/man/kreadconfig-trinity.1
-debian/man/kstart-trinity.1
-debian/man/ksystraycmd-trinity.1
-debian/man/kwriteconfig-trinity.1
-debian/man/kxkb-trinity.1
diff --git a/debian/_base/core/tdebase/debian/tdepasswd-trinity.install b/debian/_base/core/tdebase/debian/tdepasswd-trinity.install
index a951e7daf..a113fb502 100644
--- a/debian/_base/core/tdebase/debian/tdepasswd-trinity.install
+++ b/debian/_base/core/tdebase/debian/tdepasswd-trinity.install
@@ -36,3 +36,4 @@ debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.docbook
+debian/tmp/opt/trinity/share/man/man1/tdepasswd.1
diff --git a/debian/_base/core/tdebase/debian/tdepasswd-trinity.manpages b/debian/_base/core/tdebase/debian/tdepasswd-trinity.manpages
deleted file mode 100644
index 1a6f4abad..000000000
--- a/debian/_base/core/tdebase/debian/tdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdepasswd-trinity.1
diff --git a/debian/_base/core/tdebase/debian/tdeprint-trinity.install b/debian/_base/core/tdebase/debian/tdeprint-trinity.install
index ce3ec87b7..5611bb731 100644
--- a/debian/_base/core/tdebase/debian/tdeprint-trinity.install
+++ b/debian/_base/core/tdebase/debian/tdeprint-trinity.install
@@ -123,6 +123,9 @@ debian/tmp/opt/trinity/share/icons/hicolor/*/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kjobviewer.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/tdeprintfax.svgz
+debian/tmp/opt/trinity/share/man/man1/kjobviewer.1
+debian/tmp/opt/trinity/share/man/man1/kprinter.1
+debian/tmp/opt/trinity/share/man/man1/tdeprintfax.1
 debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/driver.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/folder.desktop
diff --git a/debian/_base/core/tdebase/debian/tdeprint-trinity.manpages b/debian/_base/core/tdebase/debian/tdeprint-trinity.manpages
deleted file mode 100644
index 55b9bfae7..000000000
--- a/debian/_base/core/tdebase/debian/tdeprint-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/tdeprintfax-trinity.1
-debian/man/kjobviewer-trinity.1
-debian/man/kprinter-trinity.1
diff --git a/debian/_base/core/tdebase/debian/tdm-trinity.install b/debian/_base/core/tdebase/debian/tdm-trinity.install
index dc7d5e37f..28a08b8c2 100644
--- a/debian/_base/core/tdebase/debian/tdm-trinity.install
+++ b/debian/_base/core/tdebase/debian/tdm-trinity.install
@@ -51,3 +51,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/tdmrc-ref.docbook
+debian/tmp/opt/trinity/share/man/man1/gentdmconf.1
+debian/tmp/opt/trinity/share/man/man1/krootimage.1
+debian/tmp/opt/trinity/share/man/man1/tdm.1
+debian/tmp/opt/trinity/share/man/man1/tdm_config.1
+debian/tmp/opt/trinity/share/man/man1/tdm_greet.1
+debian/tmp/opt/trinity/share/man/man1/tdmctl.1
diff --git a/debian/_base/core/tdebase/debian/tdm-trinity.manpages b/debian/_base/core/tdebase/debian/tdm-trinity.manpages
deleted file mode 100644
index 690a0f462..000000000
--- a/debian/_base/core/tdebase/debian/tdm-trinity.manpages
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/man/gentdmconf-trinity.1
-debian/man/tdm-trinity.1
-debian/man/tdm_config-trinity.1
-debian/man/tdmctl-trinity.1
-debian/man/tdm_greet-trinity.1
-debian/man/krootimage-trinity.1
diff --git a/debian/_base/core/tdebindings/debian/control b/debian/_base/core/tdebindings/debian/control
index 6dc803b91..394f9a522 100644
--- a/debian/_base/core/tdebindings/debian/control
+++ b/debian/_base/core/tdebindings/debian/control
@@ -1,7 +1,7 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
  python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
- default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc],
+ default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
  tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
diff --git a/debian/_base/core/tdebindings/debian/juic-trinity.install b/debian/_base/core/tdebindings/debian/juic-trinity.install
index b29210f2c..685deb0bf 100644
--- a/debian/_base/core/tdebindings/debian/juic-trinity.install
+++ b/debian/_base/core/tdebindings/debian/juic-trinity.install
@@ -4,3 +4,4 @@ qtjava/designer/juic/common/*.xsl	/opt/trinity/share/juic/common
 qtjava/designer/juic/java/*.xml	/opt/trinity/share/juic/java
 qtjava/designer/juic/java/*.xsl	/opt/trinity/share/juic/java
 qtjava/designer/juic/juic.xsl	/opt/trinity/share/juic
+debian/tmp/opt/trinity/share/man/man1/juic.1
diff --git a/debian/_base/core/tdebindings/debian/juic-trinity.manpages b/debian/_base/core/tdebindings/debian/juic-trinity.manpages
deleted file mode 100644
index 3b2609197..000000000
--- a/debian/_base/core/tdebindings/debian/juic-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/juic.1
diff --git a/debian/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install b/debian/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install
index c1fa59ac4..9196450ca 100644
--- a/debian/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install
+++ b/debian/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install
@@ -1 +1,2 @@
 debian/tmp/opt/trinity/bin/dcopidl2java
+debian/tmp/opt/trinity/share/man/man1/dcopidl2java.1
diff --git a/debian/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages b/debian/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages
deleted file mode 100644
index 74e63033b..000000000
--- a/debian/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/dcopidl2java.1
diff --git a/debian/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install b/debian/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install
index 33de286bb..4caa2d2ab 100644
--- a/debian/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install
+++ b/debian/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -9,4 +9,8 @@ debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
 debian/tmp/opt/trinity/lib/*/*/*/korundum.so*
 debian/tmp/opt/trinity/lib/*/*/*/korundum.la
 
+debian/tmp/opt/trinity/share/man/man1/krubyinit.1
+debian/tmp/opt/trinity/share/man/man1/rbtdesh.1
+debian/tmp/opt/trinity/share/man/man1/rbtdeapi.1
+
 korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
diff --git a/debian/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/debian/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages
deleted file mode 100644
index ab2f0ee35..000000000
--- a/debian/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbtdesh.1
-debian/local/rbtdeapi.1
diff --git a/debian/_base/core/tdebindings/debian/libqt0-ruby-trinity.install b/debian/_base/core/tdebindings/debian/libqt0-ruby-trinity.install
index a18befa22..e778c96c1 100644
--- a/debian/_base/core/tdebindings/debian/libqt0-ruby-trinity.install
+++ b/debian/_base/core/tdebindings/debian/libqt0-ruby-trinity.install
@@ -12,4 +12,9 @@ debian/tmp/opt/trinity/lib/*/*/*/qtruby.la
 debian/tmp/opt/trinity/lib/*/*/*/tqui.so*
 debian/tmp/opt/trinity/lib/*/*/*/tqui.la
 
+debian/tmp/opt/trinity/share/man/man1/qtrubyinit.1
+debian/tmp/opt/trinity/share/man/man1/rbqtsh.1
+debian/tmp/opt/trinity/share/man/man1/rbqtapi.1
+debian/tmp/opt/trinity/share/man/man1/rbuic.1
+
 qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
diff --git a/debian/_base/core/tdebindings/debian/libqt0-ruby-trinity.manpages b/debian/_base/core/tdebindings/debian/libqt0-ruby-trinity.manpages
deleted file mode 100644
index f2dc6de31..000000000
--- a/debian/_base/core/tdebindings/debian/libqt0-ruby-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/local/qtrubyinit.1
-debian/local/rbqtsh.1
-debian/local/rbqtapi.1
-debian/local/rbuic.1
diff --git a/debian/_base/core/tdebindings/debian/local/dcopidl2java.1 b/debian/_base/core/tdebindings/debian/local/dcopidl2java.1
deleted file mode 100644
index 926d78391..000000000
--- a/debian/_base/core/tdebindings/debian/local/dcopidl2java.1
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH LIBDCOP-JAVA 1 "July 31, 2002"
-.SH NAME
-dcopidl2java \- Convert a DCOP IDL file to Java language stubs
-.SH SYNOPSIS
-.B dcopidl2java
-.RI " [ " --no-skel " ]  [ " --no-stub " ]  [ " --package " " java-package " ] " file
-.SH DESCRIPTION
-This manual page documents briefly the
-.B dcopidl2java
-command.
-.PP
-\fBdcopidl2java\fP is a program that generates Java stubs from a DCOP IDL file,
-for use with the libdcop-java Java DCOP bindings.
-
-.SH OPTIONS
-A summary of options is included below.
-.TP
-.B --no-skel
-Do not generate skeleton code.
-.TP
-.B --no-stub
-Do not generate stub implementation code.
-.TP
-.B --package java-package 
-Set the name of the Java package to use in the generated code.
-.SH AUTHOR
-This manual page was written by Peter Hawkins <peterh@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdebindings/debian/local/juic.1 b/debian/_base/core/tdebindings/debian/local/juic.1
deleted file mode 100644
index 9120f44d3..000000000
--- a/debian/_base/core/tdebindings/debian/local/juic.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH JUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Java UI Compiler Manual"
-.SH NAME
-juic \- The Qt Java UI Compiler
-.SH SYNOPSIS
-.B juic
-[options] uifile
-.SH DESCRIPTION
-Juic is the Qt Java UI Compiler.  It generates Java\*(tm code from a
-XML UI Description file.  This XML UI Description file can be
-generated by Qt Designer, Qt's graphical UI designer.  Juic is the
-Java\*(tm equivalent for the C++ uic program.
-
-Juic generates Java code for the Qt UI Description File passed to it,
-and outputs it on standard output.
-.SH OPTIONS
-.TP
-.B \-proc   <xsltproc|xalan|saxon>
-Tells juic which xslt processor to use internally.  Possible values
-are "xsltproc", "xalan", "saxon".  The processor you specify must be
-available in the PATH or juic will give an error.  The default is to
-use xsltproc if it's available, and use saxon otherwise.
-.TP
-.B \-package   <the.package.for.the.class>
-Tells juic to add the given package declaration to the generated java
-class.
-.TP
-.B \-abstract   <true|false>
-Tells juic whether or not to define slots as abstract.
-.TP
-.B \-images   <dir>
-Tells juic where to find the images used in the given ui file.
-Default is "images".
-.TP
-.B \-os   <unix|msdos|mac>
-Tells juic what newline style to use in the generated java file.  Possible values are "unix", "msdos" and "mac", for UNIX, DOS and MacOS style newlines respectively.
-.SH AUTHOR
-Marco Ladermann
-.SH SEE ALSO
-uic(1)
diff --git a/debian/_base/core/tdebindings/debian/local/krubyinit.1 b/debian/_base/core/tdebindings/debian/local/krubyinit.1
deleted file mode 100644
index f8a405452..000000000
--- a/debian/_base/core/tdebindings/debian/local/krubyinit.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH KRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "KRubyInit Manual"
-.SH NAME
-krubyinit \- Start Korundum Ruby Scripts Faster
-.SH SYNOPSYS
-.B krubyinit
-[switches] [--] [programfile] [arguments]
-.SH DESCRIPTION
-Krubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the Korundum library ( the Ruby TDE bindings ).  It uses
-the tdeinit system to start the app so that they start a little bit
-faster when started in a running TDE session.
-
-The script takes exactly the same options as the ruby(1) program.
-Therefore, its options aren't documented here, please refer to the
-ruby(1) manpage.
-
-This script is part of Korundum, which is part of the TDE Bindings
-module.
-.SH OPTIONS
-Krubyinit takes exactly the same options as the ruby(1) program and
-they have exactly the same meaning.  Please refer to its manpage.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-ruby(1)
diff --git a/debian/_base/core/tdebindings/debian/local/qtrubyinit.1 b/debian/_base/core/tdebindings/debian/local/qtrubyinit.1
deleted file mode 100644
index 1ab6e7f28..000000000
--- a/debian/_base/core/tdebindings/debian/local/qtrubyinit.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH QTRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "QtRubyInit Manual"
-.SH NAME
-qtrubyinit \- Start Qt Ruby Scripts Faster
-.SH SYNOPSYS
-.B qtrubyinit
-[switches] [--] [programfile] [arguments]
-.SH DESCRIPTION
-Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the QtRuby library.  It uses the tdeinit system to start
-the app so that they start a little bit faster when started in a
-running TDE session.
-
-The script takes exactly the same options as the ruby(1) program.
-Therefore, its options aren't documented here, please refer to the
-ruby(1) manpage.
-
-This script is part of QtRuby, which is part of the TDE Bindings
-module.
-.SH OPTIONS
-Qtrubyinit takes exactly the same options as the ruby(1) program and
-they have exactly the same meaning.  Please refer to its manpage.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-ruby(1)
diff --git a/debian/_base/core/tdebindings/debian/local/rbqtapi.1 b/debian/_base/core/tdebindings/debian/local/rbqtapi.1
deleted file mode 100644
index 7cafb5b8c..000000000
--- a/debian/_base/core/tdebindings/debian/local/rbqtapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBQTAPI 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
-.SH NAME
-rbqtapi \- A QtRuby Introspection Tool
-.SH SYNOPSIS
-.B rbqtapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbqtapi is a QtRuby Introspection Tool, similar to javap(1).  Use it
-to find a list of method for a certain QtRuby class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbtdeapi(1)
diff --git a/debian/_base/core/tdebindings/debian/local/rbqtsh.1 b/debian/_base/core/tdebindings/debian/local/rbqtsh.1
deleted file mode 100644
index bda49d962..000000000
--- a/debian/_base/core/tdebindings/debian/local/rbqtsh.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH RBQTSH 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
-.SH NAME
-rbqtsh \- An Interactive QtRuby Shell
-.SH SYNOPSIS
-.B rbqtsh
-[options]
-.SH DESCRIPTION
-Rbqtsh is an interactive QtRuby shell.  It shows a GUI dialog box
-where you can enter Ruby code using the QtRuby library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbtdesh(1)
diff --git a/debian/_base/core/tdebindings/debian/local/rbtdeapi.1 b/debian/_base/core/tdebindings/debian/local/rbtdeapi.1
deleted file mode 100644
index e3d166225..000000000
--- a/debian/_base/core/tdebindings/debian/local/rbtdeapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
-.SH NAME
-rbtdeapi \- A Korundum TDE Ruby Introspection Tool
-.SH SYNOPSIS
-.B rbtdeapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
-javap(1).  Use it to find a list of method for a certain Korundum class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbqtapi(1)
diff --git a/debian/_base/core/tdebindings/debian/local/rbtdesh.1 b/debian/_base/core/tdebindings/debian/local/rbtdesh.1
deleted file mode 100644
index 6e792e7fa..000000000
--- a/debian/_base/core/tdebindings/debian/local/rbtdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBTDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
-.SH NAME
-rbtdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbtdesh
-[options]
-.SH DESCRIPTION
-Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum TDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/debian/_base/core/tdebindings/debian/local/rbuic.1 b/debian/_base/core/tdebindings/debian/local/rbuic.1
deleted file mode 100644
index d59caa1ac..000000000
--- a/debian/_base/core/tdebindings/debian/local/rbuic.1
+++ /dev/null
@@ -1,64 +0,0 @@
-.TH RBUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Ruby UI Compiler Manual"
-.SH NAME
-rbuic \- The Qt Ruby UI Compiler
-.SH SYNOPSIS
-Generate implementation:
-.B rbuic
-[options] uifile
-.LP
-Generate subclass implementation:
-.B rbuic
-[options] -subimpl <classname> <uifile>
-.LP
-Generate image collection:
-.B rbuic
-[options] -embed <project> <image1> <image2> <image3> ...
-.SH DESCRIPTION
-Rbuic is the Qt Ruby UI Compiler.  It generates Ruby code from a XML
-UI Description file.  This XML UI Description file can be generated by
-Qt Designer, Qt's graphical UI designer.  Rbuic is the Ruby equivalent
-for the C++ uic program.
-
-When invoked to generate an implementation, rbuic generates Ruby code
-for the Qt UI Description File passed to it, and outputs it on
-standard output.
-
-When invoked to generate a subclass implementation, rbuic generates
-template Ruby code for a subclass of the widget in the Qt UI
-Description File passed to it, and outputs it on standard output.
-
-When invoked to generate an image collection, rbuic generates Ruby
-code containing the image data in strings.  This is useful to avoid
-having to distribute image files along with your application.  It is
-arguably more useful for C++ ( where the image strings can be compiled
-into an executable ), but still, it is available for Ruby as well.
-.SH OPTIONS
-.TP
-.B \-o <file>
-Write output to file rather than stdout.
-.TP
-.B \-p <indent>
-Set the indent in spaces (0 to use a tab)
-.TP
-.B \-nofwd
-Omit imports of custom widgets
-.TP
-.B \-kde
-Use TDE widgets, require 'Korundum' extension
-.TP
-.B \-tr <func>
-Use func(...) rather than trUtf8(...) for i18n
-.TP
-.B \-x
-Generate extra code to test the class
-.TP
-.B \-version
-Print the Rbuic and Qt versions
-.TP
-.B \-help
-Display some help information.
-.SH AUTHOR
-Germain Garand
-Phil Thompson
-.SH SEE ALSO
-uic(1)
diff --git a/debian/_base/core/tdebindings/debian/rules b/debian/_base/core/tdebindings/debian/rules
index fce67d163..63b19e54f 100755
--- a/debian/_base/core/tdebindings/debian/rules
+++ b/debian/_base/core/tdebindings/debian/rules
@@ -110,18 +110,7 @@ common-install-arch:: stamp-install-dcopjava
 ###
 
 binary-install/juic-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 	sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/opt/trinity|" debian/$(cdbs_curpkg)/opt/trinity/bin/juic
-
-binary-install/libdcop3-java-trinity-dev::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-binary-install/libkorundum0-ruby-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-binary-install/libqt0-ruby-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
 binary-install/python-dcop-trinity::
 	${DH_PYTHON2} -p$(cdbs_curpkg)
 
diff --git a/debian/_base/core/tdegraphics/debian/control b/debian/_base/core/tdegraphics/debian/control
index c8f05c829..760fa0869 100644
--- a/debian/_base/core/tdegraphics/debian/control
+++ b/debian/_base/core/tdegraphics/debian/control
@@ -75,7 +75,7 @@ Package: tdegraphics-trinity-dev
 Section: devel
 Architecture: any
 Replaces: kdegraphics-trinity-dev (<< 4:14.0.0~)
-Breaks: kdegraphics-trinity-dev (<< 4:14.0.0~)
+Breaks: kdegraphics-trinity-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.12~)
 Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the TDE graphics module
  This package contains headers and other development files for the TDE
@@ -375,8 +375,8 @@ Description: generic framework for viewer applications in Trinity
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkscan-trinity-dev (<< 4:14.0.0~)
-Breaks: libkscan-trinity-dev (<< 4:14.0.0~)
+Replaces: libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
+Breaks: libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
 Depends: libkscan1-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
diff --git a/debian/_base/core/tdegraphics/debian/kcoloredit-trinity.install b/debian/_base/core/tdegraphics/debian/kcoloredit-trinity.install
index c760fe7d7..b66fea000 100644
--- a/debian/_base/core/tdegraphics/debian/kcoloredit-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kcoloredit-trinity.install
@@ -10,6 +10,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcolorchooser.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcoloredit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcolorchooser.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcoloredit.png
+debian/tmp/opt/trinity/share/man/man1/kcolorchooser.1
+debian/tmp/opt/trinity/share/man/man1/kcoloredit.1
 
 debian/icons/kcolorchooser.xpm		/opt/trinity/share/pixmaps
 debian/icons/kcolorchooser-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kcoloredit-trinity.manpages b/debian/_base/core/tdegraphics/debian/kcoloredit-trinity.manpages
deleted file mode 100644
index e4673b667..000000000
--- a/debian/_base/core/tdegraphics/debian/kcoloredit-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kcolorchooser.1
-debian/man/kcoloredit.1
diff --git a/debian/_base/core/tdegraphics/debian/kdvi-trinity.install b/debian/_base/core/tdegraphics/debian/kdvi-trinity.install
index 0eeb3b15f..994691b8f 100644
--- a/debian/_base/core/tdegraphics/debian/kdvi-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kdvi-trinity.install
@@ -22,6 +22,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdvi.svgz
+debian/tmp/opt/trinity/share/man/man1/kdvi.1
 debian/tmp/opt/trinity/share/services/kdvimultipage.desktop
 
 debian/icons/kdvi.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kdvi-trinity.manpages b/debian/_base/core/tdegraphics/debian/kdvi-trinity.manpages
deleted file mode 100644
index 6cab6e597..000000000
--- a/debian/_base/core/tdegraphics/debian/kdvi-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdvi.1
diff --git a/debian/_base/core/tdegraphics/debian/kfax-trinity.install b/debian/_base/core/tdegraphics/debian/kfax-trinity.install
index c38b88569..f49130c67 100644
--- a/debian/_base/core/tdegraphics/debian/kfax-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kfax-trinity.install
@@ -8,6 +8,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kfax.svgz
+debian/tmp/opt/trinity/share/man/man1/kfax.1
 
 debian/icons/kfax.xpm		/opt/trinity/share/pixmaps
 debian/icons/kfax-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kfax-trinity.manpages b/debian/_base/core/tdegraphics/debian/kfax-trinity.manpages
deleted file mode 100644
index 57b6c7961..000000000
--- a/debian/_base/core/tdegraphics/debian/kfax-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfax.1
diff --git a/debian/_base/core/tdegraphics/debian/kfaxview-trinity.install b/debian/_base/core/tdegraphics/debian/kfaxview-trinity.install
index 90e21b08c..b8967972c 100644
--- a/debian/_base/core/tdegraphics/debian/kfaxview-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kfaxview-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kfaxview.svgz
+debian/tmp/opt/trinity/share/man/man1/kfaxview.1
 debian/tmp/opt/trinity/share/services/kfaxmultipage.desktop
 debian/tmp/opt/trinity/share/services/kfaxmultipage_tiff.desktop
 
diff --git a/debian/_base/core/tdegraphics/debian/kfaxview-trinity.manpages b/debian/_base/core/tdegraphics/debian/kfaxview-trinity.manpages
deleted file mode 100644
index a30d1c56a..000000000
--- a/debian/_base/core/tdegraphics/debian/kfaxview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfaxview.1
diff --git a/debian/_base/core/tdegraphics/debian/kghostview-trinity.install b/debian/_base/core/tdegraphics/debian/kghostview-trinity.install
index add2d1e01..01ee36fbf 100644
--- a/debian/_base/core/tdegraphics/debian/kghostview-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kghostview-trinity.install
@@ -19,6 +19,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kghostview.png
+debian/tmp/opt/trinity/share/man/man1/kghostview.1
 debian/tmp/opt/trinity/share/services/kghostview_part.desktop
 
 debian/icons/kghostview.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kghostview-trinity.manpages b/debian/_base/core/tdegraphics/debian/kghostview-trinity.manpages
deleted file mode 100644
index 8cfcbdec7..000000000
--- a/debian/_base/core/tdegraphics/debian/kghostview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kghostview.1
diff --git a/debian/_base/core/tdegraphics/debian/kolourpaint-trinity.install b/debian/_base/core/tdegraphics/debian/kolourpaint-trinity.install
index 0f1bc5dcc..da3a7592c 100644
--- a/debian/_base/core/tdegraphics/debian/kolourpaint-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kolourpaint-trinity.install
@@ -167,6 +167,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kolourpaint.svgz
+debian/tmp/opt/trinity/share/man/man1/kolourpaint.1
 
 debian/icons/kolourpaint.xpm		/opt/trinity/share/pixmaps
 debian/icons/kolourpaint-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kolourpaint-trinity.manpages b/debian/_base/core/tdegraphics/debian/kolourpaint-trinity.manpages
deleted file mode 100644
index a10ddf05a..000000000
--- a/debian/_base/core/tdegraphics/debian/kolourpaint-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kolourpaint.1
diff --git a/debian/_base/core/tdegraphics/debian/kooka-trinity.install b/debian/_base/core/tdegraphics/debian/kooka-trinity.install
index 5330dc6ab..d25642f7a 100644
--- a/debian/_base/core/tdegraphics/debian/kooka-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kooka-trinity.install
@@ -27,6 +27,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/shortcut1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar2.png
+debian/tmp/opt/trinity/share/man/man1/kooka.1
 
 debian/icons/kooka.xpm		/opt/trinity/share/pixmaps
 debian/icons/kooka-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kooka-trinity.manpages b/debian/_base/core/tdegraphics/debian/kooka-trinity.manpages
deleted file mode 100644
index 319f8652c..000000000
--- a/debian/_base/core/tdegraphics/debian/kooka-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kooka.1
diff --git a/debian/_base/core/tdegraphics/debian/kpdf-trinity.install b/debian/_base/core/tdegraphics/debian/kpdf-trinity.install
index 640ebdb6e..189e43274 100644
--- a/debian/_base/core/tdegraphics/debian/kpdf-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kpdf-trinity.install
@@ -16,6 +16,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kpdf.svgz
+debian/tmp/opt/trinity/share/man/man1/kpdf.1
 debian/tmp/opt/trinity/share/services/kpdf_part.desktop
 
 debian/icons/kpdf.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kpdf-trinity.manpages b/debian/_base/core/tdegraphics/debian/kpdf-trinity.manpages
deleted file mode 100644
index 36f3caafb..000000000
--- a/debian/_base/core/tdegraphics/debian/kpdf-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpdf.1
diff --git a/debian/_base/core/tdegraphics/debian/kpovmodeler-trinity.install b/debian/_base/core/tdegraphics/debian/kpovmodeler-trinity.install
index 4cbc774ae..28ebee7e7 100644
--- a/debian/_base/core/tdegraphics/debian/kpovmodeler-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kpovmodeler-trinity.install
@@ -421,6 +421,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kpovmodeler.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+debian/tmp/opt/trinity/share/man/man1/kpovmodeler.1
 
 debian/icons/kpovmodeler.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpovmodeler-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kpovmodeler-trinity.manpages b/debian/_base/core/tdegraphics/debian/kpovmodeler-trinity.manpages
deleted file mode 100644
index 11c1a16f8..000000000
--- a/debian/_base/core/tdegraphics/debian/kpovmodeler-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpovmodeler.1
diff --git a/debian/_base/core/tdegraphics/debian/kruler-trinity.install b/debian/_base/core/tdegraphics/debian/kruler-trinity.install
index 87fa208d5..a2aa52cd8 100644
--- a/debian/_base/core/tdegraphics/debian/kruler-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kruler-trinity.install
@@ -14,6 +14,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kruler.png
+debian/tmp/opt/trinity/share/man/man1/kruler.1
 
 debian/icons/kruler.xpm		/opt/trinity/share/pixmaps
 debian/icons/kruler-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kruler-trinity.manpages b/debian/_base/core/tdegraphics/debian/kruler-trinity.manpages
deleted file mode 100644
index aac20ba29..000000000
--- a/debian/_base/core/tdegraphics/debian/kruler-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kruler.1
diff --git a/debian/_base/core/tdegraphics/debian/ksnapshot-trinity.install b/debian/_base/core/tdegraphics/debian/ksnapshot-trinity.install
index 9725e1d31..ac4bb7295 100644
--- a/debian/_base/core/tdegraphics/debian/ksnapshot-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/ksnapshot-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/ksnapshot.svgz
+debian/tmp/opt/trinity/share/man/man1/ksnapshot.1
 
 debian/icons/ksnapshot.xpm		/opt/trinity/share/pixmaps
 debian/icons/ksnapshot-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/ksnapshot-trinity.manpages b/debian/_base/core/tdegraphics/debian/ksnapshot-trinity.manpages
deleted file mode 100644
index efb781eba..000000000
--- a/debian/_base/core/tdegraphics/debian/ksnapshot-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ksnapshot.1
diff --git a/debian/_base/core/tdegraphics/debian/kuickshow-trinity.install b/debian/_base/core/tdegraphics/debian/kuickshow-trinity.install
index d8f2d8f7e..c880ff0a4 100644
--- a/debian/_base/core/tdegraphics/debian/kuickshow-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kuickshow-trinity.install
@@ -20,6 +20,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/screenshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuickshow.png
+debian/tmp/opt/trinity/share/man/man1/kuickshow.1
 
 debian/icons/kuickshow.xpm		/opt/trinity/share/pixmaps
 debian/icons/kuickshow-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/kuickshow-trinity.manpages b/debian/_base/core/tdegraphics/debian/kuickshow-trinity.manpages
deleted file mode 100644
index 3eadda903..000000000
--- a/debian/_base/core/tdegraphics/debian/kuickshow-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kuickshow.1
diff --git a/debian/_base/core/tdegraphics/debian/kview-trinity.install b/debian/_base/core/tdegraphics/debian/kview-trinity.install
index ea22868e9..9c85b5c7d 100644
--- a/debian/_base/core/tdegraphics/debian/kview-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kview-trinity.install
@@ -52,6 +52,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kview.png
+debian/tmp/opt/trinity/share/man/man1/kview.1
 debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewcanvasconfig.desktop
 debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewgeneralconfig.desktop
 debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewpluginsconfig.desktop
diff --git a/debian/_base/core/tdegraphics/debian/kview-trinity.manpages b/debian/_base/core/tdegraphics/debian/kview-trinity.manpages
deleted file mode 100644
index bad8bf322..000000000
--- a/debian/_base/core/tdegraphics/debian/kview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kview.1
diff --git a/debian/_base/core/tdegraphics/debian/kviewshell-trinity.install b/debian/_base/core/tdegraphics/debian/kviewshell-trinity.install
index 78a5947e3..a36f0377a 100644
--- a/debian/_base/core/tdegraphics/debian/kviewshell-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/kviewshell-trinity.install
@@ -23,6 +23,7 @@ debian/tmp/opt/trinity/share/config.kcfg/kviewshell.kcfg
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kviewshell.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png
+debian/tmp/opt/trinity/share/man/man1/kviewshell.1
 debian/tmp/opt/trinity/share/services/emptymultipage.desktop
 debian/tmp/opt/trinity/share/services/djvumultipage.desktop
 debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop
diff --git a/debian/_base/core/tdegraphics/debian/kviewshell-trinity.manpages b/debian/_base/core/tdegraphics/debian/kviewshell-trinity.manpages
deleted file mode 100644
index 89af3c5f2..000000000
--- a/debian/_base/core/tdegraphics/debian/kviewshell-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kviewshell.1
diff --git a/debian/_base/core/tdegraphics/debian/libkscan-dev-trinity.install b/debian/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
deleted file mode 100644
index 29764eb5d..000000000
--- a/debian/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/lib/libkscan.so
diff --git a/debian/_base/core/tdegraphics/debian/libkscan-trinity-dev.install b/debian/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
new file mode 100644
index 000000000..2aff7e3a2
--- /dev/null
+++ b/debian/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libkscan.so
+debian/tmp/opt/trinity/share/cmake/libkscan.cmake
diff --git a/debian/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install b/debian/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install
index f737043af..5080bc09f 100644
--- a/debian/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install
+++ b/debian/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install
@@ -2,3 +2,4 @@ debian/tmp/opt/trinity/include/poppler-link-qt3.h
 debian/tmp/opt/trinity/include/poppler-page-transition.h
 debian/tmp/opt/trinity/include/poppler-qt.h
 debian/tmp/opt/trinity/lib/pkgconfig/poppler-tqt.pc
+debian/tmp/opt/trinity/share/cmake/libpoppler-tqt.cmake
diff --git a/debian/_base/core/tdegraphics/debian/man/kcolorchooser.1 b/debian/_base/core/tdegraphics/debian/man/kcolorchooser.1
deleted file mode 100644
index d0fd9cfbb..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kcolorchooser.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KCOLORCHOOSER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kcolorchooser \- TDE Color Chooser
-.SH SYNOPSIS
-.B kcolorchooser
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kcolorchooser
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-TDE Color Chooser
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH AUTHOR
-KColorChooser was written by
-.nh
-Waldo Bastian <bastian@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kcoloredit.1 b/debian/_base/core/tdegraphics/debian/man/kcoloredit.1
deleted file mode 100644
index 3318864e0..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kcoloredit.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.TH KCOLOREDIT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kcoloredit \- TDE Color Palette Editor
-.SH SYNOPSIS
-.B kcoloredit
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kcoloredit
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B KColorEdit
-is a palette files editor. It can be used for editing color palettes and for color choosing and naming.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-File
-file to open
-.SH "SEE ALSO"
-The full documentation for
-.B kcoloredit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kcoloredit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KColorEdit was written by
-.nh
-Artur Rataj <art@zeus.polsl.gliwice.pl>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kdvi.1 b/debian/_base/core/tdegraphics/debian/man/kdvi.1
deleted file mode 100644
index f1df971ad..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kdvi.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH KDVI "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kdvi \- TDE DVI Viewer
-.SH SYNOPSIS
-.B kviewshell
-[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kdvi
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KDVI
-is a plugin for the KViewshell program which allows KViewshell to
-display DVI-files (.dvi) which are produced by the TeX typesetting
-system. KDVI supports many extensions of the DVI standard, for
-instance the inclusion of PostScript graphics or hyperlinks. More
-details, examples and all the technical specifications can be found in
-the file KDVI-features.dvi (or see KDVI-features.tex for the TeX
-source of that file). 
-.P
-For up-to-date information, consult KDVI's home page. 
-.P
-TeX is a high-end typesetting system geared towards scientific, and in
-particular mathematical typesetting. More information about TeX and
-DVI can be found on the homepage of the TeX user group or the German
-German DANTE e.V..  
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-part
-The part to use
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
-.TP
-\fB\-\-paper\fR
-Sets paper size (not implemented at the moment, only for compatibility with lyx)
-.TP
-file(s)
-Files to load
-.SH "SEE ALSO"
-The full documentation for
-.B kdvi
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kdvi
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KViewShell was written by
-.nh
-Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe,
-Markku Hihnala,
-David Faure,
-Daniel Duley,
-Espen Sand and
-Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kfax.1 b/debian/_base/core/tdegraphics/debian/man/kfax.1
deleted file mode 100644
index ac7583ccf..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kfax.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.TH KFAX "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kfax \- TDE Fax Viewer
-.SH SYNOPSIS
-.B kfax
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kfax
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-A program to display raw and tiffed fax images (g3, g3-2d, g4).
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-f\fR, \fB\-\-fine\fR
-Fine resolution
-.TP
-\fB\-n\fR, \fB\-\-normal\fR
-Normal resolution
-.TP
-\fB\-\-height\fR
-Height (number of fax lines)
-.TP
-\fB\-w\fR, \fB\-\-width\fR
-Width (dots per fax line)
-.TP
-\fB\-l\fR, \fB\-\-landscape\fR
-Turn image 90 degrees (landscape mode)
-.TP
-\fB\-u\fR, \fB\-\-upsidedown\fR
-Turn image upside down
-.TP
-\fB\-i\fR, \fB\-\-invert\fR
-Invert black and white.
-.TP
-\fB\-m\fR, \fB\-\-mem\fR <bytes>
-Limit memory use to 'bytes'. [8M]
-.TP
-\fB\-r\fR, \fB\-\-reverse\fR
-Fax data is packed lsb first
-.TP
-\fB\-2\fR
-Raw files are g3-2d
-.TP
-\fB\-4\fR
-Raw files are g4
-.SS "Arguments:"
-.TP
-file(s)
-Fax file(s) to show
-.SH "SEE ALSO"
-The full documentation for
-.B kfax
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kfax
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KFax was written by
-.nh
-Bernd Johannes Wuebben <wuebben@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kfaxview.1 b/debian/_base/core/tdegraphics/debian/man/kfaxview.1
deleted file mode 100644
index 592c64c09..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kfaxview.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.TH KFAXVIEWER "1" "October 2007" TDE "TDE Application"
-.SH NAME
-kfaxviewer \- TDE fax viewer using kviewshell
-.SH SYNOPSIS
-.B kfaxview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
-.SH DESCRIPTION
-This manual page briefly documents the
-.B kfaxview
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program doesn't have a manual page.
-.PP
-A fax viewer for TDE using kviewshell.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another KFaxView instance.
-If it is, bring up the other KFaxView. Otherwise, load the file.
-.TP
-\fB\-g\fR, \fB\-\-goto\fR <pagenumber>
-Navigate to this page
-.TP
-.SS "Arguments:"
-.TP
-file(s)
-Files to load
-.SH AUTHOR
-KFaxview was written by
-.nh
-Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Francesco Pedrini<francesco.pedrini@gmail.com>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-
diff --git a/debian/_base/core/tdegraphics/debian/man/kghostview.1 b/debian/_base/core/tdegraphics/debian/man/kghostview.1
deleted file mode 100644
index be63ba0f3..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kghostview.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH KGHOSTVIEW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kghostview \- TDE PS/PDF Viewer
-.SH SYNOPSIS
-.B kghostview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KGhostView
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B  KGhostView
-displays and prints PostScript (.ps, .eps) and Portable
-Document Format (.pdf) files. It a port to TDE of Tim Theisen's
-Ghostview program which uses Alladin Ghostscript to view documents
-prepared in Adobe's PostScript page description
-language. PostScript is the major page description language for
-printing on UNIX(rg systems and this application can be used to preview
-material intended for printing or for reading documents online.  
-.P
-You can use KGhostView with all recent versions of Ghostscript. Newer
-versions offer much improved performance which you can take advantage
-of with KGhostView.  
-.P
-If a document does not conform to the Adobe document structuring
-convention the functionality of the viewer is limited. For example, if
-there is no table of contents, skipping around the document and
-marking pages is not possible. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-URL
-Location to open
-.SH "SEE ALSO"
-The full documentation for
-.B KGhostView
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kghostview
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KGhostView was written by
-.nh
-Wilco Greven <greven@kde.org>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe <donohoe@kde.org>,
-David Faure <faure@kde.org>,
-Daniel Duley <mosfet@kde.org> and
-Espen Sand <espen@kde.org>
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kolourpaint.1 b/debian/_base/core/tdegraphics/debian/man/kolourpaint.1
deleted file mode 100644
index 42a126a85..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kolourpaint.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH KPAINT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kolourpaint \- TDE Paint Program
-.SH SYNOPSIS
-.B kolourpaint
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KPaint
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KPaint
-is a simple bitmap drawing program that can also be used to modify
-existing image files and convert between image file formats. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file
-File or URL to open
-.SH "SEE ALSO"
-The full documentation for
-.B KPaint
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kolourpaint
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KPaint was written by
-.nh
-Richard J. Moore <rich@kde.org>,
-Robert Williams <rwilliams@jrcmaui.com>,
-Mario Weilguni <mweilguni@kde.org>,
-Christian Oppel <uzs84g@uni-bonn.de>,
-John Califf <jcaliff@compuzone.net> and
-Laurent Montel <lmontel@mandrakesoft.com>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kooka.1 b/debian/_base/core/tdegraphics/debian/man/kooka.1
deleted file mode 100644
index a8f34e419..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kooka.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH KOOKA "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kooka \- TDE Scan & OCR Program
-.SH SYNOPSIS
-.B kooka
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kooka
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kooka
-is a TDE application which provides access to scanner
-hardware using the SANE library.
-.P
-Kooka helps you scan, save your
-image in the correct image format and perform \fBO\fRptical
-\fBC\fRharacter \fBR\fRecognition on it,using \fIgocr\fR, Joerg
-Schulenburg's and friends' Open Source ocr program.
-.P
-Kooka is a TDE application that enables easy scanning using SANE
-libraries. Therefore, SANE the package must be installed to use
-Kooka. Clear and concise use was the focus of its development. 
-.P
-Character recognition is also provided by the built-in text
-recognition program gocr. Install gocr to use this
-functionality. After character recognition is complete, the recognized
-material can be opened in the text editor Kate with just one click,
-where you can edit the contents. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-d\fR
-the SANE compatible device specification (e.g. umax:/dev/sg0) []
-.TP
-\fB\-g\fR
-gallery mode - do not connect to scanner []
-.SH "SEE ALSO"
-The full documentation for
-.B Kooka
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kooka
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-Kooka was written by
-.nh
-Klaas Freitag <freitag@suse.de> and
-Mat Colton <mat@colton.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kpdf.1 b/debian/_base/core/tdegraphics/debian/man/kpdf.1
deleted file mode 100644
index fc0c59534..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kpdf.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPDF 1 "June 2006" "Trinity Desktop Environment" "pdf viewer"
-.SH NAME
-kpdf
-\- a TDE pdf viewer based on xpdf
-.SH SYNOPSIS
-\fBkpdf\fP [Qt\-options] [TDE\-options] [URL]
-.SH DESCRIPTION
-\fBkpdf\fP is a TDE PDF viewer based on \fBxpdf\fP code. Although being based on \fBxpdf\fP code, \fBkpdf\fP has some unique features like continuous mode and presentation support.
-.sp 1
-The PDF format is widely used for publishing documents that are mostly not meant to be edited again. \fBkpdf\fP is only a viewer for these files and therefore it doesn't provide any functionality to edit or create PDF documents.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Document to open
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-\fBxpdf\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kpdf/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kpdf/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Wilco Greven <greven@kde.org>
-.br
-Christophe Devriese <oelewapperke@oelewapperke.org>
-.br
-Laurent Montel <montel@kde.org>
-.br
-Albert Astals Cid <astals11@terra.es>
-.br
-Enrico Ros <eros.kde@email.it>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdegraphics/debian/man/kpovmodeler.1 b/debian/_base/core/tdegraphics/debian/man/kpovmodeler.1
deleted file mode 100644
index 3d536d26e..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kpovmodeler.1
+++ /dev/null
@@ -1,82 +0,0 @@
-.TH KPOVMODELER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kpovmodeler \- TDE Povray Modeler
-.SH SYNOPSIS
-.B kpovmodeler
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Povray Modeler
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KPovModeler
-is a 3D modeling application to generate POV-Ray scenes.
-.P
-While it is not necessary to fully understand the POV-Ray application
-in order to make good use of KPovModeler, it is highly recommended
-that you read and try to understand the POV-Ray documentation. 
-.P
-To find out more about POV-Ray go to www.povray.org.
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file
-File to open
-.SH OPTIONS
-.TP
-\fB\-\-no\-opengl\fR
-Disables OpenGL rendering
-.SH "SEE ALSO"
-The full documentation for
-.B Povray Modeler
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kpovmodeler
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KPovModeler was written by
-.nh
-Andreas Zehender <zehender@kde.org>,
-Luis Passos Carvalho <lpassos@mail.telepac.pt>,
-Philippe Van Hecke <lephiloux@tiscalinet.be> and
-.hy
-Leonardo Skorianez <skorianez@bol.com.br>.
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kruler.1 b/debian/_base/core/tdegraphics/debian/man/kruler.1
deleted file mode 100644
index 9e32021cd..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kruler.1
+++ /dev/null
@@ -1,81 +0,0 @@
-.TH KRULER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kruler \- TDE Screen Ruler
-.SH SYNOPSIS
-.B kruler
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KRuler
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B KRuler
-is a very simple application, with only one aim in life. To
-measure distances on your screen. 
-.P
-To start KRuler, choose Graphics->TDE Screen Ruler from your T menu.
-.P
-left mouse button clicking on the KRuler will turn the cursor into a
-hand icon, and enable you to drag KRuler around the screen. 
-.P
-When you move the mouse over KRuler, your cursor will turn into an
-elongated arrow, with a circle at one end. As you move the cursor,
-KRuler will display how far from the point marked 0 the circle on the
-end of the cursor currently is. KRuler will also display the HTML
-color code of the color currently under the circle. This is very
-useful for picking out colors from an image. If you move the mouse far
-enough that the arrow cursor is no longer touching KRuler, the cursor
-will revert to normal, allowing you to carry on working with your
-other applications. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH "SEE ALSO"
-The full documentation for
-.B KRuler
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kruler
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDE Screen Ruler was written by
-.nh
-Till Krech <till@snafu.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/ksnapshot.1 b/debian/_base/core/tdegraphics/debian/man/ksnapshot.1
deleted file mode 100644
index 250ca0ef6..000000000
--- a/debian/_base/core/tdegraphics/debian/man/ksnapshot.1
+++ /dev/null
@@ -1,71 +0,0 @@
-.TH KSNAPSHOT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-ksnapshot \- TDE Screen Capture Program
-.SH SYNOPSIS
-.B ksnapshot
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KSnapshot
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KSnapshot
-is a simple applet for taking screenshots. It is capable of
-capturing images of either the whole desktop or just a single
-window. The images can then be saved in a variety of formats. 
-.PP
-TDE Screenshot utility
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH "SEE ALSO"
-The full documentation for
-.B KSnapshot
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/ksnapshot
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KSnapshot was written by
-.nh
-Richard J. Moore <rich@kde.org>,
-Matthias Ettrich <ettrich@kde.org> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kuickshow.1 b/debian/_base/core/tdegraphics/debian/man/kuickshow.1
deleted file mode 100644
index bf5caf30c..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kuickshow.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH KUICKSHOW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kuickshow \- TDE Image Viewer
-.SH SYNOPSIS
-.B kuickshow
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfiles\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kuickshow
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KuickShow
-is a comfortable image browser/viewer. It displays a
-filebrowser where you can select images which are then shown.
-.P
-The following image formats are supported:
-.P
-.RS 
-\(bu jpg
-.br
-\(bu gif
-.br
-\(bu tiff
-.br
-\(bu png
-.br
-\(bu bmp
-.br
-\(bu psd
-.br
-\(bu xmp
-.br
-\(bu xbm
-.br
-\(bu eim
-.RE
-.P
-Images can be displayed either in their own window, as large as the
-image, or fullscreen. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-lastdir\fR
-Start in the last visited directory, not the current working directory
-.SS "Arguments:"
-.TP
-files
-Optional image filenames/urls to show
-.SH "SEE ALSO"
-The full documentation for
-.B Kuickshow
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kuickshow
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KuickShow was written by
-.nh
-Carsten Pfeiffer <pfeiffer@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kview.1 b/debian/_base/core/tdegraphics/debian/man/kview.1
deleted file mode 100644
index 64a2b6928..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kview.1
+++ /dev/null
@@ -1,78 +0,0 @@
-.TH KVIEW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kview \- TDE Image Viewer
-.SH SYNOPSIS
-.B kview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KView
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KView
-is an image viewer for the Trinity desktop. You can view graphics of
-many different formats such as PostScript, TIFF etc. By saving your
-files in a different format than the original you can easily convert
-images to other graphics formats. In addition, KView provides some
-nice little features for doing simple image processing, like
-stretching/shrinking, rotation and filtering. You can tile your images
-directly onto the desktop as a background picture, or arrange them in
-a little slideshow. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-URL
-Image to open
-.SH "SEE ALSO"
-The full documentation for
-.B KView
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kview
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KView was written by
-.nh
-Matthias Kretz <kretz@kde.org>,
-Sirtaj Singh Kang <taj@kde.org>
-and Simon Hausmann <hausmann@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/kviewshell.1 b/debian/_base/core/tdegraphics/debian/man/kviewshell.1
deleted file mode 100644
index 83d0e24da..000000000
--- a/debian/_base/core/tdegraphics/debian/man/kviewshell.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH KVIEWSHELL "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kviewshell \- Generic framework for viewer applications
-.SH SYNOPSIS
-.B kviewshell
-[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kviewshell
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-Generic framework for viewer applications.
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-part
-The part to use
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
-.TP
-\fB\-\-paper\fR
-Sets paper size (not implemented at the moment, only for compatibility with lyx)
-.TP
-file(s)
-Files to load
-.SH AUTHOR
-KViewShell was written by
-.nh
-Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe,
-Markku Hihnala,
-David Faure,
-Daniel Duley,
-Espen Sand,
-and Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/man/tdeiconedit.1 b/debian/_base/core/tdegraphics/debian/man/tdeiconedit.1
deleted file mode 100644
index 70bcb510a..000000000
--- a/debian/_base/core/tdegraphics/debian/man/tdeiconedit.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-tdeiconedit \- TDE Icon Editor
-.SH SYNOPSIS
-.B tdeiconedit
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile(s)\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B TDEIconEdit
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B TDEIconEdit
-is designed to help create icons for TDE using the standard
-icon palette.  
-.PP
-TDE Icon Editor
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file(s)
-Icon file(s) to open
-.SH "SEE ALSO"
-The full documentation for
-.B TDEIconEdit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/tdeiconedit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com>
-and Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdegraphics/debian/rules b/debian/_base/core/tdegraphics/debian/rules
index c25fd3f31..2fb30108c 100755
--- a/debian/_base/core/tdegraphics/debian/rules
+++ b/debian/_base/core/tdegraphics/debian/rules
@@ -26,9 +26,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DBUILD_ALL="ON" \
- -DWITH_TIFF="ON" \
- -DWITH_OPENEXR="ON" \
- -DWITH_PDF="ON"
+ -DWITH_ALL_OPTIONS="ON"
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdegraphics-trinity-dbg
 
@@ -46,65 +44,3 @@ binary-post-install/kuickshow-trinity::
 ifeq ($(DEB_HOST_ARCH), powerpc)
 	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libtdeinit_kuickshow.so
 endif
-
-#shlibs_ver = 4:3.5.0-1
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
-
-kuickshow-trinity-tar:
-	mkdir ../kuickshow-trinity-3.5.8
-	cp -f * ../kuickshow-trinity-3.5.8 || true
-	mkdir ../kuickshow-trinity-3.5.8/doc
-	cp doc/Makefile.am ../kuickshow-trinity-3.5.8/doc
-	cp -r doc/kuickshow ../kuickshow-trinity-3.5.8/doc
-	cp -r kuickshow ../kuickshow-trinity-3.5.8
-	cp -r admin ../kuickshow-trinity-3.5.8
-	cd ../kuickshow-trinity-3.5.8; make -f admin/Makefile.common dist
-	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
-
-binary-post-install/kpdf-trinity::
-	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
-
-binary-post-install/kghostview-trinity::
-	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
-
-binary-post-install/kcolorchooser-trinity::
-	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
-
-binary-post-install/kdvi-trinity::
-	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
-
-binary-post-install/kfaxview-trinity::
-	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
-
-binary-post-install/tdeiconedit-trinity::
-	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
-
-binary-post-install/kooka-trinity::
-	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
-
-binary-post-install/kpovmodeler-trinity::
-	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
-
-binary-post-install/ksnapshot-trinity::
-	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
-
-binary-post-install/kview-trinity::
-	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
-
-binary-post-install/kcoloredit-trinity::
-	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
-
-binary-post-install/kfax-trinity::
-	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
-
-binary-post-install/kolourpaint-trinity::
-	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
-
-binary-post-install/kruler-trinity::
-	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
-
-binary-post-install/kuickshow-trinity::
-	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
-
-binary-post-install/kviewshell-trinity::
-	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/
diff --git a/debian/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install b/debian/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
index f5f48fee4..cf86e92ab 100644
--- a/debian/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
+++ b/debian/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
@@ -194,4 +194,4 @@ debian/tmp/opt/trinity/lib/libksvg.so
 debian/tmp/opt/trinity/lib/libtext2path.la
 debian/tmp/opt/trinity/lib/libtext2path.so
 
-debian/tmp/opt/trinity/share/cmake
+debian/tmp/opt/trinity/share/cmake/kviewshell.cmake
diff --git a/debian/_base/core/tdegraphics/debian/tdeiconedit-trinity.install b/debian/_base/core/tdegraphics/debian/tdeiconedit-trinity.install
index cb2ca7535..45e92ea19 100644
--- a/debian/_base/core/tdegraphics/debian/tdeiconedit-trinity.install
+++ b/debian/_base/core/tdegraphics/debian/tdeiconedit-trinity.install
@@ -36,6 +36,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/man/man1/tdeiconedit.1
 
 debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdegraphics/debian/tdeiconedit-trinity.manpages b/debian/_base/core/tdegraphics/debian/tdeiconedit-trinity.manpages
deleted file mode 100644
index e975ab6b6..000000000
--- a/debian/_base/core/tdegraphics/debian/tdeiconedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdeiconedit.1
diff --git a/debian/_base/core/tdelibs/debian/control b/debian/_base/core/tdelibs/debian/control
index f7db091e2..664c16c5a 100644
--- a/debian/_base/core/tdelibs/debian/control
+++ b/debian/_base/core/tdelibs/debian/control
@@ -9,8 +9,9 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharu
  libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev,
- liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
+ libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev,
+ liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
+ libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev, libdbus-1-tqt-dev,
  libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
@@ -100,8 +101,9 @@ Breaks: kdelibs4-trinity-dev (<< 4:14.0.0~)
 Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
- libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
+ libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libopenexr-dev (>= 1.2.2-3), libpcre3-dev,
+ liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqtinterface-dev,
diff --git a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install
index 92a201781..d06f09083 100644
--- a/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/_base/core/tdelibs/debian/tdelibs-data-trinity.install
@@ -1749,6 +1749,7 @@ debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2
 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V3
 debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0
 debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc
+debian/tmp/opt/trinity/share/apps/tdemarkdown
 debian/tmp/opt/trinity/share/autostart/tdeab2tdeabc.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/1.png
@@ -1762,6 +1763,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/8.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/9.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/appheader.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/artistic-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_bottom.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_mid.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_top.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-left.png
@@ -1778,30 +1782,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/favicon.ico
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-notice.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/flat.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/footer.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/grad.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-web.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kmenu.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainfooter.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainheader.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/print.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/qpl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/shadow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tabs.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-web.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top.jpg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.jpg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-middle.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right-konqueror.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right.jpg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-trinity.jpg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html
@@ -1905,6 +1918,7 @@ debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop
 debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop
 debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop
 debian/tmp/opt/trinity/share/services/kxzfilter.desktop
+debian/tmp/opt/trinity/share/services/markdown_part.desktop
 debian/tmp/opt/trinity/share/services/metainfo.protocol
 debian/tmp/opt/trinity/share/services/mms.protocol
 debian/tmp/opt/trinity/share/services/mmst.protocol
diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install
index b5e80c4b4..eea7555c3 100644
--- a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install
+++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install
@@ -195,6 +195,8 @@ debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la
 debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so
 debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so
+debian/tmp/opt/trinity/lib/trinity/libtdemarkdown.la
+debian/tmp/opt/trinity/lib/trinity/libtdemarkdown.so
 debian/tmp/opt/trinity/lib/trinity/libtdemultipart.la
 debian/tmp/opt/trinity/lib/trinity/libtdemultipart.so
 debian/tmp/opt/trinity/lib/trinity/libshellscript.la
diff --git a/debian/_base/core/tdemultimedia/debian/juk-trinity.install b/debian/_base/core/tdemultimedia/debian/juk-trinity.install
index b3b2e7b91..6612af4b0 100644
--- a/debian/_base/core/tdemultimedia/debian/juk-trinity.install
+++ b/debian/_base/core/tdemultimedia/debian/juk-trinity.install
@@ -22,6 +22,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/juk.png
+debian/tmp/opt/trinity/share/man/man1/juk.1
 
 debian/icons/juk.xpm		/opt/trinity/share/pixmaps
 debian/icons/juk-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdemultimedia/debian/juk-trinity.manpages b/debian/_base/core/tdemultimedia/debian/juk-trinity.manpages
deleted file mode 100644
index cc1b91a74..000000000
--- a/debian/_base/core/tdemultimedia/debian/juk-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/juk-trinity.1
diff --git a/debian/_base/core/tdemultimedia/debian/kaboodle-trinity.install b/debian/_base/core/tdemultimedia/debian/kaboodle-trinity.install
index e16be8952..e7650b74f 100644
--- a/debian/_base/core/tdemultimedia/debian/kaboodle-trinity.install
+++ b/debian/_base/core/tdemultimedia/debian/kaboodle-trinity.install
@@ -15,6 +15,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kaboodle.png
+debian/tmp/opt/trinity/share/man/man1/kaboodle.1
 debian/tmp/opt/trinity/share/services/kaboodle_component.desktop
 debian/tmp/opt/trinity/share/services/kaboodleengine.desktop
 
diff --git a/debian/_base/core/tdemultimedia/debian/kaboodle-trinity.manpages b/debian/_base/core/tdemultimedia/debian/kaboodle-trinity.manpages
deleted file mode 100644
index 56aa78551..000000000
--- a/debian/_base/core/tdemultimedia/debian/kaboodle-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kaboodle-trinity.1
diff --git a/debian/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install b/debian/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install
index 4569bbf20..411add448 100644
--- a/debian/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install
+++ b/debian/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install
@@ -35,6 +35,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kaudiocreator.png
+debian/tmp/opt/trinity/share/man/man1/kaudiocreator.1
 
 debian/icons/kaudiocreator.xpm		/opt/trinity/share/pixmaps
 debian/icons/kaudiocreator-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdemultimedia/debian/kaudiocreator-trinity.manpages b/debian/_base/core/tdemultimedia/debian/kaudiocreator-trinity.manpages
deleted file mode 100644
index e3f09d6dd..000000000
--- a/debian/_base/core/tdemultimedia/debian/kaudiocreator-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kaudiocreator-trinity.1
diff --git a/debian/_base/core/tdemultimedia/debian/kmix-trinity.install b/debian/_base/core/tdemultimedia/debian/kmix-trinity.install
index fd8ea15e1..3e0d2daf7 100644
--- a/debian/_base/core/tdemultimedia/debian/kmix-trinity.install
+++ b/debian/_base/core/tdemultimedia/debian/kmix-trinity.install
@@ -48,6 +48,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kmix.png
+debian/tmp/opt/trinity/share/man/man1/kmix.1
+debian/tmp/opt/trinity/share/man/man1/kmixctrl.1
 debian/tmp/opt/trinity/share/services/kmixctrl_restore.desktop
 
 debian/icons/kmix.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdemultimedia/debian/kmix-trinity.manpages b/debian/_base/core/tdemultimedia/debian/kmix-trinity.manpages
deleted file mode 100644
index e0adce8b6..000000000
--- a/debian/_base/core/tdemultimedia/debian/kmix-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kmix-trinity.1
-debian/man/kmixctrl-trinity.1
diff --git a/debian/_base/core/tdemultimedia/debian/krec-trinity.install b/debian/_base/core/tdemultimedia/debian/krec-trinity.install
index 40832458b..19db44587 100644
--- a/debian/_base/core/tdemultimedia/debian/krec-trinity.install
+++ b/debian/_base/core/tdemultimedia/debian/krec-trinity.install
@@ -32,6 +32,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/krec.png
+debian/tmp/opt/trinity/share/man/man1/krec.1
 debian/tmp/opt/trinity/share/services/kcm_krec.desktop
 debian/tmp/opt/trinity/share/services/kcm_krec_files.desktop
 debian/tmp/opt/trinity/share/services/krec_exportogg.desktop
diff --git a/debian/_base/core/tdemultimedia/debian/krec-trinity.manpages b/debian/_base/core/tdemultimedia/debian/krec-trinity.manpages
deleted file mode 100644
index 8a59c57a8..000000000
--- a/debian/_base/core/tdemultimedia/debian/krec-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/krec-trinity.1
diff --git a/debian/_base/core/tdemultimedia/debian/man/juk-trinity.1 b/debian/_base/core/tdemultimedia/debian/man/juk-trinity.1
deleted file mode 100644
index 0981892b5..000000000
--- a/debian/_base/core/tdemultimedia/debian/man/juk-trinity.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH "JuK" "1" "April 2006"
-.SH "NAME"
-juk \- music organizer and player for TDE
-.SH "SYNOPSIS"
-\fBjuk\fR
-.SH "DESCRIPTION"
-.LP 
-
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-.
-.SH "OPTIONS"
-.l
-\fIjuk\fP does not accept any command-line options.
-.
-
-.SH "DCOP"
-
-\fIjuk\fP has a DCOP (Desktop Communications Protocol) interface
-that may be used to start, stop, skip forward to the next song,
-etc.  This may be done from the command line using \fIdcop\fP
-as follows:
-
-.RS
-$ dcop juk Player forward
-
-$ dcop juk Player back
-
-$ dcop juk Player stop
-
-$ dcop juk Player play
-.RE
-
-.SH "AUTHOR"
-This page was written by David Schleef <ds@schleef.org> for Debian,
-but may be used elsewhere.
-
diff --git a/debian/_base/core/tdemultimedia/debian/man/kaboodle-trinity.1 b/debian/_base/core/tdemultimedia/debian/man/kaboodle-trinity.1
deleted file mode 100644
index 13745bc95..000000000
--- a/debian/_base/core/tdemultimedia/debian/man/kaboodle-trinity.1
+++ /dev/null
@@ -1,261 +0,0 @@
-.lf 1 info/tdemultimedia.kaboodle.1
-.TH KABOODLE 1 "May 2003" TDE "TDE Application"
-.SH NAME
-kaboodle \- TDE simple and lean Media Player
-.SH SYNOPSIS
-.B kaboodle
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kaboodle
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kaboodle
-is a simple KMedia (aRts) player for TDE, which can play standalone,
-or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too.
-It is meant for simple stuff like playing a quick video or sound file. 
-.B Kaboodle
-does not accept plugins, does not have a playlist or volume control and other such features.
-.P
-To get a media-player with a full-fledged user interface, look at
-.BR noatun (1)
-.SH OPTIONS
-.SS "Arguments:"
-.TP
-URL
-URL of media file to play
-.SS "General Options"
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.lf 1 info/kdeqtoptions
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
-icon, which can either be an absolute filename path, or otherwise the
-icon is sought for in places according to the normal TDE rules.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
-of the icon, according to the same rules as for the \-\-icon parameter.
-.TP
-.BI \-\-config \ filename
-Use an alternative configuration file, instead of the default, which
-is normally located in
-.I /usr/share/config
-or in
-.RB $ TDEHOME\fI/share/config
-.TP
-.BI \-\-dcopserver \ server
-Set the address of the DCOP server to attach to.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps. This option has the same
-effect as definiting the environment variable TDE_DEBUG.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-The geometry parameter follows the normal X convention for geometry,
-which is on the form:
-.RS
-.IP
-[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
-.P
-Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
-height, of the main application window. Both in pixels. A value of 0
-specifies the default size. The optional \fIxpos\fR and \fIypos\fR
-specifies the x,y-position that which is desired for the application
-window. Specifying negative values for x or y implies that the x or y
-position is to be measured from the left or bottom screen edge,
-instead of as in the normal case, with positive values, from the left
-and top edges. 
-.RE
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-Defines the default application font. The \fIfontname\fP should be in
-the X logical font name description format XLFD. For a full description of
-the format see
-.I /usr/X11R6/lib/X11/doc/xlfd.TXT
-Note that the application might override the font specified with
-its own font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-Sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-Sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-Sets the default button color.
-.TP
-.BI \-\-name \ name
-Sets the application name.
-.TP
-.BI \-\-title \ title
-Sets the application title. This option might, or might not appear
-in the title bar caption, depending on the application. To change the caption, use the 
-.B \-\-caption
-option instead. 
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-Sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirror reverses the whole layout of widgets. This means that menus
-will go in the opposite direction, the scroll bar will be on the
-opposite side, etc. For a normal western layout that means that menus
-and tool bars will go from the right edge to the left, the vertical
-scroll bar will be on the left side and so on.
-
-.lf 53 info/tdemultimedia.kaboodle.1
-.SH ENVIRONMENT
-.lf 1 info/kdeenviron
-.SS "standard TDE environment variables"
-.IP TDE_LANG
-Language locale setting to use. This option makes it possible to set
-another language environment for a program than what is the default. The
-correct language pack for this language has to be installed for this option
-to work. The default language when there is none set is en_US. When
-deciding upon a language, the following resources are looked up, in
-order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
-LANG.
-.IP TDE_UTF8_FILENAMES
-Assume that all filenames are in UTF-8 format regardless of the
-current language setting. Otherwise the filename format is defined by
-the language.
-.IP TDE_MULTIHEAD
-If this variable has the value
-.B true
-multihead multiple display mode is enabled. The TDE display will be
-shared over more than one screen.
-.IP DISPLAY
-Specifies the X display to run TDE on.
-.IP TDESYCOCA
-Specifies and alternative path for the 
-.I tdesycoca
-TDE system configuration cache file.
-The default path is
-/tmp/tde-$USER/tdesycoca
-.IP DCOPSERVER
-Specifies an alternative path for the DCOP server file. The default
-file is
-$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
-.IP SESSION_MANAGER
-The session manager to use. This option is set automatically by TDE
-and is a network path to the session manager socket.
-.IP HOME
-Path to the home directory for the current user. 
-.IP TDEHOME
-The TDE per-user setting directory. Default if not specified is
-.I $HOME/.trinity
-.lf 55 info/tdemultimedia.kaboodle.1
-.SH FILES
-.TP
-.I $HOME/.trinity/share/config/kaboodlerc
-configuration file.
-.SH AUTHOR
-Kaboodle was written by
-.nh
-.ad l
-Neil Stevens <neil@qualityassistant.com>,
-Nikolas Zimmermann <wildfox@kde.org>,
-and Charles Samuels <charles@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-.BR noatun (1)
-.br
-The full documentation for
-.B kaboodle
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kaboodle
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kaboodle
diff --git a/debian/_base/core/tdemultimedia/debian/man/kaudiocreator-trinity.1 b/debian/_base/core/tdemultimedia/debian/man/kaudiocreator-trinity.1
deleted file mode 100644
index 35600bcda..000000000
--- a/debian/_base/core/tdemultimedia/debian/man/kaudiocreator-trinity.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.TH kaudiocreator 1 "Nov 2005" "Trinity Desktop Environment" ""
-.SH NAME
-kaudiocreator \- CD ripper and audio encoder front-end
-.SH SYNOPSIS
-kaudiocreator [Qt-options] [TDE-options] 
-.SH DESCRIPTION
-.B kaudiocreator 
-is the CD ripper and audio encoder front-end for the Trinity Desktop Environment. It
-supports many encoders like 
-.BR lame (1),
-.BR oggenc (1),
-.BR flac (1),
-and performs CDDB queries.
-
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the title bar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the title bar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible window manager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
- 
-
-.SH AUTHOR
-Benjamin Meyer <ben+kaudiocreator@meyerhome.net>
-
-Please use <http://bugs.trinitydesktop.org> to report bugs, do not mail the authors
-directly.
-
-
-This man-page was written by Francois Wendling <frwendling@free.fr>
diff --git a/debian/_base/core/tdemultimedia/debian/man/kmix-trinity.1 b/debian/_base/core/tdemultimedia/debian/man/kmix-trinity.1
deleted file mode 100644
index e603facb3..000000000
--- a/debian/_base/core/tdemultimedia/debian/man/kmix-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH KMIX 1 "August, 15 2003"
-.SH NAME
-Kmix \- TDE audio mini-mixer
-.SH SYNOPSIS
-.B kmix 
-.RI [ OPTIONS ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmix
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fBKmix\fP is a mini audio mixer for TDE. It allows the user to change
-volume settings for each sound device (master, CD, line, mic, ...).
-.SH OPTIONS
-A summary of options for Kmix is included below.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-
-.SH SEE ALSO
-.BR kmixctrl (1),
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmix was written by the KDE project.
diff --git a/debian/_base/core/tdemultimedia/debian/man/kmixctrl-trinity.1 b/debian/_base/core/tdemultimedia/debian/man/kmixctrl-trinity.1
deleted file mode 100644
index 58a586b18..000000000
--- a/debian/_base/core/tdemultimedia/debian/man/kmixctrl-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KMIXCTRL 1 "August, 25 2003"
-.SH NAME
-kmixctrl \- Settings loader/saver for kmix
-.SH SYNOPSIS
-.B kmixctrl 
-.RI [ OPTIONS ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmixctrl
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fBkmixctrl\fP is used to save or restore the settings of \fIkmix\fP.
-.SH OPTIONS
-A summary of options for kmixctrl is included below.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-s, \-\-save
-Save the current settings as default
-.TP
-.B \-r, \-\-restore
-Restores the default settings
-
-.SH SEE ALSO
-.BR kmix (1),
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmixctrl was written by the KDE project.
diff --git a/debian/_base/core/tdemultimedia/debian/man/krec-trinity.1 b/debian/_base/core/tdemultimedia/debian/man/krec-trinity.1
deleted file mode 100644
index 9e2c57e3c..000000000
--- a/debian/_base/core/tdemultimedia/debian/man/krec-trinity.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH krec "1" "July 2004" "Debian" "User Commands"
-.SH NAME
-krec \- A voice recording program
-.SH SYNOPSIS
-.B krec
-[\fIoptions\fR]
-.SH DESCRIPTION
-This is a recording tool for TDE.
-It uses aRts, just look at the audiomanager
-and you will find it there accepting sound
-for recording.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-
-
-.SH USAGE
-Details  are shown in the built-in help system to krec.  Run krec and go to help-krec handbook to access this data
-	
-.SH AUTHORS
-krec is (C)2002-2003 By Arnold Krille (arnold@arnoldarts.de)
-.P
-This man page was written and maintained by Ryan Waye (rmw998@gmail.com) 
-.PP
-.
-.
-.SH "STANDARD DISCLAIMER"
-Use only at your own risk!
-There may be errors and inaccuracies that could be damaging to your system or
-your eye.
-Proceed with caution, and although this is highly unlikely, the authors don't
-take any responsibility for that!
-.PP
-
-This document is licensed under the GPL.
-.P
-KDE: 3.2.2
-.P
-KRec: 0.5
diff --git a/debian/_base/core/tdemultimedia/debian/man/noatun-trinity.1 b/debian/_base/core/tdemultimedia/debian/man/noatun-trinity.1
deleted file mode 100644
index 1ed42ae02..000000000
--- a/debian/_base/core/tdemultimedia/debian/man/noatun-trinity.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH NOATUN 1 "June 2006" "Trinity Desktop Environment" "Media Player"
-.SH NAME
-noatun
-\- fully-featured plugin-based media player for TDE
-.SH SYNOPSIS
-\fBnoatun\fP [Qt\-options] [TDE\-options] [URL] 
-.SH DESCRIPTION
-\fBNoatun\fP is a fully\-featured plugin\-based media player for TDE.
-It is an elaborate front-end to aRts - the Analog Real\-Time Synthesizer.
-By default aRts supports MP3 and MPEG\-1. Vorbis is also supported.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Files/URLs to open
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-To find additional playobjects, go to \fBhttp://noatun.kde.org/plugins.phtml\fP, or \fBhttp://mpeglib.sf.net\fP.
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can enter the URL
-.BR help:/noatun/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/noatun/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Charles Samuels <charles@kde.org>
-.br
-Stefan Westerfeld <stefan@space.twc.de>
-.br
-Martin Vogt <mvogt@rhrk.uni\-kl.de>
-.br
-Malte Starostik <malte@kde.org>
-.br
-Nikolas Zimmermann <wildfox@kde.org>
-.br
-Stefan Schimanski <1Stein@gmx.de>
-.br
-Stefan Gehn <metz@gehn.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdemultimedia/debian/noatun-trinity.install b/debian/_base/core/tdemultimedia/debian/noatun-trinity.install
index e5adf0383..407d649f1 100644
--- a/debian/_base/core/tdemultimedia/debian/noatun-trinity.install
+++ b/debian/_base/core/tdemultimedia/debian/noatun-trinity.install
@@ -323,6 +323,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/noatun.png
+debian/tmp/opt/trinity/share/man/man1/noatun.1
 debian/tmp/opt/trinity/share/mimelnk/interface/x-winamp-skin.desktop
 
 debian/icons/noatun.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdemultimedia/debian/noatun-trinity.manpages b/debian/_base/core/tdemultimedia/debian/noatun-trinity.manpages
deleted file mode 100644
index e5196f799..000000000
--- a/debian/_base/core/tdemultimedia/debian/noatun-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/noatun-trinity.1
diff --git a/debian/_base/core/tdenetwork/debian/kdict-trinity.install b/debian/_base/core/tdenetwork/debian/kdict-trinity.install
index 7d57f12cf..8712a1ebd 100644
--- a/debian/_base/core/tdenetwork/debian/kdict-trinity.install
+++ b/debian/_base/core/tdenetwork/debian/kdict-trinity.install
@@ -24,6 +24,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdict.svgz
+debian/tmp/opt/trinity/share/man/man1/kdict.1
 
 debian/icons/kdict-16.xpm	/opt/trinity/share/pixmaps
 debian/icons/kdict.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdenetwork/debian/kdict-trinity.manpages b/debian/_base/core/tdenetwork/debian/kdict-trinity.manpages
deleted file mode 100644
index 3128a0e9a..000000000
--- a/debian/_base/core/tdenetwork/debian/kdict-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdict-trinity.1
diff --git a/debian/_base/core/tdenetwork/debian/kget-trinity.install b/debian/_base/core/tdenetwork/debian/kget-trinity.install
index d2a0707c9..623f76912 100644
--- a/debian/_base/core/tdenetwork/debian/kget-trinity.install
+++ b/debian/_base/core/tdenetwork/debian/kget-trinity.install
@@ -73,6 +73,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kget_list.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kget_list.png
+debian/tmp/opt/trinity/share/man/man1/kget.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-kgetlist.desktop
 debian/tmp/opt/trinity/share/sounds/KGet_Added.ogg
 debian/tmp/opt/trinity/share/sounds/KGet_Finished.ogg
diff --git a/debian/_base/core/tdenetwork/debian/kget-trinity.manpages b/debian/_base/core/tdenetwork/debian/kget-trinity.manpages
deleted file mode 100644
index 585b03129..000000000
--- a/debian/_base/core/tdenetwork/debian/kget-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kget-trinity.1
diff --git a/debian/_base/core/tdenetwork/debian/kopete-trinity.install b/debian/_base/core/tdenetwork/debian/kopete-trinity.install
index 7d5c96219..8ac850cbf 100644
--- a/debian/_base/core/tdenetwork/debian/kopete-trinity.install
+++ b/debian/_base/core/tdenetwork/debian/kopete-trinity.install
@@ -330,7 +330,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_invisible.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_na.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_offline.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_online.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_original.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_raw.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_serv_off.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_serv_on.png
@@ -446,7 +445,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_invisible.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_na.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_offline.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_online.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_original.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_raw.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_serv_off.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_serv_on.png
@@ -476,6 +474,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/jabber_protocol.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kopete.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kopete.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kopete2.svgz
+debian/tmp/opt/trinity/share/man/man1/kopete.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-icq.desktop
 debian/tmp/opt/trinity/share/mimelnk/application/x-kopete-emoticons.desktop
 debian/tmp/opt/trinity/share/services/aim.protocol
diff --git a/debian/_base/core/tdenetwork/debian/kopete-trinity.manpages b/debian/_base/core/tdenetwork/debian/kopete-trinity.manpages
deleted file mode 100644
index 214a24d2e..000000000
--- a/debian/_base/core/tdenetwork/debian/kopete-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kopete-trinity.1
diff --git a/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.install b/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.install
index 328c9ae44..f4eb51a58 100644
--- a/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.install
+++ b/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.install
@@ -29,6 +29,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kwifimanager.svgz
+debian/tmp/opt/trinity/share/man/man1/kwifimanager.1
 
 debian/icons/kwifimanager-16.xpm	/opt/trinity/share/pixmaps
 debian/icons/kwifimanager.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages b/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages
deleted file mode 100644
index 4f390510b..000000000
--- a/debian/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kwifimanager-trinity.1
diff --git a/debian/_base/core/tdenetwork/debian/lisa-trinity.install b/debian/_base/core/tdenetwork/debian/lisa-trinity.install
index 728eed390..47ab05c03 100644
--- a/debian/_base/core/tdenetwork/debian/lisa-trinity.install
+++ b/debian/_base/core/tdenetwork/debian/lisa-trinity.install
@@ -15,6 +15,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/lanbrowser/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.docbook
+debian/tmp/opt/trinity/share/man/man8/lisa.8
+debian/tmp/opt/trinity/share/man/man8/reslisa.8
 debian/tmp/opt/trinity/share/services/lan.protocol
 debian/tmp/opt/trinity/share/services/rlan.protocol
 
diff --git a/debian/_base/core/tdenetwork/debian/lisa-trinity.manpages b/debian/_base/core/tdenetwork/debian/lisa-trinity.manpages
deleted file mode 100644
index 306f0c52e..000000000
--- a/debian/_base/core/tdenetwork/debian/lisa-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/lisa-trinity.8
-debian/man/reslisa-trinity.8
diff --git a/debian/_base/core/tdenetwork/debian/man/kdict-trinity.1 b/debian/_base/core/tdenetwork/debian/man/kdict-trinity.1
deleted file mode 100644
index aff5138c4..000000000
--- a/debian/_base/core/tdenetwork/debian/man/kdict-trinity.1
+++ /dev/null
@@ -1,180 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDICT 1 "June 2006" "Trinity Desktop Environment" "TDE Dictionary Client"
-.SH NAME
-kdict
-\- The TDE Dictionary Client
-.SH SYNOPSIS
-\fBkdict\fP [Qt\-options] [TDE\-options] [options] [word/phrase] 
-.SH DESCRIPTION
-\fBKDict\fP is a graphical client for the \fBDICT Protocol\fP. It enables you to search through dictionary databases for a word or phrase, then displays suitable definitions. \fBKDict\fP tries to ease basic as well as advanced queries. A separate list offers a convenient way to deal with the enormous number of matching words that a advanced query can return.
-.sp 1
-The remainder of \fBKDict\fP's user interface resembles a web browser. For instance, you can jump to the definition of a synonym by simply clicking on the highlighted word. The back/forward functionality is also implemented, enabling you to quickly go back to the result of previous queries.
-.sp 1
-\fBKDict\fP is able to process the content of the clipboard, so it's easy to combine \fBKDict\fP with your web browser or text editor.
-.sp 1
-If your machine is behind a firewall, has no permanent internet connection or the server of dict.org is too slow for you, you can set up your own local server, all you need is available at \fBwww.dict.org\fP. The advantages of a local server are optimal performance and the ability to install additional databases of your choice.
-.SH OPTIONS
-.SS
-.SS Arguments:
-word/phrase               Lookup the given word/phrase
-.SS Options:
-.TP
-.B \-c,  \-\-clipboard  
-Define X11-clipboard content (selected text)
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-.SH FILES
-.I ~/.trinity/share/config/kdictrc
-.br
-.I ~/.trinity/share/config/kdict_panelappletrc
-.RS
-\fBkdict\fP configuration files
-.SH SEE ALSO
-.TP
-\fBwww.dict.org\fP
-DICT Development Group home page
-.RE
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdict/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdict/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Christian Gebauer <gebauer@kde.org>
-.br
-Matthias Hoelzer <hoelzer@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdenetwork/debian/man/kget-trinity.1 b/debian/_base/core/tdenetwork/debian/man/kget-trinity.1
deleted file mode 100644
index 72b2d3305..000000000
--- a/debian/_base/core/tdenetwork/debian/man/kget-trinity.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KGET 1 "June 2006" "Trinity Desktop Environment" "download manager"
-.SH NAME
-kget
-\- An advanced download manager for TDE
-.SH SYNOPSIS
-\fBkget\fP [Qt\-options] [TDE\-options] [options] [URL(s)] 
-.SH DESCRIPTION
-\fBKGet\fP is an advanced download manager for TDE. It allows you to group downloads. In some cases, \fBKGet\fP can resume these downloads even if you shutdown your computer before the downloads have completed.
-.sp 1
-To download a document or package, drag and drop the URL on to \fBKGet\fP.
-.SH OPTIONS
-.SS
-.SS Arguments:
-URL(s)                    URL(s) to download
-.SS Options:
-.TP
-.B  \-\-showDropTarget  
-Start KGet with drop target
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kget/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kget/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Matej Moss
-.br
-Patrick  Charbonnier <pch@freeshell.org>
-.br
-Carsten Pfeiffer <pfeiffer@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdenetwork/debian/man/kopete-trinity.sgml b/debian/_base/core/tdenetwork/debian/man/kopete-trinity.sgml
deleted file mode 100644
index 87922999d..000000000
--- a/debian/_base/core/tdenetwork/debian/man/kopete-trinity.sgml
+++ /dev/null
@@ -1,334 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-  -->
-
-  <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
-  <!ENTITY dhsurname   "<surname>Stone</surname>">
-  <!ENTITY dhdate      "<date>April 20, 2002</date>">
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>dstone@kde.org</email>">
-  <!ENTITY dhusername  "Daniel Stone">
-  <!ENTITY dhucpackage "<refentrytitle>KOPETE</refentrytitle>">
-  <!ENTITY dhpackage   "kopete">
-
-  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2001</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>A TDE-based Instant Messaging client.</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-tde<replaceable></replaceable></option></arg>
-      <arg><option>--help-qt<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable> -v</replaceable></option></arg>
-      <arg><option>--license<replaceable></replaceable</option></arg>
-      <arg><option>--author<replaceable></replaceable></option></arg>
-      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--cmap<replaceable></replaceable></option></arg>
-      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--nograb<replaceable></replaceable></option></arg>
-      <arg><option>--dograb<replaceable></replaceable></option></arg>
-      <arg><option>--sync<replaceable></replaceable></option></arg>
-      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
-      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
-      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
-      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
-      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
-      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
-      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
-      <arg><option>--noxim<replaceable></replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> is a TDE-based multi-protocol Instant
-    Messaging client. Currently, it supports AIM, ICQ, MSN, IRC and Jabber.
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below. However, the ordering is very strict -
-      --help/-h must come before hostname.</para>
-    <variablelist>
-      <varlistentry>
-        <term><option>-v</option>
-	  <option>--version</option>
-	</term>
-	<listitem>
-	  <para>Show version information.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--author</option>
-	</term>
-	<listitem>
-	  <para>Show information about the author.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--license</option>
-	</term>
-	<listitem>
-	  <para>Show license information.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--caption &lt;caption&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the caption of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--icon &lt;icon&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the icon of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--miniicon &lt;icon&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the mini-icon of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--dcopserver &lt;server&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the DCOP server to use.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--nocrashhandler</option>
-	</term>
-	<listitem>
-	  <para>Disable TDE crash handler (enables core dumps).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--waitforwm</option>
-	</term>
-	<listitem>
-	  <para>Waits for a compatible window manager to start.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--style &lt;style&gt;</option>
-	</term>
-	<listitem>
-	  <para>Sets the application's GUI style (overrides TDE).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--geometry &lt;geometry&gt;</option>
-	</term>
-	<listitem>
-	  <para>Sets the geometry of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--display &lt;display&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specifies the X display to use.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--session &lt;sessionid&gt;</option>
-	</term>
-	<listitem>
-	  <para>Restores the application for the given session ID.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cmap</option>
-	</term>
-	<listitem>
-	  <para>Forces use of an internal colour map on an 8-bit display.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--ncols &lt;count&gt;</option>
-	</term>
-	<listitem>
-	  <para>Limits the number of colours allowed in an 8-bit display.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--nograb</option>
-	</term>
-	<listitem>
-	  <para>Forces Qt to never grab the mouse or keyboard.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--dograb</option>
-	</term>
-	<listitem>
-	  <para>Overrides --nograb, which may be implicitly set.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--sync</option>
-	</term>
-	<listitem>
-	  <para>Forces synchronous mode (for debugging).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--font &lt;font&gt;</option>
-	  <option>--fn &lt;font&gt;</option></term>
-	<listitem>
-	  <para>Sets the default application font.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--background &lt;colour&gt;</option>
-	  <option>--bg &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default background colour and application
-	  pallette.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--foreground &lt;colour&gt;</option>
-	  <option>--fg &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default foreground colour.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--button &lt;colour&gt;</option>
-	  <option>--btn &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default button colour.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--name &lt;name&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets the application name.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--title &lt;name&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets the application title.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--visual TrueColor</option>
-	  </term>
-	<listitem>
-	  <para>Forces the application to use a True Colour visual on 8-bit
-	  displays.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--inputstyle &lt;style&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets X Input Method (XIM) input style. Possible values are: 
-	  onthespot, overthespot, offthespot, and root.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--im &lt;server&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets X Input Method (XIM) server.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--noxim</option>
-	  </term>
-	<listitem>
-	  <para>Disables X Input Method (XIM) support.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the <acronym>GNU</acronym> General Public License
-      version 2 or any later version published by the Free Software Foundation.</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/debian/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1 b/debian/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1
deleted file mode 100644
index 5f12be561..000000000
--- a/debian/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1
+++ /dev/null
@@ -1,121 +0,0 @@
-.TH KWIFIMANAGER "1" "October 2006" "kwifimanager" "User Commands"
-.SH NAME
-kwifimanager \- manual page for kwifimanager
-.SH SYNOPSIS
-.B kwifimanager
-[\fIOPTIONS\fR]
-.SH DESCRIPTION
-\fBkwifimanager\fR is a TDE wireless management program.
-.SH GENERIC OPTIONS:
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show QT specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR,  \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.SH QT OPTIONS:
-.TP
-\fB\-\-display <displayname>\fR
-Use the X-server display 'displayname'
-.TP
-\fB\-\-session <sessionId>\fR
-Restore the application for the given 'sessionId'
-.TP
-\fB\-\-cmap\fR
-Causes the application to install a private color map on an 8-bit display
-.TP
-\fB\-\-ncols <count>\fR
-Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification
-.TP
-\fB\-\-nograb\fR
-Tells Qt to never grab the mouse or the keyboard
-.TP
-\fB\-\-dograb\fR
-Running under a debugger can cause an implicit -nograb, use -dograb to override
-.TP
-\fB\-\-sync\fR
-Switches to synchronous mode for debugging
-.TP
-\fB\-\-fn, \-\-font <fontname>\fR
-Defines the application font
-.TP
-\fB\-\-bg, \-\-background <color>\fR
-Sets the default background color and an application palette (light and dark shades are calculated)
-.TP
-\fB\-\-fg, \-\-foreground <color>\fR
-Sets the default foreground color
-.TP
-\fB\-\-btn, \-\-button <color>\fR
-Sets the default button color
-.TP
-\fB\-\-name <name>\fR
-Sets the application name
-.TP
-\fB\-\-title <title>\fR
-Sets the application title (caption)
-.TP
-\fB\-\-visual TrueColor\fR
-Forces the application to use a TrueColor visual on an 8-bit display
-.TP
-\fB\-\-inputstyle <inputstyle>\fR
-Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root
-.TP
-\fB\-\-im <XIM server>\fR
-Set XIM server
-.TP
-\fB\-\-noxim\fR
-Disable XIM
-.TP
-\fB\-\-reverse\fR
-Mirrors the whole layout of widgets
-.SH TDE OPTIONS:
-.TP
-\fB\-\-caption <caption>\fR
-Use 'caption' as name in the titlebar
-.TP
-\fB\-\-icon <icon>\fR
-Use 'icon' as the application icon
-.TP
-\fB\-\-miniicon <icon>\fR
-Use 'icon' as the icon in the titlebar
-.TP
-\fB\-\-config <filename>\fR
-Use alternative configuration file
-.TP
-\fB\-\-dcopserver <server>\fR
-Use the DCOP Server specified by 'server'
-.TP
-\fB\-\-nocrashhandler\fR
-Disable crash handler, to get core dumps
-.TP
-\fB\-\-waitforwm\fR
-Waits for a WM_NET compatible windowmanager
-.TP
-\fB\-\-style <style>\fR
-Sets the application GUI style
-.TP
-\fB\-\-geometry <geometry>\fR
-Sets the client geometry of the main widget - see man X for the argument format
-.SH AUTHOR
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-This manual page was written by Chris Bier <chris.bier@cymor.com>.
-Based on the xchat man page written by Davide Puricelli <evo@debian.org>,
-and the kwifimanager help options.  It was written for the Debian GNU/Linux
-system (but may be used by others).
diff --git a/debian/_base/core/tdenetwork/debian/man/lisa-trinity.8 b/debian/_base/core/tdenetwork/debian/man/lisa-trinity.8
deleted file mode 100644
index 9b3192e14..000000000
--- a/debian/_base/core/tdenetwork/debian/man/lisa-trinity.8
+++ /dev/null
@@ -1,77 +0,0 @@
-.TH "lisa" "8" "December 2005" 
-
-.SH "NAME" 
-lisa \-  LAN Information Server
-
-.SH "SYNOPSIS"
-.PP 
-.B lisa 
-[options]
-
-.SH "DESCRIPTION" 
-.PP 
-This manual page documents briefly the 
-.B lisa
-command. 
-.PP
-.B lisa
-is intended to provide a kind of "network neighbourhood" but only relaying on
-the TCP/IP protocol stack, no smb or whatever. The list of running hosts is
-provided via TCP port 7741.
-
-.SH "OPTIONS" 
-.TP
-.B \-c, \-\-config=\fIFILE\fR
-Read
-.I FILE
-instead of $(HOME)/.lisarc and /etc/lisarc. 
-.TP
-.BI "\-p, \-\-port" " PORTNR"
-Start the server on the portnumber
-.IR PORTNR .
-If you use this, LISa won't be able to
-cooperate with other LISa's in the network.
-.TP
-.B \-q, \-\-quiet
-Start quiet without the greeting message.
-.TP
-.B \-u, \-\-unix
-Deprecated.
-.TP
-.B \-k, \-\-kde1
-Deprecated.
-.TP
-.B \-K, \-\-kde2
-Deprecated.
-.TP
-.B \-h, \-\-help
-Show usage.
-.TP
-.B \-v, \-\-version
-Print out a short version info.
-
-.SH SIGNALS
-.PP
-If you send the Hangup-Signal to \fBlisa\fR, it will reread its
-configuration file (killall -HUP lisa).
-.PP
-If you send the User1-Signal to \fBlisa\fR, it will print some status
-information to the standard output (killall -USR1 lisa). You won't see 
-anything if the console from which \fBlisa\fR was started has terminated.
-
-.SH "SEE ALSO"
-.TP
-.BR reslisa (8)
-.TP
-.I /opt/trinity/share/doc/lisa/README.gz
-
-.SH "AUTHOR" 
-.PP
-.B LISa
-is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>.
-.PP 
-This manual page was written by Francois Wendling <frwendling@free.fr>. 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. 
-
diff --git a/debian/_base/core/tdenetwork/debian/man/reslisa-trinity.8 b/debian/_base/core/tdenetwork/debian/man/reslisa-trinity.8
deleted file mode 100644
index eb2ca8f48..000000000
--- a/debian/_base/core/tdenetwork/debian/man/reslisa-trinity.8
+++ /dev/null
@@ -1,72 +0,0 @@
-.TH "reslisa" "8" "December 2005" 
-
-.SH "NAME" 
-reslisa \-  Restricted LAN Information Server
-
-.SH "SYNOPSIS"
-.PP 
-.B reslisa 
-[options]
-
-.SH "DESCRIPTION" 
-.PP 
-This manual page documents briefly the 
-.B reslisa
-command. 
-.PP
-If you have very strict security rules in your network or you don't want to
-have another port open or whatever, you can use 
-.B resLISa
-instead of
-.BR lisa (1).
-
-.SH "OPTIONS" 
-.TP
-.B \-c, \-\-config=\fIFILE\fR
-Read
-.I FILE
-instead of $(HOME)/.reslisarc and /etc/reslisarc. 
-.TP
-.B \-q, \-\-quiet
-Start quiet without the greeting message.
-.TP
-.B \-u, \-\-unix
-Deprecated.
-.TP
-.B \-k, \-\-kde1
-Deprecated.
-.TP
-.B \-K, \-\-kde2
-Deprecated.
-.TP
-.B \-h, \-\-help
-Show usage.
-.TP
-.B \-v, \-\-version
-Print out a short version info.
-
-.SH SIGNALS
-.PP
-If you send the Hangup-Signal to \fBreslisa\fR, it will reread its
-configuration file (killall -HUP reslisa).
-.PP
-If you send the User1-Signal to \fBreslisa\fR, it will print some status
-information to the standard output (killall -USR1 reslisa). You won't see 
-anything if the console from which \fBreslisa\fR was started has terminated.
-
-.SH "SEE ALSO"
-.TP
-.BR lisa (8)
-.TP
-.I /opt/trinity/share/doc/lisa/README.gz
-
-.SH "AUTHOR" 
-.PP
-.B LISa
-is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>.
-.PP 
-This manual page was written by Francois Wendling <frwendling@free.fr>. 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. 
-
diff --git a/debian/_base/core/tdesdk/debian/kapptemplate-trinity.install b/debian/_base/core/tdesdk/debian/kapptemplate-trinity.install
index a10e6654c..4898037e6 100644
--- a/debian/_base/core/tdesdk/debian/kapptemplate-trinity.install
+++ b/debian/_base/core/tdesdk/debian/kapptemplate-trinity.install
@@ -1,2 +1,3 @@
 debian/tmp/opt/trinity/bin/kapptemplate
 debian/tmp/opt/trinity/share/apps/kapptemplate
+debian/tmp/opt/trinity/share/man/man1/kapptemplate.1
diff --git a/debian/_base/core/tdesdk/debian/kapptemplate-trinity.manpages b/debian/_base/core/tdesdk/debian/kapptemplate-trinity.manpages
deleted file mode 100644
index e558b802c..000000000
--- a/debian/_base/core/tdesdk/debian/kapptemplate-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kapptemplate.1
diff --git a/debian/_base/core/tdesdk/debian/kbabel-trinity.install b/debian/_base/core/tdesdk/debian/kbabel-trinity.install
index 0765b223f..4cfe9a49a 100644
--- a/debian/_base/core/tdesdk/debian/kbabel-trinity.install
+++ b/debian/_base/core/tdesdk/debian/kbabel-trinity.install
@@ -87,6 +87,9 @@ debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/catalogmanager.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabeldict.png
+debian/tmp/opt/trinity/share/man/man1/catalogmanager.1
+debian/tmp/opt/trinity/share/man/man1/kbabel.1
+debian/tmp/opt/trinity/share/man/man1/kbabeldict.1
 debian/tmp/opt/trinity/share/services/dbsearchengine.desktop
 debian/tmp/opt/trinity/share/services/tdefile_po.desktop
 debian/tmp/opt/trinity/share/services/pothumbnail.desktop
diff --git a/debian/_base/core/tdesdk/debian/kbabel-trinity.manpages b/debian/_base/core/tdesdk/debian/kbabel-trinity.manpages
deleted file mode 100644
index e85be5938..000000000
--- a/debian/_base/core/tdesdk/debian/kbabel-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/catalogmanager.1
-debian/man/kbabel.1
-debian/man/kbabeldict.1
diff --git a/debian/_base/core/tdesdk/debian/kbugbuster-trinity.install b/debian/_base/core/tdesdk/debian/kbugbuster-trinity.install
index 50b9c1fe5..d30028494 100644
--- a/debian/_base/core/tdesdk/debian/kbugbuster-trinity.install
+++ b/debian/_base/core/tdesdk/debian/kbugbuster-trinity.install
@@ -18,5 +18,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png
+debian/tmp/opt/trinity/share/man/man1/kbugbuster.1
 debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop
 debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdesdk/debian/kbugbuster-trinity.manpages b/debian/_base/core/tdesdk/debian/kbugbuster-trinity.manpages
deleted file mode 100644
index 8fc558a77..000000000
--- a/debian/_base/core/tdesdk/debian/kbugbuster-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kbugbuster.1
diff --git a/debian/_base/core/tdesdk/debian/kmtrace-trinity.install b/debian/_base/core/tdesdk/debian/kmtrace-trinity.install
index a163246b9..c327592b6 100644
--- a/debian/_base/core/tdesdk/debian/kmtrace-trinity.install
+++ b/debian/_base/core/tdesdk/debian/kmtrace-trinity.install
@@ -7,3 +7,7 @@ debian/tmp/opt/trinity/lib/kmtrace/libktrace.la
 debian/tmp/opt/trinity/lib/kmtrace/libktrace.so
 debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a
 debian/tmp/opt/trinity/share/apps/kmtrace/kde.excludes
+debian/tmp/opt/trinity/share/man/man1/demangle.1
+debian/tmp/opt/trinity/share/man/man1/kminspector.1
+debian/tmp/opt/trinity/share/man/man1/kmmatch.1
+debian/tmp/opt/trinity/share/man/man1/kmtrace.1
diff --git a/debian/_base/core/tdesdk/debian/kmtrace-trinity.manpages b/debian/_base/core/tdesdk/debian/kmtrace-trinity.manpages
deleted file mode 100644
index 92133295d..000000000
--- a/debian/_base/core/tdesdk/debian/kmtrace-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/demangle.1
-debian/man/kmtrace.1
-debian/man/kminspector.1
-debian/man/kmmatch.1
diff --git a/debian/_base/core/tdesdk/debian/kompare-trinity.install b/debian/_base/core/tdesdk/debian/kompare-trinity.install
index aca239beb..1876a13f0 100644
--- a/debian/_base/core/tdesdk/debian/kompare-trinity.install
+++ b/debian/_base/core/tdesdk/debian/kompare-trinity.install
@@ -29,4 +29,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kompare.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kompare.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kompare.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kompare.svgz
+debian/tmp/opt/trinity/share/man/man1/kompare.1
 debian/icons/kompare.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdesdk/debian/kompare-trinity.manpages b/debian/_base/core/tdesdk/debian/kompare-trinity.manpages
deleted file mode 100644
index acf918455..000000000
--- a/debian/_base/core/tdesdk/debian/kompare-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kompare.1
diff --git a/debian/_base/core/tdesdk/debian/kspy-trinity.install b/debian/_base/core/tdesdk/debian/kspy-trinity.install
index 12523ee90..56d2f0262 100644
--- a/debian/_base/core/tdesdk/debian/kspy-trinity.install
+++ b/debian/_base/core/tdesdk/debian/kspy-trinity.install
@@ -3,3 +3,4 @@ debian/tmp/opt/trinity/lib/libkspy.la
 debian/tmp/opt/trinity/lib/libkspy.so
 debian/tmp/opt/trinity/lib/libkspy.so.1
 debian/tmp/opt/trinity/lib/libkspy.so.1.2.0
+debian/tmp/opt/trinity/share/man/man1/testkspy.1
diff --git a/debian/_base/core/tdesdk/debian/kspy-trinity.manpages b/debian/_base/core/tdesdk/debian/kspy-trinity.manpages
deleted file mode 100644
index 34831ba91..000000000
--- a/debian/_base/core/tdesdk/debian/kspy-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/testkspy.1
diff --git a/debian/_base/core/tdesdk/debian/kuiviewer-trinity.install b/debian/_base/core/tdesdk/debian/kuiviewer-trinity.install
index 0fbde204f..d1b7104cb 100644
--- a/debian/_base/core/tdesdk/debian/kuiviewer-trinity.install
+++ b/debian/_base/core/tdesdk/debian/kuiviewer-trinity.install
@@ -11,6 +11,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuiviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kuiviewer.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kuiviewer.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kuiviewer.png
+debian/tmp/opt/trinity/share/man/man1/kuiviewer.1
 debian/tmp/opt/trinity/share/services/designerthumbnail.desktop
 debian/tmp/opt/trinity/share/services/kuiviewer_part.desktop
 debian/icons/kuiviewer.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdesdk/debian/kuiviewer-trinity.manpages b/debian/_base/core/tdesdk/debian/kuiviewer-trinity.manpages
deleted file mode 100644
index abcf3310b..000000000
--- a/debian/_base/core/tdesdk/debian/kuiviewer-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kuiviewer.1
diff --git a/debian/_base/core/tdesdk/debian/libcvsservice0-trinity.install b/debian/_base/core/tdesdk/debian/libcvsservice0-trinity.install
index 6f6370493..08ab2520e 100644
--- a/debian/_base/core/tdesdk/debian/libcvsservice0-trinity.install
+++ b/debian/_base/core/tdesdk/debian/libcvsservice0-trinity.install
@@ -8,4 +8,6 @@ debian/tmp/opt/trinity/lib/trinity/cvsaskpass.la
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.so
 debian/tmp/opt/trinity/lib/trinity/cvsservice.la
 debian/tmp/opt/trinity/lib/trinity/cvsservice.so
+debian/tmp/opt/trinity/share/man/man1/cvsaskpass.1
+debian/tmp/opt/trinity/share/man/man1/cvsservice.1
 debian/tmp/opt/trinity/share/services/cvsservice.desktop
diff --git a/debian/_base/core/tdesdk/debian/libcvsservice0-trinity.manpages b/debian/_base/core/tdesdk/debian/libcvsservice0-trinity.manpages
deleted file mode 100644
index 9afa8b3e7..000000000
--- a/debian/_base/core/tdesdk/debian/libcvsservice0-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/cvsaskpass.1
-debian/man/cvsservice.1
diff --git a/debian/_base/core/tdesdk/debian/man/adddebug.1 b/debian/_base/core/tdesdk/debian/man/adddebug.1
deleted file mode 100644
index d78dad43c..000000000
--- a/debian/_base/core/tdesdk/debian/man/adddebug.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ADDDEBUG 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-adddebug \- modifies Makefile(s) to add debug info
-.SH SYNOPSIS
-.B adddebug
-.RB "[ " \-k " ] [ " \-n " ] [ " \-r " ]"
-.SH DESCRIPTION
-\fBadddebug\fP modifies the \fIMakefile\fP in the current directory
-(and optionally in its subdirectories) to add debug info (\fI\-g3\fP).
-It will also remove optimisations (\fI\-O[1-9]?\fP), and can optionally
-remove \fI\-DNDEBUG\fP and \fI\-DNO_DEBUG\fP as well.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-.B \-k
-Keep optimisations (do not remove \fI\-O[1-9]?\fP flags which are
-removed by default).
-.TP
-.B \-n
-Compile without \fINDEBUG\fP and \fINO_DEBUG\fP being defined (this
-makes kdDebug calls work).
-.TP
-.B \-r
-Recursively search through all subdirectories of the current directory
-and operate on every Makefile that is found.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/build-progress.sh.1 b/debian/_base/core/tdesdk/debian/man/build-progress.sh.1
deleted file mode 100644
index 28c9d9016..000000000
--- a/debian/_base/core/tdesdk/debian/man/build-progress.sh.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BUILD-PROGRESS.SH 1 "June 16, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-build-progress.sh \- show kde-build progress in your konsole/xterm title bar
-.SH SYNOPSIS
-.B build-progress.sh
-.SH DESCRIPTION
-\fBbuild-progress.sh\fP can be used to watch the progress of a large TDE
-build in the title bar of your konsole or xterm.
-.PP
-The TDE build must be running elsewhere as a separate process, and it
-must be done using
-.BR kde-build (1).
-.PP
-When you run build-progress.sh, it will sit in a permanent loop while
-kde-build runs.  The title bar of the konsole/xterm in which you ran
-build-progress.sh will be continually updated with the directory in
-which the TDE build is currently working.
-.PP
-You must run build-progress.sh from the top-level directory of the TDE
-build tree.  This directory must contain a file named
-\fIkde-buildrc\fP (which is also used by kde-build).  This
-\fIkde-buildrc\fP must contain valid settings for
-\fITDELOGDIR\fP and \fITDESRCDIR\fP, or else build-progress.sh will
-fail to work.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH FILES
-.TP
-\fIkde-buildrc\fP
-This file must be contained in the current directory, which must be the
-root of the TDE build tree.  See
-.BR kde-build (1)
-for further information.
-.SH SEE ALSO
-.BR kde-build (1).
-.SH AUTHOR
-build-progress.sh was written by Malte Starostik <malte@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/catalogmanager.1 b/debian/_base/core/tdesdk/debian/man/catalogmanager.1
deleted file mode 100644
index db8b17613..000000000
--- a/debian/_base/core/tdesdk/debian/man/catalogmanager.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CATALOGMANAGER 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-catalogmanager \- advanced catalog manager for KBabel
-.SH SYNOPSIS
-.B catalogmanager
-.RI "[ " generic-options " ]"
-[ \fB\-\-project\fP \fIconfig-file\fP ]
-.SH DESCRIPTION
-\fBCatalogManager\fP is part of a suite of programs for editing gettext
-message files (PO-files).  This suite is designed to help you translate fast
-and consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager (this program)
-is a multi functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the catalogmanager-specific options.
-For a full summary of options, run \fIcatalogmanager \-\-help\fP.
-.TP
-\fB\-\-project\fP \fIconfig-file\fP
-Load the configuration from the given file.
-.SH SEE ALSO
-.BR kbabel (1),
-.BR kbabeldict (1).
-.PP
-Full user documentation for KBabel is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cheatmake.1 b/debian/_base/core/tdesdk/debian/man/cheatmake.1
deleted file mode 100644
index 098449a0b..000000000
--- a/debian/_base/core/tdesdk/debian/man/cheatmake.1
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CHEATMAKE 1 "September 27, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cheatmake \- fool make into not rebuilding certain files
-.SH SYNOPSIS
-.B cheatmake hidechange
-.I file
-.br
-.B cheatmake show
-.br
-.B cheatmake why
-.I file
-.SH DESCRIPTION
-\fBcheatmake\fP is used to save time when recompiling.  It can fool \fBmake\fP
-into skipping files that haven't changed in a meaningful way.  This can be
-used for instance when you change a comment in a file but none of the actual
-code.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-The different modes of operation are as follows.
-.TP
-\fBhidechange\fP \fIfile\fP
-Hides the fact that the given file has changed by moving its timestamp
-back into the past.  Use this option with care!
-.TP
-\fBshow\fP
-Lists which files make currently needs to rebuild.
-.TP
-\fBwhy\fP \fIfile\fP
-Explains why make must rebuild the given file.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR make (1).
-.SH AUTHOR
-cheatmake was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/create_cvsignore.1 b/debian/_base/core/tdesdk/debian/man/create_cvsignore.1
deleted file mode 100644
index ce63f6f55..000000000
--- a/debian/_base/core/tdesdk/debian/man/create_cvsignore.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CREATE_CVSIGNORE 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-create_cvsignore \- creates preliminary .cvsignore in current directory
-.SH SYNOPSIS
-.B create_cvsignore
-[ \fB\-r\fP ]
-.SH DESCRIPTION
-\fBcreate_cvsignore\fP is used to create a preliminary \fI.cvsignore\fP
-file in the current directory.  It does this by adding some standard
-stuff according to what it finds in \fIMakefile.am\fP.
-.PP
-No lines will be removed from any existing \fI.cvsignore\fP.
-If there is not already a \fI.cvsignore\fP, it will be added to the CVS
-repository.
-.PP
-Note that you must have a \fIMakefile.am\fP in the current directory for
-this tool to work.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB-r\fP
-Recursively process this directory and all directories beneath it.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/create_makefile.1 b/debian/_base/core/tdesdk/debian/man/create_makefile.1
deleted file mode 100644
index e128f23e9..000000000
--- a/debian/_base/core/tdesdk/debian/man/create_makefile.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CREATE_MAKEFILE 1 "September 26, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-create_makefile \- creates Makefile.in and Makefile from a Makefile.am
-.SH SYNOPSIS
-.B create_makefile
-.I relativepath/Makefile
-.br
-.B create_makefile
-.I relativepath
-.SH DESCRIPTION
-\fBcreate_makefile\fP creates the \fIMakefile.in\fP and \fIMakefile\fP
-in a subdirectory containing a \fIMakefile.am\fP.
-This script saves time compared to re-running configure completely.
-.PP
-Note that you must supply the path to the desired \fIMakefile\fP, not the
-existing \fIMakefile.am\fP (though the final \fI/Makefile\fP may be omitted).
-.PP
-This script may be run from the toplevel directory (the
-one containing \fIconfigure\fP) or from one of its subdirectories.
-Note that \fIrelativepath\fP must be a relative path, not an absolute path.
-.PP
-If the source directory is different from the build directory (see the
-environment variables below), it will be assumed that the \fIMakefile.am\fP
-and \fIMakefile.in\fP belong beneath the source directory and that the
-\fIMakefile\fP belongs beneath the build directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR create_makefiles (1).
-.SH AUTHOR
-create_makefile was written by David Faure <faure@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/create_makefiles.1 b/debian/_base/core/tdesdk/debian/man/create_makefiles.1
deleted file mode 100644
index 2efc03795..000000000
--- a/debian/_base/core/tdesdk/debian/man/create_makefiles.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CREATE_MAKEFILES 1 "September 27, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-create_makefiles \- recreates all Makefiles beneath a directory
-.SH SYNOPSIS
-.B create_makefiles
-.I dir
-.SH DESCRIPTION
-\fBcreate_makefiles\fP recreates all \fIMakefile\fPs in
-\fIdir\fP and its (recursed) subdirectories from the corresponding
-\fIMakefile.am\fP templates.
-.PP
-This script must be run from the toplevel directory (the
-one containing \fIconfigure\fP).
-This script saves time compared to re-running configure completely.
-.PP
-If the source directory is different from the build directory (see the
-environment variables below), it will be assumed that each \fIMakefile.am\fP
-and \fIMakefile.in\fP belongs beneath the source directory and that each
-\fIMakefile\fP belongs beneath the build directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR create_makefile (1).
-.SH AUTHOR
-create_makefiles was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvs-clean.1 b/debian/_base/core/tdesdk/debian/man/cvs-clean.1
deleted file mode 100644
index 0706e485c..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvs-clean.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVS-CLEAN 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvs\-clean \- delete all files and directories not registered with CVS
-.SH SYNOPSIS
-.B cvs\-clean
-[ \fB-n, \-\-dry-run\fP ]
-[ \fB-h, \-\-help\fP ]
-.SH DESCRIPTION
-\fBcvs\-clean\fP recursively deletes everything in or beneath the
-current directory that is not known to CVS (i.e., that has not been
-checked out of or checked into a CVS repository).
-.PP
-A list of all files and directories that are deleted will be written to
-the console.
-.PP
-This script behaves similarly to the \fIcvs-clean\fP target from the
-file \fIadmin/Makefile.common\fP found in most TDE application sources.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB-n, \-\-dry-run\fP
-Print the intended actions to the console, but do not change anything on
-the filesystem.
-.TP
-\fB-h, \-\-help\fP
-Display usage information.
-.SH SEE ALSO
-.BR cvs (1).
-.SH AUTHOR
-This utility was written by Oswald Buddenhagen <ossi@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvs2dist.1 b/debian/_base/core/tdesdk/debian/man/cvs2dist.1
deleted file mode 100644
index f0bc71a3e..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvs2dist.1
+++ /dev/null
@@ -1,201 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVS2DIST 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvs2dist \- convert subdirectories within TDE CVS into standalone
-source packages
-.SH SYNOPSIS
-.B cvsdist
-.I path-to-module
-.I directory-in-module
-[ \fB\-n, \-\-name\fP \fIname\fP ]
-[ \fB\-v, \-\-version\fP \fIversion\fP ]
-[ \fB\-\-admin-dir\fP \fIdir\fP ]
-[ \fB\-\-cvs-root\fP \fIroot\fP ]
-[ \fB\-B, \-\-branch\fP \fIbranch\fP ]
-[ \fB\-\-no-i18n\fP ]
-[ \fB\-\-no-i18n-lang\fP \fIlanguages\fP ]
-[ \fB\-\-log=\fP\fIlogfile\fP | \fB\-l\fP ]
-[ \fB\-m, \-\-make-unpackaged\fP ]
-[ \fB\-g, \-\-no-gzip\fP ]
-[ \fB\-b, \-\-no-bz2, \-\-no-bzip2\fP ]
-[ \fB\-o, \-\-only-directory\fP ]
-[ \fB\-r, \-\-required-header\fP \fIheader\fP ]
-[ \fB\-e, \-\-required-header-error-message\fP \fImessage\fP ]
-[ \fB\-d, \-\-remove-hidden\fP ]
-[ \fB\-\-replace-files\fP \fIpairs\fP ]
-[[--] \fIaddfile\fP ... ]
-.PP
-.B cvsdist
-\fB\-h, \-\-help\fP
-.SH DESCRIPTION
-Each module in the TDE CVS tree contains a large number of applications
-all bundled together.
-\fBcvs2dist\fP is used to extract a single application or component from
-one of these large CVS modules and bundle it into a standalone package.
-The application or component will be bundled into a standard
-distribution tarball (with a configure script and so on) that users can
-download, build and install.
-.PP
-By default, cvs2dist automatically tries to check out all translations
-of strings and documentation from the corresponding parts of the
-\fItde-i18n\fP CVS module and include them in the final packages.
-This can be suppressed or modified using the options \-\-no-i18n or
-\-\-no-i18n-lang.
-.PP
-The initial argument \fIpath-to-module\fP should specify where the CVS
-module has been checked out on your system, and the second argument
-\fIdirectory-in-module\fP should specify which directory within this
-module is to be packaged (all subdirectories beneath it will be included
-and so on).  See the EXAMPLE section below for details.
-.PP
-Both gzip and bzip2 compressed tarballs will be created by default and
-will be called \fIname[-version].tar.gz\fP and \fIname[-version].tar.bz2\fP.
-The \fIname\fP component will be the last directory component of
-\fIdirectory-in-module\fP unless otherwise specified by \-\-name, and
-the \fIversion\fP component will not be included unless it is specified by
-\-\-version.
-.PP
-Additional files from outside the CVS tree can be included in the final
-packages by passing them after all other options (these are the
-\fIaddfile\fP arguments displayed above).  These additional files will
-be placed in the top level directory of the final packages.
-The \-\- that precedes them is optional.
-.PP
-Many options are available for customising these procedures, as seen below.
-Note that cvs2dist will remove any temporary files that it creates.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-n, \-\-name\fP \fIname\fP
-The name of the package (to be used in the names of the final tarballs
-and directories).  Specifically, the compressed tarballs will be called
-\fIname-version.tar.gz\fP and \fIname-version.tar.bz2\fP (see the
-\-\-version option below for further information).
-This package name defaults to the last directory component of
-\fIdirectory-in-module\fP.
-.TP
-\fB\-v, \-\-version\fP \fIversion\fP
-The version of the package (to be used in the names of the final
-tarballs and directories).  If this is not supplied, no version is used
-at all (i.e., the compressed tarballs will just be called \fIname.tar.gz\fP
-and \fIname.tar.bz2\fP).
-.TP
-\fB\-\-admin-dir\fP \fIdir\fP
-The location of \fIadmin/\fP on the filesystem.  Symbolic links may
-be used.  Defaults to \fIpath-to-module/admin\fP.
-.TP
-\fB\-\-cvs-root\fP \fIroot\fP
-The value to use as CVSROOT when checking out translations from CVS.
-Defaults to the CVSROOT environment variable.
-If \-\-no-i18n is passed then this option has no effect.
-.TP
-\fB\-B, \-\-branch\fP \fIbranch\fP
-Use the given CVS branch for checking out translations from CVS.
-If \-\-no-i18n is passed then this option has no effect.
-.TP
-\fB\-\-no-i18n\fP
-Do not check out any translations from CVS.
-.TP
-\fB\-\-no-i18n-lang\fP \fIlanguages\fP
-Exclude the given language(s) when checking out translations from CVS.
-The list of languages should be comma-separated,
-such as \fI\-\-no-i18n-lang uk,de,en_GB\fP .
-.TP
-\fB\-\-log=\fP\fIlogfile\fP
-Log all proceedings to the given logfile.  Note that the = is essential,
-and may not be omitted.
-.TP
-\fB\-l\fP
-Log all proceedings to the default logfile in the current directory.
-.TP
-\fB\-m, \-\-make-unpackaged\fP
-In addition to the compressed tarballs, an unpacked distribution will be
-created in the current directory.
-.TP
-\fB\-g, \-\-no-gzip\fP
-Do not create a gzip package (\fIname-version.tar.gz\fP).
-.TP
-\fB\-b, \-\-no-bz2, \-\-no-bzip2\fP
-Do not create a bzip2 package (\fIname-version.tar.bz2\fP).
-.TP
-\fB\-o, \-\-only-directory\fP
-Alias for \-mgb.  No packages will be created, only an unpacked directory.
-.TP
-\fB\-r, \-\-required-header\fP \fIheader\fP
-When the user runs configure, an error will be generated if
-\fIheader\fP is not found on the user's system.
-.TP
-\fB\-e, \-\-required-header-error-message\fP \fImessage\fP
-The error to display to a user when the header passed with
-\-\-required-header is not found on the user's system.  Defaults to a
-sensible message.
-.TP
-\fB\-d, \-\-remove-hidden\fP
-Remove hidden files and directories (e.g., dotfiles) from the packages.
-.TP
-\fB\-h, \-\-help\fP
-Display instructions on how to use cvs2dist.
-.TP
-\fB\-\-replace-files\fP \fIpairs\fP
-Move one or more files around in the final distribution packages.
-The \fIpairs\fP argument should be a comma-separated list of
-replacements to make.  Each replacement specifies a single file to move, and
-should be of the form \fIsource\fP@\fIdest\fP.
-.br
-For each replacement, the source file will be moved to the
-destination file (in particular, the source file will be deleted).
-All filenames are relative to the top-level directory
-of the package.  Spaces in filenames are not allowed.
-.br
-Please be careful when using this option!  Try to avoid the use of ..
-in the filenames, since it may cause unexpected problems.
-.br
-An example of this option might be
-\fI\-\-replace-files take_this_file@move_it_here,configure.in.bot.dist@configure.in.bot\fP .
-.SH EXAMPLE
-The following example creates packages of the kolf picture plugin from
-the CVS source tree currently checked out in \fI/sources\fP.
-.PP
-.RS
-\fIexample$\fP cvs2dist /sources/tdegames kolf/objects/picture
-\-n kolf-picture \-v 0.9 \-r "kolf/game.h" \-\-log ~/tmp/extra-file
-.RE
-.PP
-The packages will be named \fIkolf-picture-0.9\fP and
-the process will be logged.  For configure to succeed when a user builds
-these packages, the header \fIkolf/game.h\fP must be installed or an
-error will occur.  The additional file \fI~/tmp/extra-file\fP will be
-included in the packages even though it is not part of the CVS source tree.
-.SH FILES
-.TP
-\fI~/.cvs2distrc\fP
-Any options found in this file will be
-added to the beginning of the command-line arguments.
-.SH SEE ALSO
-.BR cvs (1).
-.PP
-For the latest updates to this script, see the cvs2dist website
-\fIhttp://www.katzbrown.com/shiritsu/programming/cvs2dist/\fP.
-.SH AUTHOR
-cvs2dist was written by Jason Katz-Brown <jason@katzbrown.com>,
-Sebastian Stein <seb.stein@hpfsc.de>, Dominique Devriese <devriese@kde.org>
-and Michael Buesch <mbuesch@freenet.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvsaskpass.1 b/debian/_base/core/tdesdk/debian/man/cvsaskpass.1
deleted file mode 100644
index d4b7e5dfd..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvsaskpass.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSASKPASS 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsaskpass \- prompt for a password for the CVS DCOP service
-.SH SYNOPSIS
-.B cvsaskpass
-.RI "[ " generic-options " ]"
-.I prompt
-.SH DESCRIPTION
-This utility displays a dialog box prompting the user for the password to
-a CVS repository, then writes the password to standard output and exits.
-You should not need to run this program directly \- it is designed for
-the internal use of
-.BR cvsservice (1).
-.PP
-The prompt should be of the following form:
-.RS
-.PP
-\fIuser\fP@\fIhost\fP's password:
-.RE
-.PP
-This will allow the dialog box to display the details of the CVS
-repository to the user.
-.PP
-This utility is part of the CVS service provided with Cervisia, which in
-turn is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIcvsaskpass \-\-help\fP.
-.SH RETURN VALUE
-If a password was succefully obtained, 0 is returned.  If no prompt was
-supplied on the command-line or if the dialog was cancelled, 1 is returned.
-.SH SEE ALSO
-.BR cervisia (1),
-.BR cvsservice (1),
-.BR dcop (1).
-.PP
-Details of how to use the CVS service from within another script or C++
-program can be found in \fI/usr/share/doc/libcvsservice0/DESIGN\fP.
-.SH AUTHOR
-The CVS service was written by Christian Loose <christian.loose@kdemail.net>.
-.br
-Cervisia was written by Bernd Gehrmann <bernd@physik.hu-berlin.de>,
-Christian Loose <christian.loose@kdemail.net>,
-Andre Woebbeking <woebbeking@web.de>,
-Carlos Woelz <carloswoelz@imap-mail.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvsbackport.1 b/debian/_base/core/tdesdk/debian/man/cvsbackport.1
deleted file mode 100644
index 7181ac671..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvsbackport.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSBACKPORT 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsbackport \- backport the last change in HEAD to a branch
-.SH SYNOPSIS
-.B cvsbackport
-\fIfile\fP ...
-.SH DESCRIPTION
-For each file given on the command line,
-\fBcvsbackport\fP will attempt to determine the last change made to
-the file in HEAD and then backport that change to a CVS branch (the
-branch name is hard-coded; see below).
-.PP
-The changes to be backported will be displayed on screen, and you will
-have the chance to confirm or abort before any commits are made.
-.PP
-The files must be checked out from HEAD when you run this utility.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNINGS
-The branch tag is hard-coded into the script (currently it is set to
-KDE_3_4_BRANCH).
-.PP
-If you abort (i.e., you do not make the suggested commits), your files
-will be checked out from the branch (and not from HEAD as they were
-before).
-.SH SEE ALSO
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This utility was written by Dirk Mueller and David Faure.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvscheck.1 b/debian/_base/core/tdesdk/debian/man/cvscheck.1
deleted file mode 100644
index 3d79c255b..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvscheck.1
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSCHECK 1 "March 26, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvscheck \- offline status report for files in a checked-out CVS module
-.SH SYNOPSIS
-.B cvscheck
-[ \fB\-u, \-\-unknown\fP ]
-[ \fB\-m, \-\-modified\fP ]
-[ \fB\-\-missing\fP ]
-[ \fB\-t, \-\-tagged\fP ]
-[ \fB\-a, \-\-added\fP ]
-[ \fB\-r, \-\-removed\fP ]
-[ \fB\-c, \-\-conflicts\fP ]
-[ \fB\-l, \-\-local\fP ]
-[ \fIdir\fP ... ]
-.SH DESCRIPTION
-\fBcvscheck\fP prints information about the status of your local CVS
-checkout without communicating with the server.  This means it is
-extremely fast and does not require a network connection.
-.PP
-The given directories and all of their subdirectories will be processed
-recursively (though see the \-\-local option below).
-If no directory is given, the current directory and its
-recursed subdirectories will be used.
-.PP
-Each file with an interesting status will be printed with a status
-character in front of its name.  The status characters are as follows.
-.TP
-? \fIfoobar.c\fP
-The file is not known to CVS.  Maybe you should add it?
-.TP
-M \fIfoobar.c\fP
-The file is for sure locally modified.
-.TP
-m \fIfoobar.c\fP
-The file \fImight\fP have local changes.  You should diff with the
-server to make sure.
-.TP
-C \fIfoobar.c\fP
-The file has a CVS conflict and therefore cannot be committed.
-.TP
-U \fIfoobar.c\fP
-The file is in CVS but is somehow missing in your local checkout.
-.TP
-T \fIfoobar.c\fP
-The file has an unusual sticky CVS tag.
-.TP
-A \fIfoobar.c\fP
-You have "cvs add"ed this file but you have not yet committed.
-.TP
-R \fIfoobar.c\fP
-You have "cvs remove"d this file but you have not yet committed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-By default cvscheck will display the status for all files in and
-beneath the requested directories.  The following options however can be
-used to display only files with a particular status and/or in a
-particular directory.
-.TP
-\fB\-u, \-\-unknown\fP
-Show only unknown (?) files.
-.TP
-\fB\-m, \-\-modified\fP
-Show only modified (m/M) files.
-.TP
-\fB\-\-missing\fP
-Show only missing (U) files.
-.TP
-\fB\-t, \-\-tagged\fP
-Show only tagged (T) files.
-.TP
-\fB\-a, \-\-added\fP
-Show only added (A) files.
-.TP
-\fB\-r, \-\-removed\fP
-Show only removed (R) files.
-.TP
-\fB\-c, \-\-conflicts\fP
-Show only conflict (C) files.
-.TP
-\fB\-l, \-\-local\fP
-Do not recurse.  That is, process the given directory but none of its
-subdirectories.
-.SH SEE ALSO
-.BR cvs (1).
-.SH AUTHOR
-cvscheck was written by Dirk Mueller <mueller@kde.org> and
-Sirtaj Singh Kang <taj@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvsforwardport.1 b/debian/_base/core/tdesdk/debian/man/cvsforwardport.1
deleted file mode 100644
index 0ca6d29f5..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvsforwardport.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSFORWARDPORT 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsforwardport \- forwardport the last change in a branch to HEAD
-.SH SYNOPSIS
-.B cvsforwardport
-\fIfile\fP ...
-.SH DESCRIPTION
-For each file given on the command line,
-\fBcvsforwardport\fP will attempt to determine the last change made to
-the file in the primary CVS branch and then forwardport that change to HEAD.
-The branch name is hard-coded; see below.
-.PP
-The changes to be forwardported will be displayed on screen, and you will
-have the chance to confirm or abort before any commits are made.
-.PP
-The files must be checked out from the branch when you run this utility.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNINGS
-The branch tag is hard-coded into the script (currently it is set to
-KDE_3_4_BRANCH).
-.PP
-If you abort (i.e., you do not make the suggested commits), your files
-will be checked out from HEAD (and not from the branch as they were
-before).
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This utility was written by Dirk Mueller and David Faure.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvslastchange.1 b/debian/_base/core/tdesdk/debian/man/cvslastchange.1
deleted file mode 100644
index b651e4414..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvslastchange.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSLASTCHANGE 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvslastchange \- display the last committed changes for a file
-.SH SYNOPSIS
-.B cvslastchange
-\fIfile\fP [ \fIrevision\fP ]
-.br
-.B cvslastchange
-\fBM\fP +\fIdigits\fP -\fIdigits\fP
-.I file revision
-.SH DESCRIPTION
-\fBcvslastchange\fP displays the last changes committed to the CVS
-for the given file.
-It does this by launching '\fIcvs log\fP' and '\fIcvs diff\fP'.
-.PP
-If a revision is passed, the changes committed for that particular revision
-will be displayed.  Otherwise the currently checked out revision will be used.
-.PP
-This tool works with other branches as well as with HEAD.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fBM\fP +\fIdigits\fP -\fIdigits\fP
-These options are currently ignored.
-.SH ENVIRONMENT VARIABLES
-.TP
-CVSLASTCHANGE_KEEP_WHITESPACE
-Define this variable if you do not want the whitespace to be modified
-in any way when displaying changes.  Usually the whitespace is tidied
-up a little before the changes are displayed on screen.
-.br
-This variable is useful if you are using cvslastchange to extract a
-patch that can be applied elsewhere.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvslastlog.1 b/debian/_base/core/tdesdk/debian/man/cvslastlog.1
deleted file mode 100644
index 445a1a74a..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvslastlog.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSLASTLOG 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvslastlog \- prints the log of the last commit for a file
-.SH SYNOPSIS
-.B cvslastlog
-.I file
-.SH DESCRIPTION
-\fBcvslastlog\fP shows the log associated with the last CVS commit for the
-given file.
-It depends on the version of the local file, not the one on the server.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-cvslastlog was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvsrevertlast.1 b/debian/_base/core/tdesdk/debian/man/cvsrevertlast.1
deleted file mode 100644
index aedf45aa6..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvsrevertlast.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSREVERTLAST 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsrevertlast \- revert files in CVS by one version
-.SH SYNOPSIS
-.B cvsrevertlast
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBcvsrevertlast\fP is used to revert all the files on the command line
-by one version in CVS.  The files will not be committed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1).
-.SH AUTHOR
-This utility was written by Charles Samuels <charles@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cvsservice.1 b/debian/_base/core/tdesdk/debian/man/cvsservice.1
deleted file mode 100644
index 9d5c791d7..000000000
--- a/debian/_base/core/tdesdk/debian/man/cvsservice.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSSERVICE 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsservice \- a DCOP service for accessing CVS repositories
-.SH SYNOPSIS
-.B cvsservice
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-The CVS service is a DCOP service for accessing and working with
-remote CVS repositories.  Applications may link with this library to
-access the DCOP service directly from C++.  Alternatively, scripts may
-access the service using the standard
-.BR dcop (1)
-command-line tool.
-.PP
-DCOP is the Desktop Communication Protocol used throughout TDE.
-.PP
-The CVS DCOP service consists of the following three parts:
-.TP
-\fBCvsService\fP
-The main interface to the functionality of the
-.BR cvs (1)
-command line client.  There is one method for each CVS command, e.g., add,
-checkout, commit, etc.  The methods assemble the command line
-arguments, create a CvsJob and return a DCOPRef object for it
-to the caller.  There is one instance of this service for each
-application instance.
-.TP
-\fBRepository\fP
-This DCOPObject manages the configuration data of the current
-CVS repository.  The data is automatically updated when other
-service instances change it.
-.TP
-\fBCvsJob\fP
-This class represents a CVS job.  You can execute and cancel it,
-and you can retrieve the output of the cvs client by either
-connecting to the proper DCOP signals or by using the output()
-method.  There are two types of jobs.  First the non-concurrent
-job which has to run alone, like cvs update or import.  Second
-the jobs which can run concurrently like cvs log or annotate.
-.PP
-The CVS service is provided with Cervisia, which is part of the TDE
-Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIcvsservice \-\-help\fP.
-.SH SEE ALSO
-.BR cervisia (1),
-.BR cvs (1),
-.BR cvsaskpass (1),
-.BR dcop (1).
-.PP
-Details of how to use the CVS service from within a shell script, a C++
-program or through the JavaScript bindings can be found in
-\fI/usr/share/doc/libcvsservice0/DESIGN\fP.
-.SH AUTHOR
-The CVS service was written by Christian Loose <christian.loose@kdemail.net>.
-.br
-Cervisia was written by Bernd Gehrmann <bernd@physik.hu-berlin.de>,
-Christian Loose <christian.loose@kdemail.net>,
-Andre Woebbeking <woebbeking@web.de>,
-Carlos Woelz <carloswoelz@imap-mail.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/cxxmetric.1 b/debian/_base/core/tdesdk/debian/man/cxxmetric.1
deleted file mode 100644
index a8a855cde..000000000
--- a/debian/_base/core/tdesdk/debian/man/cxxmetric.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CXXMETRIC 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cxxmetric \- simple source metrics for C and C++
-.SH SYNOPSIS
-.B cxxmetric
-.RI "[ " file " ... ]"
-.SH DESCRIPTION
-\fBcxxmetric\fP counts lines of code, comment and blank space and
-calculates various other statistics for each given source file.
-Source files must be in C or C++.
-.PP
-If no source files are specified then all C/C++ files in or beneath the
-current directory will be used.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/demangle.1 b/debian/_base/core/tdesdk/debian/man/demangle.1
deleted file mode 100644
index 8f4f3922f..000000000
--- a/debian/_base/core/tdesdk/debian/man/demangle.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH DEMANGLE 1 "February 25, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-demangle \- undo C++ name mangling for symbols
-.SH SYNOPSIS
-.B demangle
-.SH DESCRIPTION
-\fBDemangle\fP reads a list of C++ mangled symbol names from standard
-input and converts these names to human-readable form on standard
-output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLE
-Create a file called \fInames\fP containing the following mangled symbol
-names:
-.PP
-.RS
-_ZNK6Object10metaObjectEv
-.br
-_ZN8QPtrListI5ArrowE5clearEv
-.br
-_ZTC4Kolf0_11TDEMainWindow
-.RE
-.PP
-These names can then be demangled as follows:
-.PP
-.RS
-\fIexample$\fP demangle < names
-.br
-Object::metaObject() const
-.br
-QPtrList<Arrow>::clear()
-.br
-construction vtable for TDEMainWindow-in-Kolf
-.RE
-.SH SEE ALSO
-.BR kminspector (1),
-.BR kmmatch (1),
-.BR kmtrace (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/dprof2calltree.1 b/debian/_base/core/tdesdk/debian/man/dprof2calltree.1
deleted file mode 100644
index 88bcd0b0d..000000000
--- a/debian/_base/core/tdesdk/debian/man/dprof2calltree.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH DPROF2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-dprof2calltree \- convert perl's DProf profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B dprof2calltree
-\fB\-f\fP \fIinput\fP
-[ \fB\-o\fP \fIoutput\fP ]
-.SH DESCRIPTION
-\fBdprof2calltree\fP reads the \fItmon.out\fP profiling data output by
-Perl's Devel::DProf profiling package, and converts it into calltree format
-for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP \fIinput\fP
-Specifies the DProf \fItmon.out\fP file to convert.
-.TP
-\fB\-o\fP \fIoutput\fP
-Write the calltree output to the given file for use by KCachegrind.
-If omitted, the output will be written to file of the form
-\fIcachgrind.out.<input>\fP.
-.SH EXAMPLE
-If you run a perl script as:
-.PP
-.RS
-perl -d:DProf yourscript.pl
-.RE
-.PP
-then this will write profiling data to \fItmon.out\fP.  You can then
-work with this data in KCachegrind as follows:
-.PP
-.RS
-dprof2calltree -f tmin.out -o cachegrind.out.foo
-.br
-tdecachegrind cachegrind.out.foo
-.RE
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by George Schlossnagle <george@omniti.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/extend_dmalloc.1 b/debian/_base/core/tdesdk/debian/man/extend_dmalloc.1
deleted file mode 100644
index 0078442ef..000000000
--- a/debian/_base/core/tdesdk/debian/man/extend_dmalloc.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTEND_DMALLOC 1 "April 29, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extend_dmalloc \- analyse return-addresses from dmalloc logfiles
-.SH SYNOPSIS
-.B extend_dmalloc
-.I dmalloc-log binary
-.SH DESCRIPTION
-\fBextend_dmalloc\fP will run
-.BR gdb (1)
-to get information on the return-addresses from a
-.BR dmalloc (1)
-logfile.  Specifically it will examine any \fIra=\fP lines and try to
-get the corresponding line numbers.
-.PP
-The argument \fIbinary\fP must be the binary that generated the log
-\fIdmalloc-log\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH NOTES
-You may wish to direct the output from extend_dmalloc to a file, since
-otherwise gdb seems to prompt for a return as if you are at the end of a
-page.
-.SH AUTHOR
-extend_dmalloc was written by Gray Watson <gray.watson@letters.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/extractattr.1 b/debian/_base/core/tdesdk/debian/man/extractattr.1
deleted file mode 100644
index 7e506e449..000000000
--- a/debian/_base/core/tdesdk/debian/man/extractattr.1
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTRACTATTR 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extractattr \- extract element attributes from UI and XML GUI files
-.SH SYNOPSIS
-.B extractattr
-\fB\-\-attr=\fP\fIname\fP
-[ \fB\-\-attr=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.PP
-.B extractattr \-\-help
-.SH DESCRIPTION
-\fBextractattr\fP finds all of the given element attributes within the
-given files.  It then writes the corresponding \fIi18n()\fP calls to
-standard output (usually redirected to rc.cpp) so that xgettext can parse
-them.  Only the attributes specified by \fB\-\-attr\fP will be extracted.
-.PP
-Both Qt designer (.ui) files and XML GUI (.rc) files are understood.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\-attr=\fP\fIname\fP
-Specifies an attribute to be extracted.  This option may be used
-multiple times.
-.br
-The \fIname\fP argument must be of the form
-\fIElement\fP,\fIattribute\fP or
-\fIElement\fP,\fIattribute\fP,\fIcontext\fP.
-.br
-The context is optional, and is used in constructing the i18n() calls.
-If specified it will override the default context set by \fB\-\-context\fP.
-.TP
-\fB\-\-context=\fP\fIname\fP
-Give all i18n() calls the given context: i18n("\fIname\fP", ...).
-.TP
-\fB\-\-help\fP
-Display a summary of options.
-.SH EXAMPLE
-extractattr \-\-attr=Title,data \-\-attr=Description,data,Stencils file.ui
-.SH AUTHOR
-This utility was written by Richard Evans <rich@ridas.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/extractrc.1 b/debian/_base/core/tdesdk/debian/man/extractrc.1
deleted file mode 100644
index 130fdb089..000000000
--- a/debian/_base/core/tdesdk/debian/man/extractrc.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTRACTRC 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extractrc \- extract message strings from UI and XML GUI files
-.SH SYNOPSIS
-.B extractrc
-[ \fB\-\-tag\-group=\fP\fIgroup\fP ]
-[ \fB\-\-tag=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.PP
-.B extractrc \-\-help
-.SH DESCRIPTION
-\fBextractrc\fP finds all text tags and other message strings within the
-given files.  It then writes the corresponding \fIi18n()\fP calls to
-standard output (usually redirected to rc.cpp) so that xgettext can parse
-them.
-.PP
-It understands both Qt designer (.ui) files and XML GUI (.rc) files.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Note that the old \fB\-\-lines\fP option is deprecated; source line
-numbers are now always included in comments.
-.TP
-\fB\-\-tag\-group=\fP\fIgroup\fP
-Use a predefined group of tags that we are interested in.
-Valid groups are default, koffice and none.
-The default group will be used if this option is omitted.
-.TP
-\fB\-\-tag=\fP\fIname\fP
-Extract also the contents of the tag \fIname\fP.
-This option may be used multiple times
-(e.g., \-\-tag=tag_one \-\-tag=tag_two).
-.TP
-\fB\-\-context=\fP\fIname\fP
-Give all i18n() calls the given context: i18n("\fIname\fP", ...).
-.TP
-\fB\-\-help\fP
-Display a summary of options.
-.SH AUTHOR
-This utility was written by Richard Evans <rich@ridas.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/findmissingcrystal.1 b/debian/_base/core/tdesdk/debian/man/findmissingcrystal.1
deleted file mode 100644
index 32b23294e..000000000
--- a/debian/_base/core/tdesdk/debian/man/findmissingcrystal.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FINDMISSINGCRYSTAL 1 "February 6, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-findmissingcrystal \- determine which TDE Crystal icons are the same as
-the TDE Classic hicolor icons
-.SH SYNOPSIS
-.B findmissingcrystal
-.I module
-.SH DESCRIPTION
-\fBfindmissingcrystal\fP is a small utility that runs through the icons
-in the given TDE module and determines which Crystal icons from that
-module are identical to the old TDE Classic hicolor icons.
-.PP
-This script \fBmust\fP be run from the top-level directory of a TDE source
-tree (i.e., the directory containing \fItdelibs\fP, \fItdebase\fP, etc.).
-It is assumed that \fImodule\fP is a top-level module in the source tree,
-and it is also assumed that the source tree contains the \fItdeartwork\fP
-module (which contains the old hicolor icons).
-.PP
-For each Crystal icon in the given module, a message will be output
-describing whether the icon is new (no matching hicolor icon was found),
-different from the hicolor icon or the same as the hicolor icon.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/fixkdeincludes.1 b/debian/_base/core/tdesdk/debian/man/fixkdeincludes.1
deleted file mode 100644
index 43ae3dfff..000000000
--- a/debian/_base/core/tdesdk/debian/man/fixkdeincludes.1
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FIXTDEINCLUDES 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fixkdeincludes \- reduce the number of #includes in TDE source files
-.SH SYNOPSIS
-.B fixkdeincludes
-[ \fB\-v, \-\-verbose\fP ]
-[ \fB\-e, \-\-experimental\fP ]
-[ \fB\-m, \-\-modify\fP ]
-[ \fIfile\fP ... ]
-.br
-.B fixkdeincludes \-\-help
-.SH DESCRIPTION
-\fBfixkdeincludes\fP tries to reduce the number of #includes in C++ source
-files.  Much of its processing is specific to TDE sources and so it
-might not work so well with sources for non-TDE applications.
-.PP
-The following problems are identified by fixkdeincludes:
-.PP
-.RS
-Including headers that are no longer supported but which exist for
-compatibility with older Qt/KDE versions;
-.PP
-Including the same file multiple times;
-.PP
-Using #include <...> instead of #include "...".
-.RE
-.PP
-There is also an experimental mode which tries removing each #include
-one at a time (with a few exceptions) to see whether the source still
-compiles.  Note that this experimental mode will modify the original sources.
-.PP
-By default the sources will not be modified; the identified problems
-will simply be written to standard output.
-.PP
-The list of C++ sources to examine should be given on the command-line.
-If no files are given, all C++ sources in or beneath the current
-directory will be examined (with the exception of directories whose
-\fIMakefile.am\fP contains \-UQT_NO_COMPAT or \-UTDE_NO_COMPAT).
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-v, \-\-verbose\fP
-Verbose mode.  Additional debugging information is written to standard output.
-.TP
-\fB\-e, \-\-experimental\fP
-Experimental mode, as described above in detail.  Note that this option
-implies \fB\-\-modify\fP.
-.TP
-\fB\-m, \-\-modify\fP
-As well as writing messages to standard output, actually modify the
-original sources to fix any problems that were found.
-.SH AUTHOR
-fixkdeincludes was written by Dirk Mueller <mueller@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/fixuifiles.1 b/debian/_base/core/tdesdk/debian/man/fixuifiles.1
deleted file mode 100644
index 17ce46a61..000000000
--- a/debian/_base/core/tdesdk/debian/man/fixuifiles.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FIXUIFILES 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fixuifiles \- remove undesirable features from TQt/TDE .ui files
-.SH SYNOPSIS
-.B fixuifiles
-[ \fB\-v, \-\-verbose\fP ]
-[ \fB\-\-omitqtcheck\fP ]
-[ \fIfile\fP ... ]
-.br
-.B fixuifiles \-\-help
-.SH DESCRIPTION
-\fBfixuifiles\fP processes one or more TQt/TDE user interface definition
-files (.ui files) and tries to remove some of the insanities found
-therein.  If no filenames are given, fixuifiles will process all .ui
-files in or beneath the current directory.
-.PP
-The following problems are fixed:
-.PP
-.RS
-Too high minimum Qt version;
-.PP
-Hardcoded untranslatable Alt+Letter accels (auto-added by Qt Designer);
-.PP
-Captions that are equal to class names (auto-added by Qt Designer).
-.RE
-.PP
-The threshold Qt version can be set
-using either a \fI.qt_minversion\fP file (containing simply the Qt version
-number) or a \fIconfigure.in.in\fP file (containing an appropriate
-MIN_CONFIG macro).  These files may be in the directory containing the .ui
-file or any parent directory.  If no threshold Qt version is found,
-a sensible default will be used.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-v, \-\-verbose\fP
-Verbose mode.  Additional debugging information is written to standard output.
-.TP
-\fB\-\-omitqtcheck\fP
-Do not check the minimum Qt version.
-.SH AUTHOR
-fixuifiles was written by David Faure <faure@kde.org> and
-Dirk Mueller <mueller@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/hotshot2calltree.1 b/debian/_base/core/tdesdk/debian/man/hotshot2calltree.1
deleted file mode 100644
index 8c4d4441c..000000000
--- a/debian/_base/core/tdesdk/debian/man/hotshot2calltree.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH HOTSHOT2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-hotshot2calltree \- convert hotshot profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B hotshot2calltree
-[ \fB\-\-file\-limit\fP \fIlimit\fP ]
-\fB\-o\fP \fIoutput\fP \fIinput\fP [ \fIinput\fP ... ]
-.SH DESCRIPTION
-\fBhotshot2calltree\fP reads one or more pstat profiling data files
-as output by the hotshot python profiler, and converts them into
-calltree format for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-o\fP \fIoutput\fP
-Write the calltree output into the given file for use by KCachegrind.
-This may be \fB\-\fP if you wish to write to standard output.
-.TP
-\fIinput\fP ...
-Read the hotshot profiling data from the given file(s).
-.TP
-\fB\-\-file\-limit\fP \fIlimit\fP
-Stop after the given number of input files.
-.SH EXAMPLE
-Suppose that you have used hotshot to profile a python app, with results
-dumped to the file \fIpythongrind.prof\fP.  You may then work with this
-data in KCachegrind as follows.
-.PP
-.RS
-hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof
-.br
-tdecachegrind cachegrind.out.0
-.RE
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Jorg Beyer <job@webde-ag.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kapptemplate.1 b/debian/_base/core/tdesdk/debian/man/kapptemplate.1
deleted file mode 100644
index 1010ecd52..000000000
--- a/debian/_base/core/tdesdk/debian/man/kapptemplate.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KAPPTEMPLATE 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kapptemplate \- creates a framework to develop a TDE application
-.SH SYNOPSIS
-.B kapptemplate
-[ \fB\-\-noinit\fP ] [ \fB\-\-default\fP ]
-.RB "[ " \-\-full\-app " | " \-\-kpart\-app " | " \-\-kpart\-plugin
-.RB " | " \-\-existing " ]"
-.PP
-.B kapptemplate \-\-help
-.SH DESCRIPTION
-\fBKAppTemplate\fP is a shell script that will create the necessary
-framework to develop various TDE applications.  It takes care of the
-autoconf/automake code as well as providing a skeleton and example of
-what the code typically looks like.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.SS General Options
-.TP
-\-\-help
-Display a full summary of options.
-.TP
-\-\-noinit
-Don't run 'make \-f Makefile.cvs'.
-.TP
-\-\-default
-Use default values instead of prompting.
-.SS Framework Types
-.TP
-\-\-full\-app
-Create a full featured TDE application.
-.TP
-\-\-kpart\-app
-Create a full featured KPart application.
-.TP
-\-\-kpart\-plugin
-Create a KPart plugin framework.
-.TP
-\-\-existing
-Converting existing source to an automake/autoconf TDE framework.
-.SH FILES
-.TP
-.I ~/.kapptemplate
-Stores default values.
-.SH SEE ALSO
-The original documentation from the program author
-is available in \fI/usr/share/doc/kapptemplate/\fP.
-.SH AUTHOR
-KAppTemplate was written by Kurt Granroth <granroth@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kbabel.1 b/debian/_base/core/tdesdk/debian/man/kbabel.1
deleted file mode 100644
index 047e3626d..000000000
--- a/debian/_base/core/tdesdk/debian/man/kbabel.1
+++ /dev/null
@@ -1,74 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBABEL 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbabel \- a PO-file editor for TDE
-.SH SYNOPSIS
-.B kbabel
-.RI "[ " generic-options " ]"
-[ \fB\-\-gotomsgid\fP \fImsgid\fP ] [ \fB\-\-nosplash\fP ]
-[ \fB\-\-project\fP \fIconfig-file\fP ]
-.RI "[ " file " ]"
-.SH DESCRIPTION
-\fBKBabel\fP is part of a suite of programs for editing gettext message
-files (PO-files).  It is designed to help you translate fast and
-consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel (this
-program) is an advanced and easy to use PO-file editor with full navigational
-and editing capabilities, syntax checking and statistics.  CatalogManager is
-a multi functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbabel-specific options.
-For a full summary of options, run \fIkbabel \-\-help\fP.
-.TP
-\fB\-\-gotomsgid\fP \fImsgid\fP
-Go to the entry with the given message ID.
-.TP
-.B \-\-nosplash
-Disable splashscreen at startup.
-.TP
-\fB\-\-project\fP \fIconfig-file\fP
-Load the configuration from the given file.
-.SH SEE ALSO
-.BR catalogmanager (1),
-.BR kbabeldict (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kbabeldict.1 b/debian/_base/core/tdesdk/debian/man/kbabeldict.1
deleted file mode 100644
index ffd9b4658..000000000
--- a/debian/_base/core/tdesdk/debian/man/kbabeldict.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBABELDICT 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbabeldict \- the KBabel dictionary for translators
-.SH SYNOPSIS
-.B kbabeldict
-.RI "[ " generic-options " ]"
-.RB "[ " \-\-nosplash " ]"
-.SH DESCRIPTION
-\fBKBabelDict\fP is part of a suite of programs for editing gettext message
-files (PO-files).  This suite is designed to help you translate fast and
-consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager is a multi
-functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict (this program) is a dictionary to assist
-with searching for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbabeldict-specific options.
-For a full summary of options, run \fIkbabeldict \-\-help\fP.
-.TP
-.B \-\-nosplash
-Disable splashscreen at startup.
-.SH SEE ALSO
-.BR kbabel (1),
-.BR catalogmanager (1).
-.PP
-Full user documentation for KBabel is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kbugbuster.1 b/debian/_base/core/tdesdk/debian/man/kbugbuster.1
deleted file mode 100644
index 29b9c38d7..000000000
--- a/debian/_base/core/tdesdk/debian/man/kbugbuster.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBUGBUSTER 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbugbuster \- front end for the TDE bug tracking system
-.SH SYNOPSIS
-.B kbugbuster
-.RI "[ " generic-options " ]"
-[ \fB\-d, \-\-disconnected\fP ]
-[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
-[ \fB\-\-bug\fP \fInumber\fP ]
-.SH DESCRIPTION
-\fBKBugBuster\fP is a GUI front end for the TDE bug tracking system.
-It allows the user to view and manipulate bug reports and provides a
-variety of options for searching through reports.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbugbuster-specific options.
-For a full summary of options, run \fIkbugbuster \-\-help\fP.
-.TP
-[ \fB\-d, \-\-disconnected\fP ]
-Start in disconnected mode.
-.TP
-[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
-Start with the bug list for the given package.
-.TP
-[ \fB\-\-bug\fP \fInumber\fP ]
-Start with the given bug report.
-.SH AUTHOR
-KBugBuster was written by Martijn Klingens <klingens@kde.org>,
-Simon Hausmann <hausmann@kde.org>, Cornelius Schumacher <schumacher@kde.org>
-and David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kdedoc.1 b/debian/_base/core/tdesdk/debian/man/kdedoc.1
deleted file mode 100644
index 1911442c2..000000000
--- a/debian/_base/core/tdesdk/debian/man/kdedoc.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDEDOC 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kdedoc \- view documentation for a TDE class
-.SH SYNOPSIS
-.B kdedoc
-.I classname
-.SH DESCRIPTION
-\fBkdedoc\fP opens the documentation for the TDE class \fIclassname\fP
-in kfm/konqueror.  Note that the class name is case sensitive.  It is
-assumed that you have the tdelibs documentation installed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLES
-To bring up help on the class TDEAboutDialog:
-.PP
-.RS
-kdedoc TDEAboutDialog
-.RE
-.SH DEBIAN USERS
-The tdelibs documentation is in the Debian package \fItdelibs4-doc\fP,
-which will need to be installed.
-.SH SEE ALSO
-.BR qtdoc (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kdelnk2desktop.py.1 b/debian/_base/core/tdesdk/debian/man/kdelnk2desktop.py.1
deleted file mode 100644
index 41cce73a5..000000000
--- a/debian/_base/core/tdesdk/debian/man/kdelnk2desktop.py.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KDELNK2DESKTOP.PY 1 "November 14, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kdelnk2desktop.py \- converts .kdelnk to .desktop
-.SH SYNOPSIS
-.B kdelnk2desktop.py
-.RI "[ " kdelnk-file " ] ..."
-.SH DESCRIPTION
-\fBkdelnk2desktop.py\fP is used to convert
-a \fI.kdelnk\fP file (used by KDE 1) into a \fI.desktop\fP
-file (used by KDE 2 and later).
-.PP
-File \fIkdelnk-file\fP must have a name ending in \fI.kdelnk\fP.
-After kdelnk2desktop.py is run, this will be replaced by a new file
-ending in \fI.desktop\fP.  The original \fIkdelnk-file\fP will be
-removed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNING
-If \fIkdelnk-file\fP does not end in \fI.kdelnk\fP,
-the results of this script are unpredictable.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kdemangen.pl.1 b/debian/_base/core/tdesdk/debian/man/kdemangen.pl.1
deleted file mode 100644
index 8acd79df1..000000000
--- a/debian/_base/core/tdesdk/debian/man/kdemangen.pl.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KDEMANGEN.PL 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kdemangen.pl \- automatically create a draft manpage for a TDE app
-.SH SYNOPSIS
-.B kdemangen.pl
-.I /path/to/application
-.SH DESCRIPTION
-\fBkdemangen.pl\fP will automatically create a draft manpage for a TDE
-application.  Manpages are always better when hand-tailored, but this
-should give you a fairly good start.
-.PP
-To create the manpage, it will use the \-\-author and \-\-help\-all
-output for the application passed on the command line.
-It will also use the description in the
-Debian control file if one is available.  To make use of this additional
-feature, you must run kdemangen.pl from within the \fIdebian/\fP
-subdirectory of the application sources.
-.PP
-The new manpage will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNING
-This utility will only work for a full TDE application that uses
-TDECmdLineArgs (which most full TDE applications do).
-.SH EXAMPLE
-.RS
-cd /path/to/tde/srcs/tdeedu/debian
-.br
-kdemangen /usr/bin/kstars > kstars.1
-.RE
-.SH AUTHOR
-kdemangen.pl was written by Dominique Devriese <devriese@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kminspector.1 b/debian/_base/core/tdesdk/debian/man/kminspector.1
deleted file mode 100644
index 29cb70e5b..000000000
--- a/debian/_base/core/tdesdk/debian/man/kminspector.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMINSPECTOR 1 "February 25, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kminspector \- run a program with the TDE memory leak tracer
-.SH SYNOPSIS
-.B kminspector
-\fIprogram\fP [ \fIprogram-args\fP ]
-.SH DESCRIPTION
-\fBKMinspector\fP runs the given program, examines its memory
-allocation behaviour using \fIlibktrace\fP and pipes the resulting
-allocation tree through \fIless\fP.
-.PP
-The given program does not need to be specially compiled.
-.PP
-This utility is provided with KMtrace,
-a TDE tool to assist with malloc debugging using
-glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
-current (9/9/2000) glibc versions only logs the return-address of the
-malloc/free call. The library included with KMtrace
-logs a complete backtrace upon malloc/free.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kmmatch (1),
-.BR kmtrace (1).
-.PP
-Much more extensive documentation for KMtrace can be found in
-\fI/usr/share/doc/kmtrace/README\fP.
-.SH AUTHOR
-KMtrace was written by Waldo Bastian <bastian@kde.org>,
-Mike Haertel <mike@ai.mit.edu> and Andi Kleen <ak@suse.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kmmatch.1 b/debian/_base/core/tdesdk/debian/man/kmmatch.1
deleted file mode 100644
index d80c15542..000000000
--- a/debian/_base/core/tdesdk/debian/man/kmmatch.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMMATCH 1 "February 26, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmmatch \- search for symbols in a map file
-.SH SYNOPSIS
-.B kmmatch
-.I map-file call-file
-.SH DESCRIPTION
-\fBKMMatch\fP determines which symbols from a given set (\fIcall-file\fP) are
-present in a given map file.
-.PP
-The \fImap-file\fP should contain output from \fInm\fP (which extracts
-information from object files).  It must \fBnot\fP contain any blank
-lines or header information (such as the name of the object file); this
-means you may need to strip the first few lines of \fInm\fP output from
-the \fImap-file\fP.
-.PP
-The \fIcall-file\fP should contain a list of symbols (such as function
-calls made by a program), one per line.
-.PP
-This utility will find which of the symbols in \fIcall-file\fP are
-present in \fImap-file\fP and write them to standard error, one per
-line, in the order in which they appear in \fIcall-file\fP.
-.PP
-Note that this utility is called \fBmatch\fP in the original TDE
-distribution; it has been renamed to \fBkmmatch\fP in Debian to
-avoid conflicts with unrelated packages.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kminspector (1),
-.BR kmtrace (1),
-.BR nm (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kmtrace.1 b/debian/_base/core/tdesdk/debian/man/kmtrace.1
deleted file mode 100644
index 14f5f9fc8..000000000
--- a/debian/_base/core/tdesdk/debian/man/kmtrace.1
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMTRACE 1 "February 25, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmtrace \- a TDE memory leak tracer
-.SH SYNOPSIS
-.B kmtrace
-[ \fIgeneric-options\fP ]
-[ \fB\-x, \-\-exclude\fP \fIfile\fP ]
-[ \fB\-e, \-\-exe\fP \fIfile\fP ]
-[ \fB\-t, \-\-tree\fP \fIfile\fP
-[ \fB\-\-th, \-\-treethreshold\fP \fIvalue\fP ]
-[ \fB\-\-td, \-\-treedepth\fP \fIvalue\fP ]]
-[ \fItrace-log\fP ]
-.SH DESCRIPTION
-\fBKMtrace\fP is a TDE tool to assist with malloc debugging using
-glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
-current (9/9/2000) glibc versions only logs the return-address of the
-malloc/free call. The library included with KMtrace
-logs a complete backtrace upon malloc/free.
-.PP
-KMtrace will investigate the trace log specified on the command line,
-or \fIktrace.out\fP if no trace log is specified.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kmtrace-specific options.
-For a full summary of options, run \fIkmtrace \-\-help\fP.
-.TP
-\fB\-x, \-\-exclude\fP \fIfile\fP
-File containing symbols to exclude from output.
-.TP
-\fB\-e, \-\-exe\fP \fIfile\fP
-Executable to use for looking up unknown symbols.
-.TP
-\fB\-t, \-\-tree\fP \fIfile\fP
-Write a tree of the allocations to the given file.
-.TP
-\fB\-\-th, \-\-treethreshold\fP \fIvalue\fP
-When writing the allocations tree, hide subtrees allocating less than the
-given memory amount.
-.TP
-\fB\-\-td, \-\-treedepth\fP \fIvalue\fP
-When writing the allocations tree, hide subtrees that are deeper than the
-specified depth.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kminspector (1),
-.BR kmmatch (1).
-.PP
-Much more extensive documentation can be found in
-\fI/usr/share/doc/kmtrace/README\fP.
-.SH AUTHOR
-KMtrace was written by Waldo Bastian <bastian@kde.org>,
-Mike Haertel <mike@ai.mit.edu> and Andi Kleen <ak@suse.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kompare.1 b/debian/_base/core/tdesdk/debian/man/kompare.1
deleted file mode 100644
index e777752e1..000000000
--- a/debian/_base/core/tdesdk/debian/man/kompare.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOMPARE 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kompare \- a TDE GUI for viewing differences between files
-.SH SYNOPSIS
-.B kompare
-[ \fIgeneric-options\fP ]
-.br
-.B kompare
-[ \fIgeneric-options\fP ] [ \fB\-c\fP ] \fIURL1 URL2\fP
-.br
-.B kompare
-[ \fIgeneric-options\fP ] [ \fB\-o\fP [ \fB\-n\fP ]] \fIdiff\fP
-.br
-.B kompare
-[ \fIgeneric-options\fP ] \fB\-b\fP \fIURL diff\fP
-.SH DESCRIPTION
-\fBKompare\fP is a graphical user interface for viewing the differences
-between two files.  It will also optionally create a diff file.
-.PP
-Depending upon what is passed on the command line, Kompare can compare
-documents, display diff files and blend diff files back into original
-documents.
-.PP
-If an url is given as - then Kompare will read the corresponding file
-from standard input.  Thus (for instance) Kompare can be used as:
-.PP
-.RS
-cvs diff | kompare \-o \-
-.RE
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kompare-specific options.
-For a full summary of options, run \fIkompare \-\-help\fP.
-.TP
-\fB\-b\fP \fIURL diff\fP
-Blends \fIdiff\fP into URL.  \fIdiff\fP is expected to be diff output and
-\fIURL\fP the file or folder that the diff output needs to be blended into.
-.TP
-\fB\-c\fP \fIURL1 URL2\fP
-Compares \fIURL1\fP with \fIURL2\fP.  This is the default mode if two
-URLs are passed.
-.TP
-\fB\-n\fP
-Used with \fB\-o\fP to stop Kompare from checking for the original file.
-.TP
-\fB\-o\fP \fIdiff\fP
-Opens the given diff file.  This is the default mode if only one URL is
-passed.
-.br
-Kompare will check to see if it can find
-the original file(s).  If it can, it will blend the original file(s) into
-the diff output and show the result in the viewer.  Passing \fB\-n\fP
-will disable this check.
-.SH SEE ALSO
-The original documentation from the program author
-is available in \fI/usr/share/doc/kompare/\fP.
-.SH AUTHOR
-Kompare was written by John Firebaugh <jfirebaugh@kde.org>,
-Otto Bruggeman <otto.bruggeman@home.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/kuiviewer.1 b/debian/_base/core/tdesdk/debian/man/kuiviewer.1
deleted file mode 100644
index 5439127ae..000000000
--- a/debian/_base/core/tdesdk/debian/man/kuiviewer.1
+++ /dev/null
@@ -1,65 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUIVIEWER 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kuiviewer \- a viewer for Qt Designer user interface files
-.SH SYNOPSIS
-.B kuiviewer
-.RI "[ " generic-options " ]"
-.RI "[ " ui-file ... " ]"
-.PP
-.B kuiviewer
-.RI "[ " generic-options " ]"
-{ \fB\-s, \-\-takescreenshot\fP \fIfilename\fP }
-[ \fB\-w, \-\-screenshotwidth\fP \fIint\fP ]
-[ \fB\-h, \-\-screenshotheight\fP \fIint\fP ]
-.I ui-file
-.SH DESCRIPTION
-\fBKUIViewer\fP is a utility to display and test the user interface (.ui)
-files generated by \fBQt Designer\fP.  The interfaces can be displayed in a
-variety of different widget styles.
-.PP
-Normally KUIViewer launches a full GUI, allowing the user to interact with
-the given interface.
-By passing the \fB\-\-takescreenshot\fP option, you can make KUIViewer dump a
-screenshot of the interface instead and exit immediately.  Other options
-are available to control precisely how this screenshot is constructed.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kuiviewer-specific options.
-For a full summary of options, run \fIkuiviewer \-\-help\fP.
-.TP
-\fB\-s, \-\-takescreenshot\fP \fIfilename\fP
-Take a screenshot of the given interface and exit immediately.
-The \fIfilename\fP argument specifies where the screenshot will be saved.
-This screenshot will be saved in PNG format.
-.TP
-\fB\-w, \-\-screenshotwidth\fP \fIint\fP
-Before taking a screenshot, resize the interface to the given width.
-.TP
-\fB\-h, \-\-screenshotheight\fP \fIint\fP
-Before taking a screenshot, resize the interface to the given height.
-.SH SEE ALSO
-.BR designer (1).
-.SH AUTHOR
-KUIViewer was written by Richard Moore <rich@kde.org>,
-Ian Reinhart Geiser <geiseri@kde.org> and
-Benjamin C. Meyer <ben+kuiviewer@meyerhome.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/licensecheck.1 b/debian/_base/core/tdesdk/debian/man/licensecheck.1
deleted file mode 100644
index 48728f2c2..000000000
--- a/debian/_base/core/tdesdk/debian/man/licensecheck.1
+++ /dev/null
@@ -1,37 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH LICENSECHECK 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-licensecheck \- simple license checker for source files
-.SH SYNOPSIS
-.B licensecheck
-.RB "[ " \-v " ]"
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBlicensecheck\fP examines the comments at the beginning of each given
-source file and tries to determine which license the file is placed
-under.  It does this by searching for blocks of text that it recognises
-as belonging to various licenses.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-.B \-v
-Verbose mode.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/makeobj.1 b/debian/_base/core/tdesdk/debian/man/makeobj.1
deleted file mode 100644
index 50a9f864f..000000000
--- a/debian/_base/core/tdesdk/debian/man/makeobj.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH MAKEOBJ 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-makeobj \- run make from the correct directory
-.SH SYNOPSIS
-.B makeobj
-[ \fImake-argument\fP ... ]
-.SH DESCRIPTION
-\fBmakeobj\fP is a wrapper around \fBmake\fP which basically checks
-whether it's in the source directory or the build directory and changes
-to the correct directory before calling make.
-.PP
-The command-line arguments will (generally) be passed directly to make.
-.PP
-This script is useful if the source directory is different from the
-build directory and the Makefiles are kept in the build directory, as is
-common for instance when building the TDE sources.  This script can however
-be used in more standard scenarios (such as non-TDE projects for which the
-source and build directories are the same), where it will behave just like
-make.
-.PP
-One of the environment variables OBJ_SUBDIR or OBJ_REPLACEMENT
-should be set to indicate where the build directory is in relation to
-the source directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-Note that only one of OBJ_SUBDIR and OBJ_REPLACEMENT should be used.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#src/tdesdk#src/tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR make (1),
-.BR sed (1).
-.SH AUTHOR
-makeobj was written by Stephan Kulow <coolo@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/memprof2calltree.1 b/debian/_base/core/tdesdk/debian/man/memprof2calltree.1
deleted file mode 100644
index d4f52ead4..000000000
--- a/debian/_base/core/tdesdk/debian/man/memprof2calltree.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH MEMPROF2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-memprof2calltree \- convert memprof profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B memprof2calltree
-.SH DESCRIPTION
-\fBmemprof2calltree\fP reads the memory profiles of memprof and
-converts them into calltree format for use by KCachegrind.
-.PP
-The memprof data must be supplied on standard input, and the
-corresponding calltree data will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/op2calltree.1 b/debian/_base/core/tdesdk/debian/man/op2calltree.1
deleted file mode 100644
index 0242e6cd6..000000000
--- a/debian/_base/core/tdesdk/debian/man/op2calltree.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH OP2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-op2calltree \- convert OProfile profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B op2calltree
-.SH DESCRIPTION
-\fBop2calltree\fP reads the profiling data output by OProfile v0.8 and
-converts it into calltree format for use by KCachegrind.
-.PP
-The OProfile data must be supplied on standard input, and should be
-obtained by running:
-.PP
-.RS
-opreport \-gdf
-.RE
-.PP
-This converter will then write a separate calltree data file for each
-application, to a file of the form \fIoprof.out.<app>\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/package_crystalsvg.1 b/debian/_base/core/tdesdk/debian/man/package_crystalsvg.1
deleted file mode 100644
index 32d8644e9..000000000
--- a/debian/_base/core/tdesdk/debian/man/package_crystalsvg.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PACKAGE_CRYSTALSVG 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-package_crystalsvg \- bundle up Crystal SVG sources from a TDE checkout
-.SH SYNOPSIS
-.B package_crystalsvg
-.SH DESCRIPTION
-\fBpackage_crystalsvg\fP assumes that the current directory contains one
-or more checked-out TDE modules.  It searches these modules for Crystal
-SVG vector sources (.svgz or .svg.gz files)
-and packages them up into a tarball.  The tarball will also
-contain \fIFILES\fP (describing the contents of the tarball and which
-TDE modules/paths they were copied from) as well as some other bits and
-pieces.
-.PP
-Note that you must at least have tdelibs checked out for this utility to
-run.
-.PP
-The final tarball will be created in the current working directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-package_crystalsvg was written by Frans Englich <frans.englich@telia.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/png2mng.pl.1 b/debian/_base/core/tdesdk/debian/man/png2mng.pl.1
deleted file mode 100644
index c86c17275..000000000
--- a/debian/_base/core/tdesdk/debian/man/png2mng.pl.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PNG2MNG.PL 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-png2mng.pl \- combine a set of PNG images into an animated MNG image
-.SH SYNOPSIS
-.B png2mng.pl
-.I basename width height
-.SH DESCRIPTION
-\fBpng2mng.pl\fP reads a sequence of PNG images and combines them into
-a single animated MNG image.
-.PP
-The individual PNG images should be numbered consecutively from zero up,
-and should have names of the form
-.I basenameXXXX
-where
-.I XXXX
-is the four-digit sequence number (0000, 0001, 0002, etc).
-The width and height of the PNG images should
-also be included on the command line.
-.PP
-The final animated MNG image will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLE
-The following example will combine the files hi32-action-kde-0000.png,
-hi32-action-kde-0001.png, hi32-action-kde-0002.png, etc., and write
-the resulting animated image to hi32-action-kde.mng:
-.PP
-.RS
-png2mng.pl hi32-action-kde- 32 32 > hi32-action-kde.mng
-.RE
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/po2xml.1 b/debian/_base/core/tdesdk/debian/man/po2xml.1
deleted file mode 100644
index d2f7fe5df..000000000
--- a/debian/_base/core/tdesdk/debian/man/po2xml.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PO2XML 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-po2xml \- translates a DocBook XML file using a PO-file
-.SH SYNOPSIS
-.B po2xml
-.I original-XML translated-PO
-.SH DESCRIPTION
-\fBpo2xml\fP is a command-line tool that translates the DocBook
-XML file \fIoriginal-XML\fP using the gettext message file
-\fItranslated-PO\fP.  The resulting translated XML file is sent to standard
-output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR split2po (1),
-.BR swappo (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/pprof2calltree.1 b/debian/_base/core/tdesdk/debian/man/pprof2calltree.1
deleted file mode 100644
index b5cf9082c..000000000
--- a/debian/_base/core/tdesdk/debian/man/pprof2calltree.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PPROF2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-pprof2calltree \- convert APD profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B pprof2calltree
-\fB\-f\fP \fIinput\fP
-.SH DESCRIPTION
-\fBpprof2calltree\fP reads the pprof profiling data output by
-APD (http://pecl.php.net/apd/), and converts it into calltree format
-for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP \fIinput\fP
-Specifies the APD pprof trace file to convert.  This generally has a
-name of the form \fIpprof.XXXXX.Y\fP.  The calltree output for
-KCachegrind will then be written to the file \fIcachegrind.out.XXXXX.Y\fP.
-.SH EXAMPLE
-Suppose you profile a script with APD and obtain the pprof trace file
-\fIpprof.12345.1\fP.  You can then work with this data in KCachegrind as
-follows.
-.PP
-.RS
-pprof2calltree -f pprof.12345.1
-.br
-tdecachegrind cachegrind.out.12345.1
-.RE
-.PP
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by George Schlossnagle <george@omniti.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/pruneemptydirs.1 b/debian/_base/core/tdesdk/debian/man/pruneemptydirs.1
deleted file mode 100644
index 108c7e4db..000000000
--- a/debian/_base/core/tdesdk/debian/man/pruneemptydirs.1
+++ /dev/null
@@ -1,65 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PRUNEEMPTYDIRS 1 "September 27, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-pruneemptydirs \- detects stale source dirs in a CVS tree
-.SH SYNOPSIS
-.B pruneemptydirs
-[ \fB\-f\fP ]
-.SH DESCRIPTION
-\fBpruneemptydirs\fP is used to clean up a local CVS tree.
-It detects directories containing remnants of old stuff which has been
-removed from the CVS.  Such stale directories often break compilation.
-The current directory and all directories beneath it will be examined.
-.PP
-Note that this tool does not remove anything; it simply prints what to
-do as a series of remove commands.  You can copy and paste these commands,
-or use them with eval in a script.
-.PP
-This tool works better if the source directory is not the same as the
-build directory, since it will not print directories containing old
-executables.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP
-Actually perform the deletions instead of just printing them out.
-Use this option with care (no warranties, etc.)!
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH AUTHOR
-pruneemptydirs was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/qtdoc.1 b/debian/_base/core/tdesdk/debian/man/qtdoc.1
deleted file mode 100644
index 3b7c09f60..000000000
--- a/debian/_base/core/tdesdk/debian/man/qtdoc.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH QTDOC 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-qtdoc \- view documentation for a Qt class
-.SH SYNOPSIS
-.B qtdoc
-.RI "[ " classname " ]"
-.SH DESCRIPTION
-\fBqtdoc\fP opens a Qt help page in kfm/konqueror.
-If \fIclassname\fP is given, it opens the help page for that class (note
-that the class name is case insensitive).  Otherwise the main Qt help
-page is opened.  It is assumed that you have the Qt documentation
-installed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-.TP
-QTDIR
-The directory beneath which the Qt documentation is installed.
-Thus the main Qt help page should be in \fI$QTDIR/doc/html/\fP.
-If $QTDIR is not set, \fI/usr/share/qt3\fP will be assumed.
-.SH EXAMPLES
-To bring up help on class QString:
-.PP
-.RS
-qtdoc QString
-.RE
-.SH DEBIAN USERS
-The Qt documentation is in the Debian package \fIqt3-doc\fP, which will
-need to be installed.
-.SH SEE ALSO
-.BR kdedoc (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/split2po.1 b/debian/_base/core/tdesdk/debian/man/split2po.1
deleted file mode 100644
index 539e2f6c8..000000000
--- a/debian/_base/core/tdesdk/debian/man/split2po.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH SPLIT2PO 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-split2po \- creates a PO-file from two DocBook XML files
-.SH SYNOPSIS
-.B split2po
-.I original-XML translated-XML
-.SH DESCRIPTION
-\fBsplit2po\fP is a command-line tool that takes the two given DocBook
-XML files and produces a gettext message file (PO-file) that represents
-the changes between them.  The resulting PO-file is sent to standard
-output.
-.PP
-.I translated-XML
-must be the result of translating
-.I original-XML
-into another language.  It is this translation that the resulting
-PO-file will represent.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-.TP
-NO_CREDITS
-If set, the "ROLES_OF_TRANSLATORS" and "CREDIT_FOR_TRANSLATORS" messages
-will be omitted.  By default these are always included at the end of
-the PO-file, with empty message strings.
-.br
-These messages are used with TDE documentation, so you may wish to set
-NO_CREDITS if you are working with some other type of non-TDE documentation.
-.TP
-REPORT_MISMATCHES
-Set this variable to "no" if you wish mismatch reporting to be
-suppressed.  By default, any apparent mismatches between the two XML
-files will be noted on standard error.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR swappo (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/swappo.1 b/debian/_base/core/tdesdk/debian/man/swappo.1
deleted file mode 100644
index bb1289d9b..000000000
--- a/debian/_base/core/tdesdk/debian/man/swappo.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH SWAPPO 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-swappo \- swap msgid and msgstr fields in a PO-file
-.SH SYNOPSIS
-.B swappo
-.I PO-file
-.SH DESCRIPTION
-\fBswappo\fP reads the given PO-file and swaps the \fImsgid\fP and
-\fImsgstr\fP fields for every message.  The result is a new PO-file that
-translates in the opposite direction.  For example, if \fIPO-file\fP
-translates from English to French, the new PO-file will translate from
-French to English.
-.PP
-The new PO-file will be written to standard output.  The old PO-file
-will remain untouched.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/tdecachegrind.1 b/debian/_base/core/tdesdk/debian/man/tdecachegrind.1
deleted file mode 100644
index d5f3ea064..000000000
--- a/debian/_base/core/tdesdk/debian/man/tdecachegrind.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDECACHEGRIND 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdecachegrind \- a visualisation tool for valgrind profiling output
-.SH SYNOPSIS
-.B tdecachegrind
-.RI "[ " generic-options " ]"
-[ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ]
-.SH DESCRIPTION
-\fBKCachegrind\fP is a visualisation tool for the profiling data generated
-by \fBcalltree\fP, a profiling skin for \fBvalgrind\fP.  Applications can be
-profiled using calltree without being recompiled, and shared libraries
-and plugin architectures are supported.
-.PP
-For visualising the output from other profiling tools, several converters
-are available.  On Debian systems these can be found in the
-\fItdecachegrind-converters\fP package.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the tdecachegrind-specific options.
-For a full summary of options, run \fItdecachegrind \-\-help\fP.
-.TP
-\fB\-r\fP \fIexec\fP
-Run the program \fIexec\fP under cachegrind.
-.TP
-\fItrace-file\fP
-Visualise data from the given trace.
-.SH SEE ALSO
-.BR calltree (1),
-.BR dprof2calltree (1),
-.BR hotshot2calltree (1),
-.BR memprof2calltree (1),
-.BR op2calltree (1),
-.BR pprof2calltree (1),
-.BR valgrind (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/tdecachegrind/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/tdecachegrind/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/tdecachegrind/\fP.
-.SH AUTHOR
-KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/tdekillall.1 b/debian/_base/core/tdesdk/debian/man/tdekillall.1
deleted file mode 100644
index 92bf4380c..000000000
--- a/debian/_base/core/tdesdk/debian/man/tdekillall.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDEKILLALL 1 "April 29, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdekillall \- kills processes started with tdeinit
-.SH SYNOPSIS
-.B tdekillall
-[ \fB\-\fP\fIsignal\fP ] \fIprocess-name\fP
-.SH DESCRIPTION
-\fBtdekillall\fP kills all processes with a particular name
-that were started through tdeinit.  Specifically, it kills all processes
-\fBtdeinit:\fP \fIprocess-name\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\fP\fIsignal\fP
-Kill the processes with signal \fIsignal\fP.  This option defaults to
-SIGTERM.  Run \fIkill \-l\fP for a list of possible signals.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/testkspy.1 b/debian/_base/core/tdesdk/debian/man/testkspy.1
deleted file mode 100644
index afdc702a4..000000000
--- a/debian/_base/core/tdesdk/debian/man/testkspy.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TESTKSPY 1 "May 3, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-testkspy \- show off KSpy's capabilities
-.SH SYNOPSIS
-.B testkspy
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBtestkspy\fP is a small application that shows off KSpy's capabilities.
-It simply uses KSpy to spy on itself.
-.PP
-\fBKSpy\fP is a tiny library which can be used to graphically display
-the TQObjects in use by a TQt/TDE app.  In addition to the object tree,
-you can also view the properties, signals and slots of any QObject.
-.PP
-Basically it provides much the same info as QObject::dumpObjectTree() and
-QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
-minimal overhead for the application, because the kspy library is
-loaded dynamically using KLibLoader.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fItestkspy \-\-help\fP.
-.SH SEE ALSO
-Instructions on using KSpy with your own applications can be found in
-\fI/usr/share/doc/kspy/README\fP.
-.SH AUTHOR
-KSpy was written by Richard Moore <rich@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/transxx.1 b/debian/_base/core/tdesdk/debian/man/transxx.1
deleted file mode 100644
index 6dba22392..000000000
--- a/debian/_base/core/tdesdk/debian/man/transxx.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TRANSXX 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-transxx \- create a basic fleshed-out PO-file from a PO-template file
-.SH SYNOPSIS
-.B transxx
-[ \fB\-\-text\fP \fItranslation\fP ]
-.I template
-.SH DESCRIPTION
-\fBtransxx\fP is a command-line tool that produces a basic fleshed-out
-PO-file from a PO-template file.  Some of the formatting and
-structure of the \fImsgid\fP strings will be copied to the \fImsgstr\fP
-strings, but otherwise text will be translated to "xx".
-.PP
-The fleshed-out PO-file is sent to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\-text\fP \fItranslation\fP
-Use the given translation everywhere instead of "xx".
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR swappo (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/umbrello.1 b/debian/_base/core/tdesdk/debian/man/umbrello.1
deleted file mode 100644
index 3c5d77d5e..000000000
--- a/debian/_base/core/tdesdk/debian/man/umbrello.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH UMBRELLO 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-umbrello \- a UML modelling tool and code generator
-.SH SYNOPSIS
-.B umbrello
-.RI "[ " generic-options " ]"
-[ \fIfile\fP ]
-.SH DESCRIPTION
-\fBUmbrello UML Modeller\fP is a Unified Modelling Language editor for TDE.
-With UML you can create diagrams of software and other systems in an
-industry standard format.  Umbrello can also generate code from your
-UML diagrams in a number of programming languages.
-.PP
-The program supports class diagrams, sequence diagrams, collaboration
-diagrams, use case diagrams, state diagrams, activity diagrams, component
-diagrams and deployment diagrams.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIumbrello \-\-help\fP.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/umbrello/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/umbrello/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/umbrello/\fP.
-.SH AUTHOR
-Umbrello was written by Paul Hensgen <phensgen@users.sourceforge.net> and
-many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/xml2pot.1 b/debian/_base/core/tdesdk/debian/man/xml2pot.1
deleted file mode 100644
index 0b1a293d5..000000000
--- a/debian/_base/core/tdesdk/debian/man/xml2pot.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH XML2POT 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-xml2pot \- creates a PO-template file from a DocBook XML file
-.SH SYNOPSIS
-.B xml2pot
-.I original-XML
-.SH DESCRIPTION
-\fBxml2pot\fP is a command-line tool that produces a gettext message
-template file from the DocBook XML file \fIoriginal-XML\fP.
-The template file is sent to standard output.
-.PP
-The resulting template file can be used to create gettext message files
-(PO-files) for a variety of languages.  These can then be used in conjunction
-with
-.BR po2xml (1)
-to translate the original XML file into these other languages.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR swappo (1),
-.BR transxx (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/man/zonetab2pot.py.1 b/debian/_base/core/tdesdk/debian/man/zonetab2pot.py.1
deleted file mode 100644
index d6a4330ad..000000000
--- a/debian/_base/core/tdesdk/debian/man/zonetab2pot.py.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ZONETAB2POT.PY 1 "November 14, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-zonetab2pot.py \- converts a timezone list to a PO-file template
-.SH SYNOPSIS
-.B zonetab2pot.py
-[ \fItimezone-list\fP ]
-.SH DESCRIPTION
-\fBzonetab2pot.py\fP reads the timezone list given on the command-line
-and converts it to a gettext message file (PO-file) template containing
-the names of the individual timezones.
-.PP
-The given timezone list should be in the same format as the system
-\fIzone.tab\fP.  If no timezone list is specified on the command-line,
-\fI/usr/share/zoneinfo/zone.tab\fP will be used.
-.PP
-The new PO-file template will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-zonetab2pot.py was written by Lukas Tinkl <lukas@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/core/tdesdk/debian/poxml-trinity.install b/debian/_base/core/tdesdk/debian/poxml-trinity.install
index 290c62266..c82e32dc2 100644
--- a/debian/_base/core/tdesdk/debian/poxml-trinity.install
+++ b/debian/_base/core/tdesdk/debian/poxml-trinity.install
@@ -3,3 +3,8 @@ debian/tmp/opt/trinity/bin/split2po
 debian/tmp/opt/trinity/bin/swappo
 debian/tmp/opt/trinity/bin/transxx
 debian/tmp/opt/trinity/bin/xml2pot
+debian/tmp/opt/trinity/share/man/man1/po2xml.1
+debian/tmp/opt/trinity/share/man/man1/split2po.1
+debian/tmp/opt/trinity/share/man/man1/swappo.1
+debian/tmp/opt/trinity/share/man/man1/transxx.1
+debian/tmp/opt/trinity/share/man/man1/xml2pot.1
diff --git a/debian/_base/core/tdesdk/debian/poxml-trinity.manpages b/debian/_base/core/tdesdk/debian/poxml-trinity.manpages
deleted file mode 100644
index 05e2191bf..000000000
--- a/debian/_base/core/tdesdk/debian/poxml-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/po2xml.1
-debian/man/split2po.1
-debian/man/swappo.1
-debian/man/transxx.1
-debian/man/xml2pot.1
diff --git a/debian/_base/core/tdesdk/debian/rules b/debian/_base/core/tdesdk/debian/rules
index d7be7d400..2a1a0c921 100755
--- a/debian/_base/core/tdesdk/debian/rules
+++ b/debian/_base/core/tdesdk/debian/rules
@@ -32,25 +32,10 @@ DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
 DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
 
 binary-install/tdesdk-scripts-trinity::
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/kdemangen.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdemangen.pl.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/png2mng.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/png2mng.pl.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/kdelnk2desktop.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdelnk2desktop.py.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/zonetab2pot.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/zonetab2pot.py.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/sh/man1/build-progress.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/build-progress.sh.1
 	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean \
 		debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
 	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \
 		debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/pl
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/py
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/sh
-	mv debian/tdesdk-scripts-trinity/usr/share/man/man1/* debian/tdesdk-scripts-trinity/opt/trinity/share/man/man1/
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man
 	install -p -D -m644 scripts/kde-buildrc \
 		debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
 
@@ -72,37 +57,3 @@ binary-install/kapptemplate-trinity::
 			Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \
 		chmod 755 debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
 	done
-	mv debian/kapptemplate-trinity/usr/share/man debian/kapptemplate-trinity/opt/trinity/share/
-
-binary-install/kbabel-trinity::
-	mv debian/kbabel-trinity/usr/share/man debian/kbabel-trinity/opt/trinity/share/
-
-binary-install/kbugbuster-trinity::
-	mv debian/kbugbuster-trinity/usr/share/man debian/kbugbuster-trinity/opt/trinity/share/
-
-binary-install/kmtrace-trinity::
-	mv debian/kmtrace-trinity/usr/share/man debian/kmtrace-trinity/opt/trinity/share/
-
-binary-install/kompare-trinity::
-	mv debian/kompare-trinity/usr/share/man debian/kompare-trinity/opt/trinity/share/
-
-binary-install/kspy-trinity::
-	mv debian/kspy-trinity/usr/share/man debian/kspy-trinity/opt/trinity/share/
-
-binary-install/kuiviewer-trinity::
-	mv debian/kuiviewer-trinity/usr/share/man debian/kuiviewer-trinity/opt/trinity/share/
-
-binary-install/libcvsservice0-trinity::
-	mv debian/libcvsservice0-trinity/usr/share/man debian/libcvsservice0-trinity/opt/trinity/share/
-
-binary-install/poxml-trinity::
-	mv debian/poxml-trinity/usr/share/man debian/poxml-trinity/opt/trinity/share/
-
-binary-install/tdecachegrind-converters-trinity::
-	mv debian/tdecachegrind-converters-trinity/usr/share/man debian/tdecachegrind-converters-trinity/opt/trinity/share/
-
-binary-install/tdecachegrind-trinity::
-	mv debian/tdecachegrind-trinity/usr/share/man debian/tdecachegrind-trinity/opt/trinity/share/
-
-binary-install/umbrello-trinity::
-	mv debian/umbrello-trinity/usr/share/man debian/umbrello-trinity/opt/trinity/share/
diff --git a/debian/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install b/debian/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install
index 742cfc523..59f576d85 100644
--- a/debian/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install
+++ b/debian/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install
@@ -3,3 +3,8 @@ debian/tmp/opt/trinity/bin/hotshot2calltree
 debian/tmp/opt/trinity/bin/memprof2calltree
 debian/tmp/opt/trinity/bin/op2calltree
 debian/tmp/opt/trinity/bin/pprof2calltree
+debian/tmp/opt/trinity/share/man/man1/dprof2calltree.1
+debian/tmp/opt/trinity/share/man/man1/hotshot2calltree.1
+debian/tmp/opt/trinity/share/man/man1/memprof2calltree.1
+debian/tmp/opt/trinity/share/man/man1/op2calltree.1
+debian/tmp/opt/trinity/share/man/man1/pprof2calltree.1
diff --git a/debian/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages b/debian/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages
deleted file mode 100644
index 977c48e2d..000000000
--- a/debian/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/dprof2calltree.1
-debian/man/hotshot2calltree.1
-debian/man/memprof2calltree.1
-debian/man/op2calltree.1
-debian/man/pprof2calltree.1
diff --git a/debian/_base/core/tdesdk/debian/tdecachegrind-trinity.install b/debian/_base/core/tdesdk/debian/tdecachegrind-trinity.install
index b1b9b739e..eae1a8494 100644
--- a/debian/_base/core/tdesdk/debian/tdecachegrind-trinity.install
+++ b/debian/_base/core/tdesdk/debian/tdecachegrind-trinity.install
@@ -15,5 +15,6 @@ debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/man/man1/tdecachegrind.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-tdecachegrind.desktop
 debian/icons/tdecachegrind.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdesdk/debian/tdecachegrind-trinity.manpages b/debian/_base/core/tdesdk/debian/tdecachegrind-trinity.manpages
deleted file mode 100644
index 367c3db5d..000000000
--- a/debian/_base/core/tdesdk/debian/tdecachegrind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdecachegrind.1
diff --git a/debian/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install b/debian/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install
index 8d88a20a5..7b71e3bd9 100644
--- a/debian/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install
+++ b/debian/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install
@@ -50,15 +50,48 @@ debian/tmp/opt/trinity/bin/svngettags
 debian/tmp/opt/trinity/bin/svnchangesince
 debian/tmp/opt/trinity/bin/svn-clean
 debian/tmp/opt/trinity/share/apps/katepart/syntax/tdesvn-buildrc.xml
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.docbook
+
 debian/tmp/opt/trinity/share/man/man1/cvsblame.1
 debian/tmp/opt/trinity/share/man/man1/cvsversion.1
-debian/tmp/opt/trinity/share/man/man1/kde-build.1
 debian/tmp/opt/trinity/share/man/man1/includemocs.1
+debian/tmp/opt/trinity/share/man/man1/kde-build.1
 debian/tmp/opt/trinity/share/man/man1/noncvslist.1
 debian/tmp/opt/trinity/share/man/man1/tdesvn-build.1
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.docbook
+
+debian/tmp/opt/trinity/share/man/man1/adddebug.1
+debian/tmp/opt/trinity/share/man/man1/build-progress.sh.1
+debian/tmp/opt/trinity/share/man/man1/cheatmake.1
+debian/tmp/opt/trinity/share/man/man1/create_cvsignore.1
+debian/tmp/opt/trinity/share/man/man1/create_makefile.1
+debian/tmp/opt/trinity/share/man/man1/create_makefiles.1
+debian/tmp/opt/trinity/share/man/man1/cvs-clean.1
+debian/tmp/opt/trinity/share/man/man1/cvs2dist.1
+debian/tmp/opt/trinity/share/man/man1/cvsbackport.1
+debian/tmp/opt/trinity/share/man/man1/cvscheck.1
+debian/tmp/opt/trinity/share/man/man1/cvsforwardport.1
+debian/tmp/opt/trinity/share/man/man1/cvslastchange.1
+debian/tmp/opt/trinity/share/man/man1/cvslastlog.1
+debian/tmp/opt/trinity/share/man/man1/cvsrevertlast.1
+debian/tmp/opt/trinity/share/man/man1/cxxmetric.1
+debian/tmp/opt/trinity/share/man/man1/extend_dmalloc.1
+debian/tmp/opt/trinity/share/man/man1/extractattr.1
+debian/tmp/opt/trinity/share/man/man1/extractrc.1
+debian/tmp/opt/trinity/share/man/man1/findmissingcrystal.1
+debian/tmp/opt/trinity/share/man/man1/fixkdeincludes.1
+debian/tmp/opt/trinity/share/man/man1/fixuifiles.1
+debian/tmp/opt/trinity/share/man/man1/kdedoc.1
+debian/tmp/opt/trinity/share/man/man1/kdelnk2desktop.py.1
+debian/tmp/opt/trinity/share/man/man1/kdemangen.pl.1
+debian/tmp/opt/trinity/share/man/man1/makeobj.1
+debian/tmp/opt/trinity/share/man/man1/package_crystalsvg.1
+debian/tmp/opt/trinity/share/man/man1/png2mng.pl.1
+debian/tmp/opt/trinity/share/man/man1/pruneemptydirs.1
+debian/tmp/opt/trinity/share/man/man1/qtdoc.1
+debian/tmp/opt/trinity/share/man/man1/tdekillall.1
+debian/tmp/opt/trinity/share/man/man1/zonetab2pot.py.1
 scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
 scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
 scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
diff --git a/debian/_base/core/tdesdk/debian/tdesdk-scripts-trinity.manpages b/debian/_base/core/tdesdk/debian/tdesdk-scripts-trinity.manpages
deleted file mode 100644
index bcab66ddd..000000000
--- a/debian/_base/core/tdesdk/debian/tdesdk-scripts-trinity.manpages
+++ /dev/null
@@ -1,31 +0,0 @@
-debian/man/adddebug.1
-debian/man/build-progress.sh.1
-debian/man/cheatmake.1
-debian/man/create_cvsignore.1
-debian/man/create_makefile.1
-debian/man/create_makefiles.1
-debian/man/cvs-clean.1
-debian/man/cvs2dist.1
-debian/man/cvsbackport.1
-debian/man/cvscheck.1
-debian/man/cvsforwardport.1
-debian/man/cvslastchange.1
-debian/man/cvslastlog.1
-debian/man/cvsrevertlast.1
-debian/man/cxxmetric.1
-debian/man/extend_dmalloc.1
-debian/man/extractattr.1
-debian/man/extractrc.1
-debian/man/fixkdeincludes.1
-debian/man/fixuifiles.1
-debian/man/findmissingcrystal.1
-debian/man/kdedoc.1
-debian/man/tdekillall.1
-debian/man/kdelnk2desktop.py.1
-debian/man/kdemangen.pl.1
-debian/man/makeobj.1
-debian/man/package_crystalsvg.1
-debian/man/png2mng.pl.1
-debian/man/pruneemptydirs.1
-debian/man/qtdoc.1
-debian/man/zonetab2pot.py.1
diff --git a/debian/_base/core/tdesdk/debian/umbrello-trinity.install b/debian/_base/core/tdesdk/debian/umbrello-trinity.install
index dbb79a2ad..7f0fe3b2a 100644
--- a/debian/_base/core/tdesdk/debian/umbrello-trinity.install
+++ b/debian/_base/core/tdesdk/debian/umbrello-trinity.install
@@ -48,5 +48,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/umbrello.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/mimetypes/umbrellofile.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/umbrello.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/mimetypes/umbrellofile.png
+debian/tmp/opt/trinity/share/man/man1/umbrello.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-umbrello.desktop
 debian/icons/umbrello.xpm /opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdesdk/debian/umbrello-trinity.manpages b/debian/_base/core/tdesdk/debian/umbrello-trinity.manpages
deleted file mode 100644
index 537bedefe..000000000
--- a/debian/_base/core/tdesdk/debian/umbrello-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/umbrello.1
diff --git a/debian/_base/core/tdetoys/debian/control b/debian/_base/core/tdetoys/debian/control
index 9e7d0fd13..f8fc79be5 100644
--- a/debian/_base/core/tdetoys/debian/control
+++ b/debian/_base/core/tdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdetoys-trinity
diff --git a/debian/_base/core/tdetoys/debian/kweather-trinity.install b/debian/_base/core/tdetoys/debian/kweather-trinity.install
index ae0fb921e..34499d446 100644
--- a/debian/_base/core/tdetoys/debian/kweather-trinity.install
+++ b/debian/_base/core/tdetoys/debian/kweather-trinity.install
@@ -10,7 +10,11 @@ debian/tmp/opt/trinity/lib/trinity/kweatherreport.so
 debian/tmp/opt/trinity/lib/trinity/kweatherreport.la
 debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/weather_sidebar.la
+debian/tmp/opt/trinity/lib/trinity/weather_sidebar.so
 debian/tmp/opt/trinity/share/apps/kicker/applets/kweather.desktop
+debian/tmp/opt/trinity/share/apps/konqsidebartng/add/weatherbar_add.desktop
+debian/tmp/opt/trinity/share/apps/konqsidebartng/entries/weatherbar.desktop
 debian/tmp/opt/trinity/share/apps/kweather
 debian/tmp/opt/trinity/share/apps/kweatherservice/stations.dat
 debian/tmp/opt/trinity/share/apps/kweatherservice/weather_stations.desktop
diff --git a/debian/_base/core/tdeutils/debian/ark-trinity.install b/debian/_base/core/tdeutils/debian/ark-trinity.install
index 27b3cea81..d09a8b0e4 100644
--- a/debian/_base/core/tdeutils/debian/ark-trinity.install
+++ b/debian/_base/core/tdeutils/debian/ark-trinity.install
@@ -31,6 +31,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/ark.svgz
+debian/tmp/opt/trinity/share/man/man1/ark.1
 debian/tmp/opt/trinity/share/services/ark_part.desktop
 
 debian/icons/ark.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeutils/debian/ark-trinity.manpages b/debian/_base/core/tdeutils/debian/ark-trinity.manpages
deleted file mode 100644
index 37ed04716..000000000
--- a/debian/_base/core/tdeutils/debian/ark-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ark-trinity.1
diff --git a/debian/_base/core/tdeutils/debian/kcalc-trinity.install b/debian/_base/core/tdeutils/debian/kcalc-trinity.install
index e5c35395d..6e4aab038 100644
--- a/debian/_base/core/tdeutils/debian/kcalc-trinity.install
+++ b/debian/_base/core/tdeutils/debian/kcalc-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kcalc.svgz
+debian/tmp/opt/trinity/share/man/man1/kcalc.1
 
 debian/icons/kcalc.xpm		/opt/trinity/share/pixmaps
 debian/icons/kcalc-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeutils/debian/kcalc-trinity.manpages b/debian/_base/core/tdeutils/debian/kcalc-trinity.manpages
deleted file mode 100644
index ee2f0ad0a..000000000
--- a/debian/_base/core/tdeutils/debian/kcalc-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcalc-trinity.1
diff --git a/debian/_base/core/tdeutils/debian/kcharselect-trinity.install b/debian/_base/core/tdeutils/debian/kcharselect-trinity.install
index 46f690528..e362682f0 100644
--- a/debian/_base/core/tdeutils/debian/kcharselect-trinity.install
+++ b/debian/_base/core/tdeutils/debian/kcharselect-trinity.install
@@ -11,6 +11,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcharselect/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcharselect.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcharselect.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcharselect.png
+debian/tmp/opt/trinity/share/man/man1/kcharselect.1
 
 debian/icons/kcharselect.xpm		/opt/trinity/share/pixmaps
 debian/icons/kcharselect-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeutils/debian/kcharselect-trinity.manpages b/debian/_base/core/tdeutils/debian/kcharselect-trinity.manpages
deleted file mode 100644
index 6a1e28fb7..000000000
--- a/debian/_base/core/tdeutils/debian/kcharselect-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcharselect-trinity.1
diff --git a/debian/_base/core/tdeutils/debian/kdf-trinity.install b/debian/_base/core/tdeutils/debian/kdf-trinity.install
index f8e6118ce..12a5d1ae6 100644
--- a/debian/_base/core/tdeutils/debian/kdf-trinity.install
+++ b/debian/_base/core/tdeutils/debian/kdf-trinity.install
@@ -28,6 +28,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwikdisk.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwikdisk.png
+debian/tmp/opt/trinity/share/man/man1/kdf.1
+debian/tmp/opt/trinity/share/man/man1/kwikdisk.1
 
 debian/icons/kdf.xpm		/opt/trinity/share/pixmaps
 debian/icons/kdf-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeutils/debian/kdf-trinity.manpages b/debian/_base/core/tdeutils/debian/kdf-trinity.manpages
deleted file mode 100644
index ac5e86975..000000000
--- a/debian/_base/core/tdeutils/debian/kdf-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kdf-trinity.1
-debian/man/kwikdisk-trinity.1
diff --git a/debian/_base/core/tdeutils/debian/kedit-trinity.install b/debian/_base/core/tdeutils/debian/kedit-trinity.install
index 40d08d1ab..a03e4587a 100644
--- a/debian/_base/core/tdeutils/debian/kedit-trinity.install
+++ b/debian/_base/core/tdeutils/debian/kedit-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kedit.png
+debian/tmp/opt/trinity/share/man/man1/kedit.1
 
 debian/icons/kedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/kedit-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeutils/debian/kedit-trinity.manpages b/debian/_base/core/tdeutils/debian/kedit-trinity.manpages
deleted file mode 100644
index 84374715a..000000000
--- a/debian/_base/core/tdeutils/debian/kedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kedit-trinity.1
diff --git a/debian/_base/core/tdeutils/debian/kfloppy-trinity.install b/debian/_base/core/tdeutils/debian/kfloppy-trinity.install
index 5c1588041..645753df5 100644
--- a/debian/_base/core/tdeutils/debian/kfloppy-trinity.install
+++ b/debian/_base/core/tdeutils/debian/kfloppy-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kfloppy.png
+debian/tmp/opt/trinity/share/man/man1/kfloppy.1
 
 debian/icons/kfloppy.xpm		/opt/trinity/share/pixmaps
 debian/icons/kfloppy-16.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeutils/debian/kfloppy-trinity.manpages b/debian/_base/core/tdeutils/debian/kfloppy-trinity.manpages
deleted file mode 100644
index 02c1ea86f..000000000
--- a/debian/_base/core/tdeutils/debian/kfloppy-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfloppy-trinity.1
diff --git a/debian/_base/core/tdeutils/debian/kgpg-trinity.install b/debian/_base/core/tdeutils/debian/kgpg-trinity.install
index 2317f8bad..81993777a 100644
--- a/debian/_base/core/tdeutils/debian/kgpg-trinity.install
+++ b/debian/_base/core/tdeutils/debian/kgpg-trinity.install
@@ -39,6 +39,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kgpg.png
+debian/tmp/opt/trinity/share/man/man1/kgpg.1
 
 debian/icons/kgpg.xpm		/opt/trinity/share/pixmaps
 debian/icons/kgpg-16.xpm	/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeutils/debian/kgpg-trinity.manpages b/debian/_base/core/tdeutils/debian/kgpg-trinity.manpages
deleted file mode 100644
index 111b73663..000000000
--- a/debian/_base/core/tdeutils/debian/kgpg-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kgpg-trinity.1
diff --git a/debian/_base/core/tdeutils/debian/khexedit-trinity.install b/debian/_base/core/tdeutils/debian/khexedit-trinity.install
index 7ac6b4f2e..9ee6fc10c 100644
--- a/debian/_base/core/tdeutils/debian/khexedit-trinity.install
+++ b/debian/_base/core/tdeutils/debian/khexedit-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khexedit/khexedit1.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/khexedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/khexedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/khexedit.png
+debian/tmp/opt/trinity/share/man/man1/khexedit.1
 debian/tmp/opt/trinity/share/services/kbyteseditwidget.desktop
 debian/tmp/opt/trinity/share/services/khexedit2part.desktop
 
diff --git a/debian/_base/core/tdeutils/debian/khexedit-trinity.manpages b/debian/_base/core/tdeutils/debian/khexedit-trinity.manpages
deleted file mode 100644
index 41235ebfd..000000000
--- a/debian/_base/core/tdeutils/debian/khexedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/khexedit-trinity.1
diff --git a/debian/_base/core/tdeutils/debian/man/ark-trinity.1 b/debian/_base/core/tdeutils/debian/man/ark-trinity.1
deleted file mode 100644
index d738284f4..000000000
--- a/debian/_base/core/tdeutils/debian/man/ark-trinity.1
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH Ark "1" "May 2006" "Ark" "User Commands"
-.SH NAME
-Ark \- manual page for Ark
-.SH SYNOPSIS
-.B ark
-[\fIQt-options\fR] [\fITDE-options\fR] [\fITDE-tempfile-options\fR] [\fIoptions\fR] [\fIfolder\fR] [\fIfiles\fR] [\fIarchive\fR]
-.SH DESCRIPTION
-TDE Archiving tool
-Ark is a graphical program for managing various archive formats within the
-TDE environment. Archives can be viewed, extracted, created and modified
-from within Ark.
-The program can handle various formats such as tar, gzip, bzip2, zip, rar and
-lha (if the appropriate command-line programs are installed).
-Ark can work closely with Konqueror in the TDE environment to handle archives,
-if you install the Konqueror Integration plugin available in the konq-plugins
-package.
-.SS "Generic options"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-tde\-tempfile\fR
-Show TDE\-tempfile specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-extract\fR
-Open extract dialog, quit when finished
-.TP
-\fB\-\-extract\-to\fR
-Extract 'archive' to 'folder'. Quit when finished.
-\&'folder' will be created if it does not exist.
-.TP
-\fB\-\-add\fR
-Ask for the name of the archive to add 'files' to. Quit when finished.
-.TP
-\fB\-\-add\-to\fR
-Add 'files' to 'archive'. Quit when finished.
-\&'archive' will be created if it does not exist.
-.TP
-\fB\-\-guess\-name\fR
-Used with '\-\-extract\-to'. When specified, 'archive'
-will be extracted to a subfolder of 'folder'
-whose name will be the name of 'archive' without the filename extension.
-.SS "Arguments"
-.TP
-folder
-Folder to extract to
-.TP
-files
-Files to be added
-.TP
-archive
-Open 'archive'
-.SH AUTHOR
-Ark was written by Matthias Elter <elter@kde.org> and many others.
-.br
-Ark is released under the GNU General Public License.
-.PP
-This manual page was written by Sune Vuorela <debian@pusling.com>
-for the Debian Project, and is released under the same terms as the program.
diff --git a/debian/_base/core/tdeutils/debian/man/kcalc-trinity.1 b/debian/_base/core/tdeutils/debian/man/kcalc-trinity.1
deleted file mode 100644
index eff470650..000000000
--- a/debian/_base/core/tdeutils/debian/man/kcalc-trinity.1
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCALC 1 "June 2006" "Trinity Desktop Environment" "TDE Calculator"
-.SH NAME
-kcalc
-\- TDE Calculator
-.SH SYNOPSIS
-\fBkcalc\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKCalc\fP is a scientific calculator for TDE. In addition to the usual functionality offered by most scientific calculators, \fBKCalc\fP offers a number of features:
-.br
-.IP "     \-"
-\fBKCalc\fP provides trigonometric functions, logic operations, and it is able to do statistical calculations.
-.IP "     \-"
-\fBKCalc\fP allows you to cut and paste numbers from/into its display.
-.IP "     \-"
-\fBKCalc\fP features a results\-stack which lets you conveniently recall previous results.
-.IP "     \-"
-You can configure \fBKCalc\fP's display colors and font.
-.IP "     \-"
-You can configure \fBKCalc\fP's precision and the number of digits after the period.
-.IP "     \-"
-\fBKCalc\fP offers a great number of useful  key\-bindings, which make using \fBKCalc\fP without using a pointing device easy.
-.PP
-Hint: Pressing (and holding) the Ctrl\-key, displays on every button, the corresponding key\-binding.
-
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-
-.SH FILES
-.TP
-.I ~/.trinity/share/config/kcalcrc
-\fBkcalc\fP configuration file
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kcalc/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kcalc/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Klaus Niederkruger <kniederk@math.uni\-koeln.de>
-.br
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-Evan Teran <eteran@alum.rit.edu>
-.br
-Espen Sand <espen@kde.org>
-.br
-Chris Howells <howells@kde.org>
-.br
-Aaron J. Seigo <aseigo@olympusproject.org>
-.br
-Charles Samuels <charles@altair.dhs.org>
-.br
-René Mérou <ochominutosdearco@yahoo.es>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdeutils/debian/man/kcharselect-trinity.1 b/debian/_base/core/tdeutils/debian/man/kcharselect-trinity.1
deleted file mode 100644
index cc54866fa..000000000
--- a/debian/_base/core/tdeutils/debian/man/kcharselect-trinity.1
+++ /dev/null
@@ -1,257 +0,0 @@
-.lf 1 info/tdeutils.kcharselect.1
-.TH KCHARSELECT 1 "May 2003" TDE "TDE Application"
-.SH NAME
-kcharselect \- TDE Character Selector
-.SH SYNOPSIS
-.B kcharselect
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KCharSelect
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-Using
-.B KCharSelect
-one can view all the glyphs, organized by character table, available from any
-installed font.  One can also assemble a string of characters by clicking on
-characters in the table.  The string can be exported to the clipboard for
-later use.
-.PP
-.B KCharSelect
-is helpful for determining which characters in a font have glyphs as well as
-for selecting characters that may be difficult to produce.
-.P
-This program is part of the official TDE utils module.
-.SH OPTIONS
-.SS "General Options"
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.lf 1 info/kdeqtoptions
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
-icon, which can either be an absolute filename path, or otherwise the
-icon is sought for in places according to the normal TDE rules.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
-of the icon, according to the same rules as for the \-\-icon parameter.
-.TP
-.BI \-\-config \ filename
-Use an alternative configuration file, instead of the default, which
-is normally located in
-.I /usr/share/config
-or in
-.RB $ TDEHOME\fI/share/config
-.TP
-.BI \-\-dcopserver \ server
-Set the address of the DCOP server to attach to.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps. This option has the same
-effect as definiting the environment variable TDE_DEBUG.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-The geometry parameter follows the normal X convention for geometry,
-which is on the form:
-.RS
-.IP
-[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
-.P
-Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
-height, of the main application window. Both in pixels. A value of 0
-specifies the default size. The optional \fIxpos\fR and \fIypos\fR
-specifies the x,y-position that which is desired for the application
-window. Specifying negative values for x or y implies that the x or y
-position is to be measured from the left or bottom screen edge,
-instead of as in the normal case, with positive values, from the left
-and top edges. 
-.RE
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-Defines the default application font. The \fIfontname\fP should be in
-the X logical font name description format XLFD. For a full description of
-the format see
-.I /usr/X11R6/lib/X11/doc/xlfd.TXT
-Note that the application might override the font specified with
-its own font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-Sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-Sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-Sets the default button color.
-.TP
-.BI \-\-name \ name
-Sets the application name.
-.TP
-.BI \-\-title \ title
-Sets the application title. This option might, or might not appear
-in the title bar caption, depending on the application. To change the caption, use the 
-.B \-\-caption
-option instead. 
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-Sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirror reverses the whole layout of widgets. This means that menus
-will go in the opposite direction, the scroll bar will be on the
-opposite side, etc. For a normal western layout that means that menus
-and tool bars will go from the right edge to the left, the vertical
-scroll bar will be on the left side and so on.
-
-.lf 48 info/tdeutils.kcharselect.1
-.SH ENVIRONMENT
-.lf 1 info/kdeenviron
-.SS "standard TDE environment variables"
-.IP TDE_LANG
-Language locale setting to use. This option makes it possible to set
-another language environment for a program than what is the default. The
-correct language pack for this language has to be installed for this option
-to work. The default language when there is none set is en_US. When
-deciding upon a language, the following resources are looked up, in
-order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
-LANG.
-.IP TDE_UTF8_FILENAMES
-Assume that all filenames are in UTF-8 format regardless of the
-current language setting. Otherwise the filename format is defined by
-the language.
-.IP TDE_MULTIHEAD
-If this variable has the value
-.B true
-multihead multiple display mode is enabled. The TDE display will be
-shared over more than one screen.
-.IP DISPLAY
-Specifies the X display to run TDE on.
-.IP TDESYCOCA
-Specifies and alternative path for the 
-.I tdesycoca
-TDE system configuration cache file.
-The default path is
-/tmp/tde-$USER/tdesycoca
-.IP DCOPSERVER
-Specifies an alternative path for the DCOP server file. The default
-file is
-$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
-.IP SESSION_MANAGER
-The session manager to use. This option is set automatically by TDE
-and is a network path to the session manager socket.
-.IP HOME
-Path to the home directory for the current user. 
-.IP TDEHOME
-The TDE per-user setting directory. Default if not specified is
-.I $HOME/.trinity
-.lf 50 info/tdeutils.kcharselect.1
-.SH FILES
-.TP
-.I $HOME/.trinity/share/config/kcharselectrc
-configuration file.
-.SH AUTHOR
-KCharSelect was written by
-.nh
-.ad l
-Reginald Stadlbauer <reggie@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-The full documentation for
-.B KCharSelect
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kcharselect
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kcharselect
-
diff --git a/debian/_base/core/tdeutils/debian/man/kdf-trinity.1 b/debian/_base/core/tdeutils/debian/man/kdf-trinity.1
deleted file mode 100644
index 58bbbec90..000000000
--- a/debian/_base/core/tdeutils/debian/man/kdf-trinity.1
+++ /dev/null
@@ -1,154 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDF 1 "June 2006" "Trinity Desktop Environment" "TDE free disk space utility"
-.SH NAME
-kdf
-\- TDE free disk space utility
-.SH SYNOPSIS
-\fBkdf\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKDiskFree\fP displays available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.
-.sp 1
-\fBKDiskFree\fP is similar to \fBkwikdisk\fP and is useful if you want to keep a \fBKDiskFree\fP window available at all times.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-
-.SH SEE ALSO
-\fBkwikdisk\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdf/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdf/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Kropfberger <michael.kropfberger@gmx.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdeutils/debian/man/kedit-trinity.1 b/debian/_base/core/tdeutils/debian/man/kedit-trinity.1
deleted file mode 100644
index ebf6a588b..000000000
--- a/debian/_base/core/tdeutils/debian/man/kedit-trinity.1
+++ /dev/null
@@ -1,165 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE text editor"
-.SH NAME
-kedit
-\- TDE text editor
-.SH SYNOPSIS
-\fBkedit\fP [Qt\-options] [TDE\-options] [options] \fIfile\fP
-.SH DESCRIPTION
-\fBKEdit\fP is a text editor for the Trinity Desktop. It is a small editor which can be used with \fBKonqueror\fP for text and configuration file browsing. \fBKEdit\fP also serves well for creating small plain text documents. It is not meant to be a programmers editor, in particular it is not meant to replace any of the more powerful editors such as \fBKate\fP, \fBXEmacs\fP or \fBEmacs\fP.
-.sp 1
-\fBKEdit\fP's functionality will intentionally remain rather limited to ensure a reasonably fast start.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File or URL to open
-.SS Options:
-.TP
-.B  \-\-encoding  <encoding>
-Encoding to use for the following documents
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-\fBkate\fP(1), \fBkwrite\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kedit/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kedit/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdeutils/debian/man/kfloppy-trinity.1 b/debian/_base/core/tdeutils/debian/man/kfloppy-trinity.1
deleted file mode 100644
index 412893a1a..000000000
--- a/debian/_base/core/tdeutils/debian/man/kfloppy-trinity.1
+++ /dev/null
@@ -1,182 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KFLOPPY 1 "June 2006" "Trinity Desktop Environment" "TDE Floppy Disk Utility"
-.SH NAME
-kfloppy
-\- TDE Floppy Disk Utility
-.SH SYNOPSIS
-\fBkfloppy\fP [Qt\-options] [TDE\-options] [device] 
-.SH DESCRIPTION
-\fBKfloppy Formatter\fP is a utility that provides a straightforward graphical means to format 3.5" and 5.25" floppy disks.
-.sp 1
-Starting \fBKfloppy\fP opens a single window by which the user may choose appropriate settings and control the formatting process.
-.sp 1
-\fBCaution\fP
-.br
-Make sure that your floppy disk is not mounted. \fBKfloppy\fP cannot format a mounted floppy disk.
-.sp 1
-\fBKfloppy\fP offers the following settings for floppy size:
-.RS 3
-.TP
-\- 3.5" 1.44MB
-.TP
-\- 3.5" 720KB
-.TP
-\- 5.25" 1.2MB
-.TP
-\- 5.25" 360KB
-.TP
-\- Auto-Detect
-.RE
-.sp 1
-\fBNote\fP
-.br
-The 800KB disk format used by Mac floppy drives cannot be supported on PC floppy drives since they are not capable of formatting disks in that fashion.
-.sp 1
-\fBKfloppy\fP supports the file systems DOS, ext2 and Minix.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B device
-Default device
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kfloppy/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kfloppy/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdeutils/debian/man/kgpg-trinity.1 b/debian/_base/core/tdeutils/debian/man/kgpg-trinity.1
deleted file mode 100644
index 9ea82bb85..000000000
--- a/debian/_base/core/tdeutils/debian/man/kgpg-trinity.1
+++ /dev/null
@@ -1,187 +0,0 @@
-.TH KGPG "1" "December 2002" "TDE" "TDE Application"
-.SH NAME
-kgpg \- a TDE frontend for GNU Privacy Guard (GnuPG)
-.SH SYNOPSIS
-.B kgpg
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kgpg
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kgpg
-is a simple graphical interface for gpg (http://gnupg.org).
-Basically, It allows you to encrypt and decrypt files or messages, and to manage your keys. 
-.PP
-Kgpg can be used in different ways: 
-.IP "1 -" 4
-Open Kgpg. You will see an editor. Just type or paste your text in the editor. You can then easily encrypt/decrypt the text. 
-.IP "2 -" 4
-On your Desktop or from a Konqueror window, right click on a file and you will see an encrypt file entry in the menu. just select it to encrypt the file. In the same way, simply left click on an encrypted file to decrypt it. 
-.IP "3 -" 4
-If you enable Kgpg's Klipper action, as soon as you copy an encrypted text to the clipboard, a popup menu will ask you if you want to decrypt it. 
-.SH OPTIONS
-.TP
-.B \-e
-encrypt file
-.TP
-.B \-s
-show encrypted file
-.TP
-.B \-S
-sign file
-.TP
-.B \-V
-verify signature
-.SS "Arguments:"
-.TP 12
-file
-file to open
-.SS "Generic options:"
-.TP 12
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-title \ title
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-kgpg was written by
-.nh
-.ad l
-y0k0 <bj@altern.org>,
-.br
-.hy
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-The full documentation for
-.B Kgpg
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kgpg
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kgpg
-
diff --git a/debian/_base/core/tdeutils/debian/man/khexedit-trinity.1 b/debian/_base/core/tdeutils/debian/man/khexedit-trinity.1
deleted file mode 100644
index 968d438f5..000000000
--- a/debian/_base/core/tdeutils/debian/man/khexedit-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHEXEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE hex editor"
-.SH NAME
-khexedit
-\- TDE hex editor
-.SH SYNOPSIS
-\fBkhexedit\fP [Qt\-options] [TDE\-options] [options] [file(s)] 
-.SH DESCRIPTION
-\fBKHexEdit\fP is an editor for the raw data of binary files. It includes find/replace functions, bookmarks, many configuration options, drag and drop support and other powerful features.
-.sp 1
-When a document is opened, the bytes are displayed in hexadecimal format in the data editor window. The data can be edited, cut, copied, pasted, dragged and dropped much as text is in an text editor or word processor. A cursor marks the current position. Pressing the Insert key toggles between overwrite and insert text entry modes. The data can also be displayed as octal, binary or decimal values, by choosing the desired format in the View menu.
-.sp 1
-The offset column on the left indicates the position of a particular byte in the file. The text field on the right displays the ASCII encoding of the file. The cursor position and edits in the data editor window are reflected in the text field. The text field can also be edited, and those changes are reflected in the data editor window.
-.sp 1
-The search bar allows the user to search for a specific value \-\- hexadecimal, octal, binary, decimal or text.
-.sp 1
-The conversion field displays the value of the byte at the cursor position in a variety of bases. It also displays the value of all standard data types starting at the cursor.
-.sp 1
-Multiple documents can be open at the same time but only one can be active. Use the Documents menu to select which document will be active.
-.SH OPTIONS
-.SS
-.SS Arguments:
-file(s)                   File(s) to open
-.SS Options:
-.TP
-.B  \-\-offset  <offset>
-Jump to 'offset'
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/khexedit/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/khexedit/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Espen Sand <espensa@online.no>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdeutils/debian/man/kwikdisk-trinity.1 b/debian/_base/core/tdeutils/debian/man/kwikdisk-trinity.1
deleted file mode 100644
index 74aaad6ca..000000000
--- a/debian/_base/core/tdeutils/debian/man/kwikdisk-trinity.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWIKDISK 1 "June 2006" "Trinity Desktop Environment" "TDE Free disk space utility"
-.SH NAME
-kwikdisk
-\- TDE Free disk space utility
-.SH SYNOPSIS
-\fBkwikdisk\fB [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBkwikdisk\fP is a kicker applet to display the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their free space, type and mount point. It also allows you to mount and unmount drives.
-.sp 1
-\fBkwikdisk\fP is similar to \fBKDiskFree\fP, but takes up less screen space.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-
-.SH SEE ALSO
-\fBkdf\fP(1)
-.SH AUTHORS
-.nf
-Michael Kropfberger <michael.kropfberger@gmx.net>
-.br
-Espen Sand <espen@kde.org>
-.br
-Stanislav Karchebny <Stanislav.Karchebny@kdemail.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/debian/_base/core/tdeutils/debian/man/superkaramba-trinity.1 b/debian/_base/core/tdeutils/debian/man/superkaramba-trinity.1
deleted file mode 100644
index ab0ec0f49..000000000
--- a/debian/_base/core/tdeutils/debian/man/superkaramba-trinity.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH SUPERKARAMBA 1 "juli  27, 2003"
-.SH NAME
-superkaramba \- a program based on karamba improving the eyecandy of TDE.
-.SH SYNOPSIS
-.B superkaramba
-[\fIQt-options\fR] [\fITDE-options\fR] \fIfile\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B superkaramba
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.PP
-.B Superkaramba
-is a tool based on karamba that allows anyone to easily create and run little
-interactive widgets on a Trinity desktop. Widgets are defined in a simple text file
-and can be augmented with Python code to make them interactive.
-.SH OPTIONS
-A summary of options are included below.
-.TP
-.B \-\-help
-Show summary of options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show license information
-.TP
-.B file
-A required argument 'file'
-.SH AUTHOR
-.B Superkaramba
-was written by Adam Geitgey <adam@rootnode.org> and Hans Karlsson
-<d98hk@efd.lth.se>.
-.PP
-This manual page was written by Jean-Michel Kelbert <kelbert@debian.org>,
-for the Debian project (but may be used by others).
diff --git a/debian/_base/core/tdeutils/debian/superkaramba-trinity.install b/debian/_base/core/tdeutils/debian/superkaramba-trinity.install
index 8e4b39209..b56555797 100644
--- a/debian/_base/core/tdeutils/debian/superkaramba-trinity.install
+++ b/debian/_base/core/tdeutils/debian/superkaramba-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/superkaramba.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/superkaramba.svgz
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+debian/tmp/opt/trinity/share/man/man1/superkaramba.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-superkaramba.desktop
 
 debian/icons/superkaramba.xpm		/opt/trinity/share/pixmaps
diff --git a/debian/_base/core/tdeutils/debian/superkaramba-trinity.manpages b/debian/_base/core/tdeutils/debian/superkaramba-trinity.manpages
deleted file mode 100644
index 730ac7f62..000000000
--- a/debian/_base/core/tdeutils/debian/superkaramba-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/superkaramba-trinity.1
diff --git a/debian/_base/dependencies/akode/debian/control b/debian/_base/dependencies/akode/debian/control
index f9d05d552..cbfa4bb85 100644
--- a/debian/_base/dependencies/akode/debian/control
+++ b/debian/_base/dependencies/akode/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev
 Standards-Version: 3.7.3
 
 Package: libakode2
@@ -20,6 +20,21 @@ Description: akode plugin for aRts
  FLAC and Speex. aKode also focuses on performance, and so it means a
  big enhancement for users runing aRts in non-realtime mode.
 
+Package: libakode2-ffmpeg
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: akode
+Replaces: akode
+Enhances: libarts1c2, libarts1c2a-trinity
+Description: ffmpeg plugins for akode
+ aKode is a new multithreaded audio library that provides aRts with
+ plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC),
+ FLAC and Speex. aKode also focuses on performance, and so it means a
+ big enhancement for users runing aRts in non-realtime mode.
+ .
+ This package provides for akode formats supported by FFMPEG.
+
 Package: libakode2-mpeg
 Section: libs
 Architecture: any
diff --git a/debian/_base/dependencies/akode/debian/docs b/debian/_base/dependencies/akode/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/debian/_base/dependencies/akode/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.install b/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.install
new file mode 100644
index 000000000..83c5e777b
--- /dev/null
+++ b/debian/_base/dependencies/akode/debian/libakode2-ffmpeg.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libakode_ffmpeg_decoder.so
diff --git a/debian/_base/dependencies/akode/debian/rules b/debian/_base/dependencies/akode/debian/rules
index d93e5d960..1788b4f36 100755
--- a/debian/_base/dependencies/akode/debian/rules
+++ b/debian/_base/dependencies/akode/debian/rules
@@ -23,7 +23,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DWITH_ALL_OPTIONS="ON" \
  -DWITH_LIBLTDL="OFF" \
- -DWITH_FFMPEG_DECODER="OFF"
+ -DWITH_FFMPEG_DECODER="ON"
 
 common-install-prehook-arch::
 	grep -v libakode_alsa_sink debian/libakode2.install > debian/libakode2.install.kfreebsd-i386
diff --git a/debian/_base/dependencies/arts/debian/docs b/debian/_base/dependencies/arts/debian/docs
new file mode 100644
index 000000000..6f7727790
--- /dev/null
+++ b/debian/_base/dependencies/arts/debian/docs
@@ -0,0 +1,2 @@
+README.md
+TODO
diff --git a/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.install b/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.install
index 856cad6c5..cfc14e7c5 100644
--- a/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.install
+++ b/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.install
@@ -60,3 +60,5 @@ debian/tmp/opt/trinity/lib/mcop/kmedia2.mcopclass
 debian/tmp/opt/trinity/lib/mcop/kmedia2.mcoptype
 debian/tmp/opt/trinity/lib/mcop/soundserver.mcopclass
 debian/tmp/opt/trinity/lib/mcop/soundserver.mcoptype
+debian/tmp/opt/trinity/share/man/man1/artscat-trinity.1
+debian/tmp/opt/trinity/share/man/man1/artsdsp-trinity.1
diff --git a/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages b/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
deleted file mode 100644
index 8d7f5c573..000000000
--- a/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/out/artscat-trinity.1
-debian/man/artsdsp-trinity.1
-
diff --git a/debian/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages b/debian/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
deleted file mode 100644
index cef6ee689..000000000
--- a/debian/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/artsc-config-trinity.1
diff --git a/debian/_base/dependencies/arts/debian/libartsc0-trinity-dev.install b/debian/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
index 125ebc39e..fcecb09b2 100644
--- a/debian/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
+++ b/debian/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
@@ -4,6 +4,7 @@ debian/tmp/opt/trinity/include/artsc/artsc_export.h
 debian/tmp/opt/trinity/lib/libartsc.la
 debian/tmp/opt/trinity/lib/libartsc.so
 debian/tmp/opt/trinity/lib/libartsgsl.a
+debian/tmp/opt/trinity/share/man/man1/artsc-config-trinity.1
 
 debian/tmp/usr/lib/pkgconfig/arts.pc
 debian/tmp/usr/lib/pkgconfig/artsc.pc
diff --git a/debian/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml b/debian/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
deleted file mode 100644
index 8072e337d..000000000
--- a/debian/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSC-CONFIG</refentrytitle>">
-  <!ENTITY dhpackage   "artsc-config">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>Get information about a libartsc installation</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--arts-prefix<replaceable></replaceable></option></arg>
-      <arg><option>--arts-version<replaceable></replaceable></option></arg>
-      <arg><option>--cflags<replaceable></replaceable></option></arg>
-      <arg><option>--libs<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable></replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> displays information about a previous libartsc installation.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--arts-prefix</option>
-        </term>
-        <listitem>
-          <para>This is the prefix used when libartsc was installed.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--arts-version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed arts.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cflags</option>
-        </term>
-        <listitem>
-          <para>Set of compiler options (CFLAGS) to use when compiling files that use libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--libs</option>
-        </term>
-        <listitem>
-          <para>Shows the complete set of libs and other linker options you will need in order to link your application with libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed libartsc.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (but may be used by
-      others).  Permission is granted to copy, distribute and/or
-      modify this document under the terms of the &gnu; General Public
-      License, Version 2 or any later version published by the Free
-      Software Foundation.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/debian/_base/dependencies/arts/debian/man/artscat-trinity.sgml b/debian/_base/dependencies/arts/debian/man/artscat-trinity.sgml
deleted file mode 100644
index 7dff34d95..000000000
--- a/debian/_base/dependencies/arts/debian/man/artscat-trinity.sgml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSCAT</refentrytitle>">
-  <!ENTITY dhpackage   "artscat">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>pipe data to sound device</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable> options </replaceable></option></arg>
-      <arg><option><replaceable> filename </replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> pipes data from a pipe to the sound device through arts.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-b <replaceable>bits</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of bits (8 or 16)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-c <replaceable>channels</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of channels (1 or 2)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h</option>
-        </term>
-        <listitem>
-          <para>display help and exit</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-r <replaceable>samplingrate</replaceable></option>
-        </term>
-        <listitem>
-          <para>set samplingrate to use</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-t <replaceable>title</replaceable></option>
-        </term>
-        <listitem>
-          <para>set stream title</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-        </term>
-        <listitem>
-          <para>show version</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (but may be used by
-      others).  Permission is granted to copy, distribute and/or
-      modify this document under the terms of the &gnu; General Public
-      License, Version 2 or any later version published by the Free
-      Software Foundation.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/debian/_base/dependencies/arts/debian/man/artsdsp-trinity.1 b/debian/_base/dependencies/arts/debian/man/artsdsp-trinity.1
deleted file mode 100644
index 2615f47c2..000000000
--- a/debian/_base/dependencies/arts/debian/man/artsdsp-trinity.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.TH ARTSDSP "1" "February 2008" "artsdsp" "User Commands"
-.SH NAME
-artsdsp \- manual page for artsdsp
-.SH DESCRIPTION
-artsdsp \- attempt to reroute audio device to artsd
-.PP
-artsdsp [options] binary
-.PP
-options:
-.TP
-.B \-h, \-\-help
-Show brief help.
-.TP
-.B \-n, \-\-name\fR=\fINAME\fR
-Use name to identify player to artsd.
-.TP
-.B \-m, \-\-mmap
-Emulate memory mapping (i.e. for quake).
-.TP
-.B \-s, \-\-single\-threaded
-Use the single\-threaded version.
-.TP
-.B \-v, \-\-verbose
-Show parameters.
-.TP
-.B \-V, \-\-version
-Show version.
-.PP
-This manual page was written by Fathi Boudra <fabo@debian.org>,
-for the Debian project (but may be used by others).
-
diff --git a/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/polkit-tqt/debian/cdbs/versions.pl b/debian/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/polkit-tqt/debian/changelog b/debian/_base/dependencies/polkit-tqt/debian/changelog
new file mode 100644
index 000000000..58e4a45de
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/changelog
@@ -0,0 +1,66 @@
+polkit-tqt (0.103.0-2) unstable; urgency=low
+
+  * Port to TQt3 and package renaming
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Mon, 01 Nov 2021 14:03:00 +0900
+
+polkit-qt-1 (0.103.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - fix annoying crash on shutdown. (Closes: #651815)
+
+  [ Felix Geyer ]
+  * Modify CFLAGS/CXXFLAGS after including debian-qt-kde.mk so the changes are
+    not overwritten.
+
+  [ Fathi Boudra ]
+  * Update debian/compat: bump to 8.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 14 Dec 2011 09:15:10 -0500
+
+polkit-qt-1 (0.99.0-3) unstable; urgency=low
+
+  [ Modestas Vainius ]
+  * Update symbol files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 May 2011 00:31:01 +0300
+
+polkit-qt-1 (0.99.0-2) experimental; urgency=low
+
+  * Bump Standards-Version to 3.9.2: no changes needed.
+  * Build library with -fvisibility=hidden -fvisibility-inlines-hidden.
+  * Update symbol file: many private symbols are gone due to above.
+
+ -- Modestas Vainius <modax@debian.org>  Thu, 28 Apr 2011 11:53:35 +0300
+
+polkit-qt-1 (0.99.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+  [ Modestas Vainius ]
+  * Add Vcs fields to debian/control.
+  * Switch debian/rules engine to qt-kde-team/2/*.
+  * Bump Standards-Version to 3.9.1: no changes needed.
+  * Remove dupe "Section" field from debian/control.
+  * Include verbatim BSD license to debian/copyright.
+  * Override lintian libpolkit-qt-1-0: package-name-doesnt-match-sonames.
+  * Use more failsafe wildcards in libpolkit-qt-1-0.install.
+  * Add myself to Uploaders.
+  * SONAME bumped: rename libpolkit-qt-1-0 to libpolkit-qt-1-1.
+  * Add symbol file for libpolkit-qt-1-1.
+  * Update debian/copyright.
+
+  [ Didier Raboud ]
+  * Bump B-D of libpolkit to >= 0.98.
+
+  [ José Manuel Santamaría Lema ]
+  * Update installed files.
+
+ -- Modestas Vainius <modax@debian.org>  Mon, 14 Mar 2011 01:03:06 +0200
+
+polkit-qt-1 (0.95.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #565395)
+
+ -- Fathi Boudra <fabo@debian.org>  Fri, 15 Jan 2010 12:50:13 +0100
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/compat b/debian/_base/dependencies/polkit-tqt/debian/compat
index ec635144f..ec635144f 100644
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/compat
+++ b/debian/_base/dependencies/polkit-tqt/debian/compat
diff --git a/debian/_base/dependencies/polkit-tqt/debian/control b/debian/_base/dependencies/polkit-tqt/debian/control
new file mode 100644
index 000000000..7da8dc684
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/control
@@ -0,0 +1,61 @@
+Source: polkit-tqt
+Section: devel
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev,
+               libpolkit-gobject-1-dev, libpolkit-agent-1-dev, libdbus-1-tqt-dev
+Standards-Version: 3.9.2
+
+Package: libpolkit-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, policykit-1
+Description: PolicyKit-tqt library
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the files necessary for running applications that use
+ the libpolkit-tqt library.
+
+Package: libpolkit-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: libpolkit-tqt (= ${binary:Version}), libtqtinterface-dev
+Suggests: libpolkit-tqt-examples
+Description: PolicyKit-tqt development files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the development libraries and headers.
+
+Package: libpolkit-tqt-examples
+Section: libs
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, policykit-1
+Description: PolicyKit-tqt library example files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains example files and applications.
diff --git a/debian/_base/dependencies/polkit-tqt/debian/copyright b/debian/_base/dependencies/polkit-tqt/debian/copyright
new file mode 100644
index 000000000..19e2663aa
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/copyright
@@ -0,0 +1,101 @@
+This code was ported to TQt3 and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+    https://snapshot.debian.org/package/polkit-qt-1/0.103.0-1/
+
+Original polkit-qt-1 code was packaged for Debian by:
+
+    Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+    Daniel Nicoletti <dantti85-dev@yahoo.com.br>
+    Dario Freddi <drf@kde.org>
+    Jaroslav Reznik <jreznik@redhat.com>
+    Radek Novacek <rnovacek@redhat.com>
+    Lukas Tinkl <ltinkl@redhat.com>
+    Pino Toscano <pino@kde.org>
+
+Copyright:
+
+    Copyright (C) 2008-2009 Daniel Nicoletti
+    Copyright (C) 2009-2010 Dario Freddi
+    Copyright (C) 2009 Jaroslav Reznik
+    Copyright (C) 2009 Radek Novacek
+    Copyright (C) 2009 Lukas Tinkl
+
+Copyright for polkit-tqt-export.h file:
+
+    Copyright (C) 2009 Dario Freddi <drf@kde.org>
+    Copyright (C) 2007 David Faure <faure@kde.org>
+
+Copyright for polkittqt1-version.h.cmake file:
+
+    Copyright (C) 2009 Dario Freddi <drf@kde.org>
+    Copyright (C) 2007 Sebastian Trueg <trueg@kde.org>
+
+Copyright for cmake/modules/FindAutomoc4.cmake file:
+
+    Copyright (C) 2008-2009 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/MacroPushRequiredVars.cmake file:
+
+    Copyright (C) 2006 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/InstallSettings.cmake file:
+
+    Copyright (C) 2008 Kevin Krammer <kevin.krammer@gmx.at>
+
+License for cmake modules:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License:
+
+    This package 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 of the License, or (at your option) any later version.
+
+    This package 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2' and
+`/usr/share/common-licenses/LGPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+    Copyright (C) 2011 Modestas Vainius <modax@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/debian/_base/dependencies/polkit-tqt/debian/docs b/debian/_base/dependencies/polkit-tqt/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
new file mode 100644
index 000000000..698c043d8
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
@@ -0,0 +1,31 @@
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/ActionDescription
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Listener
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Session
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Authority
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Details
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/Action
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButton
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButtons
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Identity
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Subject
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/TemporaryAuthorization
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-actiondescription.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-listener.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-session.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-authority.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-details.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-export.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-action.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbutton.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbuttons.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-identity.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-subject.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-temporaryauthorization.h
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-agent.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-core.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-gui.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-agent.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-core.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-gui.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/polkit-tqt.cmake
diff --git a/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
new file mode 100644
index 000000000..5bb70628a
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
@@ -0,0 +1,8 @@
+debian/tmp/etc/dbus-1/system.d/org.tqt.policykit.examples.conf
+debian/tmp/usr/bin/polkit-tqt-agent-example
+debian/tmp/usr/bin/polkit-tqt-example
+debian/tmp/usr/bin/polkit-tqt-example-helper
+debian/tmp/usr/share/apps/polkit-tqt/examples/*
+debian/tmp/usr/share/apps/polkit-tqt/icons/*
+debian/tmp/usr/share/dbus-1/system-services/org.tqt.policykit.examples.service
+debian/tmp/usr/share/polkit-1/actions/org.tqt.policykit.examples.policy
diff --git a/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
new file mode 100644
index 000000000..1bbe0900a
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-*.so.*
diff --git a/debian/_base/dependencies/polkit-tqt/debian/patches/series b/debian/_base/dependencies/polkit-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/patches/series
diff --git a/debian/_base/dependencies/polkit-tqt/debian/rules b/debian/_base/dependencies/polkit-tqt/debian/rules
new file mode 100755
index 000000000..71edffe1c
--- /dev/null
+++ b/debian/_base/dependencies/polkit-tqt/debian/rules
@@ -0,0 +1,23 @@
+#!/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
+
+# Build options
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DBUILD_ALL="ON"
+
+DEB_MAKE_CHECK_TARGET = check
diff --git a/ubuntu/_base/libraries/python-trinity/debian/source/format b/debian/_base/dependencies/polkit-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/source/format
+++ b/debian/_base/dependencies/polkit-tqt/debian/source/format
diff --git a/ubuntu/_base/libraries/python-trinity/debian/source/options b/debian/_base/dependencies/polkit-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/source/options
+++ b/debian/_base/dependencies/polkit-tqt/debian/source/options
diff --git a/debian/_base/dependencies/python-tqt/debian/control b/debian/_base/dependencies/python-tqt/debian/control
deleted file mode 100644
index 8af7946c1..000000000
--- a/debian/_base/dependencies/python-tqt/debian/control
+++ /dev/null
@@ -1,126 +0,0 @@
-Source: python-tqt
-Section: python
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python, python-all-dbg
-Standards-Version: 3.8.4
-
-Package: python-tqt
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
-Replaces: python-tqt (<< 4:14.0.0~)
-Breaks: python-tqt (<< 4:14.0.0~)
-Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
-Provides: ${python:Provides}
-Description: TQt bindings for Python
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- At this moment PyTQt offers a vast subset of TQt API. There are
- some minor issues related to the differences between C++ and Python
- (types, etc), but usually you'll be able to write code pretty much the
- same way in both languages (with syntax differences, of course)
-
-Package: python-tqt-dbg
-Architecture: any
-Priority: extra
-Replaces: python-tqt-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-dbg (<< 4:14.0.0~)
-Section: debug
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends}
-Description: TQt bindings for Python (debug extension)
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-tqt-gl
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
-Replaces: python-tqt-gl (<< 4:14.0.0~)
-Breaks: python-tqt-gl (<< 4:14.0.0~)
-Suggests: python-tqt-doc
-Provides: ${python:Provides}
-Description: TQt OpenGL bindings for Python
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
-
-Package: python-tqt-gl-dbg
-Priority: extra
-Section: debug
-Replaces: python-tqt-gl-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-gl-dbg (<< 4:14.0.0~)
-Architecture: any
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt OpenGL bindings for Python (debug extension)
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-tqtext
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
-Replaces: python-tqtext (<< 4:14.0.0~)
-Breaks: python-tqtext (<< 4:14.0.0~)
-Provides: ${python:Provides}
-Description: TQt extensions for PyTQt
- PyTQt Extensions. Contains:
- .
-   * QScintilla: a featureful TQt source code editing component based
-                 on Scintilla.
-
-Package: python-tqtext-dbg
-Priority: extra
-Section: debug
-Replaces: python-tqtext-dbg (<< 4:14.0.0~)
-Breaks: python-tqtext-dbg (<< 4:14.0.0~)
-Architecture: any
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt debug extensions for PyTQt
- PyTQt debug Extensions. Contains:
- .
-   * QScintilla: a featureful TQt source code editing component based
-                 on Scintilla.
-
-Package: pytqt-tools
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: pytqt-tools (<< 4:14.0.0~)
-Breaks: pytqt-tools (<< 4:14.0.0~)
-Description: pyuic and pylupdate for TQt
- pyuic is the PyTQt counterpart for TQt's uic. It takes an XML
- user interface file and generates Python code.
- .
- pylupdate is the counterpart for TQt's lupdate. It updates TQt
- Linguist translation files from Python code.
-
-Package: python-tqt-dev
-Depends: python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Suggests: python-sip-tqt-dev
-Replaces: python-tqt-dev (<< 4:14.0.0~)
-Breaks: python-tqt-dev (<< 4:14.0.0~)
-Architecture: all
-Description: TQt bindings for Python - Development files
- Development .sip files with definitions of PyTQt classes. They
- are needed to build PyTQt, but also as building blocks of other
- packages based on them, like PyTDE.
-
-Package: python-tqt-doc
-Section: doc
-Architecture: all
-Replaces: python-tqt-doc (<< 4:14.0.0~)
-Breaks: python-tqt-doc (<< 4:14.0.0~)
-Depends: ${misc:Depends}
-Suggests: python-tqt
-Description: TQt bindings for Python - Documentation and examples
- Documentation and examples for the PyTQt (bindings that allow
- the use of TQt library from within a Python script).
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.examples b/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.examples
deleted file mode 100644
index 3162f69a8..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-examples3/*
-
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install b/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install
deleted file mode 100644
index 288f3cb88..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtgl.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt.install b/debian/_base/dependencies/python-tqt/debian/python-tqt.install
deleted file mode 100644
index 61a9363d0..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtcanvas.so
-usr/lib/python*/*-packages/python_tqt/qtnetwork.so
-usr/lib/python*/*-packages/python_tqt/qtsql.so
-usr/lib/python*/*-packages/python_tqt/qttable.so
-usr/lib/python*/*-packages/python_tqt/qtui.so
-usr/lib/python*/*-packages/python_tqt/qtxml.so
-usr/lib/python*/*-packages/python_tqt/qt.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqtext.install b/debian/_base/dependencies/python-tqt/debian/python-tqtext.install
deleted file mode 100644
index 582be1bb1..000000000
--- a/debian/_base/dependencies/python-tqt/debian/python-tqtext.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtext.so
diff --git a/debian/_base/dependencies/python-tqt/debian/rules b/debian/_base/dependencies/python-tqt/debian/rules
deleted file mode 100755
index 0d9bda729..000000000
--- a/debian/_base/dependencies/python-tqt/debian/rules
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# 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
-
-export DH_OPTIONS
-
--include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
-py_sitename = site-packages
-py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-py_sitename_sh = $(py_sitename)
-py_libdir_sh = $(py_libdir)
-endif
-
-
-DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc
-INSTDIR=$(CURDIR)/debian
-
-export QTDIR=/usr/share/tqt3
-export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
-else
-	CXXFLAGS += -O1
-endif
-CXXFLAGS += "-I/usr/include/tqt"
-
-PYTHONS	:= $(shell pyversions -vr debian/control)
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
-
-GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
-ifneq (,$(filter $(GCCVER),4.2 4.3))
-	SPLIT=40
-else
-	SPLIT=10
-endif
-
-.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
-
-configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
-build-%/configure-stamp:
-	dh_testdir
-	mkdir -p build-$*
-	cd build-$* && echo yes \
-                | python$* ../configure.py \
-                        -c -n /usr/include/tqscintilla \
-                        -e python$* \
-                        -o /usr/lib -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-                        -l /usr/include/python$* \
-                        -v /usr/share/sip/tqt \
-                        -m /usr/lib/python$*/config \
-                        CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
-	touch $@
-
-dbg-build-%/configure-stamp:
-	dh_testdir
-	mkdir -p dbg-build-$*
-	cd dbg-build-$* && echo yes \
-                | python$*-dbg ../configure.py \
-                        -c -n /usr/include/tqscintilla \
-                        -e python$* \
-                        -o /usr/lib -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-                        -l /usr/include/python$*_d \
-                        -v /usr/share/sip/tqt \
-                        -m /usr/lib/python$*/config_d \
-                        CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
-	touch $@
-
-build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
-build-indep:
-
-build-%/build-stamp: build-%/configure-stamp
-	dh_testdir
-	$(MAKE) -C build-$*
-	touch $@
-
-dbg-build-%/build-stamp: dbg-build-%/configure-stamp
-	dh_testdir
-	$(MAKE) -C dbg-build-$*
-	touch $@
-
-install-indep: configure
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
-	for version in ${PYTHONS}; do\
-		pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
-		mkdir -p debian/python-tqt-dev/$$pylib;\
-		install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
-	done
-	dh_install -i
-
-install-arch: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k -a
-	dh_installdirs -a
-	for version in ${PYTHONS}; do \
-	  $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
-	done
-	for version in ${PYTHONS}; do \
-	  pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
-	  $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-tqt-dbg;\
-	  mkdir -p debian/python-tqt/$$pylib;\
-	  cp -a debian/tmp/$$pylib/__init__.py \
-	        debian/python-tqt/$$pylib/__init__.py;\
-	  mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
-	  mv debian/python-tqt-dbg/$$pylib/qtgl.so \
-             debian/python-tqt-gl-dbg/$$pylib/;\
-	  mkdir -p debian/python-tqtext-dbg/$$pylib;\
-	  mv debian/python-tqt-dbg/$$pylib/qtext.so \
-             debian/python-tqtext-dbg/$$pylib/;\
-	done
-
-	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-
-	for i in $$(find debian/python-*-dbg -name '*.so'); do \
-	  b=$$(basename $$i .so); \
-	  mv $$i $$(dirname $$i)/$${b}_d.so; \
-	done
-	find debian/python-*-dbg ! -type d \
-                ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
-	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) 
-	rm -f *-stamp
-	dh_clean
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_installdocs -A NEWS THANKS
-	dh_installexamples
-	dh_link
-ifeq (,$(findstring -i, $(DH_OPTIONS)))
-	DH_OPTIONS= dh_strip -ppytqt-tools
-	set -e; \
-	for p in python-tqt python-tqt-gl python-tqtext; do \
-	  DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
-	  rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
-	  ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
-	done
-endif
-#	dh_strip
-	dh_compress -X.py -X.bmp -X.ui -X.sql
-	dh_fixperms
-	${DH_PYTHON2}
-	dh_sip_tqt
-	dh_lintian
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build build-arch clean binary-indep binary-arch binary configure
diff --git a/debian/_base/dependencies/python-tqt/debian/README.Debian b/debian/_base/dependencies/pytqt/debian/README.Debian
index 33603ec40..33603ec40 100644
--- a/debian/_base/dependencies/python-tqt/debian/README.Debian
+++ b/debian/_base/dependencies/pytqt/debian/README.Debian
diff --git a/debian/_base/dependencies/python-tqt/debian/changelog b/debian/_base/dependencies/pytqt/debian/changelog
index 95e2f0cce..95e2f0cce 100644
--- a/debian/_base/dependencies/python-tqt/debian/changelog
+++ b/debian/_base/dependencies/pytqt/debian/changelog
diff --git a/debian/_base/dependencies/pytqt/debian/compat b/debian/_base/dependencies/pytqt/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/_base/dependencies/pytqt/debian/control b/debian/_base/dependencies/pytqt/debian/control
new file mode 100644
index 000000000..577566cd9
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/control
@@ -0,0 +1,200 @@
+Source: python-tqt
+Section: python
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
+Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python3-all-dev, python3-all-dbg, libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python
+Standards-Version: 3.8.4
+XS-Python-Version: >= 2.3
+X-Python3-Version: >= 3.0
+
+Package: python-tqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
+Replaces: python-tqt (<< 4:14.0.0~)
+Breaks: python-tqt (<< 4:14.0.0~)
+Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python:Provides}
+Description: TQt bindings for Python
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ At this moment PyTQt offers a vast subset of TQt API. There are
+ some minor issues related to the differences between C++ and Python
+ (types, etc), but usually you'll be able to write code pretty much the
+ same way in both languages (with syntax differences, of course)
+
+Package: python-tqt-dbg
+Architecture: any
+Priority: extra
+Replaces: python-tqt-dbg (<< 4:14.0.0~)
+Breaks: python-tqt-dbg (<< 4:14.0.0~)
+Section: debug
+Depends: ${shlibs:Depends}, python-all-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends}
+Description: TQt bindings for Python (debug extension)
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-tqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends}
+Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python3:Provides}
+Description: TQt bindings for Python 3
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ At this moment PyTQt offers a vast subset of TQt API. There are
+ some minor issues related to the differences between C++ and Python
+ (types, etc), but usually you'll be able to write code pretty much the
+ same way in both languages (with syntax differences, of course)
+
+Package: python3-tqt-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends}
+Description: TQt bindings for Python 3 (debug extension)
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-tqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
+Replaces: python-tqt-gl (<< 4:14.0.0~)
+Breaks: python-tqt-gl (<< 4:14.0.0~)
+Suggests: python-tqt-doc
+Provides: ${python:Provides}
+Description: TQt OpenGL bindings for Python
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+
+Package: python-tqt-gl-dbg
+Priority: extra
+Section: debug
+Replaces: python-tqt-gl-dbg (<< 4:14.0.0~)
+Breaks: python-tqt-gl-dbg (<< 4:14.0.0~)
+Architecture: any
+Depends: ${shlibs:Depends}, python-all-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt OpenGL bindings for Python (debug extension)
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-tqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends}
+Suggests: python-tqt-doc
+Provides: ${python3:Provides}
+Description: TQt OpenGL bindings for Python 3
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+
+Package: python3-tqt-gl-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt-gl (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt OpenGL bindings for Python 3 (debug extension)
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-tqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
+Replaces: python-tqtext (<< 4:14.0.0~)
+Breaks: python-tqtext (<< 4:14.0.0~)
+Provides: ${python:Provides}
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: python-tqtext-dbg
+Priority: extra
+Section: debug
+Replaces: python-tqtext-dbg (<< 4:14.0.0~)
+Breaks: python-tqtext-dbg (<< 4:14.0.0~)
+Architecture: any
+Depends: ${shlibs:Depends}, python-all-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt debug extensions for PyTQt
+ PyTQt debug Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: python3-tqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends}
+Provides: ${python3:Provides}
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: python3-tqtext-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt debug extensions for PyTQt
+ PyTQt debug Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: pytqt-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: pytqt-tools (<< 4:14.0.0~)
+Breaks: pytqt-tools (<< 4:14.0.0~)
+Description: pyuic and pylupdate for TQt
+ pyuic is the PyTQt counterpart for TQt's uic. It takes an XML
+ user interface file and generates Python code.
+ .
+ pylupdate is the counterpart for TQt's lupdate. It updates TQt
+ Linguist translation files from Python code.
+
+Package: python-tqt-dev
+Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Suggests: python3-sip-tqt-dev | python-sip-tqt-dev
+Replaces: python-tqt-dev (<< 4:14.0.0~)
+Breaks: python-tqt-dev (<< 4:14.0.0~)
+Architecture: all
+Description: TQt bindings for Python - Development files
+ Development .sip files with definitions of PyTQt classes. They
+ are needed to build PyTQt, but also as building blocks of other
+ packages based on them, like PyTDE.
+
+Package: python-tqt-doc
+Section: doc
+Architecture: all
+Replaces: python-tqt-doc (<< 4:14.0.0~)
+Breaks: python-tqt-doc (<< 4:14.0.0~)
+Depends: ${misc:Depends}
+Suggests: python-tqt
+Description: TQt bindings for Python - Documentation and examples
+ Documentation and examples for the PyTQt (bindings that allow
+ the use of TQt library from within a Python script).
diff --git a/debian/_base/dependencies/python-tqt/debian/copyright b/debian/_base/dependencies/pytqt/debian/copyright
index 715a83f24..715a83f24 100644
--- a/debian/_base/dependencies/python-tqt/debian/copyright
+++ b/debian/_base/dependencies/pytqt/debian/copyright
diff --git a/debian/_base/dependencies/python-tqt/debian/docs b/debian/_base/dependencies/pytqt/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/debian/_base/dependencies/python-tqt/debian/docs
+++ b/debian/_base/dependencies/pytqt/debian/docs
diff --git a/debian/_base/dependencies/python-tqt/debian/manpages/pylupdate.1 b/debian/_base/dependencies/pytqt/debian/manpages/pylupdate.1
index 4d2c8919a..4d2c8919a 100644
--- a/debian/_base/dependencies/python-tqt/debian/manpages/pylupdate.1
+++ b/debian/_base/dependencies/pytqt/debian/manpages/pylupdate.1
diff --git a/debian/_base/dependencies/python-tqt/debian/manpages/pyuic.1 b/debian/_base/dependencies/pytqt/debian/manpages/pyuic.1
index f1ffa41ff..f1ffa41ff 100644
--- a/debian/_base/dependencies/python-tqt/debian/manpages/pyuic.1
+++ b/debian/_base/dependencies/pytqt/debian/manpages/pyuic.1
diff --git a/debian/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/debian/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff
index 131e9dbdc..131e9dbdc 100644
--- a/debian/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff
+++ b/debian/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff
diff --git a/debian/_base/dependencies/python-tqt/debian/patches/series b/debian/_base/dependencies/pytqt/debian/patches/series
index 573069d8d..573069d8d 100644
--- a/debian/_base/dependencies/python-tqt/debian/patches/series
+++ b/debian/_base/dependencies/pytqt/debian/patches/series
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/debian/_base/dependencies/pytqt/debian/python-tqt-dev.dirs
index ae635cbcd..ae635cbcd 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
+++ b/debian/_base/dependencies/pytqt/debian/python-tqt-dev.dirs
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/debian/_base/dependencies/pytqt/debian/python-tqt-dev.install
index 7b6aca191..7b6aca191 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install
+++ b/debian/_base/dependencies/pytqt/debian/python-tqt-dev.install
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/debian/_base/dependencies/pytqt/debian/python-tqt-dev.lintian-overrides
index 36e6c1349..36e6c1349 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/debian/_base/dependencies/pytqt/debian/python-tqt-dev.lintian-overrides
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs b/debian/_base/dependencies/pytqt/debian/python-tqt-doc.dirs
index 43a4fa9fa..43a4fa9fa 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ b/debian/_base/dependencies/pytqt/debian/python-tqt-doc.dirs
diff --git a/debian/_base/dependencies/pytqt/debian/python-tqt-doc.examples b/debian/_base/dependencies/pytqt/debian/python-tqt-doc.examples
new file mode 100644
index 000000000..c48447a3e
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python-tqt-doc.examples
@@ -0,0 +1,2 @@
+examples/*
+
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.install b/debian/_base/dependencies/pytqt/debian/python-tqt-doc.install
index 65f82036b..65f82036b 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.install
+++ b/debian/_base/dependencies/pytqt/debian/python-tqt-doc.install
diff --git a/debian/_base/dependencies/pytqt/debian/python-tqt-gl.install b/debian/_base/dependencies/pytqt/debian/python-tqt-gl.install
new file mode 100644
index 000000000..d58e26ab5
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python-tqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python2.*/*-packages/python_tqt/qtgl.so
diff --git a/debian/_base/dependencies/pytqt/debian/python-tqt.install b/debian/_base/dependencies/pytqt/debian/python-tqt.install
new file mode 100644
index 000000000..4ec8f4d19
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python-tqt.install
@@ -0,0 +1,7 @@
+usr/lib/python2.*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python2.*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python2.*/*-packages/python_tqt/qtsql.so
+usr/lib/python2.*/*-packages/python_tqt/qttable.so
+usr/lib/python2.*/*-packages/python_tqt/qtui.so
+usr/lib/python2.*/*-packages/python_tqt/qtxml.so
+usr/lib/python2.*/*-packages/python_tqt/qt.so
diff --git a/debian/_base/dependencies/pytqt/debian/python-tqtext.install b/debian/_base/dependencies/pytqt/debian/python-tqtext.install
new file mode 100644
index 000000000..00345e2e7
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python-tqtext.install
@@ -0,0 +1 @@
+usr/lib/python2.*/*-packages/python_tqt/qtext.so
diff --git a/debian/_base/dependencies/pytqt/debian/python3-tqt-gl.install b/debian/_base/dependencies/pytqt/debian/python3-tqt-gl.install
new file mode 100644
index 000000000..ead3920cf
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python3-tqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtgl.so
diff --git a/debian/_base/dependencies/pytqt/debian/python3-tqt.install b/debian/_base/dependencies/pytqt/debian/python3-tqt.install
new file mode 100644
index 000000000..4ceda8c75
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python3-tqt.install
@@ -0,0 +1,7 @@
+usr/lib/python3*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python3*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python3*/*-packages/python_tqt/qtsql.so
+usr/lib/python3*/*-packages/python_tqt/qttable.so
+usr/lib/python3*/*-packages/python_tqt/qtui.so
+usr/lib/python3*/*-packages/python_tqt/qtxml.so
+usr/lib/python3*/*-packages/python_tqt/qt.so
diff --git a/debian/_base/dependencies/pytqt/debian/python3-tqtext.install b/debian/_base/dependencies/pytqt/debian/python3-tqtext.install
new file mode 100644
index 000000000..4d58d8a28
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/python3-tqtext.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtext.so
diff --git a/debian/_base/dependencies/python-tqt/debian/pytqt-tools.install b/debian/_base/dependencies/pytqt/debian/pytqt-tools.install
index 1df36c612..1df36c612 100644
--- a/debian/_base/dependencies/python-tqt/debian/pytqt-tools.install
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-tools.install
diff --git a/debian/_base/dependencies/python-tqt/debian/pytqt-tools.manpages b/debian/_base/dependencies/pytqt/debian/pytqt-tools.manpages
index 7d27d0034..7d27d0034 100644
--- a/debian/_base/dependencies/python-tqt/debian/pytqt-tools.manpages
+++ b/debian/_base/dependencies/pytqt/debian/pytqt-tools.manpages
diff --git a/debian/_base/dependencies/pytqt/debian/rules b/debian/_base/dependencies/pytqt/debian/rules
new file mode 100755
index 000000000..932c1bc35
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/rules
@@ -0,0 +1,214 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# 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
+
+export DH_OPTIONS
+
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+py_sitename = site-packages
+py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+py_sitename_sh = $(py_sitename)
+py_libdir_sh = $(py_libdir)
+endif
+
+
+DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc
+INSTDIR=$(CURDIR)/debian
+
+export QTDIR=/usr/share/tqt3
+export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CXXFLAGS += -O0
+else
+	CXXFLAGS += -O1
+endif
+CXXFLAGS += "-I/usr/include/tqt"
+
+PYTHONS	:= $(shell pyversions -vr debian/control) $(shell py3versions -vd)
+
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
+DEB_PARALLEL_JOBS ?= 40
+
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+
+configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+
+build-%/configure-stamp:
+	dh_testdir
+	mkdir -p build-$*
+	cd build-$* && echo yes \
+                | python$* ../configure.py \
+                        -c -n /usr/include/tqt3 \
+                        -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
+                        -l /usr/include/python$* \
+                        -v /usr/share/sip/tqt \
+                        -m /usr/lib/python$*/config \
+                        -z \
+                        CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
+	touch $@
+
+dbg-build-%/configure-stamp:
+	dh_testdir
+	mkdir -p dbg-build-$*
+	cd dbg-build-$* && echo yes \
+                | python$*-dbg ../configure.py \
+                        -c -n /usr/include/tqt3 \
+                        -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
+                        -l /usr/include/python$*_d \
+                        -v /usr/share/sip/tqt \
+                        -m /usr/lib/python$*/config_d \
+                        -z \
+                        CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
+	touch $@
+
+build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+build-indep:
+
+build-%/build-stamp: build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C build-$*
+	touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C dbg-build-$*
+	touch $@
+
+install-indep: configure
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i
+	dh_installdirs -i
+	for version in ${PYTHONS}; do\
+		pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/python_tqt;\
+		mkdir -p debian/python-tqt-dev/$$pylib;\
+		install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
+	done
+	dh_install -i
+
+install-arch: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k -a
+	dh_installdirs -a
+
+	for p in $(PYTHONS) ; do \
+		$(MAKE) -f debian/rules install-arch-$$p;\
+	done
+
+	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+
+	for i in $$(find debian/python-*-dbg -name '*.so'); do \
+	  b=$$(basename $$i .so); \
+	  mv $$i $$(dirname $$i)/$${b}_d.so; \
+	done
+	find debian/python-*-dbg ! -type d \
+                ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+	for i in $$(find debian/python3-*-dbg -name '*.so'); do \
+	  b=$$(basename $$i .so); \
+	  mv $$i $$(dirname $$i)/$${b}_d.so; \
+	done
+	find debian/python3-*-dbg ! -type d \
+                ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+	find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+install-arch-3.%:
+	$(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-tqt-dbg
+	mkdir -p debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+	cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+	      debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+	mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+	mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+	   debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+	mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+	mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+	   debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+
+install-arch-%:
+	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-tqt-dbg
+	mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+	cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+	      debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+	mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+	mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+	   debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+	mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+	mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+	   debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) 
+	rm -f *-stamp
+	dh_clean
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installman
+	dh_installchangelogs ChangeLog
+	dh_installdocs -A NEWS THANKS
+	dh_installexamples
+	dh_link
+ifeq (,$(findstring -i, $(DH_OPTIONS)))
+	DH_OPTIONS= dh_strip -ppytqt-tools
+	set -e; \
+	for p in python-tqt python-tqt-gl python-tqtext; do \
+	  DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
+	  rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+	  ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+	done
+endif
+#	dh_strip
+	dh_compress -X.py -X.bmp -X.ui -X.sql
+	dh_fixperms
+ifneq (dh_pysupport,${DH_PYTHON2})
+	${DH_PYTHON2} --no-dbg-cleaning
+else
+	${DH_PYTHON2}
+endif
+	dh_python3 --no-dbg-cleaning
+	dh_sip_tqt
+	dh_sip3_tqt
+	dh_lintian
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
+
+# Build architecture independant packages using the common target.
+binary-indep: install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build build-arch clean binary-indep binary-arch binary configure
diff --git a/debian/_base/dependencies/pytqt/debian/source/format b/debian/_base/dependencies/pytqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/dependencies/pytqt/debian/source/options b/debian/_base/dependencies/pytqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/dependencies/pytqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/_base/dependencies/python-tqt/debian/watch b/debian/_base/dependencies/pytqt/debian/watch
index 506321d38..506321d38 100644
--- a/debian/_base/dependencies/python-tqt/debian/watch
+++ b/debian/_base/dependencies/pytqt/debian/watch
diff --git a/debian/_base/dependencies/sip4-tqt/debian/control b/debian/_base/dependencies/sip4-tqt/debian/control
index bdd8f4eb0..ca64055dd 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/control
+++ b/debian/_base/dependencies/sip4-tqt/debian/control
@@ -4,20 +4,21 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev
+Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python3-all-dev, python3-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev, bison, flex
 Standards-Version: 3.8.4
 XS-Python-Version: all
+X-Python3-Version: >= 3.0
 
 Package: python-sip-tqt
 Architecture: any
 Section: python
 Replaces: python-sip-tqt (<< 4:14.0.0~)
 Breaks: python-sip-tqt (<< 4:14.0.0~)
-Provides: ${python:Provides}, sip-tqt-api-7.1, sip-api-7.1
+Provides: ${python:Provides}
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4 (<< 4.10)
 Description: Python/C++ bindings generator runtime library
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
 
@@ -31,7 +32,7 @@ Provides: ${python:Provides}
 Depends: python-sip-tqt (= ${binary:Version}), python-all-dbg, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4-dbg (<< 4.10)
 Description: Python/C++ bindings generator runtime library (debug extension)
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
@@ -47,17 +48,56 @@ Recommends: python-sip-tqt (>= ${source:Version})
 Provides: python-sip-dev, python-sip4-dev, sip4
 Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10)
 Description: Python/C++ bindings generator development files
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ SIP-TQt was originally designed to generate Python bindings for TDE and so
+ has explicit support for the signal slot mechanism used by the TQt/TDE
+ class libraries.
+ .
+ Features:
+     - connecting TQt signals to Python functions and class methods
+     - connecting Python signals to TQt slots
+     - overloading virtual member functions with Python class methods
+     - protected member functions
+     - abstract classes
+     - enumerated types
+     - global class instances
+     - static member functions.
+ .
+ This package contains the code generator tool and the development headers
+ needed to develop Python bindings with sip-tqt.
+
+Package: python3-sip-tqt
+Architecture: any
+Section: python
+Provides: ${python3:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ This package provides SIP-TQt with support for Python 3
+
+Package: python3-sip-tqt-dev
+Architecture: any
+Section: python
+Depends: ${python:Depends}, python3-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
+Recommends: python3-sip-tqt (>= ${source:Version})
+Description: Python/C++ bindings generator development files
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
- SIP was originally designed to generate Python bindings for TDE and so
+ SIP-TQt was originally designed to generate Python bindings for TDE and so
  has explicit support for the signal slot mechanism used by the TQt/TDE
  class libraries.
  .
  Features:
-     - connecting Qt signals to Python functions and class methods
-     - connecting Python signals to Qt slots
+     - connecting TQt signals to Python functions and class methods
+     - connecting Python signals to TQt slots
      - overloading virtual member functions with Python class methods
      - protected member functions
      - abstract classes
@@ -66,5 +106,16 @@ Description: Python/C++ bindings generator development files
      - static member functions.
  .
  This package contains the code generator tool and the development headers
- needed to develop Python bindings with sip.
+ needed to develop Python 3 bindings with sip-tqt.
 
+Package: python3-sip-tqt-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ This package contains debugging symbols for python3-sip-tqt
diff --git a/debian/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt b/debian/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt
new file mode 100644
index 000000000..9b6387689
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_sip3_tqt - set the correct dependencies for Python 3 packages using sip
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_sip3_tqt>
+
+=head1 DESCRIPTION
+
+dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be
+used by Python 3 extensions built with sip3-tqt in order to depend on a version of
+python3-sip-tqt that exports the correct public API.
+
+=cut
+
+init();
+
+my $sip3_tqt_provides = `dpkg -s python3-sip-tqt`;
+$sip3_tqt_provides =~ /^Provides:\s*(.+)$/m;
+
+my @sip3_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1)));
+
+my $sip3_tqt_api_version=$sip3_tqt_apis[-1];
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+        addsubstvar($package, "sip3-tqt:Depends", $sip3_tqt_api_version);
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+
+=head1 AUTHORS
+
+Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
+
+=cut
diff --git a/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt b/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
index 3c6450bd9..c92f23529 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
+++ b/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_sip_tqt - set the correct dependencies for Python packages using sip
+dh_sip_tqt - set the correct dependencies for Python packages using sip-tqt
 
 =cut
 
diff --git a/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1 b/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1
new file mode 100644
index 000000000..a4284326a
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1
@@ -0,0 +1,151 @@
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "DH_SIP3_TQT 1"
+.TH DH_SIP3_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+dh_sip3_tqt \- set the correct dependencies for Python 3 packages using sip-tqt
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBdh_sip3_tqt\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be used by
+Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt
+that exports the correct public \s-1API\s0.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIdebhelper\fR\|(7)
+.PP
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
diff --git a/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
index ea429fe9a..6f0edd8f1 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
+++ b/debian/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
@@ -130,20 +130,20 @@
 .if n .ad l
 .nh
 .SH "NAME"
-dh_sip_tqt \- set the correct dependencies for Python packages using sip
+dh_sip_tqt \- set the correct dependencies for Python packages using sip-tqt
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 \&\fBdh_sip_tqt\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by
-Python extensions built with sip in order to depend on a version of python-sip
+dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be used by
+Python extensions built with sip-tqt in order to depend on a version of python-sip-tqt
 that exports the correct public \s-1API\s0.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIdebhelper\fR\|(7)
 .PP
-This program is a part of python-sip-dev but is made to work with debhelper.
+This program is a part of python-sip-tqt-dev but is made to work with debhelper.
 .SH "AUTHORS"
 .IX Header "AUTHORS"
 Torsten Marek <shlomme@debian.org>
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
index 1df36c612..8b1c81fa9 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
+++ b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
@@ -1 +1,2 @@
 usr/bin/*
+../../debian/dh_sip_tqt /usr/bin/
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..01bc123e7 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/debian/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
+usr/lib/python2.*/*-packages/sip4_tqt/sip.so
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
new file mode 100644
index 000000000..43fbfa385
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
@@ -0,0 +1 @@
+../../debian/dh_sip3_tqt /usr/bin/
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
new file mode 100644
index 000000000..db0d5945a
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
@@ -0,0 +1 @@
+debian/manpages/dh_sip3_tqt.1
diff --git a/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install
new file mode 100644
index 000000000..967fec5d9
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install
@@ -0,0 +1 @@
+usr/lib/python3.*/*-packages/sip4_tqt/sip.so
diff --git a/debian/_base/dependencies/sip4-tqt/debian/rules b/debian/_base/dependencies/sip4-tqt/debian/rules
index 1feb9c154..6a81cf1e2 100755
--- a/debian/_base/dependencies/sip4-tqt/debian/rules
+++ b/debian/_base/dependencies/sip4-tqt/debian/rules
@@ -14,6 +14,10 @@ endif
 
 export DH_OPTIONS
 
+PY2_PROVIDES=sip-tqt-api-7.0, sip-tqt-api-7.1
+PY3_PROVIDES=sip-tqt-py3api-7.0, sip-tqt-py3api-7.1
+PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]")
+
 INSTDIR=$(CURDIR)/debian
 
 CFLAGS=
@@ -24,7 +28,7 @@ else
 	CFLAGS += -O2 -g
 endif
 
-PYTHONS	:= $(shell pyversions -vr debian/control)
+PYTHONS := $(shell pyversions -vr) $(shell py3versions -vd)
 
 DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
 DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
@@ -48,7 +52,6 @@ build-%/configure-stamp:
 	cd build-$* \
 		&& python$* ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-			-g python$* \
 			-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
 	touch $@
 
@@ -58,8 +61,6 @@ dbg-build-%/configure-stamp:
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-			-g python$* \
-			-e /usr/include/python$*_d \
 			-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
 	touch $@
 
@@ -81,12 +82,14 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
-	dh_clean
+	dh_clean debian/python3-sip.pydist
 
 install-arch: build
 	dh_testdir
 	dh_testroot
 	dh_prep -a
+	echo "python:Provides=$(PY2_PROVIDES)" >> debian/python-sip-tqt.substvars
+	echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip-tqt.substvars
 	dh_installdirs -a
 	# This is needed to enforce that the install-arch-% rules are
 	# not run in parallel. Both rules install into the same directory,
@@ -101,11 +104,32 @@ install-arch: build
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
+	for i in $$(find debian/python3-sip-tqt-dbg -name '*.so'); do \
+		b=$$(basename $$i .so); \
+		mv $$i $$(dirname $$i)/$${b}_d.so; \
+	done
 	find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
 	find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \;
+	find debian/python3-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
+	find debian/python3-sip-tqt-dbg -depth -empty -exec rmdir {} \;
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-	install -m 755 -o root -g root debian/dh_sip_tqt debian/python-sip-tqt-dev/usr/bin
+
+install-arch-3.%:
+	$(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-sip-tqt-dbg
+	mkdir -p debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt
+	touch debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/__init__.py
+	install -m 644 -o root -g root debian/sipconfig_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig.py
+	install -m 644 -o root -g root build-3.$*/sipconfig.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig_nd.py
+	install -m 644 -o root -g root dbg-build-3.$*/sipconfig.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig_d.py
+	mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	install -m 644 -o root -g root siplib/sip.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
+	mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip.h \
+	    debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip.h
+	mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages/sip4_tqt
+	install -m 644 -o root -g root sipdistutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages/sip4_tqt
 
 install-arch-%:
 	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
@@ -115,11 +139,11 @@ install-arch-%:
 	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
 	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_nd.py
 	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py
-	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*
-	install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/
-	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
-	ln -s ../python$*/sip.h \
-	    debian/python-sip-tqt-dev/usr/include/python$*_d/sip.h
+	mkdir -p debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
+	mkdir -p debian/python-sip-tqt-dev$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	ln -s ../$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip.h \
+	    debian/python-sip-tqt-dev/$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip.h
 	mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
 	install -m 644 -o root -g root sipdistutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
 
@@ -139,17 +163,23 @@ binary-common:
 ifneq (,$(findstring -a, $(DH_OPTIONS)))
 	DH_OPTIONS= dh_strip -ppython-sip-tqt-dev
 	DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg
+	DH_OPTIONS= dh_strip -ppython3-sip-tqt-dev
+	DH_OPTIONS= dh_strip -ppython3-sip-tqt -Npython3-sip-tqt-dev --dbg-package=python3-sip-tqt-dbg
 	rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
 	mkdir -p debian/python-sip-tqt-dbg/usr/share/doc
 	ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
+	rm -rf debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
+	mkdir -p debian/python3-sip-tqt-dbg/usr/share/doc
+	ln -s python3-sip-tqt debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
 endif
-	dh_compress 
+	dh_compress -X.inv
 	dh_fixperms
 ifneq (dh_pysupport,${DH_PYTHON2})
 	${DH_PYTHON2} --no-dbg-cleaning
 else
 	${DH_PYTHON2}
 endif
+	dh_python3 --no-dbg-cleaning
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py b/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py
index a9e761f08..32cf8d5e7 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py
+++ b/debian/_base/dependencies/sip4-tqt/debian/sipconfig.py
@@ -4,10 +4,10 @@ import sys
 
 if getattr(sys, "pydebug", False):
     try:
-        from sipconfig_d import *
-        from sipconfig_d import _pkg_config, _default_macros
+        from sip4_tqt.sipconfig_d import *
+        from sip4_tqt.sipconfig_d import _pkg_config, _default_macros
     except ImportError, msg:
         raise ImportError, 'No module named sipconfig; package python-sip-tqt-dbg not installed'
 else:
-    from sipconfig_nd import *
-    from sipconfig_nd import _pkg_config, _default_macros
+    from sip4_tqt.sipconfig_nd import *
+    from sip4_tqt.sipconfig_nd import _pkg_config, _default_macros
diff --git a/debian/_base/dependencies/sip4-tqt/debian/sipconfig_py3.py b/debian/_base/dependencies/sip4-tqt/debian/sipconfig_py3.py
new file mode 100644
index 000000000..3e6aa5aba
--- /dev/null
+++ b/debian/_base/dependencies/sip4-tqt/debian/sipconfig_py3.py
@@ -0,0 +1,13 @@
+# import the sipconfig.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+    try:
+        from sip4_tqt.sipconfig_d import *
+        from sip4_tqt.sipconfig_d import _pkg_config, _default_macros
+    except ImportError as msg:
+        raise ImportError('No module named sipconfig; package python-sip-tqt-dbg not installed')
+else:
+    from sip4_tqt.sipconfig_nd import *
+    from sip4_tqt.sipconfig_nd import _pkg_config, _default_macros
diff --git a/debian/_base/dependencies/tqca/debian/control b/debian/_base/dependencies/tqca/debian/control
index f3f6d4d7b..7da73e73c 100644
--- a/debian/_base/dependencies/tqca/debian/control
+++ b/debian/_base/dependencies/tqca/debian/control
@@ -27,7 +27,7 @@ Description:
 Package: tqca-tls
 Section: libs
 Architecture: any
-Multi-Arch: foreign
+Multi-Arch: same
 Replaces: tqca-tls (<< 4:14.0.0~)
 Breaks: tqca-tls (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/_base/dependencies/tqca/debian/tqca-tls.install b/debian/_base/dependencies/tqca/debian/tqca-tls.install
index 893c5dd19..02d23f437 100644
--- a/debian/_base/dependencies/tqca/debian/tqca-tls.install
+++ b/debian/_base/dependencies/tqca/debian/tqca-tls.install
@@ -1 +1 @@
-debian/tmp/usr/lib/tqt3/plugins
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins
diff --git a/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/debian/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/tqscintilla/debian/cdbs/versions.pl b/debian/_base/dependencies/tqscintilla/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/dependencies/tqscintilla/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/tqscintilla/debian/control b/debian/_base/dependencies/tqscintilla/debian/control
index e89abba2a..9d4458b48 100644
--- a/debian/_base/dependencies/tqscintilla/debian/control
+++ b/debian/_base/dependencies/tqscintilla/debian/control
@@ -3,15 +3,17 @@ Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Torsten Marek <shlomme@debian.org>
-Build-Depends: debhelper (>= 9~), libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
 Standards-Version: 3.8.4
 
 Package: libtqscintilla7
 Section: libs
 Architecture: any
+Multi-Arch: same
 Replaces: libtqscintilla7 (<< 4:14.0.0~)
 Breaks: libtqscintilla7 (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
+Recommends: libtqscintilla7-i18n
 Description: TQt source code editing component based on Scintilla
  Scintilla is a free source code editing component. It has features found
  in standard editing components, as well as features especially useful
@@ -19,9 +21,23 @@ Description: TQt source code editing component based on Scintilla
  .
  TQScintilla is a port or Scintilla to the TQt GUI toolkit.
 
+Package: libtqscintilla7-i18n
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Replaces: libtqscintilla7 (<< 4:14.0.12~)
+Breaks: libtqscintilla7 (<< 4:14.0.12~)
+Description: i18n files for TQScintilla library
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ This package contains the internationalization files for the TQScintilla library.
+
 Package: libtqscintilla-dev
 Section: libdevel
-Architecture: all
+Architecture: any
+Multi-Arch: foreign
 Replaces: libtqscintilla-dev (<< 4:14.0.0~)
 Breaks: libtqscintilla-dev (<< 4:14.0.0~)
 Depends: libtqscintilla7 (>= ${source:Version})
@@ -36,6 +52,7 @@ Description: TQt source code editing component - development files
 Package: libtqscintilla-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Replaces: libtqscintilla-doc (<< 4:14.0.0~)
 Breaks: libtqscintilla-doc (<< 4:14.0.0~)
 Suggests: libtqscintilla-dev
diff --git a/debian/_base/dependencies/tqscintilla/debian/dirs b/debian/_base/dependencies/tqscintilla/debian/dirs
deleted file mode 100644
index ca882bbb7..000000000
--- a/debian/_base/dependencies/tqscintilla/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/_base/dependencies/tqscintilla/debian/docs b/debian/_base/dependencies/tqscintilla/debian/docs
index edc007104..50bd824bb 100644
--- a/debian/_base/dependencies/tqscintilla/debian/docs
+++ b/debian/_base/dependencies/tqscintilla/debian/docs
@@ -1 +1,2 @@
 NEWS
+README
diff --git a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
index e183cf963..8a9449faa 100644
--- a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
+++ b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
@@ -1,2 +1,3 @@
 usr/include
-usr/lib/*.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so
diff --git a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
index 005276324..d66379c9a 100644
--- a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
+++ b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
@@ -1 +1 @@
-usr/share/doc/libtqscintilla-doc
+usr/share/doc/libtqscintilla/HTML
diff --git a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
new file mode 100644
index 000000000..8fc621fc3
--- /dev/null
+++ b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
@@ -0,0 +1 @@
+usr/share/tqt3/translations/*.qm
diff --git a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
index 2cfef7f8a..b3c140659 100644
--- a/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
+++ b/debian/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
@@ -1,3 +1,2 @@
-usr/lib/*.so.*
-usr/lib/tqt3/plugins/designer/*.so
-usr/share/tqt3/translations/*.qm
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*.so
diff --git a/debian/_base/dependencies/tqscintilla/debian/rules b/debian/_base/dependencies/tqscintilla/debian/rules
index 4fdfd9914..bcf875516 100755
--- a/debian/_base/dependencies/tqscintilla/debian/rules
+++ b/debian/_base/dependencies/tqscintilla/debian/rules
@@ -1,117 +1,20 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+#! /usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
 
-# 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)
+ifdef DEB_HOST_MULTIARCH
+  CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+  CMAKE_INSTALL_LIBDIR = lib
 endif
 
-# This is the debhelper compatibility version to use.
-export QTDIR=/usr/share/tqt3
-export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
-DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html
-HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla
-LIBSDEST=$(CURDIR)/debian/tmp/usr/lib
-TRANSDEST=$(CURDIR)/debian/tmp/$(QTDIR)/translations
-PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/designer
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	cd qt; qmake "DESTDIR=$(CURDIR)/tmplib"
-	cd designer; qmake
-	touch configure-stamp
-
-build build-arch: build-stamp
-build-indep:
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	install -d $(CURDIR)/tmplib
-	$(MAKE) -C qt
-	$(MAKE) -C designer
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	[ ! -f qt/Makefile ] || $(MAKE) -C qt clean
-	[ ! -f designer/Makefile ] || $(MAKE) -C designer clean
-	-find -name 'Makefile' -exec rm {} \;
-	-rm -rf tmplib
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -d $(HEADERDEST)/private
-	install -d $(DOCDEST)
-	install -d $(TRANSDEST)
-	install -d $(LIBSDEST)
-	install -d $(PLUGINDEST)
-	for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done
-	for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done
-	for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done
-	for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done
-	mv designer/*.so $(PLUGINDEST)
-	for i in tmplib/*; do mv $$i $(LIBSDEST); done
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_install -i --sourcedir=$(CURDIR)/debian/tmp
-	dh_installdocs -i
-	dh_installchangelogs -i ChangeLog
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-	dh_installdocs -a
-	dh_installchangelogs -a ChangeLog
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a -V
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/dependencies/tqt3/debian/control b/debian/_base/dependencies/tqt3/debian/control
index 301caf4c8..5fe6f7d10 100644
--- a/debian/_base/dependencies/tqt3/debian/control
+++ b/debian/_base/dependencies/tqt3/debian/control
@@ -19,10 +19,11 @@ Homepage: http://www.trinitydesktop.org
 
 Package: libtqt3-mt
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt (<< 4:14.0.0~)
 Breaks: libtqt3-mt (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, fontconfig
+Depends: libtqt3-mt-data (= ${binary:Version}), ${shlibs:Depends}, fontconfig
 Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
 Suggests: libtqt3-mt-psql, libtqt3-mt-mysql, libtqt3-mt-odbc
 Description: TQt GUI Library (Threaded runtime version), Version 3
@@ -30,8 +31,20 @@ Description: TQt GUI Library (Threaded runtime version), Version 3
  applications that link against the libtqt-mt.so.3, e.g. all Trinity
  applications.
 
+Package: libtqt3-mt-data
+Architecture: all
+Multi-Arch: foreign
+Section: libs
+Conflicts: libtqt3-mt (<< 4:14.0.12~)
+Depends: ${shlibs:Depends}
+Description: Data for TQt GUI Library (Threaded runtime version), Version 3
+ This is the Trolltech TQt library, version 3. It's necessary for
+ applications that link against the libtqt-mt.so.3, e.g. all Trinity
+ applications.
+
 Package: libtqt3-mt-mysql
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-mysql (<< 4:14.0.0~)
 Breaks: libtqt3-mt-mysql (<< 4:14.0.0~)
@@ -42,6 +55,7 @@ Description: MySQL database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-odbc
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-odbc (<< 4:14.0.0~)
 Breaks: libtqt3-mt-odbc (<< 4:14.0.0~)
@@ -52,6 +66,7 @@ Description: ODBC database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-psql
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-psql (<< 4:14.0.0~)
 Breaks: libtqt3-mt-psql (<< 4:14.0.0~)
@@ -63,6 +78,7 @@ Description: PostgreSQL database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-ibase
 Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Description: InterBase/FireBird database driver for TQt3 (Threaded)
@@ -72,6 +88,7 @@ Description: InterBase/FireBird database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-sqlite
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-sqlite (<< 4:14.0.0~)
 Breaks: libtqt3-mt-sqlite (<< 4:14.0.0~)
@@ -83,6 +100,7 @@ Description: SQLite database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-sqlite3
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Description: SQLite3 database driver for TQt3 (Threaded)
@@ -92,9 +110,11 @@ Description: SQLite3 database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-dev
 Architecture: any
+Multi-Arch: no
 Section: libdevel
 Replaces: libtqt3-mt-dev (<< 4:14.0.0~)
 Breaks: libtqt3-mt-dev (<< 4:14.0.0~)
+Conflicts: libtqt3-mt (<< 4:14.0.12~)
 Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
@@ -121,7 +141,8 @@ Description: TQt development files (Threaded)
  before you send a bugreport.
 
 Package: libtqt3-headers
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
 Section: devel
 Replaces: libtqt3-headers (<< 4:14.0.0~)
 Breaks: libtqt3-headers (<< 4:14.0.0~)
@@ -132,7 +153,8 @@ Description:  TQt3 header files
  have to install this package.
 
 Package: libtqt3-compat-headers
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
 Section: devel
 Replaces: libtqt3-compat-headers (<< 4:14.0.0~)
 Breaks: libtqt3-compat-headers (<< 4:14.0.0~)
@@ -149,6 +171,7 @@ Description: TQt 1.x and 2.x compatibility includes
 
 Package: tqt3-dev-tools
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-dev-tools (<< 4:14.0.0~)
 Breaks: tqt3-dev-tools (<< 4:14.0.0~)
@@ -161,10 +184,11 @@ Description: TQt3 development tools
 
 Package: tqt3-designer
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-designer (<< 4:14.0.0~)
 Breaks: tqt3-designer (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
+Depends: tqt3-designer-plugins (= ${binary:Version}), ${shlibs:Depends}
 Recommends: tqt3-dev-tools
 Suggests: tqt3-assistant, tqt3-doc
 Description: TQt3 Designer
@@ -177,8 +201,18 @@ Description: TQt3 Designer
  automatically for the developer with a project management with qmake
  or automake.
 
+Package: tqt3-designer-plugins
+Architecture: any
+Multi-Arch: same
+Section: devel
+Conflicts: tqt3-designer (<< 4:14.0.12~)
+Depends: ${shlibs:Depends}
+Description: TQt3 Designer plugins
+ This package contains plugins for TQt3 Designer
+
 Package: tqt3-apps-dev
 Architecture: any
+Multi-Arch: no
 Section: devel
 Replaces: tqt3-apps-dev (<< 4:14.0.0~)
 Breaks: tqt3-apps-dev (<< 4:14.0.0~)
@@ -194,6 +228,7 @@ Description: TQt3 Developer applications development files
 
 Package: tqt3-linguist
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-linguist (<< 4:14.0.0~)
 Breaks: tqt3-linguist (<< 4:14.0.0~)
@@ -207,6 +242,7 @@ Description: The TQt3 Linguist
 
 Package: tqt3-assistant
 Architecture: any
+Multi-Arch: foreign
 Section: x11
 Replaces: tqt3-assistant (<< 4:14.0.0~)
 Breaks: tqt3-assistant (<< 4:14.0.0~)
@@ -225,6 +261,7 @@ Description: The TQt3 assistant application
 
 Package: tqt3-qtconfig
 Architecture: any
+Multi-Arch: foreign
 Section: x11
 Replaces: tqt3-qtconfig (<< 4:14.0.0~)
 Breaks: tqt3-qtconfig (<< 4:14.0.0~)
@@ -240,6 +277,7 @@ Description: The TQt3 Configuration Application
 
 Package: tqt3-dev-tools-embedded
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0~)
 Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0~)
@@ -254,6 +292,7 @@ Description: Tools to develop embedded TQt applications
 
 Package: tqt3-dev-tools-compat
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-dev-tools-compat (<< 4:14.0.0~)
 Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~)
@@ -270,6 +309,7 @@ Description: Conversion utilities for TQt3 development
 
 Package: libtqt3-i18n
 Architecture: all
+Multi-Arch: foreign
 Section: libs
 Replaces: libtqt3-i18n (<< 4:14.0.0~)
 Breaks: libtqt3-i18n (<< 4:14.0.0~)
@@ -281,6 +321,7 @@ Description: i18n files for TQt3 library
 
 Package: tqt3-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Replaces: tqt3-doc (<< 4:14.0.0~)
 Breaks: tqt3-doc (<< 4:14.0.0~)
@@ -294,6 +335,7 @@ Description: TQt3 API documentation
 
 Package: tqt3-examples
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Replaces: tqt3-examples (<< 4:14.0.0~)
 Breaks: tqt3-examples (<< 4:14.0.0~)
@@ -308,6 +350,7 @@ Description:  Examples for TQt3
 Package: tqt-x11-free-dbg
 Section: libdevel
 Architecture: any
+Multi-Arch: no
 Replaces: tqt-x11-free-dbg (<< 4:14.0.0~)
 Breaks: tqt-x11-free-dbg (<< 4:14.0.0~)
 Priority: extra
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-data.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-data.install
new file mode 100644
index 000000000..b9308b1b4
--- /dev/null
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-data.install
@@ -0,0 +1 @@
+../../debian/qtrc etc/tqt3/
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
index 275c3ca79..c86cba1b1 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
@@ -1,9 +1,9 @@
-usr/lib/libtqt-mt.la
-usr/lib/libtqt-mt.prl
-usr/lib/libtqt-mt.so
-usr/lib/libtqui.prl
-usr/lib/libtqui.so
-usr/lib/pkgconfig/tqt-mt.pc
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc
 usr/include/tqt3/ntqconfig.h
 usr/include/tqt3/ntqgl.h
 usr/include/tqt3/ntqglcolormap.h
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links
index e382bae07..9da3a5e25 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links
@@ -1,7 +1,11 @@
-/usr/lib/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la
-/usr/lib/libtqui.prl /usr/share/tqt3/lib/libtqui.prl
-/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so
-/usr/lib/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl
-/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl /usr/share/tqt3/lib/libtqui.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5
+/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins /usr/share/tqt3/plugins
 /usr/include/tqt3 /usr/share/tqt3/include
-/usr/lib/tqt3/plugins /usr/share/tqt3/plugins
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install
index 37bbf0bb1..1cdae4fe4 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlibase.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlibase.so
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install
index efdb699be..8f5572965 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlmysql.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlmysql.so
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install
index 3b949c134..d51b3fd7f 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlodbc.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlodbc.so
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install
index b93ebe333..a5e2b70cd 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlpsql.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlpsql.so
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
index 928632aa1..d637b096b 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlite.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite.so
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
index fccd1c31b..3f3392374 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlite3.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite3.so
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt.install
index 519221dff..33303e90c 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt.install
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt.install
@@ -1,6 +1,4 @@
-usr/lib/libtqt-mt.so.*
-usr/lib/libtqui.so.1.*
-usr/lib/tqt3/plugins/imageformats/libqmng.so
-usr/lib/tqt3/plugins/inputmethods/*.so
-../../debian/qtrc etc/tqt3/                                                                              
-../../debian/qt_plugins_3.3rc etc/tqt3/                                                                  
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.*
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libqmng.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/inputmethods/*.so
diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt.links b/debian/_base/dependencies/tqt3/debian/libtqt3-mt.links
index fee2958d8..8c8f30e38 100644
--- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt.links
+++ b/debian/_base/dependencies/tqt3/debian/libtqt3-mt.links
@@ -1,5 +1 @@
-/usr/lib/libtqui.so.1.0.0 /usr/lib/libtqui.so.1 
-/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1
-/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0
-/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3
-/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1
diff --git a/debian/_base/dependencies/tqt3/debian/qtrc b/debian/_base/dependencies/tqt3/debian/qtrc
index 3c977f4d1..4f44006ae 100644
--- a/debian/_base/dependencies/tqt3/debian/qtrc
+++ b/debian/_base/dependencies/tqt3/debian/qtrc
@@ -1,6 +1,3 @@
-[3.3]
-libraryPath=/usr/lib/trinity/plugins/
-
 [General]
 GUIEffects=general^eanimatecombo^e
 embedFonts=true
@@ -12,7 +9,6 @@ style=Plastik
 
 [KDE]
 contrast=7
-kdeAddedLibraryPaths=/usr/lib/trinity/plugins/^e
 
 [KWinPalette]
 activeBackground=#1f26ad
@@ -29,4 +25,4 @@ inactiveTitleBtnBg=#ebebeb
 [Palette]
 active=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
 disabled=#808080^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#c7c7c7^e#ffffff^e#808080^e#ffffff^e#efefef^e#000000^e#567594^e#ffffff^e#0000ee^e#52188b^e
-inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
\ No newline at end of file
+inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules
index 43b2277de..463c7b7b9 100755
--- a/debian/_base/dependencies/tqt3/debian/rules
+++ b/debian/_base/dependencies/tqt3/debian/rules
@@ -60,7 +60,8 @@ CONFIGURE_OPTS = \
 		-datadir	"/usr/share/tqt3"		\
 		-headerdir	"/usr/include/tqt3"		\
 		-docdir		"/usr/share/tqt3/doc"		\
-		-plugindir	"/usr/lib/tqt3/plugins"		\
+		-libdir		"/usr/lib/$(DEB_HOST_MULTIARCH)"		\
+		-plugindir	"/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins"	\
 		-translationdir	"/usr/share/tqt3/translations"	\
 						\
 		-thread				\
@@ -217,6 +218,12 @@ clean::
 
 	cd examples/ && find . -name '.obj' | xargs rm -rf
 
+	# revert multi-arch path in install files
+	for a in debian/*install debian/*links; do \
+	    [ ! -f $$a.arch ] || \
+	    mv $$a.arch $$a; \
+	done
+
 	dh_clean
 
 install: build
@@ -227,8 +234,14 @@ install: build
 	dh_clean -i
 	dh_installdirs
 
+	# update multi-arch path in install files
+	for a in debian/*install debian/*links; do \
+	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+	done
+
 	# fix .prl files
-	for a in $(TMP_INSTALL)/usr/lib/*prl; do cat "$$a" | sed \
+	for a in $(TMP_INSTALL)/usr/lib/$(DEB_HOST_MULTIARCH)/*prl; do cat "$$a" | sed \
 	"s#$(QTDIR)#/usr/share/tqt3#g" > "$$a".new && mv "$$a".new "$$a"; done
 
 	dh_install $(IBASE) --sourcedir=$(TMP_INSTALL)
diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
index 97e2de476..d60b07fc7 100644
--- a/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libtqteditor.*
-usr/lib/libtqtdesignercore.*
-usr/lib/libtqassistantclient.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.*
 usr/include/tqt3/ntqassistantclient.h
diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.links b/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
index b62dc9759..72bd7093a 100644
--- a/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
+++ b/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
@@ -1,8 +1,8 @@
-/usr/lib/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl
-/usr/lib/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a
-/usr/lib/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl
-/usr/lib/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a
-/usr/lib/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl
-/usr/lib/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a
 /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor
 /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces
diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-designer-plugins.install b/debian/_base/dependencies/tqt3/debian/tqt3-designer-plugins.install
new file mode 100644
index 000000000..13fed3016
--- /dev/null
+++ b/debian/_base/dependencies/tqt3/debian/tqt3-designer-plugins.install
@@ -0,0 +1 @@
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*
diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-designer.install b/debian/_base/dependencies/tqt3/debian/tqt3-designer.install
index a5394810b..6cfffd9cd 100644
--- a/debian/_base/dependencies/tqt3/debian/tqt3-designer.install
+++ b/debian/_base/dependencies/tqt3/debian/tqt3-designer.install
@@ -7,4 +7,3 @@ usr/share/tqt3/templates/*
 usr/share/tqt3/doc/html/designer*html
 usr/share/tqt3/doc/html/designer*dcf
 usr/share/tqt3/doc/html/designer*jpg
-usr/lib/tqt3/plugins/designer/*
diff --git a/debian/_base/dependencies/tqtinterface/debian/control b/debian/_base/dependencies/tqtinterface/debian/control
index 9000f3df6..4bd9ab301 100644
--- a/debian/_base/dependencies/tqtinterface/debian/control
+++ b/debian/_base/dependencies/tqtinterface/debian/control
@@ -7,6 +7,7 @@ Standards-Version: 3.8.4
 
 Package: libtqtinterface
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqtinterface (<< 4:14.0.0~)
 Breaks: libtqtinterface (<< 4:14.0.0~)
@@ -19,6 +20,7 @@ Description: The Trinity Qt Interface Libraries
 
 Package: libtqtinterface-dev
 Architecture: all
+Multi-Arch: foreign
 Section: libs
 Replaces: libtqtinterface-dev (<< 4:14.0.0~)
 Breaks: libtqtinterface-dev (<< 4:14.0.0~)
@@ -31,6 +33,7 @@ Description: The Trinity Qt Interface Libraries (Development Files)
 
 Package: libtqtinterface-doc
 Architecture: all
+Multi-Arch: foreign
 Section: libs
 Replaces: libtqtinterface-doc (<< 4:14.0.0~)
 Breaks: libtqtinterface-doc (<< 4:14.0.0~)
@@ -43,6 +46,7 @@ Description: The Trinity Qt Interface Libraries (Debug Files)
 
 Package: libtqtinterface-dbg
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqtinterface-dbg (<< 4:14.0.0~)
 Breaks: libtqtinterface-dbg (<< 4:14.0.0~)
diff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules
index 1b9c978a0..1e56fa6e0 100755
--- a/debian/_base/dependencies/tqtinterface/debian/rules
+++ b/debian/_base/dependencies/tqtinterface/debian/rules
@@ -7,9 +7,16 @@ include debian/cdbs/debian-tde.mk
 version=Debian Package $(DEB_VERSION)
 DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
 
+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" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
  -DWITH_QT3="ON"
diff --git a/debian/_base/libraries/libkdcraw/debian/control b/debian/_base/libraries/libkdcraw/debian/control
index d5d3617d4..31100f835 100644
--- a/debian/_base/libraries/libkdcraw/debian/control
+++ b/debian/_base/libraries/libkdcraw/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
  liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config,
- automake, autoconf, libtool, libltdl-dev
+ libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] | libiomp-dev [amd64 arm64 armhf i386 mips64el ppc64el]
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
 
diff --git a/debian/_base/libraries/libkdcraw/debian/docs b/debian/_base/libraries/libkdcraw/debian/docs
index 50bd824bb..46a4ca718 100644
--- a/debian/_base/libraries/libkdcraw/debian/docs
+++ b/debian/_base/libraries/libkdcraw/debian/docs
@@ -1,2 +1,3 @@
+AUTHORS
 NEWS
-README
+README.md
diff --git a/debian/_base/libraries/libkdcraw/debian/rules b/debian/_base/libraries/libkdcraw/debian/rules
index a5de48a38..f69d1ece9 100755
--- a/debian/_base/libraries/libkdcraw/debian/rules
+++ b/debian/_base/libraries/libkdcraw/debian/rules
@@ -1,19 +1,20 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
 
 # add installed liblcms*-dev to libkdcraw3-trinity-dev depends
 common-binary-arch::
diff --git a/debian/_base/libraries/libkexiv2/debian/docs b/debian/_base/libraries/libkexiv2/debian/docs
index 6f83607c1..46a4ca718 100644
--- a/debian/_base/libraries/libkexiv2/debian/docs
+++ b/debian/_base/libraries/libkexiv2/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 NEWS
-README
+README.md
diff --git a/debian/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install b/debian/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
index 9b1cac640..92d306bd5 100644
--- a/debian/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
+++ b/debian/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
@@ -1,3 +1,4 @@
 debian/tmp/opt/trinity/lib/libksquirrel-libs*.so.*
 debian/tmp/opt/trinity/lib/ksquirrel-libs/libkls*.so.*
 debian/tmp/opt/trinity/share/ksquirrel-libs/*
+debian/tmp/opt/trinity/share/man/man1/*
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
deleted file mode 100644
index 51c0b6a04..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-camera2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-camera2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-camera2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
deleted file mode 100644
index df2cd06d1..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-dicom2png 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-dicom2png
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-dicom2png [OPTION]... [FILE]...
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH OPTIONS
-.TP
-.B  \-v
-Print verbose messages
-.TP
-.B  \-c
-Write image data to standard output
-.TP
-.B  \-e
-Extract embedded thumbnail image
-.TP
-.B  \-i
-Identify files without decoding them
-.TP
-.B  \-i -v
-Identify files and show metadata
-.TP
-.B  \-z
-Change file dates to camera timestamp
-.TP
-.B  \-w
-Use camera white balance, if possible
-.TP
-.B  \-a
-Average the whole image for white balance
-.TP
-.B  \-A <x y w h>
-Average a grey box for white balance
-.TP
-.B  \-r <r g b g>
-Set custom white balance
-.TP
-.B  \+M\/\-M
-Use/don't use an embedded color matrix
-.TP
-.B  \-C <r b>
-Correct chromatic aberration
-.TP
-.B  \-b <num>
-Adjust brightness (default = 1.0)
-.TP
-.B  \-n <num>
-Set threshold for wavelet denoising
-.TP
-.B  \-k <num>
-Set black point
-.TP
-.B  \-K <file>
-Subtract dark frame (16-bit raw PGM)
-.TP
-.B  \-H [0-9]
-Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)
-.TP
-.B  \-t [0-7]
-Flip image (0=none, 3=180, 5=90CCW, 6=90CW)
-.TP
-.B  \-o [0-5]
-Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)
-.TP
-.B  \-o <file>
-Apply output ICC profile from file
-.TP
-.B  \-p <file>
-Apply camera ICC profile from file or "embed"
-.TP
-.B  \-d
-Document mode (no color, no interpolation)
-.TP
-.B  \-D
-Document mode without scaling (totally raw)
-.TP
-.B  \-j
-Don't stretch or rotate raw pixels
-.TP
-.B  \-q [0-3]
-Set the interpolation quality
-.TP
-.B  \-h
-Half-size color image (twice as fast as "-q 0")
-.TP
-.B  \-f
-Interpolate RGGB as four colors
-.TP
-.B  \-m <num>
-Apply a 3x3 median filter to R-G and B-G
-.TP
-.B  \-s [0..N-1]
-Select one raw image or "all" from each file
-.TP
-.B  \-4
-Write 16-bit linear instead of 8-bit with gamma
-.TP
-.B  \-T
-Write TIFF instead of PPM
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
deleted file mode 100644
index cfe155b5a..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-dicom2png 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-dicom2png
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-dicom2png
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
deleted file mode 100644
index 9ddc44614..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-fig2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-fig2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-fig2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
deleted file mode 100644
index 4b1477bef..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-iff2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-iff2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-iff2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
deleted file mode 100644
index 81ce62873..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-leaf2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-leaf2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-leaf2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
deleted file mode 100644
index 6b38ef8da..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-ljpeg2ppm-s 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-ljpeg2ppm-s
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-ljpeg2ppm-s
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
deleted file mode 100644
index 21109a348..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-ljpeg2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-ljpeg2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-ljpeg2ppm [ -v -h ] [ inFile [outFile] ]
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
deleted file mode 100644
index 26aa84076..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-mac2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-mac2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-mac2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
deleted file mode 100644
index fcd6d5171..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-neo2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-neo2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-neo2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
deleted file mode 100644
index ba620502c..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-pi12ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-pi12ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-pi12ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
deleted file mode 100644
index d662bec23..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-pi32ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-pi32ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-pi32ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
deleted file mode 100644
index 585d8cb36..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-svg2png 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-svg2png
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-svg2png
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
deleted file mode 100644
index 7c0950acd..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-ttf2pnm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-ttf2pnm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-ttf2pnm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
deleted file mode 100644
index ddec06008..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-utah2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-utah2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-utah2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
deleted file mode 100644
index 3148b5faa..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-xcf2pnm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-xcf2pnm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-xcf2pnm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
deleted file mode 100644
index 041fdb9ed..000000000
--- a/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-xim2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-xim2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-xim2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/debian/_base/libraries/libksquirrel/debian/watch b/debian/_base/libraries/libksquirrel/debian/watch
deleted file mode 100644
index d9b799728..000000000
--- a/debian/_base/libraries/libksquirrel/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/ksquirrel/ksquirrel-libs-(.+).tar.bz2
diff --git a/debian/_base/libraries/libtdeldap/debian/docs b/debian/_base/libraries/libtdeldap/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/libraries/libtdeldap/debian/docs
+++ b/debian/_base/libraries/libtdeldap/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/debian/_base/libraries/libtqt-perl/debian/rules b/debian/_base/libraries/libtqt-perl/debian/rules
index c498ce8ca..85d92e923 100755
--- a/debian/_base/libraries/libtqt-perl/debian/rules
+++ b/debian/_base/libraries/libtqt-perl/debian/rules
@@ -24,7 +24,6 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
 	--prefix=/opt/trinity \
 	--mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
-	--with-qt-dir=/usr/share/tqt3 \
 	--disable-rpath \
 
 DEB_MAKE_INSTALL_TARGET := install \
diff --git a/debian/_base/libraries/python-trinity/debian/NEWS.Debian b/debian/_base/libraries/pytde/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/debian/_base/libraries/python-trinity/debian/NEWS.Debian
+++ b/debian/_base/libraries/pytde/debian/NEWS.Debian
diff --git a/debian/_base/libraries/python-trinity/debian/changelog b/debian/_base/libraries/pytde/debian/changelog
index 12485eccd..12485eccd 100644
--- a/debian/_base/libraries/python-trinity/debian/changelog
+++ b/debian/_base/libraries/pytde/debian/changelog
diff --git a/debian/_base/libraries/pytde/debian/compat b/debian/_base/libraries/pytde/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/_base/libraries/python-trinity/debian/control b/debian/_base/libraries/pytde/debian/control
index 633a24c00..633a24c00 100644
--- a/debian/_base/libraries/python-trinity/debian/control
+++ b/debian/_base/libraries/pytde/debian/control
diff --git a/debian/_base/libraries/python-trinity/debian/copyright b/debian/_base/libraries/pytde/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/debian/_base/libraries/python-trinity/debian/copyright
+++ b/debian/_base/libraries/pytde/debian/copyright
diff --git a/debian/_base/libraries/pytde/debian/patches/.gitignore b/debian/_base/libraries/pytde/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/patches/.gitignore
diff --git a/debian/_base/libraries/python-trinity/debian/pytdeconfig.py b/debian/_base/libraries/pytde/debian/pytdeconfig.py
index eac264752..eac264752 100644
--- a/debian/_base/libraries/python-trinity/debian/pytdeconfig.py
+++ b/debian/_base/libraries/pytde/debian/pytdeconfig.py
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/debian/_base/libraries/pytde/debian/python-trinity-trinity-dev.dirs
index c395de89f..c395de89f 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-dev.dirs
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/debian/_base/libraries/pytde/debian/python-trinity-trinity-dev.install
index f7d970bcb..f7d970bcb 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-dev.install
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.dirs
index 96235463f..96235463f 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.dirs
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
index bb9705168..bb9705168 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.examples
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.install
index 20b273acb..20b273acb 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity-doc.install
diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install b/debian/_base/libraries/pytde/debian/python-trinity-trinity.install
index facee2907..facee2907 100644
--- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install
+++ b/debian/_base/libraries/pytde/debian/python-trinity-trinity.install
diff --git a/debian/_base/libraries/python-trinity/debian/rules b/debian/_base/libraries/pytde/debian/rules
index ddbb6b15f..ddbb6b15f 100755
--- a/debian/_base/libraries/python-trinity/debian/rules
+++ b/debian/_base/libraries/pytde/debian/rules
diff --git a/debian/_base/libraries/pytde/debian/source/format b/debian/_base/libraries/pytde/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/_base/libraries/pytde/debian/source/options b/debian/_base/libraries/pytde/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/debian/_base/libraries/pytde/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/debian/_base/libraries/python-trinity/debian/watch b/debian/_base/libraries/pytde/debian/watch
index 8b3afcac0..8b3afcac0 100644
--- a/debian/_base/libraries/python-trinity/debian/watch
+++ b/debian/_base/libraries/pytde/debian/watch
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/control b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
index 96e43f1c5..0995fbb9f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
@@ -10,8 +10,7 @@ Architecture: all
 Depends: crystalcursors,
  tde-style-lipstik-trinity,
  kcalc-trinity,
- acpi-support,
- acpid,
+ acpi-support | systemd | elogind,
  alsa-utils,
  anacron,
  ark-trinity,
@@ -100,14 +99,13 @@ Recommends: firefox | iceweasel,
  dmz-cursor-theme,
  dvd+rw-tools,
  printer-driver-foo2zjs | foo2zjs,
- foomatic-db-gutenprint,
+ printer-driver-gutenprint | foomatic-db-gutenprint,
  fortune-mod,
  gcc,
  gdebi-tde-trinity,
  gwenview-trinity,
- hpijs-ppds,
- hplip,
- ijsgutenprint,
+ printer-driver-hpijs | hpijs-ppds,
+ printer-driver-hpcups | hplip,
  jockey-gtk,
  k3b-trinity,
  kaddressbook-trinity,
@@ -192,7 +190,6 @@ Recommends: firefox | iceweasel,
  tdmtheme-trinity,
  kubuntu-tdm-themes,
  plymouth-theme-kubuntu-logo-trinity,
- powermanagement-interface,
  gtk-qt-engine-trinity,
  gtk3-tqt-engine-trinity,
  qt4-tqt-theme-engine,
@@ -206,6 +203,6 @@ Suggests: adept-trinity,
  tde-guidance-trinity,
  apport-gtk,
  hplip-gui
-Conflicts: redmond-default-settings-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
+Conflicts: redmond-default-settings-trinity, desktop-base, desktop-base-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
 Description: Redmond II default settings and artwork for the Kubuntu Trinity desktop
  This package includes artwork and Kubuntu branding.
diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm b/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
index 2cbdac854..adada03a7 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
+++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
@@ -28,6 +28,9 @@ case "$1" in
   upgrade)
         ;;
 
+  abort-install)
+        ;;
+
   *)
 	echo "Unknown argument ($1) for $0"
     ;;
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/control b/debian/_base/metapackages/redmond-default-settings/debian/control
index e89dcad2f..e5cd8938c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings/debian/control
@@ -10,8 +10,7 @@ Architecture: all
 Depends: crystalcursors,
  tde-style-lipstik-trinity,
  kcalc-trinity,
- acpi-support,
- acpid,
+ acpi-support | systemd | elogind,
  alsa-utils,
  anacron,
  ark-trinity,
@@ -100,14 +99,13 @@ Recommends: firefox | iceweasel,
  dmz-cursor-theme,
  dvd+rw-tools,
  printer-driver-foo2zjs | foo2zjs,
- foomatic-db-gutenprint,
+ printer-driver-gutenprint | foomatic-db-gutenprint,
  fortune-mod,
  gcc,
  gdebi-tde-trinity,
  gwenview-trinity,
- hpijs-ppds,
- hplip,
- ijsgutenprint,
+ printer-driver-hpijs | hpijs-ppds,
+ printer-driver-hpcups | hplip,
  jockey-gtk,
  k3b-trinity,
  kaddressbook-trinity,
@@ -192,7 +190,6 @@ Recommends: firefox | iceweasel,
  tdmtheme-trinity,
  kubuntu-tdm-themes,
  plymouth-theme-kubuntu-logo-trinity,
- powermanagement-interface,
  gtk-qt-engine-trinity,
  gtk3-tqt-engine-trinity,
  qt4-tqt-theme-engine,
@@ -206,6 +203,6 @@ Suggests: adept-trinity,
  tde-guidance-trinity,
  apport-gtk,
  hplip-gui
-Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
+Conflicts: desktop-base, desktop-base-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
 Description: Redmond default settings and artwork for the Kubuntu Trinity desktop
  This package includes artwork and Kubuntu branding.
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm b/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
index 2cbdac854..adada03a7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
+++ b/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
@@ -28,6 +28,9 @@ case "$1" in
   upgrade)
         ;;
 
+  abort-install)
+        ;;
+
   *)
 	echo "Unknown argument ($1) for $0"
     ;;
diff --git a/debian/_base/metapackages/synaptic-trinity/debian/postrm b/debian/_base/metapackages/synaptic-trinity/debian/postrm
index 840ae090e..b06e07e58 100644
--- a/debian/_base/metapackages/synaptic-trinity/debian/postrm
+++ b/debian/_base/metapackages/synaptic-trinity/debian/postrm
@@ -18,6 +18,8 @@ case "$1" in
     ;;
   upgrade)
     ;;
+  abort-install)
+    ;;
   *) echo "$0: didn't understand being called with \`$1'" 1>&2
      exit 0;;
 esac
diff --git a/debian/jessie b/debian/bookworm
index e7c887a6f..e7c887a6f 120000
--- a/debian/jessie
+++ b/debian/bookworm
diff --git a/dilos/common/cmake/debian/control b/dilos/common/cmake/debian/control
index 1363e01ee..50ea830ef 100644
--- a/dilos/common/cmake/debian/control
+++ b/dilos/common/cmake/debian/control
@@ -2,7 +2,7 @@ Source: cmake-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
 Standards-Version: 3.8.4
 
 Package: cmake-trinity
diff --git a/dilos/core/tde-i18n/debian/rules b/dilos/core/tde-i18n/debian/rules
index 1631906ea..0303b4496 100755
--- a/dilos/core/tde-i18n/debian/rules
+++ b/dilos/core/tde-i18n/debian/rules
@@ -149,6 +149,7 @@ binary-indep: build install
 	dh_installdocs
 	dh_installmenu
 	dh_installchangelogs
+	dh_link
 	dh_strip
 	$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
 	dh_strip_nondeterminism)
diff --git a/dilos/core/tdeaddons/debian/atlantikdesigner-trinity.install b/dilos/core/tdeaddons/debian/atlantikdesigner-trinity.install
index cb53a8d8c..8fa30fdff 100644
--- a/dilos/core/tdeaddons/debian/atlantikdesigner-trinity.install
+++ b/dilos/core/tdeaddons/debian/atlantikdesigner-trinity.install
@@ -5,3 +5,4 @@ debian/tmp/usr/share/doc/tde/HTML/en/atlantikdesigner
 debian/tmp/usr/share/icons/hicolor/32x32/apps/atlantikdesigner.png
 debian/tmp/usr/share/icons/hicolor/16x16/apps/atlantikdesigner.png
 debian/icons/atlantikdesigner.xpm /usr/share/pixmaps
+debian/tmp/usr/share/man/man1/atlantikdesigner.1
diff --git a/dilos/core/tdeaddons/debian/atlantikdesigner-trinity.manpages b/dilos/core/tdeaddons/debian/atlantikdesigner-trinity.manpages
deleted file mode 100644
index f0b5385f4..000000000
--- a/dilos/core/tdeaddons/debian/atlantikdesigner-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/atlantikdesigner-trinity.1
diff --git a/dilos/core/tdeaddons/debian/konq-plugins-trinity.install b/dilos/core/tdeaddons/debian/konq-plugins-trinity.install
index a78976309..d343142f8 100644
--- a/dilos/core/tdeaddons/debian/konq-plugins-trinity.install
+++ b/dilos/core/tdeaddons/debian/konq-plugins-trinity.install
@@ -164,6 +164,10 @@ debian/tmp/usr/share/icons/hicolor/64x64/apps/metabar.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/metabar.svgz
 debian/tmp/usr/share/icons/hicolor/128x128/apps/metabar.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
+debian/tmp/usr/share/man/man1/exif.py.1
+debian/tmp/usr/share/man/man1/fsview.1
+debian/tmp/usr/share/man/man1/jpegorient.1
+debian/tmp/usr/share/man/man1/orient.py.1
 debian/tmp/usr/share/services/akregator_konqplugin.desktop
 debian/tmp/usr/share/services/ark_plugin.desktop
 debian/tmp/usr/share/services/fsview_part.desktop
diff --git a/dilos/core/tdeaddons/debian/konq-plugins-trinity.manpages b/dilos/core/tdeaddons/debian/konq-plugins-trinity.manpages
deleted file mode 100644
index b33b9ee5a..000000000
--- a/dilos/core/tdeaddons/debian/konq-plugins-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/exif-trinity.py.1
-debian/man/fsview-trinity.1
-debian/man/jpegorient-trinity.1
-debian/man/orient-trinity.py.1
diff --git a/dilos/core/tdeaddons/debian/ksig-trinity.install b/dilos/core/tdeaddons/debian/ksig-trinity.install
index 45758cba7..dfb6325dc 100644
--- a/dilos/core/tdeaddons/debian/ksig-trinity.install
+++ b/dilos/core/tdeaddons/debian/ksig-trinity.install
@@ -8,3 +8,4 @@ debian/tmp/usr/share/doc/tde/HTML/en/ksig/common
 debian/tmp/usr/share/doc/tde/HTML/en/ksig/index.cache.bz2
 debian/tmp/usr/share/doc/tde/HTML/en/ksig/index.docbook
 debian/tmp/usr/share/doc/tde/HTML/en/ksig/screenshot.png
+debian/tmp/usr/share/man/man1/ksig.1
diff --git a/dilos/core/tdeaddons/debian/ksig-trinity.manpages b/dilos/core/tdeaddons/debian/ksig-trinity.manpages
deleted file mode 100644
index 2b3ef735d..000000000
--- a/dilos/core/tdeaddons/debian/ksig-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ksig-trinity.1
diff --git a/dilos/core/tdeaddons/debian/man/atlantikdesigner-trinity.1 b/dilos/core/tdeaddons/debian/man/atlantikdesigner-trinity.1
deleted file mode 100644
index 41a1aeb2b..000000000
--- a/dilos/core/tdeaddons/debian/man/atlantikdesigner-trinity.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ATLANTIKDESIGNER 1 "October 14, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-atlantikdesigner \- game board designer for Atlantik
-.SH SYNOPSIS
-.B atlantikdesigner
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBAtlantik Designer\fP is a game board designer for Atlantik.
-.PP
-Atlantik is a TDE client for playing Monopoly-like board games on the
-monopd network.  It can play any board supported by the network
-server, including the classic Monopoly game as well as the Atlantik
-game in which the properties include several major cities in North
-America and Europe.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-For a full summary of options, run \fIatlantikdesigner \-\-help\fP.
-.SH SEE ALSO
-.BR atlantik (6).
-.SH AUTHOR
-Atlantik Designer was written by Jason Katz-Brown <jason@katzbrown.com>
-and Rob Kaper <cap@capsi.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/man/exif-trinity.py.1 b/dilos/core/tdeaddons/debian/man/exif-trinity.py.1
deleted file mode 100644
index 73179046f..000000000
--- a/dilos/core/tdeaddons/debian/man/exif-trinity.py.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXIF.PY 1 "February 4, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-exif.py \- extract EXIF information from digital camera image files
-.SH SYNOPSIS
-.B exif.py
-\fIimage-file\fP ...
-.SH DESCRIPTION
-This is a Python library for extracting EXIF tags from digital camera
-image files.  It contains a command-line testing and debugging interface,
-which reads EXIF tags from the given files and dumps them to the
-console.
-.PP
-This library is provided with the image conversion and transformation
-plugins for Konqueror.  The JPEG rotation/reflection tool \fBjpegorient\fP,
-part of the same set of plugins, makes use of this library.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH SEE ALSO
-.BR jpegorient (1),
-.BR konqueror (1),
-.BR orient.py (1).
-.SH AUTHOR
-The EXIF extraction library was written by Thierry Bousch
-<bousch@topo.math.u-psud.fr>, Gene Cash <gcash@cfl.rr.com> and
-Leif Jensen <jensen@math.columbia.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/man/fsview-trinity.1 b/dilos/core/tdeaddons/debian/man/fsview-trinity.1
deleted file mode 100644
index a1dd43b20..000000000
--- a/dilos/core/tdeaddons/debian/man/fsview-trinity.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FSVIEW 1 "February 4, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fsview \- a filesystem viewer that graphically shows disk usage
-.SH SYNOPSIS
-.B fsview
-.RI "[ " generic-options " ]"
-[ \fIfolder\fP ]
-.SH DESCRIPTION
-\fBFSView\fP is a tool for showing disc utilization in a graphical form, much
-like the UNIX command 'du'.  The visualisation type chosen is a
-treemap.  Each directory is represented by a rectangle whose area is
-proportional to its size.  Each directory rectangle contains smaller
-rectangles for its contents, and so on down.
-.PP
-FSView is provided both as a Konqueror plugin for viewing directories,
-and as a standalone executable.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the fsview-specific options.
-For a full summary of options, run \fIfsview \-\-help\fP.
-.TP
-\fIfolder\fP
-View the filesystem starting from this folder.
-.SH SEE ALSO
-.BR du (1),
-.BR kdirstat (1),
-.BR konqueror (1).
-.PP
-For a full featured graphical 'du', see KDirStat.  It's quite similar
-to FSView, but allows for lot of cleanup actions.
-.SH AUTHOR
-FSView was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/man/jpegorient-trinity.1 b/dilos/core/tdeaddons/debian/man/jpegorient-trinity.1
deleted file mode 100644
index 3317c868c..000000000
--- a/dilos/core/tdeaddons/debian/man/jpegorient-trinity.1
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH JPEGORIENT 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-jpegorient \- change the orientations of JPEG images
-.SH SYNOPSIS
-.B jpegorient
-{ \fB\-90\fP | \fB\-180\fP | \fB\-270\fP | \fB\-v\fP | \fB\-h\fP }
-\fIimage-file\fP ...
-.SH DESCRIPTION
-This is a simple utility for changing the orientations of one or more
-JPEG images.
-It is provided as part of the image conversion and transformation
-plugins for Konqueror.
-.PP
-A single option must be passed before any filenames to specify how the
-orientations of the images are to be changed.  Each new image will be
-saved over the old one.
-.PP
-This utility makes use of
-.BR orient.py (1),
-which is designed to work with certain types of digital camera image
-files.  Instead of modifying the image data, it alters the EXIF
-tags stored with the image to reflect the new orientation.  For this
-reason only images with the correct types of EXIF tags can be changed
-using this tool.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH OPTIONS
-.TP
-\fB\-90\fP
-Rotate each image by 90 degrees clockwise.
-.TP
-\fB\-180\fP
-Rotate each image by a half turn (i.e., 180 degrees).
-.TP
-\fB\-270\fP
-Rotate each image by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
-.TP
-\fB\-v\fP
-Flip each image vertically.
-.TP
-\fB\-h\fP
-Flip each image horizontally.
-.SH SEE ALSO
-.BR exif.py (1),
-.BR konqueror (1),
-.BR orient.py (1).
-.SH AUTHOR
-The image transformation plugins were written by
-Leif Jensen <jensen@math.columbia.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/man/ksig-trinity.1 b/dilos/core/tdeaddons/debian/man/ksig-trinity.1
deleted file mode 100644
index 69bb9ec43..000000000
--- a/dilos/core/tdeaddons/debian/man/ksig-trinity.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSIG 1 "February 4, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ksig \- a graphical tool for managing multiple email signatures
-.SH SYNOPSIS
-.B ksig
-.RI "[ " generic-options " ]"
-[ \fB\-\-random\fP | \fB\-\-daily\fP ]
-.SH DESCRIPTION
-\fBKSig\fP is a graphical tool for keeping track of many different email
-signatures.  The signatures themselves can be edited through KSig's
-graphical user interface.  This is done by starting KSig in the usual way
-through the menus, or by running KSig without either of the special
-options \-\-random or \-\-daily.
-.PP
-A direct command-line interface is then available for generating random
-or daily signatures from this list.  This is achieved by running KSig
-with one of the options \-\-random or \-\-daily, both of which are
-described below.
-.PP
-The command-line interface makes a suitable plugin for generating
-signatures in external mail clients such as KMail.  See
-\fI/usr/share/doc/ksig/README.Debian\fP for details on how this can be
-done.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the ksig-specific options.
-For a full summary of options, run \fIksig \-\-help\fP.
-.TP
-\fB\-\-random\fP
-Write a random signature from the list to the console.
-.TP
-\fB\-\-daily\fP
-Write a signature for the day to the console.  The signature will change
-from day to day, but multiple calls on the same day will always return
-the same signature.
-.SH SEE ALSO
-.BR kmail (1).
-.SH AUTHOR
-KSig was written by Scott Wheeler <wheeler@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/man/lnkforward-trinity.1 b/dilos/core/tdeaddons/debian/man/lnkforward-trinity.1
deleted file mode 100644
index 692d6182a..000000000
--- a/dilos/core/tdeaddons/debian/man/lnkforward-trinity.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH LNKFORWARD 1 "October 23, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-lnkforward \- open an URL in a Windows .lnk file under TDE
-.SH SYNOPSIS
-.B lnkforward
-[ \fIgeneric-options\fP ]
-[ \fB\-\-map\fP \fIdrive\fP=\fIpath\fP ... ]
-\fIURL\fP
-.SH DESCRIPTION
-\fBlnkforward\fP examines a Windows .lnk file, determines its target and
-then opens this target file.  In deciding how to open the target file,
-the usual TDE file associations will be used.
-.PP
-The given URL must include a protocol.  Specifically, if it is simply a
-file on the local filesystem, it must be given in the form
-\fIfile:/path/to/file.lnk\fP.
-.PP
-Drive mappings must be supplied (via \-\-map) for any Windows drive
-referred to in the .lnk file.  See the OPTIONS section below for details.
-.PP
-This utility is used by the .lnk tdefile plugin, and is
-part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the lnkforward-specific options.
-For a full summary of options, run \fIlnkforward \-\-help\fP.
-.TP
-\fB\-\-map\fP \fIdrive\fP=\fIpath\fP
-Map the given Windows drive to the given path on the local filesystem
-(generally its mount point).
-This option may be passed multiple times.
-.SH EXAMPLE
-Suppose that the Windows file \fIc:\\readme.txt.lnk\fP is a link to
-\fId:\\foo\\bar.txt\fP.  Then the following command will open the file
-\fI/mnt/data/foo/bar.txt\fP in the usual TDE text editor:
-.PP
-.RS
-\fIprompt$\fP
-lnkforward \-\-map c=/mnt/windows \-\-map d=/mnt/data /mnt/windows/readme.lnk
-.RE
-.SH AUTHOR
-This utility was written by Martin Koller <m.koller@surfeu.at>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1 b/dilos/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
deleted file mode 100644
index fe860f1f8..000000000
--- a/dilos/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NOATUNSYNAESCOPE.BIN 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-noatunsynaescope.bin \- start the Synaescope visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatunsynaescope.bin
-.SH DESCRIPTION
-This program starts the Synaescope visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Synaescope plugin was written by Charles Samuels <charles@kde.org>,
-Paul Francis Harrison <pfh@yoyo.cc.monash.edu.au> et al.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1 b/dilos/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
deleted file mode 100644
index b33eb3b16..000000000
--- a/dilos/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NOATUNTIPPECANOE.BIN 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-noatuntippecanoe.bin \- start the Tippecanoe visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatuntippecanoe.bin
-.SH DESCRIPTION
-This program starts the Tippecanoe visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Tippecanoe plugin was written by Neil Stevens <multivac@fcmail.com>,
-Charles Samuels <charles@kde.org> and
-Paul Francis Harrison <pfh@yoyo.cc.monash.edu.au>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1 b/dilos/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1
deleted file mode 100644
index 5a4001047..000000000
--- a/dilos/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NOATUNTYLER.BIN 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-noatuntyler.bin \- start the Tyler visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatuntyler.bin
-.SH DESCRIPTION
-This program starts the Tyler visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Tyler plugin was written by Neil Stevens <multivac@fcmail.com>,
-Julien Carme <julien.carme@acm.org>, Charles Samuels <charles@kde.org>
-and Mitja Horvat <Mitja.Horvat@hermes.si>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/man/orient-trinity.py.1 b/dilos/core/tdeaddons/debian/man/orient-trinity.py.1
deleted file mode 100644
index 024ec11d7..000000000
--- a/dilos/core/tdeaddons/debian/man/orient-trinity.py.1
+++ /dev/null
@@ -1,88 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ORIENT.PY 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-orient.py \- change the orientation of a digital camera image file
-.SH SYNOPSIS
-.B orient.py
-.I image-file
-.br
-.B orient.py
-[1-8]
-.I image-file
-.SH DESCRIPTION
-This is a small script for changing the orientation of certain types
-of digital camera image files.  The image data is not modified, but
-rather the EXIF tags stored with the image are altered to reflect the
-new orientation.  For this reason only images with the correct types of
-EXIF tags can be changed using this script.
-.PP
-When called with with a numeric argument from 1 to 8, the orientation
-will be changed as described in the options section below.  When called
-with only a filename, the current orientation will be written to the
-console (also as a number from 1 to 8).
-.PP
-If the image contains no EXIF information or if the EXIF information is not
-of the correct type, an error will be displayed and this script will
-exit immediately.
-.PP
-This script is provided with the image conversion and transformation
-plugins for Konqueror.  For a more general-purpose JPEG rotation/reflection
-tool, see
-.BR jpegorient (1)
-which is also a part of this same set of plugins.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH OPTIONS
-The possible orientations are represented by the numbers 1 to 8 as
-follows.
-.TP
-.B 1
-No change of orientation.
-.TP
-.B 2
-Flip horizontally.
-.TP
-.B 3
-Rotate by a half turn (i.e., 180 degrees).
-.TP
-.B 4
-Flip vertically.
-.TP
-.B 5
-Transpose image (i.e., reflect across the upper-left to lower-right
-diagonal axis).
-.TP
-.B 6
-Rotate by 90 degrees clockwise.
-.TP
-.B 7
-Transverse transpose image (i.e., reflect across the upper-right to
-lower-left diagonal axis).
-.TP
-.B 8
-Rotate by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
-.SH SEE ALSO
-.BR exif.py (1),
-.BR jpegorient (1),
-.BR konqueror (1).
-.SH AUTHOR
-The image transformation plugins were written by
-Leif Jensen <jensen@math.columbia.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeaddons/debian/noatun-plugins-trinity.install b/dilos/core/tdeaddons/debian/noatun-plugins-trinity.install
index 5b4e11183..7ef1dd163 100644
--- a/dilos/core/tdeaddons/debian/noatun-plugins-trinity.install
+++ b/dilos/core/tdeaddons/debian/noatun-plugins-trinity.install
@@ -51,6 +51,9 @@ debian/tmp/usr/share/apps/noatun/tylerstates
 debian/tmp/usr/share/apps/noatun/wakeup.plugin
 debian/tmp/usr/share/apps/noatun/wavecapture.plugin
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/synaescope.png
+debian/tmp/usr/share/man/man1/noatunsynaescope.bin.1
+debian/tmp/usr/share/man/man1/noatuntippecanoe.bin.1
+debian/tmp/usr/share/man/man1/noatuntyler.bin.1
 noatun-plugins/dub/AUTHORS /usr/share/doc/noatun-plugins/dub
 noatun-plugins/dub/BUGS /usr/share/doc/noatun-plugins/dub
 noatun-plugins/dub/ChangeLog /usr/share/doc/noatun-plugins/dub
diff --git a/dilos/core/tdeaddons/debian/noatun-plugins-trinity.manpages b/dilos/core/tdeaddons/debian/noatun-plugins-trinity.manpages
deleted file mode 100644
index 76a3fc35b..000000000
--- a/dilos/core/tdeaddons/debian/noatun-plugins-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/noatunsynaescope-trinity.bin.1
-debian/man/noatuntippecanoe-trinity.bin.1
-debian/man/noatuntyler-trinity.bin.1
diff --git a/dilos/core/tdeaddons/debian/rules b/dilos/core/tdeaddons/debian/rules
index 8adaa5ebe..f65314296 100755
--- a/dilos/core/tdeaddons/debian/rules
+++ b/dilos/core/tdeaddons/debian/rules
@@ -31,16 +31,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg \
 
 DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter
 
-binary-install/konq-plugins-trinity::
-	mkdir -p debian/konq-plugins-trinity/usr/share/
-#	mv -f debian/konq-plugins-trinity/usr/share/man debian/konq-plugins-trinity/usr/share/
-#	rm -rf debian/konq-plugins-trinity/usr/share/man
-#	mv -f debian/konq-plugins-trinity/usr/share/man/py/man1/exif.1 \
-#		debian/konq-plugins-trinity/usr/share/man/man1/exif.py.1; \
-#	mv -f debian/konq-plugins-trinity/usr/share/man/py/man1/orient.1 \
-#		debian/konq-plugins-trinity/usr/share/man/man1/orient.py.1; \
-#	rm -rf debian/konq-plugins-trinity/usr/share/man/py;
-
 binary-install/tdeaddons-tdefile-plugins-trinity::
 	install -p -D -m644 renamedlgplugins/README \
 		debian/tdeaddons-tdefile-plugins-trinity/usr/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins
diff --git a/dilos/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install b/dilos/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
index baa1fbfc1..363f4e8f9 100644
--- a/dilos/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
+++ b/dilos/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/usr/lib/*/trinity/librenaudioplugin.so
 debian/tmp/usr/lib/*/trinity/librenimageplugin.la
 debian/tmp/usr/lib/*/trinity/librenimageplugin.so
 debian/tmp/usr/share/applnk/.hidden/lnkforward.desktop
+debian/tmp/usr/share/man/man1/lnkforward.1
 debian/tmp/usr/share/mimelnk/application/x-win-lnk.desktop
 debian/tmp/usr/share/services/tdefile_cert.desktop
 debian/tmp/usr/share/services/tdefile_desktop.desktop
diff --git a/dilos/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages b/dilos/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
deleted file mode 100644
index eda9949fb..000000000
--- a/dilos/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/lnkforward-trinity.1
diff --git a/dilos/core/tdeartwork/debian/man/kbanner-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kbanner-trinity.kss.1
deleted file mode 100644
index d8cc7f4f6..000000000
--- a/dilos/core/tdeartwork/debian/man/kbanner-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBANNER.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbanner.kss \- Banner screen saver for TDE
-.SH SYNOPSIS
-.B kbanner.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBanner\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkbanner.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Martin R. Jones <mjones@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kblob-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kblob-trinity.kss.1
deleted file mode 100644
index d3d2b9394..000000000
--- a/dilos/core/tdeartwork/debian/man/kblob-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBLOB.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kblob.kss \- Blob screen saver for TDE
-.SH SYNOPSIS
-.B kblob.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBlob\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkblob.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Tiaan Wessels <tiaan@netsys.co.za>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kclock-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kclock-trinity.kss.1
deleted file mode 100644
index 03c795709..000000000
--- a/dilos/core/tdeartwork/debian/man/kclock-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KCLOCK.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kclock.kss \- Clock screen saver for TDE
-.SH SYNOPSIS
-.B kclock.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBClock\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkclock.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Melchior Franz <mfranz@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/keuphoria-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/keuphoria-trinity.kss.1
deleted file mode 100644
index c8fb549b8..000000000
--- a/dilos/core/tdeartwork/debian/man/keuphoria-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KEUPHORIA.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-keuphoria.kss \- Euphoria screen saver for TDE
-.SH SYNOPSIS
-.B keuphoria.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBEuphoria\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkeuphoria.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1
deleted file mode 100644
index 58f427ba4..000000000
--- a/dilos/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFIRESAVER.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kfiresaver.kss \- Fireworks 3D screen saver for TDE
-.SH SYNOPSIS
-.B kfiresaver.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBFireworks 3D\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkfiresaver.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Enrico Ros <asy@libero.it> and
-David Sansome.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kflux-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kflux-trinity.kss.1
deleted file mode 100644
index 3556a7bc3..000000000
--- a/dilos/core/tdeartwork/debian/man/kflux-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFLUX.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kflux.kss \- Flux screen saver for TDE
-.SH SYNOPSIS
-.B kflux.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBFlux\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkflux.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kfountain-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kfountain-trinity.kss.1
deleted file mode 100644
index 9aa452ded..000000000
--- a/dilos/core/tdeartwork/debian/man/kfountain-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFOUNTAIN.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kfountain.kss \- Particle Fountain screen saver for TDE
-.SH SYNOPSIS
-.B kfountain.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBParticle Fountain\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkfountain.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>,
-Jeff Molofee <nehe@connect.ab.ca> and Nick Betcher <nbetcher@usinternet.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kgravity-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kgravity-trinity.kss.1
deleted file mode 100644
index f7789052b..000000000
--- a/dilos/core/tdeartwork/debian/man/kgravity-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KGRAVITY.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kgravity.kss \- Particle Gravity screen saver for TDE
-.SH SYNOPSIS
-.B kgravity.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBParticle Gravity\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkgravity.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>,
-Jeff Molofee <nehe@connect.ab.ca> and Nick Betcher <nbetcher@usinternet.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/klines-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/klines-trinity.kss.1
deleted file mode 100644
index 6121f8e2d..000000000
--- a/dilos/core/tdeartwork/debian/man/klines-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KLINES.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-klines.kss \- Lines screen saver for TDE
-.SH SYNOPSIS
-.B klines.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBLines\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIklines.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by
-Dirk Staneker <dirk.stanerker@student.uni-tuebingen.de>,
-Martin R. Jones <mjones@kde.org> and Mario Weilguni <mweilguni@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/klorenz-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/klorenz-trinity.kss.1
deleted file mode 100644
index 3df447a64..000000000
--- a/dilos/core/tdeartwork/debian/man/klorenz-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KLORENZ.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-klorenz.kss \- Lorenz Attractor screen saver for TDE
-.SH SYNOPSIS
-.B klorenz.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBLorenz Attractor\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIklorenz.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Nicolas Brodu <brodu@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kpendulum-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kpendulum-trinity.kss.1
deleted file mode 100644
index d253f4189..000000000
--- a/dilos/core/tdeartwork/debian/man/kpendulum-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPENDULUM.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpendulum.kss \- Pendulum screen saver for TDE
-.SH SYNOPSIS
-.B kpendulum.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBPendulum\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It simulates a two-part pendulum.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkpendulum.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Georg Drenkhahn
-<georg-d@users.sourceforge.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kpolygon-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kpolygon-trinity.kss.1
deleted file mode 100644
index bc7e56868..000000000
--- a/dilos/core/tdeartwork/debian/man/kpolygon-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPOLYGON.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpolygon.kss \- Polygons screen saver for TDE
-.SH SYNOPSIS
-.B kpolygon.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBPolygons\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkpolygon.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Martin R. Jones <mjones@kde.org> and
-Mario Weilguni <mweilguni@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/krotation-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/krotation-trinity.kss.1
deleted file mode 100644
index 6bc0c172b..000000000
--- a/dilos/core/tdeartwork/debian/man/krotation-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KROTATION.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-krotation.kss \- Rotation screen saver for TDE
-.SH SYNOPSIS
-.B krotation.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBRotation\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It simulates a force free rotating asymmetric body.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkrotation.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Georg Drenkhahn
-<georg-d@users.sourceforge.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kscience-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kscience-trinity.kss.1
deleted file mode 100644
index 061374a15..000000000
--- a/dilos/core/tdeartwork/debian/man/kscience-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSCIENCE.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kscience.kss \- Science screen saver for TDE
-.SH SYNOPSIS
-.B kscience.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBScience\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkscience.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Rene Beutler <rbeutler@g26.ethz.ch>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kslideshow-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kslideshow-trinity.kss.1
deleted file mode 100644
index c8b208e0d..000000000
--- a/dilos/core/tdeartwork/debian/man/kslideshow-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSLIDESHOW.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kslideshow.kss \- Slide Show screen saver for TDE
-.SH SYNOPSIS
-.B kslideshow.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSlide Show\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkslideshow.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Stefan Taferner <taferner@kde.org>,
-Martin R. Jones <mjones@kde.org>, Chris Howells <howells@kde.org>
-and Sven Leiber <s.leiber@web.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
deleted file mode 100644
index 8555d6209..000000000
--- a/dilos/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSOLARWINDS.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ksolarwinds.kss \- Solar Winds screen saver for TDE
-.SH SYNOPSIS
-.B ksolarwinds.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSolar Winds\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIksolarwinds.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kspace-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kspace-trinity.kss.1
deleted file mode 100644
index 1e39ff18e..000000000
--- a/dilos/core/tdeartwork/debian/man/kspace-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSPACE.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kspace.kss \- Space screen saver for TDE
-.SH SYNOPSIS
-.B kspace.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSpace\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkspace.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Bernd Johannes Wuebben
-<wuebben@math.cornell.edu> and Silicon Graphics, Inc.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kswarm-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kswarm-trinity.kss.1
deleted file mode 100644
index ea1e0d653..000000000
--- a/dilos/core/tdeartwork/debian/man/kswarm-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSWARM.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kswarm.kss \- Swarm screen saver for TDE
-.SH SYNOPSIS
-.B kswarm.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSwarm\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkswarm.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Patrick J. Naughton,
-Emanuel Pirker <epirker@edu.uni-klu.ac.at>,
-Jeff Butterworth <butterwo@ncsc.org> and Mario Weilguni <mweilguni@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kvm-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kvm-trinity.kss.1
deleted file mode 100644
index a7e037cbe..000000000
--- a/dilos/core/tdeartwork/debian/man/kvm-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KVM.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kvm.kss \- Virtual Machine screen saver for TDE
-.SH SYNOPSIS
-.B kvm.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBVirtual Machine\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkvm.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Artur Rataj <art@zeus.polsl.gliwice.pl>,
-Eric Plante and Jamie Zawinski <jwz@jwz.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kwave-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/kwave-trinity.kss.1
deleted file mode 100644
index 8ad59b9c1..000000000
--- a/dilos/core/tdeartwork/debian/man/kwave-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KWAVE.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kwave.kss \- Bitmap Wave screen saver for TDE
-.SH SYNOPSIS
-.B kwave.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBitmap Wave\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkwave.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>
-and Jeff Molofee <nehe@connect.ab.ca>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kxsconfig-trinity.1 b/dilos/core/tdeartwork/debian/man/kxsconfig-trinity.1
deleted file mode 100644
index f4cd67694..000000000
--- a/dilos/core/tdeartwork/debian/man/kxsconfig-trinity.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KXSCONFIG 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kxsconfig \- TDE X screen saver configuration tool
-.SH SYNOPSIS
-.B kxsconfig
-.RI "[ " generic-options " ]"
-\fIscreensaver\fP
-[ \fIsavername\fP ]
-.SH DESCRIPTION
-\fBkxsconfig\fP is a screen saver configuration tool
-for the Trinity Desktop Environment (TDE).  It is used to configure generic
-X screen savers, i.e., screen savers that have not been written explicitly
-for TDE.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the kxsconfig-specific options.
-For a full summary of options, run \fIkxsconfig \-\-help\fP.
-.TP
-\fIscreensaver\fP
-The filename of the screen saver to configure.
-.TP
-\fIsavername\fP
-An optional human-readable screen saver name to use in messages.
-.SH EXAMPLES
-\fIexample$\fP kxsconfig /usr/lib/xscreensaver/bouboule Bouboule
-.SH SEE ALSO
-.BR kxsrun (1).
-.SH AUTHOR
-This tool was written by Martin R. Jones <mjones@kde.org>.  It also
-makes use of xscreensaver code written by Jamie Zawinski <jwz@jwz.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/kxsrun-trinity.1 b/dilos/core/tdeartwork/debian/man/kxsrun-trinity.1
deleted file mode 100644
index 9e45a775c..000000000
--- a/dilos/core/tdeartwork/debian/man/kxsrun-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KXSRUN 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kxsrun \- TDE X screen saver launcher
-.SH SYNOPSIS
-.B kxsrun
-.RI "[ " generic-options " ]"
-\fIscreensaver\fP
-[ \fB\-\-\fP \fIoptions\fP ]
-.SH DESCRIPTION
-\fBkxsrun\fP is a screen saver launcher
-for the Trinity Desktop Environment (TDE).  It is used to launch generic
-X screen savers, i.e., screen savers that have not been written explicitly
-for TDE.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the kxsrun-specific options.
-For a full summary of options, run \fIkxsrun \-\-help\fP.
-.TP
-\fIscreensaver\fP
-The filename of the screen saver to launch.
-.TP
-\fB\-\-\fP \fIoptions\fP
-Additional options to pass to the screen saver.
-.SH EXAMPLES
-\fIexample$\fP kxsrun /usr/lib/xscreensaver/bouboule
-.SH SEE ALSO
-.BR kxsconfig (1).
-.SH AUTHOR
-This tool was written by Martin R. Jones <mjones@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1
deleted file mode 100644
index 2eb943ee2..000000000
--- a/dilos/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDEASCIIQUARIUM.KSS 1 "May 21, 2021"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdeasciiquarium.kss \- TDE screensaver to draw an ASCII art aquarium
-.SH SYNOPSIS
-.B tdeasciiquarium.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBTDEAsciiquarium\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It draws an ASCII art aquarium.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fItdeasciiquarium.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-Native TDE Screensaver based on the Asciiquarium program
-from Kirk Baucom <kbaucom@schizoid.com>, available at
-http://www.robobunny.com/projects/asciiquarium.
-.br
-Ported to TDE by Maksim Orlovich <maksim@kde.org> and
-Michael Pyne <michael.pyne@kdemail.net>.
-.br
-This manual page was prepared by Michele Calgaro <michele.calgaro@yahoo.it>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 b/dilos/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
deleted file mode 100644
index 00b4d4c58..000000000
--- a/dilos/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPARTSAVER.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdepartsaver.kss \- Media screen saver for TDE
-.SH SYNOPSIS
-.B tdepartsaver.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBMedia\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fItdepartsaver.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Stefan Schimanski <1Stein@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdeartwork/debian/tdescreensaver-trinity.install b/dilos/core/tdeartwork/debian/tdescreensaver-trinity.install
index baee119f7..3d7593b49 100644
--- a/dilos/core/tdeartwork/debian/tdescreensaver-trinity.install
+++ b/dilos/core/tdeartwork/debian/tdescreensaver-trinity.install
@@ -44,3 +44,25 @@ debian/tmp/usr/share/applnk/System/ScreenSavers/tdeasciiquarium.desktop
 debian/tmp/usr/share/applnk/System/ScreenSavers/tdepartsaver.desktop
 debian/tmp/usr/share/apps/kfiresaver
 debian/tmp/usr/share/apps/tdescreensaver
+debian/tmp/usr/share/man/man1/kbanner.kss.1
+debian/tmp/usr/share/man/man1/kblob.kss.1
+debian/tmp/usr/share/man/man1/kclock.kss.1
+debian/tmp/usr/share/man/man1/keuphoria.kss.1
+debian/tmp/usr/share/man/man1/kfiresaver.kss.1
+debian/tmp/usr/share/man/man1/kflux.kss.1
+debian/tmp/usr/share/man/man1/kfountain.kss.1
+debian/tmp/usr/share/man/man1/kgravity.kss.1
+debian/tmp/usr/share/man/man1/klines.kss.1
+debian/tmp/usr/share/man/man1/klorenz.kss.1
+debian/tmp/usr/share/man/man1/tdepartsaver.kss.1
+debian/tmp/usr/share/man/man1/kpendulum.kss.1
+debian/tmp/usr/share/man/man1/kpolygon.kss.1
+debian/tmp/usr/share/man/man1/krotation.kss.1
+debian/tmp/usr/share/man/man1/kscience.kss.1
+debian/tmp/usr/share/man/man1/kslideshow.kss.1
+debian/tmp/usr/share/man/man1/ksolarwinds.kss.1
+debian/tmp/usr/share/man/man1/kspace.kss.1
+debian/tmp/usr/share/man/man1/kswarm.kss.1
+debian/tmp/usr/share/man/man1/kvm.kss.1
+debian/tmp/usr/share/man/man1/kwave.kss.1
+debian/tmp/usr/share/man/man1/tdeasciiquarium.kss.1
diff --git a/dilos/core/tdeartwork/debian/tdescreensaver-trinity.manpages b/dilos/core/tdeartwork/debian/tdescreensaver-trinity.manpages
deleted file mode 100644
index dad73c192..000000000
--- a/dilos/core/tdeartwork/debian/tdescreensaver-trinity.manpages
+++ /dev/null
@@ -1,22 +0,0 @@
-debian/man/kbanner-trinity.kss.1
-debian/man/kblob-trinity.kss.1
-debian/man/kclock-trinity.kss.1
-debian/man/keuphoria-trinity.kss.1
-debian/man/kfiresaver-trinity.kss.1
-debian/man/kflux-trinity.kss.1
-debian/man/kfountain-trinity.kss.1
-debian/man/kgravity-trinity.kss.1
-debian/man/klines-trinity.kss.1
-debian/man/klorenz-trinity.kss.1
-debian/man/tdepartsaver-trinity.kss.1
-debian/man/kpendulum-trinity.kss.1
-debian/man/kpolygon-trinity.kss.1
-debian/man/krotation-trinity.kss.1
-debian/man/kscience-trinity.kss.1
-debian/man/kslideshow-trinity.kss.1
-debian/man/ksolarwinds-trinity.kss.1
-debian/man/kspace-trinity.kss.1
-debian/man/kswarm-trinity.kss.1
-debian/man/kvm-trinity.kss.1
-debian/man/kwave-trinity.kss.1
-debian/man/tdeasciiquarium-trinity.kss.1
diff --git a/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install b/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
index 8c662c33c..b71d2b1ba 100644
--- a/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
+++ b/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
@@ -64,9 +64,10 @@ debian/tmp/usr/share/applnk/System/ScreenSavers/lockward.desktop
 debian/tmp/usr/share/applnk/System/ScreenSavers/cwaves.desktop
 debian/tmp/usr/share/applnk/System/ScreenSavers/topblock.desktop
 debian/tmp/usr/share/applnk/System/ScreenSavers/voronoi.desktop
-
 debian/tmp/usr/share/applnk/System/ScreenSavers/cubicgrid.desktop
 debian/tmp/usr/share/applnk/System/ScreenSavers/hypnowheel.desktop
 debian/tmp/usr/share/applnk/System/ScreenSavers/lcdscrub.desktop
+debian/tmp/usr/share/man/man1/kxsconfig.1
+debian/tmp/usr/share/man/man1/kxsrun.1
 
 
diff --git a/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages b/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
deleted file mode 100644
index 356af4f32..000000000
--- a/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kxsconfig-trinity.1
-debian/man/kxsrun-trinity.1
diff --git a/dilos/core/tdebase/debian/control b/dilos/core/tdebase/debian/control
index ae117a245..5a31aff48 100644
--- a/dilos/core/tdebase/debian/control
+++ b/dilos/core/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharutils, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libcpp [solaris-any]
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev, libcpp [solaris-any]
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-trinity (<< 4:14.0.0~)
 Breaks: kdebase-trinity (<< 4:14.0.0~)
-Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib
+Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib | argyll
 Recommends: tdm-trinity (>= ${source:Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${source:Version})
 Description: base components from the official TDE release
diff --git a/dilos/core/tdebase/debian/img/cr128-app-energy_star.png.uu b/dilos/core/tdebase/debian/img/cr128-app-energy_star.png.uu
deleted file mode 100644
index 0d74bb8ef..000000000
--- a/dilos/core/tdebase/debian/img/cr128-app-energy_star.png.uu
+++ /dev/null
@@ -1,299 +0,0 @@
-begin 644 cr128-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```(````"`"`8```##/F'+````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CL!!M^7Q```(`!)1$%4>)SMO7FT'=5]Y_O9
-M56>\Y\Z#KJZD*Y"$L"20$`*$31@LBT$!@V/2V-@$&T*,$XAC>Z7?RWK]5EZ_
-M7MV=[L3N7MTO3MSNV&UBM_-B;#\SV`8S3P)+0@BPL)!`\WCG\9Q[IJK]_JC:
-M5;N&<^ZY5]AQ._>W5MU3M6NX>^_O]S?MO4\=6)`%69`%69`%69`%69`%69`%
-M69`%69`%69`%69`%69`%69#?9!&-7'3;;;>9N5QN'=!O&,8B(/7+K=:"S%/*
-MMFT/`L?S^?POOO>][UFSW5"7`/?<<\_5MFW_/G`CT/,>57)!?C4R!#PFI?SF
-M`P\\\%RMBV()<-===ZT'OBR$N#Z7R[%BQ0K./?=<VMK::&IJPC1-[UHIY7M=
-M\5^Y_#JV83YULFV;?#[/Y.0DQXX=X]"A0Q0*!8`GI91_^L`##_P\?$^$`'??
-M??<G@*\W-34U;=Z\F?7KUY-*I6AN;J:EI854*D4BD<`PC/FTZS=>%'#AS]G.
-MU[MOMGTI);9M8UD6E4J%F9D9BL4BE4J%M]YZBYT[=U(H%&:`>[_YS6_^3[T^
-M`0+<???=_SOPE\N7+^>FFVXBE\O1W=U-=W?W`N#SD+EJ\5RN#U]KVS:V;5.M
-M5JE4*EB6Q>3D)%-34Q0*!1Y[[#&.'S\.\&??_.8W_TK=Y]GRN^ZZZW>$$'^W
-M9LT:<<LMM]#2TL**%2MH;6U%B(9BQ04)B1!BUFVNU]?:#,/`-$V2R23I=-H[
-MSF:SV+;-^>>?S_CX.",C(]=NVK1IWYX]>]X"EP!WW7778B'$LTN6+$GKX"<2
-MB7^";OO-E5]%K*'^1R*1()5*(:4DF\U2J53H[^_GU*E38G)R\K<W;][\P.[=
-MNZ>57?]WIFDV;]NVC::F)I8O7[Y@\M\CD5)ZVR_CF>%-%\,P:&YN)IE,TM[>
-M3B:3X=IKK\4TS>9*I?+O`<Q[[[VWS[;M;VW:M,E8MVX=_?W]I-/I]ZRR_YSE
-M;$%_+T@CA""93%*I5#R+/C,SPYDS9R[:L&'#-XQJM7HK8*Y?OYZ6EA9RN=Q9
-M_]-_KE)/&^?SG/>J+D((FIJ:O/A@PX8-`(9IFA\UI)0WMK>WT]/30UM;VUG]
-MTW_.\EX"-M_[ZCTCE4IY06%75Q<='1T`'S:`53T]/9Z_6)"YRWS`GX^U:`3H
-M>M>GTVD2B01""+J[NQ%"K$@`2YJ;FQ<&=^8H\P7]EWG/;-<J\`W#H*6E!2GE
-MT@30HIBQ((W)>PG*V=PSUWH8AH&4$M,T%=XY#_6Y:/^__JMOD$L4&[Y^07ZY
-M<L?MMY)*9^EH:ZY+BKA!J(1^HE$QA472E!P:KCTK;&,P+KJ]Y^K_0PCG&/=3
-M>.<!!,)PQZA599UB;5^XSW"?@WNO`.'MJ^=ZK??'O06@]9,$D-+]U(XE2+=`
-MNL?@EDO_'BG=:[QSZAY5)KWG2ML?OP\^3[M7.R^1=!NC&-@U^UJ8:6_09S8)
-M7S,ONR^$(%].\)7GVV//&T*P]L*E=/4TNSY'WPR$VA<"PU2?1N!:H=\C0O>I
-M\\*_3C]6SQ'>L5.G.)*K#K%5A]O2G5R12%LZY5J95Z[*+-N[QM+.>>=MVSL.
-MWF]KUZC-#MWK;*^/=?/N@0%L.Q[@>^\VR62C4#9""&.NV@_,>OWY:Q?3WMGD
-M5B!^-LS3"._3N=;3#'?SSKL'7E1K^QKK7:<!&+C.[4@K!@Q;`SL`?CCBMI4F
-MA\K=.MA2:Q/1MNA82*U/O'IK_:)]`)+6MBPK5BV:=?5.O0PA/"Y@&*["S6>B
-MIQYI^L_IHJ.K.=@8SZQYM8ET0K"39-!T:IO^'-4@.]!PYWP$:$VCO<VV`QJK
-M:Y\#.#6W8+VE5V>T.ONMT?I!<P=A462/]!O0UIYER;+..JC$/:\V&<#!<5XQ
-M@+HG+&T=32Q9ZKH%"5(XC1*A3PD(Y4-5.8Z/5GTDO/NEPWQU;`.&V\$V2,,]
-M9X-M@(%3CL`]4(U6\4"TZP.^V/:)I(@5)%C,IIX1(4C0:O@60K]6LQ2J/AJ#
-M].?V]+8P-37#Y,1,35QJF7T]MM"Q\US`7`A@&$8D:S!-@Q4K>]1_BS%SBHE:
-M1P0ZS3\OPQUF.R:VGD8J/VQK'1KUQU'P(GY8LQ"1>P+WJ[J'R1!C_E4_J#]Z
-M7X1!"ED(W15(*5G:WXEIQF=L]<R^+KH+2+Q7<_U]2]M)),V:&J[6GBBP/0T/
-M:7[`4NB=X?=-P,0J2X`AL)$8KB5PDP*G'L+Y7Z'@']2QE-ISHQ8@WAW4T'X[
-M9`4T()1B^"Y!:Z>N&'H;0Q8BD3!8M+B5TR?'8W&8S0+HXKD`=="H&(:!T!Z8
-M2B7H6=3BH@=(X8+KFG*OPT3$#:C&":%UH@:N<)_E/4=UE.L*;!L,@P`)A`V&
-M`ETH$KA4"S=3?Z;;43[@&AGB`L.ZVB\#[B30MHC5"Y);MQ`Z;.K>CHX<(T/3
-ME,O5NB#'@1XN2^CF8+[2O:@%(80?U2L-ER"%KN&:S[=!FD(CB(.A6<\*V&`;
-M`L,[EE$2N*IONY\>$5R+4ROZDN!E%GXP&4,&+4BT0QH?K_VZM9":1DO]W]>T
-M$''!,0(ZNG(,G)X(-6-VP"'D`F:'-RI.^N#X(0%T=.9<;74[&5_#=3?@U$5H
-MQS)@);QK0E8@$#5K9#$0`1)X@T/*!4BPA/0'D)`1HNNIG&<)=`*$P%?C!0[X
-M=:R!=B[BQK2V1>*=6`L1M"1(:&MK8O#,9,.@USJ7F'<&X#ZGJ3E-(F'XVJW`
-M5&Y`:Y`0CBDUC-K7V.!HN$X`&VQ#.D&]]#4^3`)/;`=,80B/E%X8$M<Y'D":
-M)7`14T#8>G:@@3MKAA"S!=Q$P%KX%D(W_P'7X9XQ#,AFDQ0*Y9K@QI6K+$!M
-M\R:`TJE<+NV!ZS=$<P.Z_Y9^K!$Q[ZX)52E>(-T#L(63\H7,OF?U=0O@;@X1
-M7,OBFO^8$,`CLP](#0N@@Q_(#C0WH(@LHV71S873&V3R+9TWL*1?IT7"4D*V
-M*1T@0!S@<67Z\/R\@D"=`)EL4NNPH%9[K`V00'K@*>WV<GFT1FO[2IS[HF;?
-M\$)^O/Q?)Z5P4P'-<(4Z!Z\-JK.DRV2=`+;:5ZFC!WZ\Z=?]>D"S-4(%V@K$
-MC3AZ==3)`Z0RN@</QA6J'7&BER?F,PZ@$R"1-)$V"#.HU:C!GQJ`2JG'`GX'
-MA%V!<AE*`B10`9\A$$B?`Y:O]>%!J%H2B,8]+=.#PB#88?#CLX0&M#]TCU<'
-M]+Y"JX_/A*09C6?4IVW;2"FQ+`O+LKPOCMBV'1T'.)N10%,(QSAIP`KIN^4X
-M*^`%@+J&ZP0(I'C"TU"=!,+0W+[M@^U%_1#P_T[T7*.-,B801*^CC.['@:\R
-M`[7531U#5E+]?\V21`CB7>/VHZ894L+DY*0'/OC/"A-$QW#>68"R`);M^R0=
-MV+E8`0=$&70%6@S@:;UNP&V!;6A:[_X_VWV&,]LL_6E@-P`4H2C`"[6\^BFM
-M#UF"&F2(@A]T`W;XN.;(HO9<#[`Z!(DQ^4KKG7OCP5=!H)*S#@*KEJ5UE'-.
-M@1ZQ`EXC_$KY=13>=38Q$;_R]Z%H7S'`T_J0^?<47VJ6("1ZAZ,%@!$W$/#W
-M06W5P0]D!I%1Q!H6H08QP`<[0!`)5C6X1J`1\!5^@7&`LR%`I6PYRJXUT.M,
-MSY3Z^^%HWQO$4=>Y(WJ.%9#!8,\0V+:,1/O"S?4](K@L=\8D@B.`X:9Z_10R
-M_[XET*U`B`!>,!@#?@#XQN*"V,S!UOHO]"S+CBX2F0W\L-5(Z"E!HZ*/`\P4
-MRK1W-,5H-UZ$K^_'60)=RPWWFD".[T;VMJU%_#$S?8H(*MY0N,N`!8B*U![D
-MU4V1(0"\UI%Q$T\AD.TYF'[5(;6"P[@XH%P*OO^A4?`#::#^Y<)&11\)S$^7
-M')9JT[)Z_JZ8'><*]`@_G!JBY?C>%&^=O%_]+W4LT?-_QPI(J#$0X`.NGA,T
-MI^X52NNUS@X#'9U'J#\;J:Z/T_ZPLH3O+94JP:8T`+Z*`2)#P?.="ZA4+$JE
-M,IEL*AAURVB*%VB4,O6JA8"4PB>%A[X[P4,4=&4-I%:F_B](C>DNP#77U*C_
-M'^X\YUS8`D1<04"KZVA^31=01^-K:+^44"I6(VT(UK^^^0?F9P$,PW`ML//`
-MT9$"?4M2-:R`C+@";^&&=ZT#C&W;&(;A^?GP!$]XL,=VGV'4($&`A&Y]=:+'
-M=8@..O@:C_1]O5<>(H-MQQV'SL6M2:CA%NIMY5*%:C7Z"J#9P-?;/.\T,"R3
-M$P6Z>UI(I<R(V5):I[L"/>6S`<,E#`AMH*+&!(_:M'.*"-ZU$!@$\AM<#W2U
-M+[4V2,]R!8"GE@6(!S^LZ1'`PYE":(8QSCWDITLQ[9@;^##/D4#?`EA>!XX,
-M3[&XKRU`@$B$+_W@SK$&TM-DGP2.Z/>B!X.A+:KYCJG7QP'<)_A&4C55!][O
-M1=]=Q5@"+]"JXP["X$?F#P+9PQS<@!9+3.>C!(#&21"9##K;-8'C8P5:6K/.
-MY)"!QP*O`UWSC^&<BHSKHTC@0Q4D@?\<?;I7S_G#FB]4,((?"S@/B3Y3G8BU
-M!E+WO[X_CELX$@W^B("GK&'8[#>TZ$3"]'0Q,@;@U;>!S\ADT+S&`6)N.7-Z
-MG'-7]B"$X0=YWK"N']RI&"".!,JTZ]E!W"Q?8/!'@E3S_A)O38+P_DAO@*J6
-M>.8Q9/XC*2%$OMP1!"]$B)@XP*X+>FW3[_2'S<1X8=9VS&;^`RY`?^U;(R)$
-MP*!Z4BE;G#XQQM+^3B^?EQ"-^&N1P`OPP@,^TB-=N$P2-^_OIGV!_%\2RUJG
-M=T!OD0ZZ>UX!JSK3!SILOHD$B+[/#Z\SU,T[H7NCIE]*R?A8(5;[5;WJ?>K[
-MG@L`YKPD3!\)#,OT=(F!,^,L[FO7?#Y:3."B$B*!"O0"R[HC`SXJA_5-O!`@
-M+6U?$%C^Y5'5<P=X=9<Q08`"W-_W@58NHI;OK[D?,V(8<!'V;%;!V8K%:MTE
-MX:J/XC[#^TK.>BX@3L;'9C!-TUDH:NA6()X$#LZ.%;#K1/NJFFH$5">"\^GX
-M>WT<P`=?C_V"'2%#.W[GN5=KY3K`@;*X["`P*13O#FK-`7A?57,WRY(,#TW5
-MQ:41\)42O6<K@FK)R/`TEB59W-?F+^>J00(O"%37Q.7]@8C?:81E!5U#D`RJ
-MT7Z\4B<$0(98(&/($`N\[AYBM#\<&P2.]84E86+HYVW)T,`DU<JLK_Z=%?R:
-M+F"NT@AIQL?R6)9%WY(.2!`A07BPQPX%>Y'<W\$S-O731_WT_#\\%E!/@IT6
-MIU$0=@/H1$`W\4$R1,RZK<4'[CU^T!>T!B-#DQ2+E4A]:]5_-O!UF?=D4*.7
-M3TT6*16'6-K?02:;#'UU*V9VSW,)!*R!GNIY`5]L_N\SW.V"AMH6[IR:;D`;
-M&91NL!AG`8+^GL;`#\T9*,V/6_?72#OBP(]U`7.U`',A`$"Y7.7(X6%Z>UOI
-MZ,I%)G@"4LL:A(F@6P.(6?[EF_\XYL>)[@;T6P+@.J<]X`,6H('`,#Q<7`M\
-MR[(9')BB.%-&".C,V4@)8P6CID5K!'PE`1>@"AJ5N1(`G`:>.3W!Y,0,BY>V
-MD\DD`T&>X0X%J\X/6P.O3">"Q$GY:N3_<S'_7CT]5:?V>``A4NB`0JP+:"0X
-M5."7BA4&!R>I5FRN.;_$K9LJM+0X[UHH%HL\OC?)HWL$MHP'83;P=9G_]P+J
-MAE2UI5`H<_C=(3J[<O0L:L5,.`,&X0$?P+,&EEL6)H*>\CF@A_-_&<C]:[72
-M5WP9.@Z"C@:PNCSL^R&&%#56$NG60($_,3'#V,@T4L+O;"SPT<MS?.QW;R.3
-MR0!0*I4X]_GM;#IG@'_[B$EX/F@V\,-6X*Q7!,U5U+\:&\TS-5FDLRM'1V?.
-M^<:KJ^XZR+K6*R((+?"3U,G_!2#]=8#U*.NEAOJ'3@@]\-,#0:@!?`T+$"*#
-M&B0J%2N,#$]1=*=X;UX_Q2V7YKCC]EL#`W6)1((/??!*DJD=W#-^@J\]&_WM
-MAMG`CXP$SE7T!2%SO<\!U/?-HR-Y)B8*M'<VT]Z6Q4P8#ERQ*WX(F7\W*(S+
-M_W4B*%1G&0ET[L8G@=>)3J&L:0FT0%`=U]+Z$#&J%<M1AHD9CZ`WKAOGEDMS
-M?.J.VSSPP\N[+]FXGL.'C_'=)GUB?G;P:P:!O\P8(`R\7P%`.$/$XR-Y)L<+
-MY)HSM+9FR&23@9S?KWB\YN-9AE``&*C)7()!S<R[._4L@7.)"SPUM![?WU<K
-M%N-C>28FB@&@MJT9Y>9+LOS^IS_A!>=22N\W`!0!+,MBZ9)>+E@RH-5[=O!]
-M/$)!X%RD40*$P0X#'R8%0"%?8J90(I5.T)Q+TY1+DTB:_F".YM:]6`#_TUO_
-MJ5D`O3YQHL='M4R_7ZREA#H1-.")T7I55BR6F9PHD9\N>NOWE5RW>H@/;\IR
-M[SUW!C(SI0"52B5`@*9,DN:T'P0T`GXX&$SHVM6H-$*`".A&'!F"_LAP$WTA
-M!%;59G*RR.1DD70Z03:;(I--DDR9'@GT>D>__A4:"G:*:HM.@D`'.B=5D;"J
-M+!I^AXZQX[1.G2%5+H*`DIEFO+F7B9;%#':NH&0V>02H5&T*^1+YZ1*5<M4A
-MK`$&_I=J/[3B##=N3/&'G_ET)"V74E(JE2($.'EFE-/CT6O#^W73P/ED`>H!
-M\>5!$S,;\`[F\59!`5JMVDQ-%YF>+F(F#-+I)*ET@E0J@6D:7KJGIWVZ*]#K
-M%B=!I9"!,BDE0MJL//PR5^[^GW2-'*)="!972[172Z@7ZY>`<3/-2"+-*%`T
-M4QSI6L/S?1]D;_MZ2D8:\-_6*<%;)G?5LI-LNRC)?9^].W9,9FIJBE*I%'`!
-MP\/#'#D^R%NG_5?U-0)^V`W,ZR51M2R`*O?>T3>;%5`K=PRAW>\_6QCJ6SW^
-M]5)"J5BA5*HZ28,A2*1,DDF39,+YF10SH0^6^%9"UK$`8=.H#L\YL8N;G_SW
-M+"]-LZF<K__;>5;)V8`J,%AXB0^>WLU)87*P_7Q^O.(CO-VQ`5N9*0F_U7>,
-MZ]<;_/$?W4,RF8S496)B@IF9&4_K+<MB9&2$IY_?R5\_UX%E1X&8#7Q=/!<P
-M%PF/`S2F]?Z^(7S@]:'H@/8+X4;X0O/K;IDB!CCI8<7&JMH4\?7=3)@8AL`T
-MG9=0&H!P7S;I_!_#)5H\\,*VN>&%_\SF_4]P77F:N;Y(/P$L`994G>G;,T.O
-ML7E\/Z>,%#]:^2]XOO\Z-O8>9^M:^-Q]]Y),)B,XC(^/4R@4`F9_>'B8)Y[]
-M&7_[4@\#4[5?#EGO,Q($ZM%C(Q+0TA#XAE%;ZPT=W-@`40-<A+3?.W8L09@4
-M"+]NJDV6);$L$*+V+)H>5'IEMLW=S_PY5PV\P0>K,Y'1:@20<BO0:D!.0-J`
-MLH2BA"G;,0$`1><E!8N!FRIYBN19>^!;7-IU`./\Z_C\'W^>=#H=Z?^QL3$*
-MA4(@_1L>'N;QI[?SM5?Z&)Q.QK1E=O##<E9I8*S)#Q$@0H@ZP(?!]UU`B!!:
-MF5OD(5/+-<6)HPWA,OC(JU_EMP;?Y$/5T.(+`20%K#+APA1TF'XJXI@T?]\6
-M,%B%(V4X4(2*A*)-1L+PYDUD/W0-]W[^<V0RF8CO#H-O619#0T,\_O1VOKYS
-M&4/YVN]HGK,%.)LLP`-7(X!10^O]:^+)0(0,H>#0!2`<(.IU\O?#.WHHJ'66
-M7NIVT-HC+W+M^"X^9(=6W2:`=@.N34.+&04\3(*$@*5I6):!J]I@S()7IWBX
-M8R/O?G`K?_#%+WK@ZP08'1TEG\\'S/[@X""//?42#[QV+D/YVK_GU*@%B'4!
-M<Q,-9`/O1<QA"V#4`KTN&30+$"*&#GI`^\-NP-_1:ASJK'"9%&1+D]RV^V_8
-M]A?_%\;]]_OG3*#7A!LR8`IGYBJB]7%DT+9NDX>OO8IWNB[G[C_Z$[+9;&3@
-M1H&O1_L#`P/\^(D7^,[/SV.X4.?'O+2LI=YG6,[.!>C@!][278,`C0"OF?_`
-M_ZH!>#@><(O1#L.U]WM+]9W+AH^^]&4^_'_^2Y)#0\%;F@1<GW6T6AB02$)[
-M%^1:()N#9-)9SFY+J%:A4H)B`?+34"V#$#Q<6<N!KLNYZ[-_3%-34UWP%0$&
-M!@9X]/'G>/#MM8R5LJBU#K7`;`1\]7\C+F`NXIAV8E_/'C7Y,7%"@!!1X'5M
-M;R@KT-3?N5:K:ZSQ#Y9))(N&W^&2Y`B=7_P"W'JK?S(MX)J,X_N3:5BR'+I[
-MP=#\OYI[]C;\LG*1AP]G.="ZED_?>[\'OOX6CY&1D8C/'Q@8X$<_>9H?'MG(
-M>*4)X2ZK<UX97QLS'73+LCAUZI3WYI#FYF9:6UOI[^_W<)R7"]!]OQ'Q_S4`
-M#Q.B#AE4Y;QCS2W@DL]S!T(#66C0AJQ!/9$(/OK\7['USS[C%.S?[Y]L$K`D
-M`2UML'(M)%/U37V(#`\/+&)_=CF?NN>SGMG7W^0Q,C(2,?MGSISAV8<>HO.1
-MQ^CODXSU7NE\_<U;11U/`AW\2J7"WKU[6;-F#==<<PV93(;!P4'>>.,-=NW:
-MY=TS+Q?@7&\'P8]Q`2)L%4)`*\(X>(6NT<IT[0^`'K($83*XI^J#+V'9Z9^S
-M?.H,33??#)4*G#CAG#0%O"_I@+_Z0C!-W]='M#Y*A(>/Y=@O^[GCKC_P?L-7
-M`11G]I7F/_O00]SX]),TE2=I>ON_T9L_SI,K/Q%#@NC@E@+_]==?YXHKKF#M
-MVK7>N;Z^/GI[>]F]>S='CQ[U+8`"8&XR._C!^"`<+\3$`3'`&[H5B,L*%!'"
-M;D"O:9VV22FY[I6O<LWR7NCL=`A0<+]YDP)69!W--Q,UP#8"H'N:?[2)MZU^
-M/OGI>VAJ:@IHO6W;L='^P,``S__T1]RX^TDZ1X<@E65KLR1YXB=DJM,\>OYG
-M'!((_X4:>CPCI:1<+K-[]VZNO/+*`/@ZR=:M6\?)DR?)9#)GL1[`]$$/F_O@
-MS[6$`L-Z!`CL^V5!%Z`1)"8K"!(@GA!^AT'WZ!&6C1ZA<_,6)X";T7)_"9RW
-M'%+I*-AUMH>/-K'/6L8G[KR;;#:+Y;Y'21&@5K3_XI,_X4;Q&IU7M4"V#'O'
-M,;,YKFE-DQA\B4QUAN^O^QR6(<".MJM<+K-CQPZV;-G"NG7K/%*$)Y$LRV+E
-MRI4,#@Z>C0N0$?##XP+>;_I$7$#M0-"(`UYIOQ$%/4R$`!GTLC@"`!_8_6TN
-M+TY`;Z^C_4EMA$T(6+8T"+PQN^;OJRSE8W=\.@`^.)H?-\(W.#C(2\_\E!LS
-M^^BT2L[S+N^!SC2\,(#1U,R5;6G,L=U4]_TW?KCVCP+?J@*8*138OGT[6[=N
-M]<#7^T*M)U!;+I=S?CZN8=1#XIOJ*/A&H"SD]VNDAC6!USYK@1Z7&2C\:E-`
-MDJB6.._PRRR7$G(YAP``K:TP.0EITTGY:IG\4/G#1[+\HKR$VSYY)YE,AFK5
-M&0]6@=_8V%AD8F=H:(CMSS_%3?UC=*87PU@")D:=9Y[?`4D3GCZ%:&[A_>U9
-MRB,_(W^HC9^N_*3'NU*QP`\>_1X?VK*%"RZX(()5M5J-$&!Z>MKY0>GYN``E
-M$=]?`_SH_$`X$Q`-K1>(9`8:X'&6P"-''`>D8/4[S[*J6G:*;=LGP*)%#@$2
-M<0,^\<=/G,BPM]3';9_X/=+I=,#LJ^'=F9F9@"D>&AKBE1>?X:9E8W1F`0PG
-MQ<QF8?B,8Z)6M3GU>.($1FL[5W4U43WY&%.I=EY>=B.Y1(6G'OT.VVZXEO7K
-MUT<L>;E<CL0:EF6Q?_]^IJ:FSN[W`GQ`8L"/"PQ#%J#1:6,%;,VL@!`I\!A1
-M.PT4<.FK_\B&<MXYGIIR8@"`_GXX=`@R)HQ,0D]'//"N.YBJ&#QU,LNG[ODX
-MJ53*`U\%?N$I7=NV&1H:8L=+SW'3\G$7?.5*@.8V2*1A^!14+5C1#EN`%TZ3
-M:&OGYL7MM!U^D/&.Y6S>7.6Z:V]1OP@>2`W+Y3+CX^.1I61OOOFFM\#DK%X2
-MY8%8%_P:@:$6*]0.!+68(D"XD#M09M]S_4+;CY=T<9+.B5.TJ()3IWP+L'8M
-MO/0BY%)P9`P6=:K&QA+AP)C!LOYS2"025-QG*`),3DY2+!8#VC<\/,RNEU_@
-MIG,F-/"]7G4^LEGH.P<&3B*L"JT;>V@'VE\9(M'30_LY&8ZL/<9'/O8';-RX
-M$2'\<0$A!*52B;&QL<ABTM=??QTI)4N6+.'X\>/SS0*<>@8U>!;P`V,"HNX<
-M0CSP(?.O@:X`#\0`NN6/:>/*=YYC=47[^=L3)QP""`$77^SF60*.3<#EAA;\
-MA<V_054*$LD4Q6+1F]J54GK@A^?S=__L)6XZ=Y+.C-)6K_+^H1"TMC?3T;>.
-M]K'3F%89;FB&O,7TP1F^?MV-W/+I3W/999<@A/]N)2DEQ6*1T='1P/^U;9O7
-M7GN-?#[/K;?>RIX]>Q#B+%\2Y?GX&N#'906!(#`N@ZAK$713']5^WS)X-0P=
-M^[+AM1_ROHJ6\AT^!&5GW)X+UD$R`=,6O#L>'_EK^TM:!3_>?YQBL4BI5,(P
-M#(K%(N5R.:!]HZ.C&O@JC_/!-X2@-9>FHR5-6R[M_SI8:PY.'H)*A>E;UO*?
-MWNQEZ^_=R:6;-WO@`P'PPYJ_>_=N"H4"%UUT46#9V9S7!/H^)JR]4<U7(-?*
-M"L(6)$B6.IH?`EW$!(!ZF\+M,ZPJ[:/':/4*A)/_O_VV`WXZ`^>MAH/O@EV%
-M8@6:,D'P-5+TMPF,RC1'CQZEM[<W$G"I(-`!?XK.K`0<`AE"T-:<IJ,E0VLN
-MC6GHI'`;F4K!LI5,'SG*EX_VL?53MW/9^]\?`!]@9F8F`+XBP*Y=N\CG\UQZ
-MZ:4A]SG'7PX-@`^!WP`.1OMU8@,C;`E"ORTL!*;A!*;Z[P2+4)EA^L?^,PQ,
-MT]F<Y6#^OK[UG-I+CQI!,PQ_>^-UJ%0=5[!YLP-R=PYV'ZD)OBK_S$:+G=N?
-M9V!@@$JE0J52H5JM!L%?X8!O&"8=K1E6+FGGHM6+6+FDG8YY[=-!```3E$E$
-M0536K/OM*/5\;=\03)/FRX?ZV7++Q[ET\^4>^&K+Y_,,#0UY_UMM.W;L8')R
-MT@,_=DG87,!W/E6P$;<%W4$D-HBS`&&M#X\5Q+D!@N?4L:I7/?._<O]SG%\8
-M=X$7/@&V;X=;?]>YZ>JKX7O?A8J`UP;AFG4UP4<8+&T5W'=)E:^^]`S=BY?0
-MW;L4PS`8&QWFY)&#_,YY><[IRM#1DJ8UE_;-<,@-A&,!$$R7)%]^=H9KMGV4
-MRS3P%28S,S.,C(Q$HOT=.W90*!2XXHHK//#U?H(&78`.OK_46@:#N)@M$AO4
-M`%^?&6QDVAC4&T;B78!R%UI7:IT-RP^\2)\00?`-`P[LAX$SL'@QK%CII(.G
-M3T,Z!6<F8&EG%'PM,UC5;?(7U\/.$V?8>VJ0B@WK.B1_N"U-+I7U[PD`+@)U
-M"W].ER1??J;(U==_A$LOB_?YP\/#$9__RBNO4"@4N/KJJP/@1Y:%ST:`*/AZ
-M?X;-OP]XF!RS@1^WO"S.`JA[=?#]P!`_*%3]&TH$!9*FZ1$R8?`-U]=6J\XF
-M!-SPV_#M!Z`Y!=N/P<>[:H#OEZ42@BM7.%O`-"I0/0+,3@('_!FNO.[#7'+I
-M90@AL"SU<DX9T'R=`-NW;V=F9H8M6[;$@J\3H.XW/./`]QZBP-(!JY$6QH&O
-M_'W$SPN]W/??RI_'Q0U^7&'XQ^[]P@A>VSIZC!81`[YAP/4W0%N;3X*M6R&3
-M@1,S<+($T\6ZX-?=#,._-LZ-A)XW788O/U7@B@_=R"677.9IO@(ZG\\S.#A(
-MN5P.^/SGGWJ*\=.GZX*O2\T@L![X84)'VAIUD1'P8P-#(0*DTDD0`-X,@1\A
-M@G"^"Z`'C.[6<>H7+*O,:,"[G9]M@FW;P+)\`J33L&6+T]A<`IXZ$@*N#OA&
-MC7)A$`^\>\Y0X.?YP);?]L`/C^,/#@YZH"L2O/SLLTSMV<WB'SU:$WP=SYI!
-M8%W-QS,`?/'6E:B4+)BFA<PSFJ_6K@\?^Y91>Y:R-C4'>_1]14Z!5H3N!<2.
-M_?1:14@D@E;@_9?[+D`'[,.WP(O/P^$)2&1A>!H6M<VB\?JB$4U3"%WG5=B_
-M;KHD^=(3TWS@@]NX>-,E`(%YA;A4S[(L=K[X`C-OOL&'CQS@Q5,GR1\^3-.Y
-MY]8$7XGW\_&-@A_P(U[GQX"O]?S9@2^"9?J]ZO^Y<P?!969NOX;<DGGH;5H,
-M,PB^:<!55X%5A6K%(<'DA'/<W@Y;MCI?Y*N4X;F3,2:NAG8'RHR0MFOGW.=-
-MER5?^ND4EU]S`QLOWN1I?K5:]31_:&@H8O9_]O*+S!Q]BQM>?@YA"%9UM7'B
-M&U^O"W[L.,!<P/?P]8!3F\]LW0*H,W,!7P<S%O@(*?3C\'7.)D\?H]G4?+$A
-MX)QSH:W=-?\6'#L"?_D7SLJ@:A5^^R9HRL*)*6=X^/63M;6^EK;'D42+!:;+
-MDB\]/L7FJZYCX\:+`6<:5VW3T],,#P]'\_R?;:<T=)`;SIU`3.?!MNGKZ>3,
-MSEU4IZ;JXAD;!,X&?M`"!`$GU&[_'\6`2*B?"(,6U7I!//#Q@(>)X#*^6,!4
-M6J\LP/KUKO97H5R"[WP;QL;@QX\ZI&ANAEL^XEQ[:`3VS00#PKEL@0#0(<),
-M!;[T^`277KF5]1LN0DK9$/B[=KQ">>P8-UQ@(A(FO/\<F)S&,`UZVW(,//%$
-M73<.(1?0,/B^4D<U5KL@'`\$B.-ILZ_Y==V`3@C"P,>!CN<:O$U*A%6-!FBK
-M5SO@6U5X^248&G*N>>D%.'G"(<'56V#)4IBI0F4&GCU%X&6%NN;7U/XX0AA\
-M9\<T[]NPF0LOW.`MX5+;]/0T(R,C$?!?W?DSRN/'N&&=@4@D(-<*%R^#J4DP
-M3/HZ6QG]Z>.U8SBW3P*S@8V`KY^;+%11OC>BK6K?(`28!KRZ!OS!GI"_#Q+,
-MH8]Z?9QBE2(?ZJO@&MD"7P";&J/#<%?V*NWO7>2D>M4J%(OPPG-^9B`E_,.W
-MX?-_"MD,W'X'_.U_A8/CT-$*+Q^%JU;XH-<U^Z!5W#MG(_CY\2*?_?`E'OA*
-M$4NE$A,3$]$IW==>I3IYPM%\U;A<,W05W"EM24=[*V_L>1MK9@;#?<-8&+]`
-M%C`7\"_;L)I,*L'241F,P'50O%X/:;]V0[!<A*Y1'17"4Y$D4A8GP1/%HX.<
-M21K.Z\:4_U_6[X!O&+!KA].!^OC`P!EX[$=PRT=A^7*X]GIXYBG8>QHNZH<#
-M@[!F<1TMKY$JNG4K522I9))*I8)IFMXZ@E*IQ-345&20YXT]N[&F3G'#!8E`
-M_V$F'"*?UPW3!41'*QWM+8SMW$G7U5<'\-,E,!+8"/A22B0F&`DZFO4'!H$.
-M`NF"$2D+`A^Z-`2JJ%$>O<^K3^BT+$Z35N`J8+J['=,_4W4F@_0`35W[LY?A
-M_/-AW86P]7IX]QTX=0+>'7+(U#8.2[L:!]\C@""3$A1+)0J%`M5J%<,PJ%0J
-ML<NX]O[\=:SI4]QP82+2CP!D<K"JFZ;71^G(94EWM7'\G0-P]=6UAX+C^K$>
-M^`"M329@TY&-3S,:)1(0>-5:H\^R9WMFC6<5IX9P?NK<!=@TH+/#B?S?.>!J
-MOP@&B(9+O.\_"'_8`[V+X1._!U_[&R=+&)F`%R1<FX+>V<8'H@000K!^>8X#
-M^]]FY:KS(AJOQ@#V_OQU1_,O3,:"G\NF:%_40L?&Y:1?'X)<EF1W!X???#,6
-M?"6&$&*R7"Y'K$"CGV<%_C_!LZJ6Y6MW(@%-.2?(>W>_7^X%:)H5J)3A'[[E
-M!%FM;4X\D$S`R`SD9^")8S`UO\S@ULO;>/VU79%(7TTGUP(_ETVQK+>=]:O[
-M6+-B$8M[VDBO7@*3>3!-.KK:*!X[%NF?I.MRA!#3AA#B5#Z?_[4%;+9[3_SW
-M_\[)?_B'QI^%!G)3#FP+QD=A>#@X+Z!;`46&B7'XP8-.JGC.N7#CS<[YP8+C
-M1G[P-HSG&P->(UIW:Y(_NJ&'%YY]DK?W[:-0*'A!X)[=NZ@J\`UHSJ7I[^M@
-M_?E+6+.RE][N%E(I[5M+;2U0+(-A8"23X))(]8-IFJ33:?+Y/$*(4PG@X/#P
-M\!H`PS`"LTV_[N"//?\\DW_S-U0OO92^VV^?]5EF<[/SK1H%:%.38_Y/G-"`
-MCAFQT\EPXBC\X+MPVR=@TV50G(&7GH.!&5B4A7_\!?R+M=#;7C\P!#\@$H+S
-MES3Q?]^^C(=W'N?E%]ZF6+9()0TN6I[@`Y>TTM&2I;TE0S)I4C,*DH`T_#J[
-M@,MRV?O"2T='!T((AH>'`=Y-""$>G9J:NFEH:(BNKJ[_9<"O3DPP^A_^`U<,
-M#_.,TYA9GY7LZ2%?J3KO\Q'"F>RQ+#ASRL\*=)`B92Y!CAR$'SX(MWX<KKS&
-MB2MVO`PC9>?;/-_>`Q]=`ZN7NF#5`E\%MLYG6U."3VU9Y)[W_L1%SM0484(J
-MZ7R154J2V0S6Q`1F=S=22A8O7LS(R`B3DY,8AO%CPS3-AX40U7W[]J%_/^#7
-M&7R`@U_X`IOV[2,-5-T7.LSV+)%,8AL:N`G#&?L?'X_Z??4FD/"<@3I_^!`\
-M\GTHE>#JK;#Y`\[Y*<MY:<2#>^'E_<&@+P"H#KZ^Z>?K!)!QFQ!P9`!:F[WZ
-M5LL5C%P.*24='1UT=G;RUEMO(82PJM7J#XW[[[__C!#B&WOW[F5L;(Q$(A'I
-MN%\W\(>?>X[FG3O)5:N8@)R>;OA9(IW!%K@IFNGX=?4+E8'(/QP,:AHL7((<
-M.00/?L<)##]X+;S_2C=@!-HZX-E#\/5GHC.,*"YHH"-J`Z](T\BV]QATMGEN
-MRZI4(),AF4RR>O5JQL?'V;MW+\#_^.(7OWC:`+!M^\^EE)-//_TTEF4%WEGW
-MZP:^E!)9+F.H;_$`AFUC:]_#J_>L[*I5C%74<#`.`>+F[B,KAG1+H)T;/`/_
-M^/<P-`!7?A"VW>SX6TM`2P],6O!G#\*1,PKU$-`Z^(0^0UK?"`&>^06L[`?3
-M0`H#:9J8ILD%%UQ`,IGDJ:>>0DHY:5G6GP/.9-"?_,F?#$DI[QP8&+">?/))
-M`-+IX`N)?EW`!T@O6<)TRG]56J>43+[V6D//:KKR2@8M=RS`LB"?#P$>\OMZ
-MT.B=TZR#:4`A#]__?^'@`5A[(?SN)YVAV80)Z4Y8N1S^S</PC2?<GUM6ICX&
-M_+`[B"5!W+4"]AV'JNVL:C)-AH=&R*X^CXLOOIB6EA:>>>89!@8&+"GEG5_X
-MPA<&/`(`?.YSGWL$^-SAPX?E(X\\0K%8))O-1EY?^D\-OI22W/O>QZCT?@6`
-ME1,3G/G;OVWH62V;-S.@7O."A%(QF.J%5^MX+B'&.IC:M58%'G\$GG\*>GKA
-M]D_#TG[WNF;8?"D<&H<[_Q_8_@L"?EL'7^W/94))W?<?'X+++W("0,/@U.DA
-MSKO]DQB&P2.//,*[[[XK@7_I8@TX+T#SY"<_^<FK-]]\\]ZIJ:D;]^_?GS(,
-M@T6+%I%.^\N8PZ\QG^W36<9E>`&F.@Z7U_L,7V<F$DSMVD7VX$%:@%;#X)W1
-M4=)KU]*T:E7D7M,TO<]45Q>'O_I5UF33B'3:&>#Q8@`13/G,L.D/EXGH=<.#
-M<.B`,TYPV6\YX_.#IQQ`.WJ@?S$\\2H\]AHL[X3%G37`1R.(IO6UB/&7/P"1
-M@/X5'DEW[]A+\HX[>6;'#L;'QZ>%$'?>?__]_T/'7!`C7_G*5\XW#.-+P"V9
-M3(;ERY>S?/ER6EM;:6IJ(I6J_:;*7Y6,O?$&;V[;QO43XY!(D#=-GLIDN>@;
-MWZ#OQAOKWKO[SCLYYY476-K7Z[@!J^II380`LQ$B'"NH:Q(FK-\$FW_+&2MX
-MX4D8/.U;FYD)V/.6$T_<?@5LW>AD)1&P(1@[$-RW;/BWWX5#@[#E&N=:*3EY
-M\!@OO3O`Z+V?!7@4^-_NN^\^[>U7[F/J==37OO:URZ64OR^EO`E8VA`ROT)I
-M_>N_YO)WWV%5PG1(8`B>L213O8LI7'45=G>W,]P;$N/$"<YY[,=<MZP7IPMD
-M$.SPIV&X!!&USP>.75=B&LY@TV57P`4;X<01>/5EF!CSB5":@@/OPL%3L/D\
-MV+81+EGMOI`*8@-$<`:PGM@#7_TI7+@2UJUWRJ7S&T0/_?W#]M#O?NPA:^W:
-M+]UWWWT_J]6'=0F@1$HI_N[O_FZU95E+@*52REQ#"/V219PYD^OXR__XKZ]+
-MF&V=Z90#=L+D5+7*T7*U-&E;54N"-Q>OS2CF\X6F#Z\^1V23B:CV!SY-1TM-
-M?1VA?BRB1`A;!R&@JPLV7`:KU\+1@_#SW2X1%,`21@?@T#$X.@`=.5C=!_W=
-MT-WLU*-8@>%)>.LX[#L)%YP+&RZ`K/J2NP1;LO/Q%XM'?G'P^Q_/S]PY:Q_^
-M<J#YU<G?PX:,$$]=W=;<O;@I*S!-Y[4JINF8X43"WS==338-#@V-,C`TQ@?Z
-M^X(`1TA@1D&/Q`(QY_4!)W6M$,[\PYH+X<)-,%.`=]Z"PP<<-Z0"3P&4BS`]
-M"5/3SMQ#J>RL6F[*.E/8N78?/15,2\D[N_967WOJE0,3Q=)EGX7";/WWOSP!
-M`+X#*TTAGN[/9;HO[FQOSJ93SDQ=0B.":7K@8YI(P^#QG6_R_J6]=#0WU08^
-MCARU]F-)H1VKM%&XS^SIA>4K8>FY3D.&3L.9$S`VY("N`FYE^@WA@ZV+!&S)
-MGB>W%PZ\^M;^Z<+,M7\`HXWTW6\$`0">A<1IP_B\`7_6DDXE>EN:LLVI5,9(
-M:.!YJ9WS.5DH,C@XPK8U*YQU=35)4`/HP'4U@D&]7+<$@7/">0-I9S>T=T)[
-MMU-6FG&&F@O3SO[TI#-TK8N4Y">F>/$[/YZ8&AE[@OS,[WT,&OZQX=\8`BB1
-M(+X%EPFXR#2,<X6!&Z\8L=<;L'5E5]N:RU8L2_@6(L;W-^H:PO%!+?##A/3,
-MOR`X[@"!`2"]K;;-_NU[2F\^^<IDM53^S!V6]?!<^^LWC@!SE0<A92<2VS<N
-M[]OPOB4]*8\$NF;'^7[3B)*CIDNH81UTEQ#>5T0(I(7NIX1C/]\O7WWHF;%J
-MJ?1@H5#\/^Z&\?FT_Y\]`0`>A#:93+Q\8?_B5>N6]Z6C)*@!?$3[:P2(<?&"
-M`CSL$B(6P-^D;7-DSS[KC<=>&*\42R\5I@I_>A<</)NV+Q#`E6]!+IU,_*2O
-MH^WB#ZP[KR612@1),)OVUPP075<2FR;J+D%`^!M#;D8P,S'-@>U[\N^\\OJ,
-M7;4>K>8+_^8../I>M'N!`)I($-]-)/Z5F1!_>NG[5K2>NW2Q&0MXG&O0M3_.
-M0M0=,]!21I<4E4J%$WO?M0]LWSTR.3`Z7BV6_TNB4OG.QV#BO6SS`@%BY-O0
-METFGOI).);=L6K>JHZ^W&T.-+31"@D8R"!U\%_3\Q!2G#ARM'MJU=W1R8*0H
-MI?U@*3_S]Y^"O;^LMBX0H(Y\&R[*9%+_RK;E=>?T]R97K>AO[NKN<+Z'%VL9
-MZ@2/(=,OA6!B9)S1DX/VJ7>.C`X>.FY+R;'R3.G_JY;+#WT*]OTJVKA`@`;D
-M0<B63//6IG3R3LN6&[+9=')QWZ)T>V=K2U-SCEQK,YF6)H1A8"03)-(IJK:D
-M7*E0+E<H5ZKDI_),C(Q-3PR-%2:&QB@72V5AB+?+,^5GJN7RBQG8.9?\_;V2
-M!0+,0[X)BTVX+)$P5B=3J;6&(59*1`^`M&462`K#F,%@`F=$;J12K.RKELN_
-CL.%0%@Y]#*;_21OARO\/`@Q9S<[?68P`````245.1*Y"8((`
-`
-end
diff --git a/dilos/core/tdebase/debian/img/cr16-app-energy_star.png.uu b/dilos/core/tdebase/debian/img/cr16-app-energy_star.png.uu
deleted file mode 100644
index 174f00947..000000000
--- a/dilos/core/tdebase/debian/img/cr16-app-energy_star.png.uu
+++ /dev/null
@@ -1,21 +0,0 @@
-begin 644 cr16-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CL,>&[K>0```KM)1$%4.(VEDSUHG64`A9_W
-MY_N[W[TW]]+$$A.31K&-UJ:5"`Z"(!V=Q"Y.P460$L'%01$W=SN(.KDX%!<1
-MJRY"Q4$:+7H+QE+2>IN6VG)S\_?U^__>]W4(U-&"!\YX#N?`.?`_(5975Z>6
-MEY??ZO?[O8<16&L!&(_'NX/!X!P;&QO7W4/"6NNLM<X8X^JZ=NOKZW^)-$V+
-MBY=O!9]=V,1$'<+0(P@]PL##\Q7&.JJRIBP:BJ*B*&ITE?+!RA(+A[U*`VSO
-MEUS;BYAN=U!12-`)47&`\A7".)J\PJB2PA8D><[=44-6@3'&:2$$4DJ$%)1E
-MC9<KI!188U%:X9RC*AORK*+(*\JJ06E!FF:DJ3`:0$K)O;O[A*&'$`)K'55E
-M4$K@'-2UH2SJ!R;;XPQK#<8(M!#"22D9CQ)PCIG9/DUC\`J%E!+G'*:QE%5S
-MD""YS\NG6EAK<4[R;P4AR+**V[>VB>.0,/+0GF(BW^6-7S]AVF[QS:$7./OY
-M.UP?WJ$Q!I!(*:532M+IA'2[$9UN1-CR\#R%%/#^[G>\_N*?O/1FG_<^/D.Z
-M?HEW/_P)3SJ44IX60J"5(FX'Q.V`J.43A`<&O73,Z7H()Y_AZORKC&X,F=CX
-MBB^.5,P]N\+-FT-Y4$$)CBU,$+=\HCAXL('G?OZ!X)%)2'9X-/^=6>7PEY?8
-M?^4,5[[]FOZ)4Z6VUKK);LC*Z1E\3Z-]A=82I27S@QVX,X;M&::.YG!HDK7R
-M.*-?+O+8']]CCSV-3I+D]HG'NT>?FFMHF@.6E]=HQF/\*0]^^QO*^]!:A),I
-M"_VK'']"$3?S#+:V[JG%Q<7S4LHJS_,K29*L95FVEF?9P#OW49QNWMCOE7E/
-MM2-!Y2!M$;L:?Z]@="T=_B@[SXO_>M_FTI.O]6:GW]:')X_8B?:."8-+>SN[
-<%^8^_?(\P#\DY761`2R&E`````!)14Y$KD)@@@``
-`
-end
diff --git a/dilos/core/tdebase/debian/img/cr32-app-energy_star.png.uu b/dilos/core/tdebase/debian/img/cr32-app-energy_star.png.uu
deleted file mode 100644
index 77c6322f4..000000000
--- a/dilos/core/tdebase/debian/img/cr32-app-energy_star.png.uu
+++ /dev/null
@@ -1,48 +0,0 @@
-begin 644 cr32-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CL;^[UNO@``!W9)1$%46(7MEUMH'-<=QG_G
-M,KLCK;2R;BM'DNW*L7R1&LM)(6EJNTG;AY)`Z4.@.(&Z-DTI%!L$@4*A#VEH
-M"Z6!4DJ<EX9":*&%/ABGD-(\)*5N3>WZ(ODB2W+DM:V+94FVM*O5[FCFG-.'
-MF5U);EY*3?O2`\.<96?F^\[W??__X<#_Q_]X"(!CQXZ]U-?7]_WN[NY6(<0C
-M^;"UMC9WSM7NSCEF9F86KEZ]^J,3)T[\7@\.#KYZ_/CQG_?T]-0_*O#UH)]$
-M(@S#+?E\_EW/\YK5X.#@R0,'#K3]-\`!A!!(*6EL;/26EY?WZ6W;MF6JX+\^
-M=8[9N26,A<`IA!`(07+?.(\_!LZ!BU&PSL:_$ZF=`V?C>UH9E("!W5OXXF=W
-MH+6FJZNK42NE:NS.#$_S]@<!?4]TD^O(XOL>:=\CG=:DTYI4.IY[*87G*804
-M6..((D.X:@B"D""(""H1JT%()8@(*B%!$#)_;YGQT1E^^=W'L=;BG$,I);24
-M<H,\;;DLV:R/M0YK'<98C+%$QJ(B0RCCU5OK$$+@DF?"T!!%%A-9K+48Z[#&
-MUKZ3:4C3W-J`<ZY&0`C!!@)22II;ZC$F?KD*;B)+)"U"F!JXBF(KG'.8J@JA
-M(8K6B!AC8Q(F!FUJJ@/`&%/#^Q<"6BJ,358=&:042"$0R<J=<VACD5+6,F!M
-MK%`4QB2J1*K*51<BI<`8P^+B(L:83U:@7%DEY6LB:9$R?J@&;AW62HR2""D0
-MQ`&LVA!%,8DJD2@TF&B-3!`8K'5$482U-B:@E*K5GQ""A?DBF4P:*==27P-W
-M#F4D2LG:?\ZYF(!UL571F@KQE5@869:+Y<1"NT;@804*2Q4>W%^FI:UQ0QW'
-MX7$H)1-R@JH$<0YLLCJST8KD'E1"BDL5P&TDL+X,JV2FIY8PQM'>D4T(Q,$S
-MD44F!*1<:US5I%>#&ZM0S41$$(3<FUG").VY2@!`K^^`50+..>[.++%<J+"Y
-MLXF&;!W&2I24*!5G0HAU&:C:8%R-@(GBTBP4RNQJJ?#;-P<X>V6F5H;6QD'6
-MK!OKR6BMB(QE9F:)S&*93&,=F08/+^4A50Q>+0/GP"L7&9CX"YE*B3N9#LYE
-M^WFPM,J^KI!3/WD13PNT"SCWL<%:U@@\G`$I!=J+.YW6"JTE2$&YLLIJ&**D
-M0'D*I135&#Q]\R.^=^8M^OQY:%&X`,:*39PZ^`I'?_P#M(+K8Q.\_JMKO/A<
-M_T8+I)2UG4)I12JUUFJU5FA/H91,+E&K?Q*U<H5)?ECZD&V=]^&KW9#=A'`6
-MGVT<.?H:2CF&AR[S^KLW^.,5S0N?CRVH5"JD4JF-%GA:D4IKO$0!STL(:(E6
-M:HV`7+-KL'"!;8T*#NZ!W=M!:?*B&[G_.X1*,S9\B;E?_)2NR_7HKD-)5@Q[
-M]^[EVK5K]1LLJ"G@J5B%E,;3$JUC$DK)N`J2G=$/BAP,IZ"U$7;4@Y<B[SHH
-M[3U,R@C&K@Q3'#[%UNT/^/;'EXAF?79NWL'`P`"%0H$P#.5#&1!X7J)"2I'R
-M--J+<^`E5LA:'X`#E_]$;G8,GML/=X=A9Y:IU1SIT'+S^C56QS^@M[%`<U<_
-MFSZ5XS4SP*YG^IB?GV=\?!RE5+EF@7,.*43-_S4E=)*'1(EUC:A_;A3&Q^!;
-MK\+P:>COX0DUS9E+?Z!9EMBW4Y"I?PPG)%?:#M+S[$O,SLXR.C*"U)K.SDZC
-MJ^W46DLZK7FVKZ56!5X20NTIM))(+9%2HF0<PKYB'OK[84LWG,U!8,AN4GRY
-M:1&4!I7!"<FEE1UT/?4"4U-33)P]37A^B-RA5^*-;7UGJDLI#GRZ&:WENN17
-MO1<H&6]"U2[8LEJ`)[\$;[\%^_?#Y;_"%UIB<*U!:?YQOX/6_N>9G)PD/SK$
-MIML?XE^^B?W:H9C`^L[TY*X<*Z$$(39L1G'J01`7OA`.&U3(K*Y`>05NC$)#
-M'6S9`5=GX*D>T!YHS<(*E"<GF<Y?I\.,T-770>9\GAMW[F"S6:<7%A9*[>WM
-M+=9:^K8V8(S9T"ZM-;7YZL6+E(:'R;S\,DX[HN8FN',;TBG(3T![&\RVP/!M
-M>'H7*,WGMA2Y,/DW/I,+Z-G<B582MK8Q,3-->?OVHAP:&GHCBJ)2O*,]#+[Q
-M,N^]AS\Z6GO&='3`TH.80,J#L1$(#"QTP/O#L+A"ML'C^;X4O5N;T.D4+`=$
-MD22W9T]E9&3D#77RY,D+O;V]UX(@V!F&850L%@O%8K&PO+Q<*)5*A5*I5"B7
-MRX5RN5P(C`F:WGG'7R@L%BNW;ZV8?%ZTK10UZ134I<%/0Z4$2D)N-XQ/P^P<
-M+)=C#_/S<'&2B?M>Z4RV]?"1HT=_\V\?!LYE_,.;FS=]PVMJ>*PLA-^JQ=;&
-MYDV*.A_JZZ#>ASH?_!2TYR";!1M!N0C.,3UVZ_S$T/@W#UZ\.@3)T>P_&1>Z
-M<E]_?&OGF]E<2X[Z.LC4Q6K4^^#[X*<Q`C<W>??*O5O3O[M]_J.??66:E>K[
-MC^0X].?V]M[-6UJ/-+0T/Z,R?H>LJ_>-IY:,5%.E<OGJW*VIT_O_?OE]D9QA
-8UH]_`NO&3=99UCY]`````$E%3D2N0F""
-`
-end
diff --git a/dilos/core/tdebase/debian/img/cr48-app-energy_star.png.uu b/dilos/core/tdebase/debian/img/cr48-app-energy_star.png.uu
deleted file mode 100644
index 0be925842..000000000
--- a/dilos/core/tdebase/debian/img/cr48-app-energy_star.png.uu
+++ /dev/null
@@ -1,81 +0,0 @@
-begin 644 cr48-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CLFH]4BKP``#3M)1$%4:('MF7N,7-5]QS_G
-M<>_,[,R^7_8^[%T;L`UU@(``EU@0`I22A$I])(@*E`8JE**@0A0E?U1J6A)5
-MZ1]5%;7_1)2V4+>-*B(@)+9I"R&$IX!B'L$8O+;7Z_'N>G=G=G9F]C'WG-,_
-M[F,>NQ@BT?!'<Z2K>^^Y>^_Y?G^_[^]Q=N#7X]?C__<0C3>WWGKK@._[.YUS
-M_L<%Z&Q#"+&VMK9V^*&''IJ-YS3`'7?<,9C+Y?YA]^[=-^[:M:O6UM9F/NK%
-MG7,?.!]?O]]<M5I51XX<\?KZ^O8O+2U]^?[[[Y\1M]UV6^_6K5M?N_WVVS>-
-MCHYJ*>5'C?T#QX<A!V"MI5JMDL_GS;Y]^TY/3DY>I/;LV?/7=]YYY]7;MV_7
-M0H@-/_1QC58\0@A\WZ>MK4T.#0VU'3ITJ%V/C8W=/#(RHC\.@!_6\JWWZ72:
-M@8$!O67+EB_J;#;;FTZGDX>UP/#,2T<^>K2-@#@[P(U&KBW%I;O'DOMT.DTV
-MF^W5M&2BQ?(*CQU\AI<G4P"(;!\JUX%6$J4D2D=G)=%:(I4,GVF)DA*I)5(*
-MI!0Q6HRU&&.QQF*,PP3AO3&6(+!8:PD"D\P'QF("BUTNHU86`/C&E_9L%.1B
-MPZ"=6?)X]FB&WKX<.T>&$)Y">AKM*;2G\#R%]B2>I_!T.*=U.!>3BPDX1P0P
-M!%4+#$'-$`266BV\KM4,1(>M&:@%N)HA4#D.YR7%0H79LH=S+@%OK44(P8:!
-M*Z5$:\76\=[D)><<-CY;B[,":QQ&.H0)/X8(+>ZL2^Y==!];UAH;OF="RUOK
-ML-;AK&M8B^08'NVFO+2<@&Z4G922#3T@I:2W/XN4$A<M8*T+%Y<"*P7&.(2T
-M"",0HIXQG'5(*1!2A'P<T?N1;`*+L74B-B;B7/)WC6M*(>CJSH4?BH#'1CPK
-M@8Z.3!UX]&%K!<:&%I<B(B)LHO70*@(A0@+QO(VL&^L^U'ITWV"<T"LN(11[
-M/9OS$_#6VH3$AA(2(@2@/=5$P$0RD5)@A2`0MA[^+@(:$9`-!)R+%XZ]$`>Q
-M20A98UN,5?>,LPZE%0"52H5:K1:]:\[N@:!F\;P0N(QD$P(0B;YC[K%%I`V!
-MAP%<-XQS+I%%XH7$$W$V,I&L&KT2D@YJ`0Y865G!&%-?3TJT4FI=Q9-24BFO
-MD$KK)MF$WFD(6.K!9B/MU_4?>0"'LQMXH8%$F$KCN8:XL`YC'6NK09.AFB3D
-M>=XZ#P@A*!2J='5G,1%@*<`(T50TDLQA'5()I)1)0(<V"=-2G(GB0*W7A"B]
-MMG@C)A+_7;F\NHY`$L1:K^\BI)0L5]<H%*KT]+2%P!N0N\CR6LO0^BJ4CY2N
-MA4"#EQH(Q)IO]H()"UA#7!AKJ:U9*BT$XD`^:PR`8?IT$4]+VCLS38!BW3CG
-M4`EXV42@,<!=2QRT>J&Q^K96X[DSI:8*W)B%-B009Z%8(B=/+C#B>NCHRK3B
-M1T86#;5OFR04?BM)WPTQX!)]6[,^'DP#D<)"A6IU+5FW$?P'5N($K'6<G)RG
-M:RG+YN$N/(\D/RLKD:HQ==H6_=?!AP!<74IQMC%V76:JU0SS9Y;XK0L<_5T=
-M[/MIZ?TE]$$$XE$L5%A>7J.W-T=W3QO:4[A$/B*I$4F*;<A"<9%+JK)S#;F_
-MGGD"8ZDLK;(PM\1=UVF^??<->)[FD]N?#;/9AY'01@2D%"@5SA4*%9:65NCL
-MS)#-I4AG="2=*'U&&:MQN!8"SCGDVC*!]+'&$1A#N;Q*J;A,I;S"O3?Z?/=K
-MGT,(*)5*7'9^/R\>7<5:O5Y"&_7B=0V+J+L4R+B=EN'U\O(:*ZLUM)+X:4TJ
-MY:&UQ/-U**?6+.0<>U_[#SXU\3.V+9P@Y2PEE6(JT\_+N7%^O/EJ%MJV\-7K
-MX*_N_2Q2"DJE$J52B4=_^@Z;QG;C7/#A)22E:.K]&]MDJ>H]OY0"9QRKRS76
-MI(#*&E*"0(*,*X'@*T]_ASN//46[-K!)0H\"48:E.6Y>>).OGGR"_5_Y4VZ[
-M]\^04C(_/T^A4.!??_PJW_V1XWOWB(TEU)AU8JM+&?9"C1L7I<+-BXKD%!.I
-M:[\A@S6E7/CBB4?XD]7#M&4-[$W#6!K2&9`:3(!#,M%^$[=\[1LH)9F9F0G!
-M/_X*?W/08R50D2<WJ,3KS`\HK=!:HI4*O1#MML)S@P?B\[H`KH_,2I&[/G<N
-M;4_FX=(47+D3^H=`:Y`*)^#)ZDXN^H-[$$)P^O1I"H4"S_[@A_SS2UL(:`-L
-M4G>JU2J^[]<K\48$M(YV6+&$M$JVC7%`Q]Z(>Y^$0$,,`?SN<P^RZ0_O!&7A
-MFIVP:12D`J5P4O'?U5V<?],?`X)\/D^Q6.2M)Q[FDH?_B:\O=O*]<^YB,CT"
-MA`$]/#S,R,@(JZNKE$HEY+I"!B@9R28BXFF)]L(Y+]I2>M'V,MQBZNA0^+[&
-M]Q6^KTAKQU5S;T!W-^0TC(^`TJ`U3FH.EG>P_=I;<<Z1S^>9G9WEC6?WLRMX
-M%?_:?C[57>#KQ_Z.OMH\K!48'1UE='0T`2^$"+O1UB&D2*P>QT+=&^L#6LEZ
-M"A4-->#"-PYPZ:EW0"GH[8"Y,HP.@%*\6>YB^#=_#V,L^7R>Q<5%)E[[&;O5
-M$?R^7LAE\-)I;CQX"L\]RMX+KV=H:(C5U57FYN:8GIZF6"QN("$1:EI'H'44
-M`W$\:"V1&\5#0J">0B\Y_@*^L_#>NS!\/DP587PS*(V0,#<WAU2:<KG,R5^\
-MP"?T>^0RFJ[V--WM`^1V#C,YN(VK/GTO8V.C5"H5SIPY0SZ?IU0JD4JEUJ?1
-MN$"H2$(Q^(2(5G5/-!&03=D(8-O<!'@:GGD&+KL<CCP22DAI?J.OQH'#3S`K
-M!K#5!:X=F&&PNY=<FP]"@A"<6.JD>L.7&-]Y$4M+2\S,S)#/YZE4*@P,#(0>
-M:(R!.,>**%!#\`U>\.K!W%P;9+@?:/!`;F&*'<63X'L0!'#--?#B8U!:@;Y.
-M4)H;QLH@ET%*D!WA64B0DA,EG^+0]8QO.Y]2J<3,S`R31]YA%<'PR$B]#K2"
-M=\[1W9'F]_?VH)2H@U3K):.40`A9WX4)D"+<3G;O?YQ-&.CJ@BNN`*U@VV7P
-MRC&XL3>,BR@;(55$(CR.+VKF>JYF;&P'BXN+H>6/O\?:0P_2?L&%N.'AI$'4
-M0H@F\,XZ4IYBZV`F_$^;$DT2:9)+D_:;6_&.M2+"UW#AA5!:A`?_$6Z_`Q[Z
-M6S@Q#^=L;B$A02I.EA13F<L9VW(NA4*!V=E9ID]-(DX]Q_C"!*<.&=SG;ZKW
-M0E+*I@8)YQ@?[N+X@DJVB5(*E)2AM&+@0B"40`H9>ETT=Z*9Y5)8K,:VPG\>
-M@&-'X;F?PZ77P9LOAC+J[UI'XHVY+.=<OIU"H<#<W!RSTU/H^?]A:[^#H0[T
-MR3G6BD54>WO22CCGG(B]T);1#/6W,S0@HW(=2BQV6=.]LR`L.!MM7**^WSD,
-MRZ%L,ADX_'88"S]_&O[H#C@]#"_/P/4Y\/P&$I*L7F%R\@3&6.9G\Z26WF);
-MGZ4CEZ5[SWE<L#3)\Z^_CK=W+T((IZO5ZKQSKB]ID`1L[4^OV_W46V*W[MG:
-M\>/,[]O'P#>_F3PKMWG0EH&IDR$QK4$*^.$/X`NWP'-/PW\=A4^?!UWMB0?V
-M[A`\^?8+%*H>@ZDE+M[=06='*&>P\/0T\LPTV6R68K$X+_/Y_+\%01"T[O@W
-MNGZ_9\%]]Y$]<:+IF4FG(96"V9DPE6H-G@?6P$\>A:L^`Z5../@V')])`EA*
-MQ;6[T]Q\A<=G/ME+3T\[2NOP^8DYZ.K`2<7@X&`P-37U[[)<+G_KP($#TU+*
-MH#4;?1CPSCE6EY;01X]B@R"98VR<&@[*42QX.I24UA#40A*?N!@Z=L%3Q^"Q
-ME\"8IE1:/R*)'9NGXFDV77*)>?[YYZ<KE<J?JX,'#RY?>>65_S(Q,;$+.-?S
-MO,!::X(@,$$0&&.,L=8:8XQQSAEKK7'.&>><`8P0PE0G)QD[<$!.S4S;S-Z]
-M-9U.&V_+%E-Y_#'9:0.!5B$!3X>QX'DAF5.3,#@(YUT,IQ;AE5_`Z7D8Z85,
-MJIY>'?#P"[":X>ABX%[=LGW_0K'XV;OOOGNNJ0P_\,`#_;5:;8<0(LTO,ZI5
-MM?O;]WWG8BTNF=;>PHJG5_$4U<IRU\6#O1E\#](^^'Y((.75KWT/,FG8<4$X
-MMS`#T^]!FP)?@@6J`:3[F)M9J+[\\MOW_/:K;WP_Z7Q^*:!G&4^!5NUM?]G3
-MGKU"^7X:SZ.&3>4L%XQO[DN1B@"G4W7@*;_NE=@S?7V0:P\_NKH,*Q6PCHE7
-MWGKOV*$CW[KVG8E]C>O^G_\L^617U^_L&!WX^Z'-?<.D4G7KMYY]KRXS3X?[
-M!2$X=7AB:NJM=W]T[-"[?W%+I3+3^OU?R>^J^]O;]PQMZKYO^_CPWFQ7IT_*
-M)SEB3Z1"#Q@IF3\]6YR?FGUE_N3IITX?/O[]+Y3+9][OV[_2'X9_TM-Y?7]?
-MS^=S7>UC*N5WR;2?12GEE)RO&5-<7EDY59PNO'[B\-%'O@SO"[IQ_"\KGJJI
-04E_IW0````!)14Y$KD)@@@``
-`
-end
diff --git a/dilos/core/tdebase/debian/img/cr64-app-energy_star.png.uu b/dilos/core/tdebase/debian/img/cr64-app-energy_star.png.uu
deleted file mode 100644
index 0691c9b78..000000000
--- a/dilos/core/tdebase/debian/img/cr64-app-energy_star.png.uu
+++ /dev/null
@@ -1,117 +0,0 @@
-begin 644 cr64-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```$````!`"`8```"J:7'>````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CLT4&Q3YP``$ZE)1$%4>)SMFGN,7-5]QS_G
-MG'MG9G=V]FWC]=K>M1V\`=N8APTQ)0T$8I,$"N)1$DB":5,2H@8I;:/^4:4B
-ME:I655,I2/FCJ"IITL0(DI`0'FF:$($;.8`Q:VSC]]I>K_<U.[.[L[/SON?T
-MC_N8.[.SWJ20!*D<Z?C<>^?ZGOO]_KZ_QSEWX;WV7GNOO=?>:_]_FPB?//C@
-M@VWE<OEN8#NP`HC\7M[JG6\E8!S8:]OV4X\]]MBL_T-`P`,//'!_=W?WUZ^\
-M\LJVC1LW.FUM;5)**1H][7?1C#&+7@O_UNA:_77'<<S<W)P^=NR8&AP<S$Q-
-M33W\^../_P=X!.S:M>LOMFS9\K7;;KO-]/;VBDCDW6OX1L0L=8\QAG*YS/S\
-M/,EDTKSPP@OBX,&#7W[\\<?_6>W:M6OSVK5K?W#OO?>*OKX^H93Z;;W[.]*$
-M6%J40HB@^^=**9J:FHC%8J*GIX?SY\_?U-?7][040OSE33?=9%:N7/G;?O>W
-MU8PQ0?]U[FETKS&&YN9F.CL[N?[ZZXT0XJ^LUM;6'>O6K5/O9LLO!GHI=UCL
-M]^;F9GIZ>E1[>_L.*Y%(7!2+Q=[V2_XVVF\*_$*!,]QLV\:R+.+Q^')+""$;
-M6?^Q)UYB>O0PQ4K5YPHZ0EE$:GQ+"'!/_6,!WB@(G>-?]X[]%_3^-08P!F]P
-MCPT8#!A?WN'SVDCOGT<I$5/EX/E;K]A(3V\?FRZN=7$/@[06"RH51_/<H3A[
-M3C8!$(O97'Y5'[$F&\M2*$MB28FR%)8EL2R)4M5SI<+7O%%)I))(CS@\L%IK
-MM#8X%8WC:"J..SH5MU<<QQW]WRN.>[S@W*&0+_/6X5&*!9>$AZPXGU_;VE`)
-M4DJDE+)A9`U'4:4DEVQ>B67)*O,A*U0MX)UK]YK6H>Z8*BC'!>-V)[CNWVMT
-MZ!G&8#3N&#R;D"I,S3LH6W'QP$4H)6OP-`J.0@AD/?!&!*Q:W4DT8H<`USTP
-M!-1H]Z7#X!U'XVC/JDX(=-C2NMK#I&E=):%F/N\]=`-"+$NQHJ>M"I[%LX,E
-M96,.?`*B48ONY8D%#]#:(*7W,A)DZ+IP#$(8!-H7&QB-D0(C31`7O+=;H!;'
-MT6A'>ZX1[AZY]9;7(15ZQQV=<9+)N<#-&J5$I91+P(5<H*,K7@O88UU*#ZPT
-M"*W1#D%`%`)P/.`>"<8(C!%H+1H3$%:2HW&TP0F[1.CWL(L$!JEQ1?>XM:VI
-M!G#]L1""18.@WYJ;HS6`I3886:L`(PQ:5BWOQO:J]0TZ`.\O+_QYZU_:E;U+
-M@':T%SN\&**K+E$37VK<HAHSFILBH3D6(2#\,N'F14AL2]4H0!N#T"Y0[8U"
-MN.#!@!.2/=JUL!(8+1#25T#M7&'I.IYU':T#,O1BL4'K6C74!4YIN1,YCD,^
-MGT=K3:52P7&<8.Y%%>"[@`X%$->_=2!SQ_'O,R"T]_^JL@?A65>@I4!H@72+
-M@[`'@#%HCX2J*VC7\O[HD^$TB`DA=PD'8HP[2Z52(9]WT-IW1Q,8V5)*77"!
-M42I6B$:LP-(ULA=NP'*Q2@0&*AJCO*"GA!<S7.D+`3I<&+&PT-%!"M55V7M9
-MI&KYA;U1G*A4JI8.@S?&#<122M<%+J2`[%R!>$LTD+WCC7A=".W>ZQ%A`MNZ
-M0<\H]UG&^-+WQIH@6%M/^-*N6E57ZPA?`8ZN<X?:M*F-H9`O>Z!KP=>D09^)
-MQ0B8G<G3O2P12%TX!L>3N(O#E[QT)_*M[\E>&I`"UP5$'0EX92^A0-@HR'E@
-M??".$[X>ZJ8V2^1RQ0!/?1H/%+!4'5"I.*12698M3X32G/2L7_5]%X3T)O,L
-M;H17)[C^'ZP=W`D"!OSZO[[0"?RY'KQ?0&D3(L/4D%$J5\CG2@')BU6"2]8!
-M8$@EL[2T1&F.1Q'XJ4Z[J=XO<CP%N`6&=`G0`E,'/@B`81?PB6A0$[A;6GJ!
-M$IRP`AR?I*IJ9E+SA&N?10GX=?8!C#&,#*?I6]M-+&;7%#D&4$9X(#R_-R"E
-M&_BJ`;"Z2JS#7U6!KJL)PC&@KDCR5>`&RMK,,)\MDLT6PP`:$A!D@48MO!8`
-MJ%0T9\],L7IU%\UQ?\_0S_6^G#W9^ZE/5TGPE\K51U8I\"U5$P1]-3A5WZ[*
-MW-2"=ZJILI`O,S4Y5VO`!@KPX\"B=8!?"'GF=DDH:\Z<F6+%16UT=L>K18YQ
-MJSWERUX1*GS">W2-BZ[JNK[!@F=!RJM&_S!XQ]'D\T4FQC-82E.JB`5S-'2!
-M7V>3L>9!VC`V-D,FDZ=G50>QF!58W'BR-\:@157Z->"]Z<*E<*,XX+O`@F5U
-M*"WZ0=%Q-+,S.:S*'/_RZ00;+U[!B;-IOO[C&1_]A6/`4OL!C5H^7^+,J21M
-M'4UT=2>(1BW""Y[%_+^!!RP:!WP%+"2A*O]"OD(JF2&N"OS]ISKYTWMWHK7F
-M@U>7B5A[V#]J%ET.2RF7+H4;79=2()5`"D$N6R*?FR;>$B&1B!&/1Y!*+O!_
-MA%<&XR^&`N,0U`$A%?C6#Y3@IT;/\OE\B9ETCKEL@:[F"O_@@7>-DZ=4*G'%
-MP'*.3&0NG`;#<KP0`4+X<<$C0$I$<"PHERI,I^>9F<X1:XK0U&01:XI@63)P
-M`;V$N[GN8.@_^RI;C_Z4SF(6NU*@K&Q2T7:&6OOYQ<H;F"K;E$H5M-8LBU?X
-MZCT)_N03.P!WX9/+Y2@6BQP^,49)=P3/7I2`I100!BV5J".B*G,IW<#G.`[S
-M\YI<KH22$F5++*50ML)2`B%!XM[KUP7&0%?J#)]^\1_Y</(H:RI%ZNDJ`*_%
-M=K,_T<]/>ZYCL/\#_/4M$?[LOH\BA*!<+C,U-46Q6&3?FR?YUY],<=FF[H8Q
-M(,@"BQ5"?I-2N)N94K@;FE*@`B)"2A`B4(00>!N?7M`SKF4<1U-NL!06PM"6
-MG>)+/_TRMV9&W!\Z)'1+6*9`2BA!+&/XX$R&#T[MYV9GF%<_LY9[[G\((03%
-M8I%D,DFA4&#?@9,\^LPDOSK3Q&6;&J?!)1=#4DHLRW)W=$.65R$B_!W>0`4A
-M(L*1?T$&"*\$`:DU7YG^'K?,G7=OZ%=P?0QB%DB/`"F#X]1XC*-;/\==GW_0
-M54:AP,3$!,5BD5<'C_&-9].\=JZECNA%7,!GHZ'E96@[.U!"K?55&'S8%7PB
-M"!=`"S=#`&YY<S>W/K`3\?.GX"()'XG#\A70N0R:XMYJRD`A1VK.8<_`'=SX
-MR<]AC"&?SS,Q,4&A4&!P_R&^\;,\;XRU(41HU1<"/COK?AF/1J-+U`'"]56E
-MJ@H(]O7#;B&K,:'&%;S_']0!+OZ:CR(`JE+@DYMBV%FO>ML8@_=OAM:.6NL+
-M22K6S4OM'^"&VS\5@!\?'Z=8+'+BE5^1_>9W6#W3SX$U=P)NC>`KS7$<)B8F
-MN.JJJT@D$AP\>!#+LA:/`5)(I%(+%:`DJCX0^F2(:GH4#5S!X[6F[7CUVUSV
-MJ2M@?!R:!7SH_=#662-YI"15CO"BWLJ';KT'K36%0H')R4D*A0(G#[Y.Y+4G
-MN6;D$*L*QVDK3?.=]WT6CW.TUHR,C+!CQPXLRZ)<+C,P,,#HZ.CBWP5\P$'W
-MO_:$KKE?A!16<.Q%>__+D56]QS]WOQSY77+U\"NH[FY0RO7YWE[W6%G>J)BJ
-M1/AYY4JV[[P3QW'(9K.</W^>N;DYCA]Z@\BYEUG7/@,WKZ`W4>$3N=?XQ*E_
-M1RJ)D)`\=X2=.W<2B4306I/+Y<CE<DMLB^-&<M?J7CRP9$U&4'X<4`OK`M_Z
-MLBX(AF=:<_8UKDD-P?0T)!+0'L7=S8P$UG>$Y+F9#?SA']WN[>WE@U1W^O@A
-MXLE]K.O2T+X.HJ/P\1A=SX]P=V&0[/D?T1_]&+?=<CN69:&U)I/)D,OEF)F9
-M(95*+1T#&H$/NX):I#:H"8;U>P%>VW[P67K+!9B8@,V;H2SAS#1<LBIP@61>
-MTKUV,Z52B7*Y3#J=IE@L,GSJ"(GT&ZQOS0,2["C6ZK6TSZ?HN*^9RYX>)GU3
-M)W=]YE9LV\9Q'%*I%/E\GG0ZS>CH*,:8"R^&I)`UF:!&#2H4&$.*$**:'H4,
-MI\)J!O#GO#AYW+UP]`C<>@L4(W`R!1O[`@*Z6R13YX[3UME-L5BD6"PR>N8$
-MK3.#K&\M8-LV[2TQ.A(Q6IHB"-E#9?@,/[[W6F[_\[\E$HU0J51()I/D<CG2
-MZ31#0T-LV[:-O7OW-B;`38T$"@C27E@-=9E!-<H(=4KPA`4(6J?.LF%F%"P%
-MK[\.Q2)<>RVDWW3!*P5284G)QN@(@X._HJ5[%=/CPUQ4.L&V/DE[HI.6IEA0
-M42*@HN&9\I5<_]!#1&,Q2J52`'YJ:HK3IT\S,#`0&&(!`4&QX,>`L`(:@`]G
-MB2`;A(GP8X`,I4/@DJ,_H[^2!\N"R0E(I^'&F^!;;\!P"M;W!$1L[:FPH72:
-M$]/GZ.^'KGB+EQI]X.YQQ8%GAA+\P6V?)1J-!=7A_/P\J:DIADZ?9M.F32$O
-M%\@P`36E(NY+NPKP?;X!>*O61=SLX/V-@)\%[&K4MVR%92O63)[$LBQ7`5NW
-MNH`V;H1R&[R9K%$!4M+:K+AJE:"K1872HPIZQ4A^>+*%:SZVBV@TZKK*Z"BS
-ML[.,CXRP;_=W`_`-=X06U,K`I?T=;-K04HWNHK&TERJ!&U6!O4]D7/"6!3MV
-MNBX`<-==\-+WX&P*WM=36P8+_UA4CX6@H@5/'XNQ;>=]1"(1"H5"5?;)2<Y]
-M?S>7[!\DNVT;\<NVU*X'W(\6#59+F%IP-0`;@P^O"\)N4+^,EE(2R<VY!*SL
-M@67+X,0Q^/8W8=LU8#KAR(R[&U=7$-5:7J*%XOMO1=ERP]W8=H1\/A]8?G)B
-MC.$W7V1K[A@],8OTCWZT8"T@%U6`$&AC*)8UQ8JAY'>G.I;KNW;'BL;KICH:
-MJ&CAC@:LW)PK\0T;(#<//W@*]N^#HV_!G7?#H12\<BYD:5E+@G*)>/F49L,U
-M'\>R;'*Y'&-C8V0R&28GQQDYO(=MJTN([>NA4L"9FL`XSD(7:*2`E<M;V?+^
-M5G)%:O^XJ:ZHJ4;W4*'C2]X[#C;"/1<HIU,H7705T-L+1PZ[0=!2\.1N^-*7
-M8?N'X?CKT#D&5ZQ9L"+T29DN:-J%))O-DLEDR.?SS$RGF1IZE6UK2@@AH;T#
-MU6+15S;,'SM&+)P%C/OA3-83<&E?NRN5%G^;VC142L.N&U\'[UGI<931K@+B
-M<?CEGJ#L93X+3_PG[/HL/'$>CDQ#2Q0NZ:US`Y>`;6LCO+C_%5:N64^I5&(N
-MDR%]9A_;UE2P+$5;2XR.1!>MO1TXE59>.G``LV$#2BF,,5KF\_F)Q8`%+_R;
-M@`_U\O0TIQY^>,&S5',S%2F@J<F5?W+2"X@>"2/#\-P/X<X_AFD+#B3AP+F%
-M!$C)JBZ+C>UC#!W>R^EC;Y`;?9V;MT2YN'\96P9Z6;NJF_:V%F1+#+LYAIQ-
-M8XS[%Z/Y?'["RF0R/YF9F;D_'H_+=Q*\,8;L(X_0.CR\X%DR'B??U.Q^81X=
-MK0(/DW#D$$2C<-_]\-1WX$`*YHIPXV8O[_M=<-6Z9JY:[_OIBH5+3G#OM2U$
-M1:*40BFEY^;F_DLJI;ZV9\\>8]NV>2?!YTZ?IOVYYXA,3N*42K7/`LJ)A/NB
-MZ2E/_K*.!`N.'H*7?@9WWPNJ$TYFX5LO0ZY8+8*D:.`:#:YEBQ"QT5(R,#!@
-M]N[=BS'F:^KYYY]/7G?==<GY^?E;UJU;9[36XNV"-\8@+(O\DT_2/3%!:LL6
-MHOW]-;_/__*7K)Q)`P:TX]8#?K?]8P79#$R.P4<^#OD23,W#OL-0*+K5HEA8
-M$099P[_^ZC%(5TC-E;$_>KLYE<N)H:&AA[_XQ2\^JP">?_[Y?=NW;Q\:&AJZ
-M(1J--B42"<>V;:241BD5=,NR@M&V[6"T;=M$(I&@1Z-1TY1(F.2++[+NU"DQ
-M,3QLVF^]U;0L6V9BL9AI:FHR^9%SM!T<%):2;G;P+>\#MY1+A&U!J0A#QV#3
-M%MAP":2S,)F!_WD32F58<Y%7-8JJ:_A*>&L8_OLMZ%S)\;%9#FVX='9D;.S!
-M+WSA"_\6)"R_/?KHHZVV;=\!7"N$:%_H2+]9BQXXT/6!W=_=/B!I&FQJSDZV
-MM<]IR])(@7&T7)V>6K9Y>8?E@K6K@.TZ%=@A970O@RNOALP,'#\,^5G(34-K
-M!#H3\+X5+AECTW!J`K0%';UDTK/Z%P?//CM\USV??OCAAS-!:'B[()=J+RBU
-M:U4\]M5+N]K7R*881"-NC]B\-3+.AM86K%BT%J1M0<0F(*:&!$\E'9VP?L"U
-M<F'>=9-"%O+S[L21*,3B`,R,IXJO_^3E9VX\.7R/\#Y`_<X(`-@-_5TML;^)
-M1Z)KA+*B6`*DPL%8D8J^_.KUJ^.UUK<A4A</`E5X9"A_E-#4#!U=8$>@5(#\
-M')0K&&,X\<J;8T/[#S_VT3.CCS1ZM]\)`1=JSS0W;^OK;GOJLO5K^FJL7^\*
-M857XYS59PZ\2!2`X,W@T>6;PR,O3Y\]_Y8Y4]LAB\__>"0!X.AZ_?'E;\^-7
-M#*S=TI2(BT`%844TB@]U)&2G,\[0OD/'I\]/[$L/3_[3'=/3AY::^UU!`,"3
-M$&GO:ON[SL[VG6O[5U[:N:PK4@,X4D>(I2@[FO&SYZ?38\FS<ZG,R9FQB1^/
-MGI_<_3DH+SVCV]XU!/CM$9"7MS;?G&AIN26>B/?:L4B'%8TT(Q5&4:EH,ULJ
-JE6=+I<I,/C-W-'EV['N?@>'_ZWS_"^RYW^\E9("T`````$E%3D2N0F""
-`
-end
diff --git a/dilos/core/tdebase/debian/kappfinder-trinity.install b/dilos/core/tdebase/debian/kappfinder-trinity.install
index 5b9ef4e46..612818866 100644
--- a/dilos/core/tdebase/debian/kappfinder-trinity.install
+++ b/dilos/core/tdebase/debian/kappfinder-trinity.install
@@ -211,6 +211,7 @@ debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.desktop
 debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
 debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
 debian/tmp/usr/share/icons/hicolor/*/apps/kappfinder.png
+debian/tmp/usr/share/man/man1/kappfinder.1
 
 debian/icons/kappfinder.xpm		/usr/share/pixmaps
 debian/icons/kappfinder-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdebase/debian/kappfinder-trinity.manpages b/dilos/core/tdebase/debian/kappfinder-trinity.manpages
deleted file mode 100644
index b83ec9565..000000000
--- a/dilos/core/tdebase/debian/kappfinder-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kappfinder-trinity.1
diff --git a/dilos/core/tdebase/debian/kate-trinity.install b/dilos/core/tdebase/debian/kate-trinity.install
index d31d453d1..d20f25d78 100644
--- a/dilos/core/tdebase/debian/kate-trinity.install
+++ b/dilos/core/tdebase/debian/kate-trinity.install
@@ -60,6 +60,8 @@ debian/tmp/usr/share/icons/hicolor/*/apps/kate.png
 debian/tmp/usr/share/icons/hicolor/*/apps/kwrite.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kate2.svgz
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kwrite2.svgz
+debian/tmp/usr/share/man/man1/kate.1
+debian/tmp/usr/share/man/man1/kwrite.1
 debian/tmp/usr/share/servicetypes/kateplugin.desktop
 
 debian/icons/kate-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdebase/debian/kate-trinity.manpages b/dilos/core/tdebase/debian/kate-trinity.manpages
deleted file mode 100644
index 56b772103..000000000
--- a/dilos/core/tdebase/debian/kate-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kate-trinity.1
-debian/man/kwrite-trinity.1
diff --git a/dilos/core/tdebase/debian/kfind-trinity.install b/dilos/core/tdebase/debian/kfind-trinity.install
index 8e831d455..ddb77d448 100644
--- a/dilos/core/tdebase/debian/kfind-trinity.install
+++ b/dilos/core/tdebase/debian/kfind-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/kfind/common
 debian/tmp/usr/share/doc/tde/HTML/en/kfind/index.cache.bz2
 debian/tmp/usr/share/doc/tde/HTML/en/kfind/index.docbook
 debian/tmp/usr/share/icons/hicolor/*/apps/kfind.png
+debian/tmp/usr/share/man/man1/kfind.1
 debian/tmp/usr/share/services/kfindpart.desktop
 debian/tmp/usr/share/servicetypes/findpart.desktop
 
diff --git a/dilos/core/tdebase/debian/kfind-trinity.manpages b/dilos/core/tdebase/debian/kfind-trinity.manpages
deleted file mode 100644
index f0e6d9c78..000000000
--- a/dilos/core/tdebase/debian/kfind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfind-trinity.1
diff --git a/dilos/core/tdebase/debian/kicker-trinity.install b/dilos/core/tdebase/debian/kicker-trinity.install
index fa3b81d1b..d3a15cdec 100644
--- a/dilos/core/tdebase/debian/kicker-trinity.install
+++ b/dilos/core/tdebase/debian/kicker-trinity.install
@@ -259,6 +259,10 @@ debian/tmp/usr/share/icons/crystalsvg/*/apps/systemtray.png
 debian/tmp/usr/share/icons/crystalsvg/*/apps/taskbar.png
 debian/tmp/usr/share/icons/crystalsvg/scalable/apps/kbinaryclock.svgz
 debian/tmp/usr/share/icons/crystalsvg/scalable/apps/systemtray.svgz
+debian/tmp/usr/share/man/man1/appletproxy.1
+debian/tmp/usr/share/man/man1/extensionproxy.1
+debian/tmp/usr/share/man/man1/kasbar.1
+debian/tmp/usr/share/man/man1/kicker.1
 
 debian/tmp/usr/share/apps/kicker/icons/crystalsvg/16x16/actions/modified.png
 debian/tmp/usr/share/apps/kicker/icons/crystalsvg/16x16/actions/suspend2disk.png
diff --git a/dilos/core/tdebase/debian/kicker-trinity.manpages b/dilos/core/tdebase/debian/kicker-trinity.manpages
deleted file mode 100644
index 399a3843c..000000000
--- a/dilos/core/tdebase/debian/kicker-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/appletproxy-trinity.1
-debian/man/extensionproxy-trinity.1
-debian/man/kasbar-trinity.1
-debian/man/kicker-trinity.1
diff --git a/dilos/core/tdebase/debian/kmenuedit-trinity.install b/dilos/core/tdebase/debian/kmenuedit-trinity.install
index 6933c180b..80d48118f 100644
--- a/dilos/core/tdebase/debian/kmenuedit-trinity.install
+++ b/dilos/core/tdebase/debian/kmenuedit-trinity.install
@@ -30,6 +30,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/kmenuedit/kmenueditmain.png
 debian/tmp/usr/share/doc/tde/HTML/en/kmenuedit/new.png
 debian/tmp/usr/share/doc/tde/HTML/en/kmenuedit/selecticon.png
 debian/tmp/usr/share/doc/tde/HTML/en/kmenuedit/selectinternet.png
+debian/tmp/usr/share/man/man1/kmenuedit.1
 
 debian/icons/kmenuedit.xpm		/usr/share/pixmaps
 debian/icons/kmenuedit-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdebase/debian/kmenuedit-trinity.manpages b/dilos/core/tdebase/debian/kmenuedit-trinity.manpages
deleted file mode 100644
index e657bdffb..000000000
--- a/dilos/core/tdebase/debian/kmenuedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kmenuedit-trinity.1
diff --git a/dilos/core/tdebase/debian/konqueror-trinity.docs b/dilos/core/tdebase/debian/konqueror-trinity.docs
index c023d564b..e00f630aa 100644
--- a/dilos/core/tdebase/debian/konqueror-trinity.docs
+++ b/dilos/core/tdebase/debian/konqueror-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/dilos/core/tdebase/debian/konqueror-trinity.install b/dilos/core/tdebase/debian/konqueror-trinity.install
index d853c14ea..041e29586 100644
--- a/dilos/core/tdebase/debian/konqueror-trinity.install
+++ b/dilos/core/tdebase/debian/konqueror-trinity.install
@@ -197,6 +197,9 @@ debian/tmp/usr/share/services/konq_sidebartng.desktop
 debian/tmp/usr/share/services/konq_textview.desktop
 debian/tmp/usr/share/services/konq_treeview.desktop
 debian/tmp/usr/share/servicetypes/konqaboutpage.desktop
+debian/tmp/usr/share/man/man1/keditbookmarks.1
+debian/tmp/usr/share/man/man1/kfmclient.1
+debian/tmp/usr/share/man/man1/konqueror.1
 
 debian/icons/keditbookmarks.xpm		/usr/share/pixmaps
 debian/icons/keditbookmarks-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdebase/debian/konqueror-trinity.manpages b/dilos/core/tdebase/debian/konqueror-trinity.manpages
deleted file mode 100644
index 8097ed067..000000000
--- a/dilos/core/tdebase/debian/konqueror-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/konqueror-trinity.1
-debian/man/kfmclient-trinity.1
-debian/man/keditbookmarks-trinity.1
diff --git a/dilos/core/tdebase/debian/konqueror-trinity.postinst b/dilos/core/tdebase/debian/konqueror-trinity.postinst
index 7ba093ff4..bad50382d 100644
--- a/dilos/core/tdebase/debian/konqueror-trinity.postinst
+++ b/dilos/core/tdebase/debian/konqueror-trinity.postinst
@@ -30,7 +30,7 @@ case "$1" in
         divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
 
         update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/konqueror 100 \
-          --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
+          --slave /usr/share/man/man1/x-www-browser.1 x-www-browser.1 /usr/share/man/man1/konqueror.1
     ;;
 
     install)
diff --git a/dilos/core/tdebase/debian/konsole-trinity.install b/dilos/core/tdebase/debian/konsole-trinity.install
index 440344fa6..9882b34d1 100644
--- a/dilos/core/tdebase/debian/konsole-trinity.install
+++ b/dilos/core/tdebase/debian/konsole-trinity.install
@@ -82,6 +82,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/konsole/konsole.png
 debian/tmp/usr/share/doc/tde/HTML/en/konsole/tabbar.png
 debian/tmp/usr/share/icons/hicolor/*/apps/konsole.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/konsole.svgz
+debian/tmp/usr/share/man/man1/konsole.1
 debian/tmp/usr/share/mimelnk/application/x-konsole.desktop
 debian/tmp/usr/share/services/kded/kwrited.desktop
 debian/tmp/usr/share/services/konsolepart.desktop
diff --git a/dilos/core/tdebase/debian/konsole-trinity.manpages b/dilos/core/tdebase/debian/konsole-trinity.manpages
deleted file mode 100644
index 8c33f637e..000000000
--- a/dilos/core/tdebase/debian/konsole-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/konsole-trinity.1
diff --git a/dilos/core/tdebase/debian/konsole-trinity.postinst b/dilos/core/tdebase/debian/konsole-trinity.postinst
index ecc71cdc1..6e38c4939 100644
--- a/dilos/core/tdebase/debian/konsole-trinity.postinst
+++ b/dilos/core/tdebase/debian/konsole-trinity.postinst
@@ -23,7 +23,7 @@ fi
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/bin/konsole 35 \
-          --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
+          --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /usr/share/man/man1/konsole.1
 
         # force ldconfig due to tdeinit library
 #        ldconfig
diff --git a/dilos/core/tdebase/debian/kpager-trinity.install b/dilos/core/tdebase/debian/kpager-trinity.install
index 3d77373f4..f1787f42d 100644
--- a/dilos/core/tdebase/debian/kpager-trinity.install
+++ b/dilos/core/tdebase/debian/kpager-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/kpager/index.docbook
 debian/tmp/usr/share/doc/tde/HTML/en/kpager/screenshot.png
 debian/tmp/usr/share/doc/tde/HTML/en/kpager/settings.png
 debian/tmp/usr/share/icons/hicolor/*/apps/kpager.png
+debian/tmp/usr/share/man/man1/kpager.1
 
 debian/icons/kpager.xpm		/usr/share/pixmaps
 debian/icons/kpager-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdebase/debian/kpager-trinity.manpages b/dilos/core/tdebase/debian/kpager-trinity.manpages
deleted file mode 100644
index b34d67959..000000000
--- a/dilos/core/tdebase/debian/kpager-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpager-trinity.1
diff --git a/dilos/core/tdebase/debian/kpersonalizer-trinity.install b/dilos/core/tdebase/debian/kpersonalizer-trinity.install
index 500170a23..aeb2650a3 100644
--- a/dilos/core/tdebase/debian/kpersonalizer-trinity.install
+++ b/dilos/core/tdebase/debian/kpersonalizer-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/usr/share/apps/kpersonalizer/pics/step3.png
 debian/tmp/usr/share/apps/kpersonalizer/pics/step4.png
 debian/tmp/usr/share/apps/kpersonalizer/pics/step5.png
 debian/tmp/usr/share/icons/crystalsvg/*/apps/kpersonalizer.png
+debian/tmp/usr/share/man/man1/kpersonalizer.1
 
 debian/icons/kpersonalizer.xpm		/usr/share/pixmaps
 debian/icons/kpersonalizer-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdebase/debian/kpersonalizer-trinity.manpages b/dilos/core/tdebase/debian/kpersonalizer-trinity.manpages
deleted file mode 100644
index bcd309b73..000000000
--- a/dilos/core/tdebase/debian/kpersonalizer-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpersonalizer-trinity.1
diff --git a/dilos/core/tdebase/debian/ksmserver-trinity.install b/dilos/core/tdebase/debian/ksmserver-trinity.install
index 5820c44ba..5295822ca 100644
--- a/dilos/core/tdebase/debian/ksmserver-trinity.install
+++ b/dilos/core/tdebase/debian/ksmserver-trinity.install
@@ -7,3 +7,4 @@ debian/tmp/usr/share/apps/tdeconf_update/ksmserver.upd
 debian/tmp/usr/share/apps/tdeconf_update/move_session_config.sh
 debian/tmp/usr/share/apps/ksmserver/pics/shutdown.png
 debian/tmp/usr/share/apps/ksmserver/pics/shutdownkonq.png
+debian/tmp/usr/share/man/man1/starttde.1
diff --git a/dilos/core/tdebase/debian/ksmserver-trinity.manpages b/dilos/core/tdebase/debian/ksmserver-trinity.manpages
deleted file mode 100644
index 354e23800..000000000
--- a/dilos/core/tdebase/debian/ksmserver-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/starttde-trinity.1
diff --git a/dilos/core/tdebase/debian/ksmserver-trinity.postinst b/dilos/core/tdebase/debian/ksmserver-trinity.postinst
index 49a3e1878..f4b160056 100644
--- a/dilos/core/tdebase/debian/ksmserver-trinity.postinst
+++ b/dilos/core/tdebase/debian/ksmserver-trinity.postinst
@@ -24,8 +24,8 @@ case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
 	x-session-manager /usr/bin/starttde 40 \
-	--slave /usr/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
+	--slave /usr/share/man/man1/x-session-manager.1 \
+	x-session-manager.1 "/usr/share/man/man1/starttde.1"
 
         # force ldconfig due to tdeinit library
 #        ldconfig
diff --git a/dilos/core/tdebase/debian/libkonq4-trinity.docs b/dilos/core/tdebase/debian/libkonq4-trinity.docs
index c023d564b..e00f630aa 100644
--- a/dilos/core/tdebase/debian/libkonq4-trinity.docs
+++ b/dilos/core/tdebase/debian/libkonq4-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/dilos/core/tdebase/debian/man/appletproxy-trinity.1 b/dilos/core/tdebase/debian/man/appletproxy-trinity.1
deleted file mode 100644
index 3ab13208f..000000000
--- a/dilos/core/tdebase/debian/man/appletproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH APPLETPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel applet proxy"
-.SH NAME
-appletproxy
-\- TDE kicker panel applet proxy
-.SH SYNOPSIS
-\fBappletproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The applet's desktop file
-.SS 
-.SS Options:
-.TP
-.B  \-\-configfile  <file>
-The config file to be used
-.TP
-.B  \-\-callbackid  <id>
-DCOP callback id of the applet container
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-.SH FILES
-\fI/usr/share/apps/kicker/applets\fP
-kicker applets directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBextensionproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/drkonqi-trinity.1 b/dilos/core/tdebase/debian/man/drkonqi-trinity.1
deleted file mode 100644
index 987164834..000000000
--- a/dilos/core/tdebase/debian/man/drkonqi-trinity.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH DRKONQI 1 "June 2006" "Trinity Desktop Environment" "TDE crash handler"
-.SH NAME
-drkonqi
-\- TDE crash handler gives the user feedback if a program crashed
-.SH SYNOPSIS
-\fBdrkonqi\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-The TDE crash handler gives the user feedback if a program crashed.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-signal  <number>
-The signal number that was caught
-.TP
-.B  \-\-appname  <name>
-Name of the program
-.TP
-.B  \-\-apppath  <path>
-Path to the executable
-.TP
-.B  \-\-appversion  <version>
-The version of the program
-.TP
-.B  \-\-bugaddress  <address>
-The bug address to use
-.TP
-.B  \-\-programname  <name>
-Translated name of the program
-.TP
-.B  \-\-pid  <pid>
-The PID of the program
-.TP
-.B  \-\-startupid  <id>
-Startup ID of the program
-.TP
-.B  \-\-tdeinit  
-The program was started by tdeinit
-.TP
-.B  \-\-safer  
-Disable arbitrary disk access
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Hans Petter Bieker <bieker@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/extensionproxy-trinity.1 b/dilos/core/tdebase/debian/man/extensionproxy-trinity.1
deleted file mode 100644
index 4ea041189..000000000
--- a/dilos/core/tdebase/debian/man/extensionproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH EXTENSIONPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel extension proxy"
-.SH NAME
-extensionproxy
-\- TDE kicker panel extension proxy
-.SH SYNOPSIS
-\fBextensionproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBextensionproxy\fP is a small application that allows you to run a kicker extension outside of \fBkicker\fP itself.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The extension's desktop file
-.SS 
-.SS Options:
-.TP
-.B  \-\-configfile  <file>
-The config file to be used
-.TP
-.B  \-\-callbackid  <id>
-DCOP callback id of the extension container
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-.SH FILES
-\fI/usr/share/apps/kicker/extensions\fP
-kicker extensions directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBappletproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/gentdmconf-trinity.1 b/dilos/core/tdebase/debian/man/gentdmconf-trinity.1
deleted file mode 100644
index d98e166c2..000000000
--- a/dilos/core/tdebase/debian/man/gentdmconf-trinity.1
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH GENTDMCONF 1 "June 2006" "Trinity Desktop Environment" "generate configuration files for tdm"
-.SH NAME
-gentdmconf
-\- generate configuration files for tdm
-.SH SYNOPSIS
-\fBgentdmconf\fP
-.RB [ \-\-in
-.IR /path/to/new/tdm\-config\-dir ]
-.RS 11
-.RB [ \-\-old\-xdm
-.IR /path/to/old/xdm\-dir ]
-.br
-.RB [ \-\-old\-kde
-.IR /path/to/old/kde\-config\-dir ]
-.br
-.RB [ \-\-no\-old ]
-.RB [ \-\-no\-old\-xdm ]
-.RB [ \-\-no\-old\-kde ]
-.RB [ \-\-old\-scripts ]
-.br
-.RB [ \-\-no\-old\-scripts ]
-.RB [ \-\-old\-confs ]
-.RB [ \-\-no\-backup ]
-.br
-.RB [ \-\-no\-in\-notice ]
-.RE
-
-.SH DESCRIPTION
-\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP.
-.br
-If an older xdm/tdm configuration is found, its config files are "absorbed";
-if it lives in the new target directory, its scripts are reused (and possibly
-modified) as well, otherwise the scripts are ignored and default scripts are
-installed.
-.SH OPTIONS
-.TP
-.BI \-\-in \ /path/to/new/tdm\-config\-dir
-In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected.
-.br
-Default is \fI/etc/trinity/tdm\fP.
-.TP
-.BI \-\-old\-xdm \ /path/to/old/xdm\-dir
-Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan
-.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ;
-there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP.
-.br
-Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect.
-.TP
-.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir
-Where to look for the \fItdmrc\fP of an older \fBtdm\fP.
-.br
-.RI Default\ is\ to\ scan\  /etc/trinity \ and\ { /usr,/usr/local ,
-.RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config .
-.TP
-.B \-\-no\-old
-Don't look at older xdm/tdm configurations, just create default config.
-.TP
-.B \-\-no\-old\-xdm
-Don't look at older xdm configurations.
-.TP
-.B \-\-no\-old\-kde
-Don't look at older tdm configurations.
-.TP
-.B \-\-old\-scripts
-Directly use all scripts from the older xdm/tdm configuration.
-.TP
-.B \-\-no\-old\-scripts
-Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory.
-.TP
-.B \-\-old\-confs
-Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea.
-.TP
-.B \-\-no\-backup
-Overwrite/delete old config files instead of backing them up.
-.TP
-.B \-\-no\-in\-notice
-Don't put the notice about \fB\-\-in\fP being used into the generated README.
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kappfinder-trinity.1 b/dilos/core/tdebase/debian/man/kappfinder-trinity.1
deleted file mode 100644
index ec8eae964..000000000
--- a/dilos/core/tdebase/debian/man/kappfinder-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KAPPFINDER 1 "August, 24 2003"
-.SH NAME
-kappfinder \- searches for program to add to the Kde menu
-.SH SYNOPSIS
-.B kappfinder
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kappfinder
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the TDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-dir directory
-Use this option to set where the .desktop files will be installed (default is $(HOME)/.trinity/share/applnk
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kappfinder was written by the KDE project
diff --git a/dilos/core/tdebase/debian/man/kasbar-trinity.1 b/dilos/core/tdebase/debian/man/kasbar-trinity.1
deleted file mode 100644
index 7d57958d2..000000000
--- a/dilos/core/tdebase/debian/man/kasbar-trinity.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KASBAR 1 "June 2006" "Trinity Desktop Environment" "An alternative task manager"
-.SH NAME
-kasbar
-\- An alternative task manager
-.SH SYNOPSIS
-\fBkasbar\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-The \fBKasBar\fP is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the left mouse button. The active window is highlighted, minimized windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-test  
-Test the basic kasbar code
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-\fBkicker\fP(1)
-.SH AUTHORS
-.nf
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kate-trinity.1 b/dilos/core/tdebase/debian/man/kate-trinity.1
deleted file mode 100644
index e48268d6f..000000000
--- a/dilos/core/tdebase/debian/man/kate-trinity.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.TH KATE 1 "May 2006"
-.SH NAME
-kate \- TDE Advanced Text Editor
-.SH SYNOPSIS
-.B kate
-.RI [ options ] [file(s)]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kate
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkate\fP is a powerful text editor for TDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ...
-
-It is able to expand or collapse parts of code (C functions, ...), can handle complete projects, and includes a terminal emulator.
-
-Kate is primarily intended for developers but can be used by anyone. It will for example be very useful to edit configuration files for example.
-
-It can handle plugins to expand its capabilities (more languages support, vim/Emacs compatibility, ...)
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-s, \-\-start <name>
-Start Kate with a given session
-.TP
-.B \-u, \-\-use
-Use a already running kate instance (if possible)
-.TP
-.B \-p, \-\-pid <pid>
-Only try to reuse kate instance with this pid
-.TP
-.B \-e, \-\-encoding <name>
-Set encoding for the file to open
-.TP
-.B \-l, \-\-line <line>
-Navigate to this line
-.TP
-.B \-c, \-\-column <column>
-Navigate to this column
-.TP
-.B \-i, \-\-stdin
-Read the contents of stdin
-.TP
-.B file(s)
-is the file or the files to open
-
-.SH SEE ALSO
-.BR kwrite (1)
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, for Debian GNU/Linux, but may be used by others.
-.PP
-kate was written by the KDE project
diff --git a/dilos/core/tdebase/debian/man/kblankscrn.kss-trinity.1 b/dilos/core/tdebase/debian/man/kblankscrn.kss-trinity.1
deleted file mode 100644
index 46b2d4e1a..000000000
--- a/dilos/core/tdebase/debian/man/kblankscrn.kss-trinity.1
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KBLANKSCRN.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
-.SH NAME
-kblankscrn.kss
-\- TDE screensaver which shows a blank screen
-.SH SYNOPSIS
-\fBkblankscrn.kss\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBKBlankScreen\fP is a screensaver which shows a blank screen.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-setup  
-Setup screen saver
-.TP
-.B  \-\-window\-id  wid
-Run in the specified XWindow
-.TP
-.B  \-\-root  
-Run in the root XWindow
-.TP
-.B  \-\-demo  
-Start screen saver in demo mode [default]
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-The KDE Project <www.kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kcheckpass-trinity.1 b/dilos/core/tdebase/debian/man/kcheckpass-trinity.1
deleted file mode 100644
index fa5a4c817..000000000
--- a/dilos/core/tdebase/debian/man/kcheckpass-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  KCHECKPASS 1 "June 2006" "Trinity Desktop Environment" "authentication software"
-.SH NAME
-kcheckpass
-\- The KCheckPass authentication software
-.SH SYNOPSIS
-\fBkcheckpass\fP
-.SH DESCRIPTION
-\fBKCheckPass\fP is TDE's authentication program. It is meant to be
-used by any software in need of user authentication, most
-notably screensavers.
-.sp 1
-It enhances security be the following means:
-.br
-.IP "     \-"
-It's only a small program, which is hopefully simple enough to
-allow it to be SUID root. Setting it to SUID root is necessary
-on Shadow Password systems.
-.IP "     \-"
-No other program in need of user authentication, must be
-SUID root.
-.IP "     \-"
-It provides a single implementation to check passwords. So one only must take a closer look at \fBKCheckPass\fP to ensure password security. It's much easier for programs using \fBKCheckPass\fP to preserve security.
-.PP
-.br
-\fBTechnique:\fP
-.sp 1
-\fBKCheckPass\fP is a simple password checker. Just invoke and send it the password on stdin.
-.sp 1
-If the password was accepted, the program exits with 0;
-.br
-if it was rejected, it exits with 1. Any other exit code signals an error.
-
-.SH AUTHORS
-.nf
-Olaf Kirch <okir@caldera.de>
-.br
-Christian Esken <esken@kde.org>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kcminit-trinity.1 b/dilos/core/tdebase/debian/man/kcminit-trinity.1
deleted file mode 100644
index 4c557456e..000000000
--- a/dilos/core/tdebase/debian/man/kcminit-trinity.1
+++ /dev/null
@@ -1,153 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCMINIT 1 "June 2006" "Trinity Desktop Environment" "Trinity Control Modules initialization"
-.SH NAME
-kcminit
-\- runs startups initialization for Control Modules.
-.SH SYNOPSIS
-\fBkcminit\fP [Qt\-options] [TDE\-options] [options] module 
-.SH DESCRIPTION
-\fBkcminit\fP runs startups initialization for Control Modules.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B module
-Configuration module to run
-.SS Options:
-.TP
-.B  \-\-list  
-List modules that are run at startup
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kdcop-trinity.1 b/dilos/core/tdebase/debian/man/kdcop-trinity.1
deleted file mode 100644
index 1c01dcc47..000000000
--- a/dilos/core/tdebase/debian/man/kdcop-trinity.1
+++ /dev/null
@@ -1,159 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDCOP 1 "June 2006" "Trinity Desktop Environment" "A graphical DCOP browser/client"
-.SH NAME
-kdcop
-\- A graphical DCOP browser/client
-.SH SYNOPSIS
-\fBkdcop\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBkdcop\fP is a browser/executor for DCOP. It queries the DCOP clients in a system,
-their interfaces, and the interfaces' arguments. You can even execute DCOP
-calls by double\-clicking on a call. If the method has parameters, \fBkdcop\fP will
-open a dialog and prompt you for them. If the method returns a return value,
-you will see it in a message box after the call.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdcop/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdcop/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Matthias Kalle Dalheimer <kalle@kde.org>
-.br
-Rik Hemsley <rik@kde.org>
-.br
-Ian Reinhart Geiser <geiseri@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kdialog-trinity.1 b/dilos/core/tdebase/debian/man/kdialog-trinity.1
deleted file mode 100644
index 243709ed1..000000000
--- a/dilos/core/tdebase/debian/man/kdialog-trinity.1
+++ /dev/null
@@ -1,209 +0,0 @@
-.TH KDIALOG "1" "December 2002" "TDE" "TDE Application"
-.SH NAME
-kdialog \- Show TDE dialog boxes from shell scripts
-.SH SYNOPSIS
-.B kdialog
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIarg\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kdialog
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B kdialog
-allows to display dialog boxes from shell scripts.
-The syntax is very much inspired from the 
-.B dialog
-command
-(which shows text mode dialogs).
-.SH OPTIONS
-.TP
-.BI \-\-yesno " text"
-Question message box with yes/no buttons
-.TP
-.BI \-\-yesnocancel " text"
-Question message box with yes/no/cancel buttons
-.TP
-.BI \-\-warningyesno " text"
-Warning message box with yes/no buttons
-.TP
-.BI \-\-warningcontinuecancel " text"
-Warning message box with continue/cancel buttons
-.TP
-.BI \-\-warningyesnocancel " text"
-Warning message box with yes/no/cancel buttons
-.TP
-.BI \-\-sorry " text"
-\&'Sorry' message box
-.TP
-.BI \-\-error " text"
-\&'Error' message box
-.TP
-.BI \-\-msgbox " text"
-Message Box dialog
-.TP
-.BI \-\-inputbox " text init"
-Input Box dialog
-.TP
-.BI \-\-password " text"
-Password dialog
-.TP
-.RI \fB\-\-textbox\fP \ file " [" width "] [" height ]
-Text Box dialog
-.TP
-.RI \fB\-\-menu\fP \ text " [" "tag item" "] [" "tag item" "] ..."
-Menu dialog
-.TP
-.RI \fB\-\-checklist\fP \ text " [" "tag item status" "] ..."
-Check List dialog
-.TP
-.RI \fB\-\-radiolist\fP " text" " [" "tag item status" "] ..."
-Radio List dialog
-.TP
-.BI \-\-title " text"
-Dialog title
-.TP
-.B \-\-separate\-output
-Return list items on separate lines (for checklist option)
-.SS "Arguments:"
-.TP
-arg
-Arguments - depending on main option
-.SS "Generic options:"
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options:"
-.TP
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-title \ title
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options:"
-.TP
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-KDialog was written by
-.nh
-.ad l
-David Faure <faure@kde.org>,
-Nick Thompson,
-Nick Thompson,
-Matthias Hoelzer <hoelzer@kde.org> and
-David Gumbel <david.guembel@gmx.net>.
-.br
-.hy
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdebase/debian/man/keditbookmarks-trinity.1 b/dilos/core/tdebase/debian/man/keditbookmarks-trinity.1
deleted file mode 100644
index 23606dccb..000000000
--- a/dilos/core/tdebase/debian/man/keditbookmarks-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KEDITBOOKMARKS 1 "Jan 2005" "Trinity Desktop Environment" "Konqueror Bookmarks Editor"
-.SH NAME
-keditbookmarks
-- Konqueror Bookmark Editor
-.SH SYNOPSIS
-keditbookmarks [Qt-options] [TDE-options] [options] [file] 
-.SH DESCRIPTION
-Bookmark editor for TDE.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File to edit
-.SS Options:
-.TP
-.B  --importmoz  <filename>
-Import bookmarks from a file in Mozilla format
-.TP
-.B  --importns  <filename>
-Import bookmarks from a file in Netscape (4.x and earlier) format
-.TP
-.B  --importie  <filename>
-Import bookmarks from a file in Internet Explorer's Favorites format
-.TP
-.B  --importopera  <filename>
-Import bookmarks from a file in Opera format
-.TP
-.B  --exportmoz  <filename>
-Export bookmarks to a file in Mozilla format
-.TP
-.B  --exportns  <filename>
-Export bookmarks to a file in Netscape (4.x and earlier) format
-.TP
-.B  --exporthtml  <filename>
-Export bookmarks to a file in a printable HTML format
-.TP
-.B  --exportie  <filename>
-Export bookmarks to a file in Internet Explorer's Favorites format
-.TP
-.B  --exportopera  <filename>
-Export bookmarks to a file in Opera format
-.TP
-.B  --address  <address>
-Open at the given position in the bookmarks file
-.TP
-.B  --customcaption  <caption>
-Set the user readable caption for example "Konsole"
-.TP
-.B  --nobrowser  
-Hide all browser related functions
-.SS 
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
-.SS 
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-Alexander Kellett <lypanov@kde.org>
-.br
-
diff --git a/dilos/core/tdebase/debian/man/kfind-trinity.1 b/dilos/core/tdebase/debian/man/kfind-trinity.1
deleted file mode 100644
index 55542fd66..000000000
--- a/dilos/core/tdebase/debian/man/kfind-trinity.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH KFIND 1 "August, 25 2003"
-.SH NAME
-kfind \- TDE find tool
-.SH SYNOPSIS
-.B kfind
-.RI [ options ]  [searchpath]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kfind
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkfind\fP is a find tool for TDE. It allows fine tuning of the search options (name, path, type, plain text search, meta search, modification date, size, user, group, ...)
-
-It also permits to save the results of the search in a file, which is a plain-text list of file URIs. (file:/path_to_file)
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.TP
-.B searchpath
-is the path in which the search must be done
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kfind was written by the KDE project
diff --git a/dilos/core/tdebase/debian/man/kfmclient-trinity.1 b/dilos/core/tdebase/debian/man/kfmclient-trinity.1
deleted file mode 100644
index 67cbed380..000000000
--- a/dilos/core/tdebase/debian/man/kfmclient-trinity.1
+++ /dev/null
@@ -1,222 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added.
-.TH KFMCLIENT 1 "Jan 2005" "Trinity Desktop Environment" "TDE tool for opening URLs from the command line"
-.SH NAME
-kfmclient
-- TDE tool for opening URLs from the command line
-.SH SYNOPSIS
-kfmclient [Qt-options] [TDE-options] [options] command [URL(s)] 
-.SH DESCRIPTION
-kfmclient is a tool for opening local and remote URLs in Konqueror from
-the command line.
-.SH COMMANDS
-.SS
-.SS openURL
-.TP
-kfmclient openURL \fIurl\fR [ \fImimetype\fR ]
-Opens a window showing \fIurl\fR. \fIurl\fR may be a relative path or file name,
-such as . or subdir/. If \fIurl\fR is omitted, $HOME is used instead.
-
-If \fImimetype\fR is specified, it will be used to determine the component
-that Konqueror should use. For instance, set it to text/html for a web
-page, to make it appear faster.
-.SS newTab
-.TP
-kfmclient newTab \fIurl\fR [ \fImimetype\fR ]
-Same as above but opens a new tab with \fIurl\fR in an existing Konqueror
-window on the current active desktop if possible.
-.SS openProfile
-.TP
-kfmclient openProfile \fIprofile\fR [ \fIurl\fR ]
-Opens a window using the given profile. \fIprofile\fR is a file under
-~/.trinity/share/apps/konqueror/profiles. \fIurl\fR is an optional URL to open.
-.SS openProperties
-.TP
-kfmclient openProperties \fIurl\fR
-Opens a properties menu.
-.SS exec
-.TP
-kfmclient exec [ \fIurl\fR [ \fIbinding\fR ] ]
-Tries to execute \fIurl\fR. \fIurl\fR may be a usual URL, this URL will
-be opened. You may omit \fIbinding\fR. In this case the default binding
-is tried. Of course URL may be the URL of a document, or it may be a
-*.desktop file.
-This way you could for example mount a device by passing 'Mount default'
-as binding to 'cdrom.desktop'.
-.SS move
-.TP
-kfmclient move \fIsrc\fR \fIdest\fR
-Moves the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
-.SS copy
-.TP
-kfmclient copy \fIsrc\fR \fIdest\fR
-Copies the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
-.SS download
-.TP
-kfmclient download [ \fIsrc\fR ]
-Copies the URL \fIsrc\fR to a user specified location. \fIsrc\fR may be
-a list of URLs, if not present then a URL will be requested.
-.SS sortDesktop
-.TP
-kfmclient sortDesktop
-Rearranges all icons on the desktop.
-.SS configure
-.TP
-kfmclient configure
-Re-read Konqueror's configuration.
-.SS configureDesktop
-.TP
-kfmclient configureDesktop
-Re-read kdesktop's configuration.
-.SH OPTIONS
-.SS
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
-.SH EXAMPLES
-.TP
-kfmclient exec file:/root/Desktop/cdrom.desktop "Mount default"
-Mounts the CD-ROM.
-.TP
-kfmclient exec file:/home/weis/data/test.html
-Opens the file with default binding.
-.TP
-kfmclient exec file:/home/weis/data/test.html Netscape
-Opens the file with netscape.
-.TP
-kfmclient exec ftp://localhost/
-Opens new window with URL.
-.TP
-kfmclient exec file:/root/Desktop/emacs.desktop
-Starts emacs.
-.TP
-kfmclient exec file:/root/Desktop/cdrom.desktop
-Opens the CD-ROM's mount directory.
-.TP
-kfmclient exec .
-Opens the current directory. Very convenient.
-.SH OTHER
-This manual page was written by Adeodato Simo <asp16@alu.ua.es> for the
-Debian system (but may be used by others).
-
-This manual page can be redistribute and/or modified it under the terms
-of the GNU General Public License as published by the Free Software
-Foundation; version 2 dated June, 1991.
-.nf
diff --git a/dilos/core/tdebase/debian/man/khotkeys-trinity.1 b/dilos/core/tdebase/debian/man/khotkeys-trinity.1
deleted file mode 100644
index 34d754b05..000000000
--- a/dilos/core/tdebase/debian/man/khotkeys-trinity.1
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHOTKEYS 1 "June 2006" "Trinity Desktop Environment" "KHotKeys daemon"
-.SH NAME
-khotkeys
-\- daemon to bind actions to triggers and conditions
-.SH SYNOPSIS
-\fBkhotkeys\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKHotKeys\fP is a utility that allows you to bind actions to triggers and conditions. The most common case is where action means launching some  command/application/URL, the trigger is some key combination pressed and condition is some window being (not) active/existing.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS
-
-.SH FILES
-.I ~/.trinity/share/config/khotkeysrc
-\fBkhotkeys\fP configuration file
-
-.SH AUTHORS
-.nf
-Lubos Lunak <l.lunak@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kicker-trinity.1 b/dilos/core/tdebase/debian/man/kicker-trinity.1
deleted file mode 100644
index 1d17fa199..000000000
--- a/dilos/core/tdebase/debian/man/kicker-trinity.1
+++ /dev/null
@@ -1,171 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KICKER 1 "June 2006" "Trinity Desktop Environment" "The TDE panel"
-.SH NAME
-kicker
-\- The TDE panel
-.SH SYNOPSIS
-\fBkicker\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKicker\fP is the TDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-
-.SH SEE ALSO
-\fBkasbar\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kicker/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kicker/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Aaron J. Seigo <aseigo@kde.org>
-.br
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-Wilco Greven <greven@kde.org>
-.br
-Rik Hemsley <rik@kde.org>
-.br
-Daniel M. Duley <mosfet@kde.org>
-.br
-Preston Brown <pbrown@kde.org>
-.br
-John Firebaugh <jfirebaugh@kde.org>
-.br
-Waldo Bastian <bastian@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kjobviewer-trinity.1 b/dilos/core/tdebase/debian/man/kjobviewer-trinity.1
deleted file mode 100644
index 6dae2692e..000000000
--- a/dilos/core/tdebase/debian/man/kjobviewer-trinity.1
+++ /dev/null
@@ -1,202 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KJOBVIEWER 1 "June 2006" "Trinity Desktop Environment" "A print job viewer"
-.SH NAME
-kjobviewer
-\- a print job viewer
-.SH SYNOPSIS
-\fBkjobviewer\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBKJobViewer\fP is a powerful queue and spool manager. You can view jobs in the different queues waiting for print as well as manipulate jobs in many ways.
-.sp 1
-The details are, again, as with all other modules of \fBTDEPrint\fP, dependent on the print subsystem in use. \fBCUPS\fP, as is usual now, in this field is the most feature\-complete system for "doing something with jobs that are sent away already and wait for print, possibly on a remote print server".
-.sp 1
-With kjobviewer you can...
-.IP "     \-"
-see an overview for a certain queue or see all jobs on all queues;
-.IP "     \-"
-filter the list to see your "own" jobs only;
-.IP "     \-"
-sort the pending jobs according to different criteria (size, ownership, job\-ide, job\-name; billing\-tags);
-.IP "     \-"
-stop a job from printing, putting it into a "held" state;
-.IP "     \-"
-re\-start a held job;
-.IP "     \-"
-manually release a job that was sent to "hold" from the client already;
-.IP "     \-"
-reschedule a job for printing at a specified time;
-.IP "     \-"
-increase or decrease the job\-priorities (allowed values are 1\-100) to re-arrange the order of automatic printing;
-.IP "     \-"
-move a job to a different print\-queue;
-.IP "     \-"
-stop jobs from leaving the queue (while still accepting incoming ones);
-.IP "     \-"
-reject new incoming jobs (while still printing all the pending ones until the queue is empty);
-.IP "     \-"
-check and re\-set all job options \-\- even adapt them to another target printet which might have a complete different set of commands;
-.IP "     \-"
-view the existing and re\-assign a new job\-billing tag to a job;
-.IP "     \-"
-pop up on screen a nicely formatted report of IPP attributes for any job and also print it;
-.IP "     \-"
-increase or decrease the number of required copies;
-.IP "     \-"
-cancel and delete a no-longer\-required job.
-.PP
-Note, that some of these manipulations require job ownership or root access.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-d  
-<printer\-name>         The printer for which jobs are requested
-.TP
-.B  \-\-noshow  
-Show job viewer at startup
-.TP
-.B  \-\-all  
-Show jobs for all printers
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kjobviewer/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kjobviewer/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kmenuedit-trinity.1 b/dilos/core/tdebase/debian/man/kmenuedit-trinity.1
deleted file mode 100644
index fd5c7daf5..000000000
--- a/dilos/core/tdebase/debian/man/kmenuedit-trinity.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH KMENUEDIT 1 "August, 24 2003"
-.SH NAME
-kmenuedit \- editor for the TDE menu
-.SH SYNOPSIS
-.B kmenuedit
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmenuedit
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkmenuedit\fP is a powerful editor for the TDE menu. It allows you to add, remove, or move items in the menu, add sub-menus, ...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmenuedit was written by the KDE project
diff --git a/dilos/core/tdebase/debian/man/knetattach-trinity.1 b/dilos/core/tdebase/debian/man/knetattach-trinity.1
deleted file mode 100644
index 84bc38fcf..000000000
--- a/dilos/core/tdebase/debian/man/knetattach-trinity.1
+++ /dev/null
@@ -1,164 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KNETATTACH 1 "June 2006" "Trinity Desktop Environment" "TDE Network Wizard"
-.SH NAME
-knetattach
-\- TDE Network Wizard
-.SH SYNOPSIS
-\fBknetattach\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-The \fBTDE Network Wizard\fP is an application which makes it easier to integrate your network resources with your Trinity Desktop.
-.sp 1
-The program, also known as the \fBNetwork Folder Wizard\fP, allows easy addition and integration of various network folders with your Trinity desktop.
-.sp 1
-The \fBNetwork Folder Wizard\fP currently allows you to add four types of network folders:
-.br
-.RS 3
-\- WebDav
-.br
-\- FTP
-.br
-\- Microsoft(R) Windows(R) (Samba) network drives
-.br
-\- SSH
-.RE
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/knetattach/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/knetattach/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-George Staikos <staikos@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/konqueror-trinity.1 b/dilos/core/tdebase/debian/man/konqueror-trinity.1
deleted file mode 100644
index 0515c4f87..000000000
--- a/dilos/core/tdebase/debian/man/konqueror-trinity.1
+++ /dev/null
@@ -1,245 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KONQUEROR 1 "Jan 2005" "Trinity Desktop Environment" "Web browser, file manager, ..."
-.SH NAME
-konqueror
-- Web browser, file manager, ...
-.SH SYNOPSIS
-konqueror [Qt-options] [TDE-options] [options] [URL] 
-.SH DESCRIPTION
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view
-documents without ever launching another application.
-
-This package is part of the official TDE base module.
-
-
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Location to open
-.SS Options:
-.TP
-.B  --silent  
-Start without a default window
-.TP
-.B  --preload  
-Preload for later use
-.TP
-.B  --profile  <profile>
-Profile to open
-.TP
-.B  --profiles  
-List available profiles
-.TP
-.B  --mimetype  <mimetype>
-Mimetype to use for this URL (e.g. text/html or inode/directory)
-.TP
-.B  --select  
-For URLs that point to files, opens the directory and selects the file, instead of opening the actual file
-.SS 
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/konqueror/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/konqueror/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-Simon Hausmann <hausmann@kde.org>
-.br
-Michael Reiher <michael.reiher@gmx.de>
-.br
-Matthias Welk <welk@fokus.gmd.de>
-.br
-Alexander Neundorf <neundorf@kde.org>
-.br
-Michael Brade <brade@kde.org>
-.br
-Lars Knoll <knoll@kde.org>
-.br
-Dirk Mueller <mueller@kde.org>
-.br
-Peter Kelly <pmk@post.com>
-.br
-Waldo Bastian <bastian@kde.org>
-.br
-Germain Garand <germain@ebooksfrance.org>
-.br
-Leo Savernik <l.savernik@aon.at>
-.br
-Stephan Kulow <coolo@kde.org>
-.br
-Antti Koivisto <koivisto@kde.org>
-.br
-Apple Safari Developers
-.br
-Harri Porten <porten@kde.org>
-.br
-Koos Vriezen <koos.vriezen@xs4all.nl>
-.br
-Matt Koss <koss@miesto.sk>
-.br
-Alex Zepeda <zipzippy@sonic.net>
-.br
-Richard Moore <rich@kde.org>
-.br
-Dima Rogozin <dima@mercury.co.il>
-.br
-Wynn Wilkes <wynnw@calderasystems.com>
-.br
-Stefan Schimanski <schimmi@kde.org>
-.br
-George Staikos <staikos@kde.org>
-.br
-Dawit Alemayehu <adawit@kde.org>
-.br
-Carsten Pfeiffer <pfeiffer@kde.org>
-.br
-Torsten Rahn <torsten@kde.org>
-.br
-Torben Weis <weis@kde.org>
-.br
-Joseph Wenninger <jowenn@kde.org>
-.br
-
diff --git a/dilos/core/tdebase/debian/man/konsole-trinity.1 b/dilos/core/tdebase/debian/man/konsole-trinity.1
deleted file mode 100644
index 5de5500b4..000000000
--- a/dilos/core/tdebase/debian/man/konsole-trinity.1
+++ /dev/null
@@ -1,179 +0,0 @@
-.\" The draft of this file was generated by kdemangen.pl and edited after.
-.TH Konsole 1 "Nov 2005" "Trinity Desktop Environment" ""
-.SH NAME
-.BR Konsole
-\- X terminal emulator for TDE.
-.SH SYNOPSIS
-.BR Konsole 
-[Qt\-options] [TDE\-options] [options] [args] 
-.SH DESCRIPTION
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-.PP
-Konsole advanced features include simple configuration and the ability to use
-multiple terminal shells in a single window, making for a less
-cluttered desktop.
-.PP
-Using Konsole, a user can open:
-.PP
-.RS
-Linux console sessions
-.PP
-Shell sessions
-.PP
-Screen sessions
-.PP
-Midnight Commander file manager sessions
-.PP
-Root console sessions
-.PP
-Root Midnight Commander sessions
-.PP
-User created sessions
-.RE
-
-These sessions can be renamed to help you keep track of all your shells,
-or signaled (STOP, CONT, HUP, INT, TERM, KILL).
-.PP
-For more control over konsole, a user can:
-hide/show the menubar and/or frame;
-select the size of a konsole window, fonts, color
-schemes, and key mapping;
-change location of the scrollbar or hide the scrollbar;
-change location of the tabbar or hide the tabbar.
-.PP
-All chosen settings can be made the default for forthcoming sessions by
-saving them.
-.SH OPTIONS
-.SS
-.SS Konsole specific options:
-.TP
-.B  \-\-name  <name>
-Set window class
-.TP
-.B  \-\-ls  
-Start login shell
-.B \-T <title>                
-Set the window title
-.TP
-.B  \-\-tn  <terminal>
-Specify terminal type as set in the TERM [xterm]
-environment variable
-.TP
-.B  \-\-noclose  
-Do not close Konsole when command exits
-.TP
-.B  \-\-nohist  
-Do not save lines in history
-.TP
-.B  \-\-nomenubar  
-Do not display menubar
-.TP
-.B \-\-notabbar,  \-\-notoolbar  
-Do not display tab bar
-.TP
-.B  \-\-noframe  
-Do not display frame
-.TP
-.B  \-\-noscrollbar  
-Do not display scrollbar
-.TP
-.B  \-\-noxft  
-Do not use Xft (anti-aliasing)
-.TP
-.B  \-\-vt_sz CCxLL             
-Terminal size in columns x lines
-.TP
-.B  \-\-noresize  
-Terminal size is fixed
-.TP
-.B  \-\-type  <type>
-Start with given session type
-.TP
-.B  \-\-types  
-List available session types
-.TP
-.B  \-\-keytab  <name>
-Set keytab to 'name'
-.TP
-.B  \-\-keytabs  
-List available keytabs
-.TP
-.B  \-\-profile  <name>
-Start with given session profile
-.TP
-.B  \-\-profiles  
-List available session profiles
-.TP
-.B  \-\-schema  <name>
-| <file>  Set schema to 'name' or use 'file'
-.TP
-.B \-\-schemas,  \-\-schemata  
-List available schemata
-.TP
-.B  \-\-script  
-Enable extended DCOP Qt functions
-.TP
-.B  \-\-workdir  <dir>
-Change working directory to 'dir'
-.TP
-.B \-e <command> [ arguments ]
-Execute 'command' instead of shell. It also sets the window title and 
-icon name to be the basename of the program being executed if neither 
--T nor -n are given on the command line. 
-This must be the last option on the command line.
-.SS 
-.SS Arguments:
-.TP
-.B args
-Arguments for 'command'
-.SS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/konsole/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/konsole/'"
-from the command-line.
-.BR
-
-Konsole homepage: 
-.BR http://konsole.kde.org/
-.SH AUTHORS
-Kurt V. Hindenburg <kurt.hindenburg@kdemail.net>
-
-Lars Doelle <lars.doelle@on-line.de>
-.BR
-.SH OTHER
-This manual page was written by Ana Beatriz Guerrero Lopez <ana@ekaia.org> for the Debian
-system (but may be used by others).
-.BR
-
diff --git a/dilos/core/tdebase/debian/man/kpager-trinity.1 b/dilos/core/tdebase/debian/man/kpager-trinity.1
deleted file mode 100644
index 63a24f267..000000000
--- a/dilos/core/tdebase/debian/man/kpager-trinity.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.TH KPAGER 1 "August, 24 2003"
-.SH NAME
-kpager \- Trinity desktop pager
-.SH SYNOPSIS
-.B kpager
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kpager
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkpager\fP is a desktop pager for the Trinity desktop. It creates mini-views of the different Trinity desktops. These views show the real content of the desktop, or only icons. 
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-hidden
-Create the preview of the desktops, but hide the window
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kpager was written by the KDE project
diff --git a/dilos/core/tdebase/debian/man/kpersonalizer-trinity.1 b/dilos/core/tdebase/debian/man/kpersonalizer-trinity.1
deleted file mode 100644
index 01dc0b3cc..000000000
--- a/dilos/core/tdebase/debian/man/kpersonalizer-trinity.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.TH KPERSONALIZER 1
-.SH NAME
-kpersonalizer - TDE basic settings wizard
-
-.SH SYNOPSIS
-
-.B kpersonalizer [OPTION...]
-
-.SH DESCRIPTION
-
-The TDE Personalizer (KPersonalizer) is a wizard to configure TDE, and should automatically be run the first time a user runs TDE, to allow the user to configure basic TDE settings.
-.PP
-KPersonalizer allows the user to set locales, desktop behavior, enable accessibility features, and so forth. The options can be changed later by the Trinity Control Center application.
-
-.SH OPTIONS
-
-KPersonalizer accepts the following options:
-.PP
-.B Help options
-.TP
-.B \-\-help
-Show help about options.
-.TP
-.B \-\-help-qt
-Show Qt specific options.
-.TP
-.B \-\-help-tde 
-Show TDE specific options.
-.TP
-.B \-\-help-all 
-Show all options.
-.TP
-.B \-\-author
-Show author information.
-.TP
-.B \-v, \-\-version
-Show version information.
-.TP
-.B \-\-license 
-Show license information. 
-
-.PP
-.B Options
-.TP
-.B \-r 
-KPersonalizer is restarted by itself. 
-.TP
-.B \-\-before-session 
-KPersonalizer is started before the TDE session.
-
-.SH EXAMPLES
-.TP
-.B kpersonalizer
-Run kpersonalizer to set (or reset) TDE preferences.
-.TP
-.B kpersonalizer --before-session
-Run kpersonalizer before the first TDE session. 
-
-.SH AUTHORS
-
-Kpersonalizer was written by Ralf Nolden <nolden@kde.org>, Carsten Wolff <wolff@kde.org>, qwertz <kraftw@gmx.de>, and Bernhard Rosenkraenzer <bero@redhat.com>.
-.PP
-This  manual page was written by Joe Brockmeier <jzb@zonker.net>, for the Debian GNU/Linux project, but may be used by others.
-.SH "SEE ALSO"
-.TP
-.BR khelpcenter (1)
diff --git a/dilos/core/tdebase/debian/man/kprinter-trinity.1 b/dilos/core/tdebase/debian/man/kprinter-trinity.1
deleted file mode 100644
index a3ecdc88b..000000000
--- a/dilos/core/tdebase/debian/man/kprinter-trinity.1
+++ /dev/null
@@ -1,209 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPRINTER 1 "June 2006" "Trinity Desktop Environment" "A printer tool for TDE"
-.SH NAME
-kprinter
-\- a printer tool for TDE
-.SH SYNOPSIS
-\fBkprinter\fP [Qt\-options] [TDE\-options] [options] file(s) 
-.SH DESCRIPTION
-\fBKPrinter\fP opens automatically when you click on the "Print" icon of any TDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
-.sp 1
-\fBkprinter\fP is a very versatile tool. Depending on the actual features and power of the print subsystem of your computer, \fBkprinter\fP translates the former's abilities into a nice and easy\-to\-understand GUI. If your print subsystem does not support duplexing, \fBkprinter\fP will not show the option. If your print subsystem is CUPS, kprinter is at its peak shape.
-.sp 1
-With \fBKPrinter\fP you can...
-.IP "     \-"
-switch "on the fly" the print subsystem\-to\-use,
-.IP "     \-"
-start the Add Printer Wizard,
-.IP "     \-"
-choose the target printer,
-.IP "     \-"
-possibly select one or more files to print,
-.IP "     \-"
-drag'n'drop files for print,
-.IP "     \-"
-check for or set the print options,
-.IP "     \-"
-schedule the job for later printing,
-.IP "     \-"
-tag the print job with accounting information for billing purposes,
-.IP "     \-"
-set the job priority for a higher or lower level to influence the order of the job queue,
-.IP "     \-"
-access the TDEPrint configurator,
-.IP "     \-"
-and activate (or disable) a viewing filter that shows all or just the selected few printers relevant to the user.
-.SP
-.SH OPTIONS
-.SS
-.SS Arguments:
-file(s)                   Files to load
-.SS Options:
-.TP
-.B  \-c  
-Make an internal copy of the files to print
-.TP
-.B \-P,  \-d  <printer>
-Printer/destination to print on
-.TP
-.B \-J,  \-t  <title>
-Title/Name for the print job
-.TP
-.B \-#, \-n <number>
-Number of copies
-.TP
-.B  \-o  
-<option=value>         Printer option
-.TP
-.B  \-j  <mode>
-Job output mode (gui, console, none) [gui]
-.TP
-.B  \-\-system  <printsys>
-Print system to use (lpd, cups)
-.TP
-.B  \-\-stdin  
-Allow printing from STDIN
-.TP
-.B  \-\-nodialog  
-Do not show the print dialog (print directly)
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\fB\-\-nograb\fP, use \fB\-\-dograb\fP to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kprinter/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kprinter/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/krandom.kss-trinity.1 b/dilos/core/tdebase/debian/man/krandom.kss-trinity.1
deleted file mode 100644
index 4a13d95ec..000000000
--- a/dilos/core/tdebase/debian/man/krandom.kss-trinity.1
+++ /dev/null
@@ -1,152 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KRANDOM.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
-.SH NAME
-krandom.kss
-\- Start a random TDE screen saver
-.SH SYNOPSIS
-\fBkrandom.kss\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBkrandom.kss\fP starts a random TDE screen saver.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-setup  
-Setup screen saver
-.TP
-.B  \-\-window\-id  wid
-Run in the specified XWindow
-.TP
-.B  \-\-root  
-Run in the root XWindow
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kreadconfig-trinity.1 b/dilos/core/tdebase/debian/man/kreadconfig-trinity.1
deleted file mode 100644
index 3bb6c4d0b..000000000
--- a/dilos/core/tdebase/debian/man/kreadconfig-trinity.1
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "Trinity Desktop Environment" "Read TDEConfig entries"
-.SH NAME
-kreadconfig
-\- Read TDEConfig entries (for use in shell scripts)
-.SH SYNOPSIS
-\fBkreadconfig\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBkreadconfig\fP is a command line tool to retrieve values from TDE configuration files.
-.sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
-.SS Example:
-.TP
-\fBkreadconfig \-\-group\fP Directories \fB--key\fP dir_tmp
-read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from TDE's main configuration file
-
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-file  <file>
-Use <file> instead of global config
-.TP
-.B  \-\-group  <group>
-Group to look in [TDE]
-.TP
-.B  \-\-key  <key>
-Key to look for
-.TP
-.B  \-\-default  <default>
-Default value
-.TP
-.B  \-\-type  <type>
-Type of variable
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS
-
-.SH FILES
-.I /etc/trinity/system.kdeglobals
-global TDE configuration file
-.I ~/.trinity/share/config
-standard configuration directory
-
-.SH AUTHORS
-.nf
-Bernhard Rosenkraenzer <bero@redhat.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/krootimage-trinity.1 b/dilos/core/tdebase/debian/man/krootimage-trinity.1
deleted file mode 100644
index e9b19a604..000000000
--- a/dilos/core/tdebase/debian/man/krootimage-trinity.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KROOTIMAGE 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-krootimage
-\- set desktop background for tdm
-.SH SYNOPSIS
-\fBkrootimage\fP [Qt\-options] [TDE\-options] config 
-.SH DESCRIPTION
-\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B config
-Name of the configuration file
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kstart-trinity.1 b/dilos/core/tdebase/debian/man/kstart-trinity.1
deleted file mode 100644
index 9d3a77ddc..000000000
--- a/dilos/core/tdebase/debian/man/kstart-trinity.1
+++ /dev/null
@@ -1,215 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSTART 1 "June 2006" "Trinity Desktop Environment" "application launch utility"
-.SH NAME
-kstart
-\- Utility to launch applications with special window properties 
-.SH SYNOPSIS
-\fBkstart\fP [Qt\-options] [TDE\-options] [options] command 
-.SH DESCRIPTION
-Utility to launch applications with special window properties.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B command
-Command to execute
-.SS 
-.SS Options:
-.TP
-.B  \-\-window  <regexp>
-A regular expression matching the window title
-.TP
-.B  \-\-windowclass  <class>
-A string matching the window class (WM_CLASS property)
-The window class can be found out by running
-'xprop | grep WM_CLASS' and clicking on a window
-(use either both parts separated by a space or only the right part).
-NOTE: If you specify neither window title nor window class,
-then the very first window to appear will be taken;
-omitting both options is NOT recommended.
-.TP
-.B  \-\-desktop  <number>
-Desktop on which to make the window appear
-.TP
-.B  \-\-currentdesktop  
-Make the window appear on the desktop that was active
-when starting the application
-.TP
-.B  \-\-alldesktops  
-Make the window appear on all desktops
-.TP
-.B  \-\-iconify  
-Iconify the window
-.TP
-.B  \-\-maximize  
-Maximize the window
-.TP
-.B  \-\-maximize\-vertically  
-Maximize the window vertically
-.TP
-.B  \-\-maximize\-horizontally  
-Maximize the window horizontally
-.TP
-.B  \-\-fullscreen  
-Show window fullscreen
-.TP
-.B  \-\-type  <type>
-The window type: Normal, Desktop, Dock, Tool, 
-Menu, Dialog, TopMenu or Override
-.TP
-.B  \-\-activate  
-Jump to the window even if it is started on a 
-different virtual desktop
-.TP
-.B \-\-ontop,  \-\-keepabove  
-Try to keep the window above other windows
-.TP
-.B \-\-onbottom,  \-\-keepbelow  
-Try to keep the window below other windows
-.TP
-.B  \-\-skiptaskbar  
-The window does not get an entry in the taskbar
-.TP
-.B  \-\-skippager  
-The window does not get an entry on the pager
-.TP
-.B  \-\-tosystray  
-The window is sent to the system tray in Kicker
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Matthias Ettrich <ettrich@kde.org>
-.br
-David Faure <faure@kde.org>
-.br
-Richard J. Moore <rich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/ksystraycmd-trinity.1 b/dilos/core/tdebase/debian/man/ksystraycmd-trinity.1
deleted file mode 100644
index 4807276c0..000000000
--- a/dilos/core/tdebase/debian/man/ksystraycmd-trinity.1
+++ /dev/null
@@ -1,189 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSYSTRAYCMD 1 "June 2006" "Trinity Desktop Environment" "system tray utility"
-.SH NAME
-ksystraycmd
-\- Allows any application to be kept in the system tray
-.SH SYNOPSIS
-\fBksystraycmd\fP [Qt\-options] [TDE\-options] [options] command 
-.SH DESCRIPTION
-The system tray is an area in which an application can display a small window.
-It may be used to display status information or provide quick access to commands.
-Normally tray icons are developed as part of an application.
-\fBksystraycmd\fP allows any application to be kept in the system tray.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B command
-Command to execute
-.SS 
-.SS Options:
-.TP
-.B  \-\-window  <regexp>
-A regular expression matching the window title
-If you do not specify one, then the very first window
-to appear will be taken \- not recommended.
-.TP
-.B  \-\-wid  <int>
-The window id of the target window
-Specifies the id of the window to use. If the id starts with 0x
-it is assumed to be in hex.
-.TP
-.B  \-\-hidden  
-Hide the window to the tray on startup
-.TP
-.B  \-\-startonshow  
-Wait until we are told to show the window before
-executing the command
-.TP
-.B  \-\-tooltip  <text>
-Sets the initial tooltip for the tray icon
-.TP
-.B  \-\-keeprunning  
-Keep the tray icon even if the client exits. This option
-has no effect unless startonshow is specified.
-.TP
-.B  \-\-ownicon  
-Use ksystraycmd's icon instead of window's icon in systray
-(should be used with \-\-icon to specify ksystraycmd icon)
-.TP
-.B  \-\-ontop  
-Try to keep the window above other windows
-.TP
-.B  \-\-quitonhide  
-Quit the client when we are told to hide the window.
-This has no effect unless startonshow is specified and implies keeprunning.
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Richard Moore <rich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/ktrash-trinity.1 b/dilos/core/tdebase/debian/man/ktrash-trinity.1
deleted file mode 100644
index 0094c84fa..000000000
--- a/dilos/core/tdebase/debian/man/ktrash-trinity.1
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KTRASH 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-ktrash
-\- Helper program to handle the TDE trash can
-.SH SYNOPSIS
-\fBktrash\fP [Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-\fBktrash\fP is a helper program to handle the TDE trash can.
-.sp 1
-Note: to move files to the trash, do not use \fBktrash\fP, but "\fBkfmclient\fP move 'url' trash:/"
-.SH OPTIONS
-.SS
-.SS Options:
-.TP
-.B  \-\-empty  
-Empty the contents of the trash
-.TP
-.B  \-\-restore  <file>
-Restore a trashed file to its original location
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-.SH SEE ALSO
-\fBkfmclient\fP(1)
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kwrite-trinity.1 b/dilos/core/tdebase/debian/man/kwrite-trinity.1
deleted file mode 100644
index f7d39f61d..000000000
--- a/dilos/core/tdebase/debian/man/kwrite-trinity.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.TH KWRITE 1 "August, 25 2003"
-.SH NAME
-kwrite \- TDE text editor
-.SH SYNOPSIS
-.B kwrite
-.RI [ options ]  [file]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kwrite
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkwrite\fP is a text editor for TDE, that is a light version of \fIkate\fP.
-It allows syntax coloration for many langages.
-
-It is able to expand or collapse parts of code (C functions, ...).
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.B file
-is the file to open
-
-.SH SEE ALSO
-.BR kate (1)
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kwrite was written by the KDE project
diff --git a/dilos/core/tdebase/debian/man/kwriteconfig-trinity.1 b/dilos/core/tdebase/debian/man/kwriteconfig-trinity.1
deleted file mode 100644
index b347b9849..000000000
--- a/dilos/core/tdebase/debian/man/kwriteconfig-trinity.1
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "Trinity Desktop Environment" "Write TDEConfig entries"
-.SH NAME
-kwriteconfig
-\- Write TDEConfig entries (for use in shell scripts)
-.SH SYNOPSIS
-\fBkwriteconfig\fP [Qt\-options] [TDE\-options] [options] value 
-.SH DESCRIPTION
-\fBkwriteconfig\fP is a command line tool to write values in TDE configuration files.
-Nonexisting files/groups/keys will be created.
-.sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
-.SS Example:
-.TP
-\fBkwriteconfig \-\-file\fP \fImyrc\fP \fB\-\-group\fP Directories \fB\-\-key\fP dir_tmp /tmp
-writes the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories in configuration \fBfile\fP \fImyrc\fP
-
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B value
-The value to write. Mandatory, on a shell use '' for empty
-.SS Options:
-.TP
-.B  \-\-file  <file>
-Use <file> instead of global config
-.TP
-.B  \-\-group  <group>
-Group to look in [TDE]
-.TP
-.B  \-\-key  <key>
-Key to look for
-.TP
-.B  \-\-type  <type>
-Type of variable. Use "bool" for a boolean, otherwise it is treated as a string
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Luis Pedro Coelho <luis_pedro@netcabo.pt>
-.br
-Bernhard Rosenkraenzer <bero@redhat.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/kxkb-trinity.1 b/dilos/core/tdebase/debian/man/kxkb-trinity.1
deleted file mode 100644
index 9a6a6bcf6..000000000
--- a/dilos/core/tdebase/debian/man/kxkb-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KXKB 1 "June 2006" "Trinity Desktop Environment" "A utility to switch keyboard maps"
-.SH NAME
-kxkb
-\- A utility to switch keyboard maps
-.SH SYNOPSIS
-\fBkxkb\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKxkb\fP is a keyboard layout switching utility based on X11 xkb extension. It allows to use different keyboard layouts for inputing text. \fBKxkb\fP features keyboard layout indicator.
-.sp 1
-\fBKxkb\fP starts automatically and stays in system tray as a flag with 2 or 3 letter abbreviation of layout name on top of it if more than one layout is defined or Show indicator for single layout option is turned on.
-.sp 1
-When \fBKxkb\fP is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can right mouse button click the \fBKxkb\fP icon and select layout from the list.
-.sp 1
-Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBtdecmshell keyboard_layout\fP in a terminal.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kxkb/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kxkb/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Andriy Rysin <rysin@kde.org>
-.br
-Shaheed Haque <srhaque@iee.org>
-.br
-Ilya Konstantinov <kde\-devel@future.galanet.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/starttde-trinity.1 b/dilos/core/tdebase/debian/man/starttde-trinity.1
deleted file mode 100644
index 73ab27b9c..000000000
--- a/dilos/core/tdebase/debian/man/starttde-trinity.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH starttde 1 "Jan 17, 2005"
-.SH NAME
-starttde \- Starts up the Trinity Desktop Environment 
-.SH SYNOPSIS
-.B starttde
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B starttde
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-The \fBstarttde\fP script starts up the Trinity Desktop Environment and
-is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from
-your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
-will load your last session, or a default session that includes the standard
-TDE programs if no saved session is available.
-
-\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
-any X11R6 SM compliant program.
-
-\fBstarttde\fP and ksmserver use the contents of the ~/.trinity directory
-for starting previously saved sessions. Source scripts found in ~/.trinity/env/*.sh
-can be used to define environment variables that will be available to all TDE 
-programs.
-
-For anything else (that doesn't set env vars, or that needs a window manager),
-better use the ~/.trinity/Autostart folder.
-
-At the end of a session, the scripts found in ~/.trinity/shutdown will be executed.
-
-
-.SH OPTIONS
-\fBstarttde\fP takes no command line options.
-
-.SH AUTHOR
-\fBstarttde\fP is written by the KDE Project.
-
-This manual page was written by Philipp Grau.
-
-.SH "REPORTING BUGS"
-Report bugs of this modified Debian version of starttde to the Bug
-Tracking System at: http://bugs.debian.org
-.SH COPYRIGHT
-Copyright \(co 2005 Philipp Grau.
diff --git a/dilos/core/tdebase/debian/man/tdedebugdialog-trinity.1 b/dilos/core/tdebase/debian/man/tdedebugdialog-trinity.1
deleted file mode 100644
index af48f59e6..000000000
--- a/dilos/core/tdebase/debian/man/tdedebugdialog-trinity.1
+++ /dev/null
@@ -1,200 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEDEBUGDIALOG 1 "June 2006" "Trinity Desktop Environment" "control debug output"
-.SH NAME
-tdedebugdialog
-\- A dialog box for setting preferences for debug output
-.SH SYNOPSIS
-\fBtdedebugdialog\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
-.sp 1
-If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
-.sp 1
-If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
-.sp 1
-In full mode, first you should select the debug area you are interested in from the drop down list at the top.
-.sp 1
-You may independently set the output for various types of messages:
-.sp 1
-.RS 3
-\- Information
-.br
-\- Warning
-.br
-\- Error
-.br
-\- Fatal Error
-.RE
-.PP
-For each of these types, you can set the following:
-.sp 1
-\fBOutput to\fP:
-.br
-In this Combobox, you can choose where the messages should be output. The choices are: \fBFile\fP?, \fBMessage Box\fP, \fBShell\fP (meaning stderr), \fBSyslog\fP an \fBNone\fP. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is ?Message Box?.
-.sp 1
-\fBFilename:\fP
-.br
-This is only enabled when you have chosen \fBFile\fP as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is \fIkdebug.dbg\fP.
-Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level TDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message.
-.sp 1
-When you close the dialog by pressing OK, your entries apply immediately and are saved in \fIkdebugrc\fP. When you press Cancel, your entries are discarded and the old ones are restored.
-
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-fullmode  
-Show the fully\-fledged dialog instead of the default list dialog
-.TP
-.B  \-\-on  <area>
-Turn area on
-.TP
-.B  \-\-off  <area>
-Turn area off
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS
-
-.SH FILES
-.I ~/.trinity/share/config/kdebugrc
-\fBtdedebugdialog\fP configuration file
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdedebugdialog/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdedebugdialog/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 b/dilos/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
deleted file mode 100644
index 1e7b055f6..000000000
--- a/dilos/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-tdeio_media_mounthelper
-\- tdeio_media_mounthelper
-.SH SYNOPSIS
-\fBtdeio_media_mounthelper\fP [Qt\-options] [TDE\-options] [options] URL 
-.SH DESCRIPTION
-\fBtdeio_media_mounthelper\fP is a helper program to handle the mounting of media in TDE. It is part of the KIO subsystem.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-media:/ URL to mount/unmount/eject/remove
-.SS Options:
-.TP
-.B  \-u  
-Unmount given URL
-.TP
-.B  \-m  
-Mount given URL (default)
-.TP
-.B  \-e  
-Eject given URL via tdeeject
-.TP
-.B  \-s  
-Unmount and Eject given URL (necessary for some USB devices)
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-.SH AUTHORS
-.nf
-Waldo Bastian <bastian@kde.org>
-.br
-Kevin Ottens <ervin@ipsquad.net>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 b/dilos/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
deleted file mode 100644
index 270dd86e6..000000000
--- a/dilos/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  tdeio_system_documenthelper 1 "June 2006" "Trinity Desktop Environment" "helper script"
-.SH NAME
-tdeio_system_documenthelper
-\- TDE helper script used by document.desktop
-.SH SYNOPSIS
-\fBtdeio_system_documenthelper\fP
-
-.SH DESCRIPTION
-The script is used by document.desktop entry to determine if it must be shown or not.
-
-.SH AUTHORS
-.nf
-Kevin Ottens <ervin@ipsquad.net>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/tdepasswd-trinity.1 b/dilos/core/tdebase/debian/man/tdepasswd-trinity.1
deleted file mode 100644
index e09aff0e2..000000000
--- a/dilos/core/tdebase/debian/man/tdepasswd-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.TH TDEPASSWD 1
-
-.SH NAME
-tdepasswd \- graphical frontend to change the user's password
-
-.SH SYNOPSIS
-.B tdepasswd [ \fIQt-options\fR ] [ \fITDE-options\fR ] \fIoptions\fR
-
-.SH DESCRIPTION
-Changes a UNIX password.
-
-.SH OPTIONS
-.B Generic options:
-.TP
-.HP
-.B \-\-help
-Show help about options
-.TP
-.HP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.HP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.HP
-.B \-\-help\-all
-Show all options
-.TP
-.HP
-.B \-\-author
-Show author information
-.TP
-.HP
-.B \-v\fR, \fB \-\-version
-Show version information
-.TP
-.HP
-.B \-\-license
-Show license information
-.TP
-.B Qt options:
-.TP
-.HP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'.
-.TP
-.HP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'.
-.TP
-.HP
-.B \-\-cmap
-Causes the application to install a private 
-color map on an 8-bit display.
-.TP
-.HP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.HP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.HP
-.B \-\-dograb
-Running under a debugger can cause an implicit
--nograb, use -dograb to override.
-.TP
-.HP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.HP
-.B \-\-fn, \-\-font <fontname>
-Defines the application font.
-.TP
-.HP
-.B \-\-bg, \-\-background <color> 
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.HP
-.B \-\-fg, \-\-foreground <color> 
-Sets the default foreground color.
-.TP
-.HP
-.B \-\-btn, \-\-button <color>
-Sets the default button color.
-.TP
-.HP
-.B \-\-name <name>
-Sets the application name.
-.TP
-.HP
-.B \-\-title <title>
-Sets the application title (caption).
-.TP
-.HP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.HP
-.B \-\-inputstyle <inputstyle>
-Sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root.
-.TP
-.HP
-.B \-\-im <XIM server>
-Set XIM server.
-.TP
-.HP
-.B \-\-noxim
-Disable XIM.
-.TP
-.HP
-.B \-\-reverse
-Mirrors the whole layout of widgets.
-.TP
-.B TDE options:
-.TP
-.HP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar.
-.TP
-.HP
-.B \-\-icon <icon>
-Use 'icon' as the application icon.
-.TP
-.HP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar.
-.TP
-.HP
-.B \-\-config <filename>
-Use alternative configuration file.
-.TP
-.HP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'.
-.TP
-.HP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.HP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.HP
-.B \-\-style <style>
-Sets the application GUI style.
-.TP
-.HP
-.B \-\-geometry <geometry>
-Sets the client geometry of the main widget.
-
-.SH "SEE ALSO"
-.BR passwd (1).
-
-.SH AUTHOR
-Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/dilos/core/tdebase/debian/man/tdeprintfax-trinity.1 b/dilos/core/tdebase/debian/man/tdeprintfax-trinity.1
deleted file mode 100644
index e407c294e..000000000
--- a/dilos/core/tdebase/debian/man/tdeprintfax-trinity.1
+++ /dev/null
@@ -1,160 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEPRINTFAX 1 "June 2006" "Trinity Desktop Environment" "A fax utility"
-.SH NAME
-tdeprintfax
-\- a interface to fax-packages
-.SH SYNOPSIS
-\fBtdeprintfax\fP [Qt\-options] [TDE\-options] [options] [file] 
-.SH DESCRIPTION
-\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File to fax (added to the file list)
-.SS Options:
-.TP
-.B  \-\-phone  
-Phone number to fax to
-.TP
-.B  \-\-immediate  
-Send fax immediately
-.TP
-.B  \-\-batch  
-Exit after sending
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/tdesu-trinity.1 b/dilos/core/tdebase/debian/man/tdesu-trinity.1
deleted file mode 100644
index fa8c45e09..000000000
--- a/dilos/core/tdebase/debian/man/tdesu-trinity.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.TH TDESU 1 "May 2005" "Trinity Desktop Environment" "Runs a program with elevated privileges."
-.SH NAME
-tdesu \- Runs a program with elevated privileges.
-.SH SYNOPSIS
-\fBtdesu\fR [Qt\-options] [TDE\-options] [tdesu options] command 
-.SH DESCRIPTION
-Runs a program with elevated privileges.
-.PP
-TDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
-.PP
-\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
-.PP
-\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  --help
-Show help about options
-.TP
-.B  --help-qt
-Show Qt specific options
-.TP
-.B  --help-tde
-Show TDE specific options
-.TP
-.B  --help-all
-Show all options
-.TP
-.B  --author
-Show author information
-.TP
-.B -v,  --version
-Show version information
-.TP
-.B  --license
-Show license information
-.SS
-.SS tdesu Options:
-.TP
-.TP
-.B -c <command>
-Specifies the command to run
-.TP
-.B -f <file>
-Run command under target uid if <file> is not writable
-.TP
-.B -u <user>
-Specifies the target uid [default is root]
-.TP
-.B -n
-Do not keep password
-.TP
-.B -s
-Stop the daemon (forgets all passwords)
-.TP
-.B -t
-Enable terminal output (no password keeping)
-.TP
-.B -p <prio>
-Set priority value: 0 <= prio <= 100, 0 is lowest [default is 50]
-.TP
-.B -r
-Use realtime scheduling
-.TP
-.B  --nonewdcop
-Let command use existing dcopserver
-.TP
-.B -i <icon name>
-Specify icon to use in the password dialog
-.TP
-.B -d
-Do not show the command to be run in the dialog
-.SS 
-.SS Arguments:
-.TP
-.B command
-Specifies the command to run
-
-.SH CONFIGURATION FILES
-.PP
-\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .trinity/share/config/tdesurc. Alternative a section could be added to kdeglobals.
-.SH EXAMPLE
-The configuration item for the configuration files is the following:
-.br
-[super-user-command] 
-.br
-super-user-command=sudo
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center. You can also enter the URL
-.BR help:/tdesu/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/tdesu/'"
-from the command-line.
-.br
-.SH AUTHORS
-.br
-Geert Jansen <jansen@kde.org>
-.br
-Pietro Iglio <iglio@fub.it>
-.PP
-This manual page was written by Christopher Martin <chrsmrtn@debian.org> for Debian GNU/Linux, but may be used by others. It borrows from an earlier manpage by Karolina Lindqvist <pgd\-karolinali@algonet.se>.
diff --git a/dilos/core/tdebase/debian/man/tdm-trinity.1 b/dilos/core/tdebase/debian/man/tdm-trinity.1
deleted file mode 100644
index a51a933d9..000000000
--- a/dilos/core/tdebase/debian/man/tdm-trinity.1
+++ /dev/null
@@ -1,116 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDM 1 "June 2006" "Trinity Desktop Environment" "Trinity Display Manager"
-.SH NAME
-tdm
-\- Trinity Display Manager
-.SH SYNOPSIS
-\fBtdm\fP [options] [tty]
-.SH DESCRIPTION
-\fBtdm\fP is the Trinity display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session.
-.br
-\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network.
-.sp 1
-\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP.
-.SH OPTIONS
-.TP
-.B \-daemon
-Daemonize even when started by init
-.TP
-.B \-nodaemon
-Don't daemonize even when started from command line
-.TP
-.BI \-config\  file
-Use alternative master configuration file
-.TP
-.BR \-xrm \ res
-Override frontend\-specific resource
-.TP
-.BI \-error\  file
-Use alternative log file
-.TP
-.BR \-debug \ num
-Debug option bitfield:
-.RS 11
-0x1   \- core log
-.br
-0x2   \- config reader log
-.br
-0x4   \- greeter log
-.br
-0x8   \- IPC log
-.br
-0x10  \- session sub-daemon post-fork delay
-.br
-0x20  \- config reader post-start delay
-.br
-0x40  \- greeter post-start delay
-.br
-0x80  \- don't use syslog
-.br
-0x100 \- core Xauth log
-.br
-0x400 \- valgrind config reader and greeter
-.br
-0x800 \- strace config reader and greeter
-.RE
-.SH FILES
-.TP
-.I /etc/trinity/tdm/backgroundrc
-configuration file with background settings
-.TP
-.I /etc/trinity/tdm/tdm.options
-options for X display manager tdm
-.TP
-.I /etc/trinity/tdm/tdmrc
-the tdm configuration file
-.TP
-.I /etc/trinity/tdm/Xaccess
-access control file for XDMCP connections
-.TP
-.I /etc/trinity/tdm/Xservers
-list of local X-servers
-.TP
-.I /etc/trinity/tdm/Xreset
-script to run as root after session exits
-.TP
-.I /etc/trinity/tdm/Xsession
-script to run as user after login of user
-.TP
-.I /etc/trinity/tdm/Xsetup
-script to run as root before the login dialog appears
-.sp 1
-this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen
-.TP
-.I /etc/trinity/tdm/Xstartup
-script to run as root before session starts
-.TP
-.I /etc/trinity/tdm/Xwilling
-output of this script is displayed in the chooser window
-.SH SEE ALSO
-.BR tdm.options (5),\  tdmctl (1),\  tdm_config (1),\  tdm_greet (1),\  startx (1),\  X (7x),\  xconsole (1),\  xdm (1)
-.TP
-.I /usr/share/doc/tdm/README.gz
-Information about \fBtdm\fP and its options
-.sp 1
-.RE
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdm/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdm/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Steffen Hansen <hansen@kde.org>
-.br
-Thomas Tanghus <tanghus@earthling.net>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/tdm_config-trinity.1 b/dilos/core/tdebase/debian/man/tdm_config-trinity.1
deleted file mode 100644
index b8753b168..000000000
--- a/dilos/core/tdebase/debian/man/tdm_config-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_CONFIG 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-tdm_config
-\- helper programm for tdm to read configuration files
-.SH SYNOPSIS
-\fBtdm_config\fP
-.SH DESCRIPTION
-\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files.
-.SH SEE ALSO
-\fBtdm\fP(1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/tdm_greet-trinity.1 b/dilos/core/tdebase/debian/man/tdm_greet-trinity.1
deleted file mode 100644
index 10b7bde6e..000000000
--- a/dilos/core/tdebase/debian/man/tdm_greet-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_GREET 1 "June 2006" "Trinity Desktop Environment" "TDE greeter module"
-.SH NAME
-tdm_greet
-\- TDE greeter module for tdm
-.SH SYNOPSIS
-\fBtdm_greet\fP
-.SH DESCRIPTION
-\fBtdm_greet\fP is a TDE greeter module for \fBtdm\fP. It shows the login dialog.
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/man/tdmctl-trinity.1 b/dilos/core/tdebase/debian/man/tdmctl-trinity.1
deleted file mode 100644
index d62d1ee4b..000000000
--- a/dilos/core/tdebase/debian/man/tdmctl-trinity.1
+++ /dev/null
@@ -1,220 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDMCTL 1 "June 2006" "Trinity Desktop Environment" "TDM remote control application"
-.SH NAME
-tdmctl
-\- tdm remote control application
-.SH SYNOPSIS
-\fBtdmctl\fP [options] [command [command arguments]]
-.SH DESCRIPTION
-\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets.
-.sp 1
-There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user).
-.sp 1
-The directory in which the sockets are located is determined this way:
-.RS 3
-\- the \fB\-s\fP option is examined
-.br
-\- the $DM_CONTROL variable is examined
-.br
-\- the tdm config file is searched for the FifoDir key
-.br
-.RI \- /var/run/xdmctl \ and\  /var/run \ are\ tried
-.RE
-.sp 1
-If $DISPLAY is set (or \fB\-d\fP was specified) and \fB\-g\fP was not specified, the
-display\-specific control socket will be used, otherwise the global one.
-.sp 1
-Tokens in the command and the reply are tab\-separated.
-Command arguments can be specified as separate command line parameters,
-in which case they are simply concatenated with tabs in between.
-.sp 1
-If the command is '\-', \fBtdmctl\fP reads commands from stdin.
-The default command is 'caps'.
-.SH OPTIONS
-.SS
-.SS Options:
-.TP
-.B \-h \-help
-print help message.
-.TP
-.B \-g \-global
-Use global control socket even if $DISPLAY is set
-.TP
-.B \-d \-display
-Override $DISPLAY
-.TP
-.B \-s \-sockets
-Override $DM_CONTROL
-.TP
-.B \-c \-config
-Use alternative tdm config file
-.SS Commands:
-.br
-.SS Global commands:
-.TP 
-.B login
-display (now|schedule) user password [session_arguments]
-.br
- login user at specified display. if "now" is specified, a possibly running session is killed, otherwise the login is done after the session exits.
-.br
-session_arguments are printf\-like escaped contents for \fI.dmrc\fP. Unlisted keys will default to previously saved values.
-.SS Per\-display commands:
-.TP 
-.B lock
-The display is marked as locked. If the X\-Server crashes in this state, no auto\-relogin will be performed even if the option is on.
-.TP 
-.B unlock
-Reverse the effect of "lock": re\-enable auto\-relogin.
-.TP 
-.B suicide
-The currently running session is forcibly terminated. No auto\-relogin is attempted, but a scheduled "login" command will be executed.
-.SS Commands for all sockets:
-.TP
-.B caps
-Returns a list of this socket's capabilities:
-.IP "    \- tdm"
-identifies tdm, in case some other DM implements this protocol, too.
-.IP "    \- list, activate, lock, suicide, login"
-the respective command is supported.
-.IP "    \- bootoptions"
-the "listbootoptions" command and the "=" option to "shutdown" are supported.
-.IP "    \- shutdown <list>"
-"shutdown" is supported and allowed to the listed users (comma\-separated). "*" means all authenticated users.
-.IP "    \- shutdown"
-"shutdown" is supported and allowed to everybody.
-.IP "    \- nuke <list>"
-forced shutdown is allowed to the listed users.
-.IP "    \- nuke"
-forced shutdown is allowed to everybody.
-.IP "    \- reserve <number>"
-reserve displays are configured and <number> are available at this time.
-.TP 
-\fBlist\fP [all|alllocal]
-.br
-Return a list of running sessions. By default all active sessions are listed. If "all" is specified, passive sessions are listed as well. If "alllocal" is specified, passive sessions are listed as well, but all incoming remote sessions are skipped.
-.sp 1
-Each session entry is a comma\-separated tuple of:
-.RS 7
-\- Display or TTY name
-.br
-\- VT name for local sessions
-.br
-\- Logged in user's name, empty for passive sessions and outgoing
-.br
-  remote sessions (local chooser mode)
-.br
-\- Session type or remote host for outgoing remote sessions,
-.br
-  empty for passive sessions
-.br
-\- A flag field:
-.RS 5
-\- "t" for tty sessions
-.br
-\- "*" for the display belonging to the requesting socket
-.br
-\- "!" for sessions that cannot be killed by the requesting
-.br
-  socket
-.br
-\- New flags might be added later
-.br
-.RE
-\- New fields might be added later
-.RE
-.TP
-\fBreserve\fP [timeout in seconds]
-.br
-Start a reserve login screen. If nobody logs in within the specified amount of time (one minute by default), the display is removed again. When the session on the display exits, the display is removed, too.
-.br
-Permitted only on sockets of local displays and the global socket.
-.TP
-\fBactivate\fP (vt|display)
-.br
-Switch to a particular VT (virtual terminal). The VT may be specified either directly (e.g., vt3) or by a display using it (e.g., :2).
-.br
-Permitted only on sockets of local displays and the global socket.
-.TP
-.B listbootoptions
-List available boot options.
-.br
-=> "ok" list default current default and current are indices into the list and are \-1 if unset or undeterminable.
-.TP
-\fBshutdown\fP (reboot|halt) [=bootchoice]
-.br
-  (ask|trynow|forcenow|schedule|start
-.br
-   (\-1|end (force|forcemy|cancel)))
-.br
-.RS 7
-Request a system shutdown, either a reboot or a halt/poweroff.
-.sp 1
-An OS choice for the next boot may be specified from the list returned by "listbootoptions".
-.sp 1
-Shutdowns requested from per\-display sockets are executed when the current session on that display exits. Such a request may pop up a dialog asking for confirmation and/or authentication.
-.sp 1
-start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately.
-.sp 1
-end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following:
-.RS 3
-- "cancel" \- give up the shutdown.
-.br
-- "force" \- shut down nonetheless.
-.br
-- "forcemy" \- shut down nonetheless if all active sessions
-.br
-   belong to the requesting user. Only for per\-display sockets.
-.RE
-.sp 1
-start and end are specified in seconds since the UNIX epoch.
-.sp 1
-"trynow" is a synonym for "0 0 cancel", "forcenow" for "0 0 force" and "schedule" for "0 \-1".
-.sp 1
-"ask" attempts an immediate shutdown and interacts with the user if active sessions are still running. Only for per\-display sockets.
-.RE
-.TP
-\fBshutdown cancel\fP [local|global]
-.br
-Cancel a scheduled shutdown. The global socket always cancels the currently pending shutdown, while per\-display sockets default to cancelling their queued request.
-.TP
-\fBshutdown status\fP
-Return a list with information about shutdowns.
-.br
-The entries are comma\-separated tuples of:
-.RS 10
-\- ("global"|"local") \- pending vs. queued shutdown. A local
-.br
-  entry can be returned only by a per\-display socket.
-.br
-\- ("halt"|"reboot")
-.br
-\- start
-.br
-\- end
-.br
-\- ("ask"|"force"|"forcemy"|"cancel")
-.br
-\- Numeric user ID of the requesting user, \-1 for the global
-.br
-  socket.
-.br
-\- The next boot OS choice or "\-" for none.
-.br
-\- New fields might be added later.
-.RE
-.SH SEE ALSO
-.BR tdm (1)
-.TP
-.I /usr/share/doc/tdm/README.gz
-Information about the command sockets (and \fBtdm\fP)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdebase/debian/prune-nonfree b/dilos/core/tdebase/debian/prune-nonfree
deleted file mode 100644
index 4fa832d5c..000000000
--- a/dilos/core/tdebase/debian/prune-nonfree
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-# Removes non-free files from the source tree. Must be done before
-# creating the orig.tar.gz.
-
-TOPLEVEL="$1"
-
-if [ "$TOPLEVEL" = "" ]; then
-	echo "Please provide the toplevel directory as the argument."
-	exit 1
-else
-	rm -f $TOPLEVEL/kcontrol/energy/pics/energybig.png
-	rm -f $TOPLEVEL/kcontrol/energy/pics/lo-energy.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr128-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr16-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr32-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr48-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr64-app-energy_star.png
-fi
-
-exit 0
diff --git a/dilos/core/tdebase/debian/rules b/dilos/core/tdebase/debian/rules
index 872a0adb4..d0ce30141 100755
--- a/dilos/core/tdebase/debian/rules
+++ b/dilos/core/tdebase/debian/rules
@@ -100,15 +100,6 @@ PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-t
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
-makebuilddir::
-	touch kcontrol/energy/pics/energybig.png
-	touch kcontrol/energy/pics/lo-energy.png
-	uudecode -o kcontrol/pics/cr128-app-energy_star.png debian/img/cr128-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr16-app-energy_star.png debian/img/cr16-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr32-app-energy_star.png debian/img/cr32-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr48-app-energy_star.png debian/img/cr48-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr64-app-energy_star.png debian/img/cr64-app-energy_star.png.uu
-
 common-install-prehook-arch::
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-i386
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-amd64
@@ -117,7 +108,6 @@ common-install-prehook-arch::
 
 clean::
 	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-tdeio-plugins-trinity.install.kfreebs*
-	rm -f kcontrol/pics/cr*-app-energy_star.png kcontrol/energy/pics/energybig.png kcontrol/energy/pics/lo-energy.png
 
 binary-install/tdebase-data-trinity::
 	# hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time
diff --git a/dilos/core/tdebase/debian/tdebase-data-trinity.install b/dilos/core/tdebase/debian/tdebase-data-trinity.install
index 4deb26c90..2ff6aeb6e 100644
--- a/dilos/core/tdebase/debian/tdebase-data-trinity.install
+++ b/dilos/core/tdebase/debian/tdebase-data-trinity.install
@@ -57,6 +57,8 @@ debian/tmp/usr/share/apps/kcontrol/pics/gamma2.2.gif
 debian/tmp/usr/share/apps/kcontrol/pics/gamma2.2.png
 debian/tmp/usr/share/apps/kcontrol/pics/gamma2.4.gif
 debian/tmp/usr/share/apps/kcontrol/pics/gamma2.4.png
+debian/tmp/usr/share/apps/kcontrol/pics/energybig.png
+debian/tmp/usr/share/apps/kcontrol/pics/lo-energy.png
 debian/tmp/usr/share/apps/tdedisplay/app-defaults/AAAAAAGeneral.ad
 debian/tmp/usr/share/apps/tdedisplay/app-defaults/AAAMotif.ad
 debian/tmp/usr/share/apps/tdedisplay/app-defaults/AAATk.ad
diff --git a/dilos/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/dilos/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 0b7cc73c5..4a036828d 100644
--- a/dilos/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/dilos/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -149,6 +149,8 @@ debian/tmp/usr/share/doc/tde/HTML/en/tdeioslave/xz
 debian/tmp/usr/share/doc/tde/HTML/en/tdeioslave/zeroconf
 debian/tmp/usr/share/doc/tde/HTML/en/tdeioslave/zip
 debian/tmp/usr/share/icons/crystalsvg/*/apps/mac.png
+debian/tmp/usr/share/man/man1/tdeio_media_mounthelper.1
+debian/tmp/usr/share/man/man1/ktrash.1
 debian/tmp/usr/share/mimelnk/inode/system_directory.desktop
 debian/tmp/usr/share/mimelnk/media/audiocd.desktop
 debian/tmp/usr/share/mimelnk/media/blankbluray.desktop
diff --git a/dilos/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages b/dilos/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
deleted file mode 100644
index 249292ad7..000000000
--- a/dilos/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/tdeio_media_mounthelper-trinity.1
-debian/man/ktrash-trinity.1
diff --git a/dilos/core/tdebase/debian/tdebase-trinity-bin.install b/dilos/core/tdebase/debian/tdebase-trinity-bin.install
index 69e9344a3..8fe01a835 100644
--- a/dilos/core/tdebase/debian/tdebase-trinity-bin.install
+++ b/dilos/core/tdebase/debian/tdebase-trinity-bin.install
@@ -100,3 +100,20 @@ debian/tmp/usr/share/doc/tde/HTML/en/kxkb/layout.png
 debian/tmp/usr/share/doc/tde/HTML/en/kxkb/switching.png
 debian/tmp/usr/share/doc/tde/HTML/en/kxkb/xkb.png
 debian/tmp/usr/share/services/kxkb.desktop
+debian/tmp/usr/share/man/man1/drkonqi.1
+debian/tmp/usr/share/man/man1/kblankscrn.kss.1
+debian/tmp/usr/share/man/man1/kcheckpass.1
+debian/tmp/usr/share/man/man1/kcminit.1
+debian/tmp/usr/share/man/man1/kdcop.1
+debian/tmp/usr/share/man/man1/kdialog.1
+debian/tmp/usr/share/man/man1/khotkeys.1
+debian/tmp/usr/share/man/man1/knetattach.1
+debian/tmp/usr/share/man/man1/krandom.kss.1
+debian/tmp/usr/share/man/man1/kreadconfig.1
+debian/tmp/usr/share/man/man1/kstart.1
+debian/tmp/usr/share/man/man1/ksystraycmd.1
+debian/tmp/usr/share/man/man1/kwriteconfig.1
+debian/tmp/usr/share/man/man1/kxkb.1
+debian/tmp/usr/share/man/man1/tdedebugdialog.1
+debian/tmp/usr/share/man/man1/tdeio_system_documenthelper.1
+debian/tmp/usr/share/man/man1/tdesu.1
diff --git a/dilos/core/tdebase/debian/tdebase-trinity-bin.links b/dilos/core/tdebase/debian/tdebase-trinity-bin.links
index 975b98403..ae96aae0b 100644
--- a/dilos/core/tdebase/debian/tdebase-trinity-bin.links
+++ b/dilos/core/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-usr/share/man/man1/tdesu-trinity.1.gz usr/share/man/man1/tdesud-trinity.1.gz
+usr/share/man/man1/tdesu.1 usr/share/man/man1/tdesud.1
diff --git a/dilos/core/tdebase/debian/tdebase-trinity-bin.manpages b/dilos/core/tdebase/debian/tdebase-trinity-bin.manpages
deleted file mode 100644
index 92b784172..000000000
--- a/dilos/core/tdebase/debian/tdebase-trinity-bin.manpages
+++ /dev/null
@@ -1,17 +0,0 @@
-debian/man/drkonqi-trinity.1
-debian/man/kblankscrn.kss-trinity.1
-debian/man/kcheckpass-trinity.1
-debian/man/kcminit-trinity.1
-debian/man/kdcop-trinity.1
-debian/man/tdedebugdialog-trinity.1
-debian/man/tdesu-trinity.1
-debian/man/kdialog-trinity.1
-debian/man/khotkeys-trinity.1
-debian/man/tdeio_system_documenthelper-trinity.1
-debian/man/knetattach-trinity.1
-debian/man/krandom.kss-trinity.1
-debian/man/kreadconfig-trinity.1
-debian/man/kstart-trinity.1
-debian/man/ksystraycmd-trinity.1
-debian/man/kwriteconfig-trinity.1
-debian/man/kxkb-trinity.1
diff --git a/dilos/core/tdebase/debian/tdepasswd-trinity.install b/dilos/core/tdebase/debian/tdepasswd-trinity.install
index 9b29dc799..058a912b4 100644
--- a/dilos/core/tdebase/debian/tdepasswd-trinity.install
+++ b/dilos/core/tdebase/debian/tdepasswd-trinity.install
@@ -36,3 +36,4 @@ debian/tmp/usr/share/config.kcfg/kcm_useraccount_pass.kcfg
 debian/tmp/usr/share/doc/tde/HTML/en/tdepasswd/common
 debian/tmp/usr/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2
 debian/tmp/usr/share/doc/tde/HTML/en/tdepasswd/index.docbook
+debian/tmp/usr/share/man/man1/tdepasswd.1
diff --git a/dilos/core/tdebase/debian/tdepasswd-trinity.manpages b/dilos/core/tdebase/debian/tdepasswd-trinity.manpages
deleted file mode 100644
index 1a6f4abad..000000000
--- a/dilos/core/tdebase/debian/tdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdepasswd-trinity.1
diff --git a/dilos/core/tdebase/debian/tdeprint-trinity.install b/dilos/core/tdebase/debian/tdeprint-trinity.install
index 041786e32..1191a8ca0 100644
--- a/dilos/core/tdebase/debian/tdeprint-trinity.install
+++ b/dilos/core/tdebase/debian/tdeprint-trinity.install
@@ -123,6 +123,9 @@ debian/tmp/usr/share/icons/hicolor/*/apps/tdeprintfax.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kjobviewer.svgz
 debian/tmp/usr/share/icons/hicolor/scalable/apps/printmgr.svgz
 debian/tmp/usr/share/icons/hicolor/scalable/apps/tdeprintfax.svgz
+debian/tmp/usr/share/man/man1/kjobviewer.1
+debian/tmp/usr/share/man/man1/kprinter.1
+debian/tmp/usr/share/man/man1/tdeprintfax.1
 debian/tmp/usr/share/mimelnk/print/class.desktop
 debian/tmp/usr/share/mimelnk/print/driver.desktop
 debian/tmp/usr/share/mimelnk/print/folder.desktop
diff --git a/dilos/core/tdebase/debian/tdeprint-trinity.manpages b/dilos/core/tdebase/debian/tdeprint-trinity.manpages
deleted file mode 100644
index 55b9bfae7..000000000
--- a/dilos/core/tdebase/debian/tdeprint-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/tdeprintfax-trinity.1
-debian/man/kjobviewer-trinity.1
-debian/man/kprinter-trinity.1
diff --git a/dilos/core/tdebase/debian/tdm-trinity.install b/dilos/core/tdebase/debian/tdm-trinity.install
index 4e91c5434..9ba22f862 100644
--- a/dilos/core/tdebase/debian/tdm-trinity.install
+++ b/dilos/core/tdebase/debian/tdm-trinity.install
@@ -51,6 +51,12 @@ debian/tmp/usr/share/doc/tde/HTML/en/tdm/common
 debian/tmp/usr/share/doc/tde/HTML/en/tdm/index.cache.bz2
 debian/tmp/usr/share/doc/tde/HTML/en/tdm/index.docbook
 debian/tmp/usr/share/doc/tde/HTML/en/tdm/tdmrc-ref.docbook
+debian/tmp/usr/share/man/man1/gentdmconf.1
+debian/tmp/usr/share/man/man1/krootimage.1
+debian/tmp/usr/share/man/man1/tdm.1
+debian/tmp/usr/share/man/man1/tdm_config.1
+debian/tmp/usr/share/man/man1/tdm_greet.1
+debian/tmp/usr/share/man/man1/tdmctl.1
 
 #DilOS SMF
 debian/svc/tdm		var/svc/method/
diff --git a/dilos/core/tdebase/debian/tdm-trinity.manpages b/dilos/core/tdebase/debian/tdm-trinity.manpages
deleted file mode 100644
index 690a0f462..000000000
--- a/dilos/core/tdebase/debian/tdm-trinity.manpages
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/man/gentdmconf-trinity.1
-debian/man/tdm-trinity.1
-debian/man/tdm_config-trinity.1
-debian/man/tdmctl-trinity.1
-debian/man/tdm_greet-trinity.1
-debian/man/krootimage-trinity.1
diff --git a/dilos/core/tdebindings/debian/control b/dilos/core/tdebindings/debian/control
index 99fbd2427..c9b846391 100644
--- a/dilos/core/tdebindings/debian/control
+++ b/dilos/core/tdebindings/debian/control
@@ -1,7 +1,7 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
  python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
- default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc],
+ default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
  tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev,
  graphviz [solaris-any], libgtk2.0-dev [solaris-any], oracle-java8-jdk [solaris-any]
diff --git a/dilos/core/tdebindings/debian/juic-trinity.install b/dilos/core/tdebindings/debian/juic-trinity.install
index 489cc979d..b3754926d 100644
--- a/dilos/core/tdebindings/debian/juic-trinity.install
+++ b/dilos/core/tdebindings/debian/juic-trinity.install
@@ -4,3 +4,4 @@ qtjava/designer/juic/common/*.xsl	/usr/share/juic/common
 qtjava/designer/juic/java/*.xml	/usr/share/juic/java
 qtjava/designer/juic/java/*.xsl	/usr/share/juic/java
 qtjava/designer/juic/juic.xsl	/usr/share/juic
+debian/tmp/usr/share/man/man1/juic.1
diff --git a/dilos/core/tdebindings/debian/juic-trinity.manpages b/dilos/core/tdebindings/debian/juic-trinity.manpages
deleted file mode 100644
index 3b2609197..000000000
--- a/dilos/core/tdebindings/debian/juic-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/juic.1
diff --git a/dilos/core/tdebindings/debian/libdcop3-java-trinity-dev.install b/dilos/core/tdebindings/debian/libdcop3-java-trinity-dev.install
index bcc14a752..3afb886e0 100644
--- a/dilos/core/tdebindings/debian/libdcop3-java-trinity-dev.install
+++ b/dilos/core/tdebindings/debian/libdcop3-java-trinity-dev.install
@@ -1 +1,2 @@
 debian/tmp/usr/bin/dcopidl2java
+debian/tmp/usr/share/man/man1/dcopidl2java.1
diff --git a/dilos/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages b/dilos/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages
deleted file mode 100644
index 74e63033b..000000000
--- a/dilos/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/dcopidl2java.1
diff --git a/dilos/core/tdebindings/debian/libkorundum0-ruby-trinity.install b/dilos/core/tdebindings/debian/libkorundum0-ruby-trinity.install
index 8df9c7310..a61f2891a 100644
--- a/dilos/core/tdebindings/debian/libkorundum0-ruby-trinity.install
+++ b/dilos/core/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -9,4 +9,8 @@ debian/tmp/usr/lib/ruby/*/TDE/korundum.rb
 debian/tmp/usr/lib/*/*/*/korundum.so*
 debian/tmp/usr/lib/*/*/*/korundum.la
 
+debian/tmp/usr/share/man/man1/krubyinit.1
+debian/tmp/usr/share/man/man1/rbtdesh.1
+debian/tmp/usr/share/man/man1/rbtdeapi.1
+
 korundum/ChangeLog /usr/share/doc/libkorundum0-ruby
diff --git a/dilos/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/dilos/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages
deleted file mode 100644
index ab2f0ee35..000000000
--- a/dilos/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbtdesh.1
-debian/local/rbtdeapi.1
diff --git a/dilos/core/tdebindings/debian/libqt0-ruby-trinity.install b/dilos/core/tdebindings/debian/libqt0-ruby-trinity.install
index ca7fdff7c..1a89c8d9a 100644
--- a/dilos/core/tdebindings/debian/libqt0-ruby-trinity.install
+++ b/dilos/core/tdebindings/debian/libqt0-ruby-trinity.install
@@ -12,4 +12,9 @@ debian/tmp/usr/lib/*/*/*/qtruby.la
 debian/tmp/usr/lib/*/*/*/tqui.so*
 debian/tmp/usr/lib/*/*/*/tqui.la
 
+debian/tmp/usr/share/man/man1/qtrubyinit.1
+debian/tmp/usr/share/man/man1/rbqtsh.1
+debian/tmp/usr/share/man/man1/rbqtapi.1
+debian/tmp/usr/share/man/man1/rbuic.1
+
 qtruby/ChangeLog /usr/share/doc/libqt0-ruby
diff --git a/dilos/core/tdebindings/debian/libqt0-ruby-trinity.manpages b/dilos/core/tdebindings/debian/libqt0-ruby-trinity.manpages
deleted file mode 100644
index f2dc6de31..000000000
--- a/dilos/core/tdebindings/debian/libqt0-ruby-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/local/qtrubyinit.1
-debian/local/rbqtsh.1
-debian/local/rbqtapi.1
-debian/local/rbuic.1
diff --git a/dilos/core/tdebindings/debian/local/dcopidl2java.1 b/dilos/core/tdebindings/debian/local/dcopidl2java.1
deleted file mode 100644
index 926d78391..000000000
--- a/dilos/core/tdebindings/debian/local/dcopidl2java.1
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH LIBDCOP-JAVA 1 "July 31, 2002"
-.SH NAME
-dcopidl2java \- Convert a DCOP IDL file to Java language stubs
-.SH SYNOPSIS
-.B dcopidl2java
-.RI " [ " --no-skel " ]  [ " --no-stub " ]  [ " --package " " java-package " ] " file
-.SH DESCRIPTION
-This manual page documents briefly the
-.B dcopidl2java
-command.
-.PP
-\fBdcopidl2java\fP is a program that generates Java stubs from a DCOP IDL file,
-for use with the libdcop-java Java DCOP bindings.
-
-.SH OPTIONS
-A summary of options is included below.
-.TP
-.B --no-skel
-Do not generate skeleton code.
-.TP
-.B --no-stub
-Do not generate stub implementation code.
-.TP
-.B --package java-package 
-Set the name of the Java package to use in the generated code.
-.SH AUTHOR
-This manual page was written by Peter Hawkins <peterh@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdebindings/debian/local/juic.1 b/dilos/core/tdebindings/debian/local/juic.1
deleted file mode 100644
index 9120f44d3..000000000
--- a/dilos/core/tdebindings/debian/local/juic.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH JUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Java UI Compiler Manual"
-.SH NAME
-juic \- The Qt Java UI Compiler
-.SH SYNOPSIS
-.B juic
-[options] uifile
-.SH DESCRIPTION
-Juic is the Qt Java UI Compiler.  It generates Java\*(tm code from a
-XML UI Description file.  This XML UI Description file can be
-generated by Qt Designer, Qt's graphical UI designer.  Juic is the
-Java\*(tm equivalent for the C++ uic program.
-
-Juic generates Java code for the Qt UI Description File passed to it,
-and outputs it on standard output.
-.SH OPTIONS
-.TP
-.B \-proc   <xsltproc|xalan|saxon>
-Tells juic which xslt processor to use internally.  Possible values
-are "xsltproc", "xalan", "saxon".  The processor you specify must be
-available in the PATH or juic will give an error.  The default is to
-use xsltproc if it's available, and use saxon otherwise.
-.TP
-.B \-package   <the.package.for.the.class>
-Tells juic to add the given package declaration to the generated java
-class.
-.TP
-.B \-abstract   <true|false>
-Tells juic whether or not to define slots as abstract.
-.TP
-.B \-images   <dir>
-Tells juic where to find the images used in the given ui file.
-Default is "images".
-.TP
-.B \-os   <unix|msdos|mac>
-Tells juic what newline style to use in the generated java file.  Possible values are "unix", "msdos" and "mac", for UNIX, DOS and MacOS style newlines respectively.
-.SH AUTHOR
-Marco Ladermann
-.SH SEE ALSO
-uic(1)
diff --git a/dilos/core/tdebindings/debian/local/krubyinit.1 b/dilos/core/tdebindings/debian/local/krubyinit.1
deleted file mode 100644
index f8a405452..000000000
--- a/dilos/core/tdebindings/debian/local/krubyinit.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH KRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "KRubyInit Manual"
-.SH NAME
-krubyinit \- Start Korundum Ruby Scripts Faster
-.SH SYNOPSYS
-.B krubyinit
-[switches] [--] [programfile] [arguments]
-.SH DESCRIPTION
-Krubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the Korundum library ( the Ruby TDE bindings ).  It uses
-the tdeinit system to start the app so that they start a little bit
-faster when started in a running TDE session.
-
-The script takes exactly the same options as the ruby(1) program.
-Therefore, its options aren't documented here, please refer to the
-ruby(1) manpage.
-
-This script is part of Korundum, which is part of the TDE Bindings
-module.
-.SH OPTIONS
-Krubyinit takes exactly the same options as the ruby(1) program and
-they have exactly the same meaning.  Please refer to its manpage.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-ruby(1)
diff --git a/dilos/core/tdebindings/debian/local/qtrubyinit.1 b/dilos/core/tdebindings/debian/local/qtrubyinit.1
deleted file mode 100644
index 1ab6e7f28..000000000
--- a/dilos/core/tdebindings/debian/local/qtrubyinit.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH QTRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "QtRubyInit Manual"
-.SH NAME
-qtrubyinit \- Start Qt Ruby Scripts Faster
-.SH SYNOPSYS
-.B qtrubyinit
-[switches] [--] [programfile] [arguments]
-.SH DESCRIPTION
-Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the QtRuby library.  It uses the tdeinit system to start
-the app so that they start a little bit faster when started in a
-running TDE session.
-
-The script takes exactly the same options as the ruby(1) program.
-Therefore, its options aren't documented here, please refer to the
-ruby(1) manpage.
-
-This script is part of QtRuby, which is part of the TDE Bindings
-module.
-.SH OPTIONS
-Qtrubyinit takes exactly the same options as the ruby(1) program and
-they have exactly the same meaning.  Please refer to its manpage.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-ruby(1)
diff --git a/dilos/core/tdebindings/debian/local/rbqtapi.1 b/dilos/core/tdebindings/debian/local/rbqtapi.1
deleted file mode 100644
index 7cafb5b8c..000000000
--- a/dilos/core/tdebindings/debian/local/rbqtapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBQTAPI 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
-.SH NAME
-rbqtapi \- A QtRuby Introspection Tool
-.SH SYNOPSIS
-.B rbqtapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbqtapi is a QtRuby Introspection Tool, similar to javap(1).  Use it
-to find a list of method for a certain QtRuby class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbtdeapi(1)
diff --git a/dilos/core/tdebindings/debian/local/rbqtsh.1 b/dilos/core/tdebindings/debian/local/rbqtsh.1
deleted file mode 100644
index bda49d962..000000000
--- a/dilos/core/tdebindings/debian/local/rbqtsh.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH RBQTSH 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
-.SH NAME
-rbqtsh \- An Interactive QtRuby Shell
-.SH SYNOPSIS
-.B rbqtsh
-[options]
-.SH DESCRIPTION
-Rbqtsh is an interactive QtRuby shell.  It shows a GUI dialog box
-where you can enter Ruby code using the QtRuby library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbtdesh(1)
diff --git a/dilos/core/tdebindings/debian/local/rbtdeapi.1 b/dilos/core/tdebindings/debian/local/rbtdeapi.1
deleted file mode 100644
index e3d166225..000000000
--- a/dilos/core/tdebindings/debian/local/rbtdeapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
-.SH NAME
-rbtdeapi \- A Korundum TDE Ruby Introspection Tool
-.SH SYNOPSIS
-.B rbtdeapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
-javap(1).  Use it to find a list of method for a certain Korundum class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbqtapi(1)
diff --git a/dilos/core/tdebindings/debian/local/rbtdesh.1 b/dilos/core/tdebindings/debian/local/rbtdesh.1
deleted file mode 100644
index 6e792e7fa..000000000
--- a/dilos/core/tdebindings/debian/local/rbtdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBTDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
-.SH NAME
-rbtdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbtdesh
-[options]
-.SH DESCRIPTION
-Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum TDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/dilos/core/tdebindings/debian/local/rbuic.1 b/dilos/core/tdebindings/debian/local/rbuic.1
deleted file mode 100644
index d59caa1ac..000000000
--- a/dilos/core/tdebindings/debian/local/rbuic.1
+++ /dev/null
@@ -1,64 +0,0 @@
-.TH RBUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Ruby UI Compiler Manual"
-.SH NAME
-rbuic \- The Qt Ruby UI Compiler
-.SH SYNOPSIS
-Generate implementation:
-.B rbuic
-[options] uifile
-.LP
-Generate subclass implementation:
-.B rbuic
-[options] -subimpl <classname> <uifile>
-.LP
-Generate image collection:
-.B rbuic
-[options] -embed <project> <image1> <image2> <image3> ...
-.SH DESCRIPTION
-Rbuic is the Qt Ruby UI Compiler.  It generates Ruby code from a XML
-UI Description file.  This XML UI Description file can be generated by
-Qt Designer, Qt's graphical UI designer.  Rbuic is the Ruby equivalent
-for the C++ uic program.
-
-When invoked to generate an implementation, rbuic generates Ruby code
-for the Qt UI Description File passed to it, and outputs it on
-standard output.
-
-When invoked to generate a subclass implementation, rbuic generates
-template Ruby code for a subclass of the widget in the Qt UI
-Description File passed to it, and outputs it on standard output.
-
-When invoked to generate an image collection, rbuic generates Ruby
-code containing the image data in strings.  This is useful to avoid
-having to distribute image files along with your application.  It is
-arguably more useful for C++ ( where the image strings can be compiled
-into an executable ), but still, it is available for Ruby as well.
-.SH OPTIONS
-.TP
-.B \-o <file>
-Write output to file rather than stdout.
-.TP
-.B \-p <indent>
-Set the indent in spaces (0 to use a tab)
-.TP
-.B \-nofwd
-Omit imports of custom widgets
-.TP
-.B \-kde
-Use TDE widgets, require 'Korundum' extension
-.TP
-.B \-tr <func>
-Use func(...) rather than trUtf8(...) for i18n
-.TP
-.B \-x
-Generate extra code to test the class
-.TP
-.B \-version
-Print the Rbuic and Qt versions
-.TP
-.B \-help
-Display some help information.
-.SH AUTHOR
-Germain Garand
-Phil Thompson
-.SH SEE ALSO
-uic(1)
diff --git a/dilos/core/tdebindings/debian/rules b/dilos/core/tdebindings/debian/rules
index a43bbff91..97aacdcc5 100755
--- a/dilos/core/tdebindings/debian/rules
+++ b/dilos/core/tdebindings/debian/rules
@@ -117,20 +117,6 @@ common-install-arch:: stamp-install-dcopjava
 
 ###
 
-binary-install/juic-trinity::
-#	DilOS dirty hack
-#	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/usr/share/
-	sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/usr|" debian/$(cdbs_curpkg)/usr/bin/juic
-
-binary-install/libdcop3-java-trinity-dev::
-#	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/usr/share/
-
-binary-install/libkorundum0-ruby-trinity::
-#	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/usr/share/
-
-binary-install/libqt0-ruby-trinity::
-#	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/usr/share/
-
 binary-install/python-dcop-trinity::
 	${DH_PYTHON2} -p$(cdbs_curpkg)
 
diff --git a/dilos/core/tdegraphics/debian/control b/dilos/core/tdegraphics/debian/control
index b9e2824f5..fa7773eef 100644
--- a/dilos/core/tdegraphics/debian/control
+++ b/dilos/core/tdegraphics/debian/control
@@ -75,7 +75,7 @@ Package: tdegraphics-trinity-dev
 Section: devel
 Architecture: any
 Replaces: kdegraphics-trinity-dev (<< 4:14.0.0~)
-Breaks: kdegraphics-trinity-dev (<< 4:14.0.0~)
+Breaks: kdegraphics-trinity-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.12~)
 Depends: kghostview-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the TDE graphics module
  This package contains headers and other development files for the TDE
@@ -379,8 +379,8 @@ Description: generic framework for viewer applications in Trinity
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkscan-trinity-dev (<< 4:14.0.0~)
-Breaks: libkscan-trinity-dev (<< 4:14.0.0~)
+Replaces: libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
+Breaks: libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
 Depends: libkscan1-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
diff --git a/dilos/core/tdegraphics/debian/kcoloredit-trinity.install b/dilos/core/tdegraphics/debian/kcoloredit-trinity.install
index 7f46de951..6ef759e45 100644
--- a/dilos/core/tdegraphics/debian/kcoloredit-trinity.install
+++ b/dilos/core/tdegraphics/debian/kcoloredit-trinity.install
@@ -10,6 +10,8 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/kcolorchooser.png
 debian/tmp/usr/share/icons/hicolor/16x16/apps/kcoloredit.png
 debian/tmp/usr/share/icons/hicolor/22x22/apps/kcolorchooser.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kcoloredit.png
+debian/tmp/usr/share/man/man1/kcolorchooser.1
+debian/tmp/usr/share/man/man1/kcoloredit.1
 
 debian/icons/kcolorchooser.xpm		/usr/share/pixmaps
 debian/icons/kcolorchooser-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kcoloredit-trinity.manpages b/dilos/core/tdegraphics/debian/kcoloredit-trinity.manpages
deleted file mode 100644
index e4673b667..000000000
--- a/dilos/core/tdegraphics/debian/kcoloredit-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kcolorchooser.1
-debian/man/kcoloredit.1
diff --git a/dilos/core/tdegraphics/debian/kdvi-trinity.install b/dilos/core/tdegraphics/debian/kdvi-trinity.install
index cdebf33d2..082259f94 100644
--- a/dilos/core/tdegraphics/debian/kdvi-trinity.install
+++ b/dilos/core/tdegraphics/debian/kdvi-trinity.install
@@ -22,6 +22,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/kdvi.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kdvi.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kdvi.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kdvi.svgz
+debian/tmp/usr/share/man/man1/kdvi.1
 debian/tmp/usr/share/services/kdvimultipage.desktop
 
 debian/icons/kdvi.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kdvi-trinity.manpages b/dilos/core/tdegraphics/debian/kdvi-trinity.manpages
deleted file mode 100644
index 6cab6e597..000000000
--- a/dilos/core/tdegraphics/debian/kdvi-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdvi.1
diff --git a/dilos/core/tdegraphics/debian/kfax-trinity.install b/dilos/core/tdegraphics/debian/kfax-trinity.install
index 02e7194ba..f054e4e22 100644
--- a/dilos/core/tdegraphics/debian/kfax-trinity.install
+++ b/dilos/core/tdegraphics/debian/kfax-trinity.install
@@ -8,6 +8,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/kfax.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kfax.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kfax.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kfax.svgz
+debian/tmp/usr/share/man/man1/kfax.1
 
 debian/icons/kfax.xpm		/usr/share/pixmaps
 debian/icons/kfax-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kfax-trinity.manpages b/dilos/core/tdegraphics/debian/kfax-trinity.manpages
deleted file mode 100644
index 57b6c7961..000000000
--- a/dilos/core/tdegraphics/debian/kfax-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfax.1
diff --git a/dilos/core/tdegraphics/debian/kfaxview-trinity.install b/dilos/core/tdegraphics/debian/kfaxview-trinity.install
index a9888e519..9728a5983 100644
--- a/dilos/core/tdegraphics/debian/kfaxview-trinity.install
+++ b/dilos/core/tdegraphics/debian/kfaxview-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kfaxview.png
 debian/tmp/usr/share/icons/hicolor/22x22/apps/kfaxview.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kfaxview.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kfaxview.svgz
+debian/tmp/usr/share/man/man1/kfaxview.1
 debian/tmp/usr/share/services/kfaxmultipage.desktop
 debian/tmp/usr/share/services/kfaxmultipage_tiff.desktop
 
diff --git a/dilos/core/tdegraphics/debian/kfaxview-trinity.manpages b/dilos/core/tdegraphics/debian/kfaxview-trinity.manpages
deleted file mode 100644
index a30d1c56a..000000000
--- a/dilos/core/tdegraphics/debian/kfaxview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfaxview.1
diff --git a/dilos/core/tdegraphics/debian/kghostview-trinity.install b/dilos/core/tdegraphics/debian/kghostview-trinity.install
index b0ceae026..5935dd0d1 100644
--- a/dilos/core/tdegraphics/debian/kghostview-trinity.install
+++ b/dilos/core/tdegraphics/debian/kghostview-trinity.install
@@ -19,6 +19,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/kghostview.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kghostview.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kghostview.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kghostview.png
+debian/tmp/usr/share/man/man1/kghostview.1
 debian/tmp/usr/share/services/kghostview_part.desktop
 
 debian/icons/kghostview.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kghostview-trinity.manpages b/dilos/core/tdegraphics/debian/kghostview-trinity.manpages
deleted file mode 100644
index 8cfcbdec7..000000000
--- a/dilos/core/tdegraphics/debian/kghostview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kghostview.1
diff --git a/dilos/core/tdegraphics/debian/kolourpaint-trinity.install b/dilos/core/tdegraphics/debian/kolourpaint-trinity.install
index fc6ff4414..7293fea0c 100644
--- a/dilos/core/tdegraphics/debian/kolourpaint-trinity.install
+++ b/dilos/core/tdegraphics/debian/kolourpaint-trinity.install
@@ -167,6 +167,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/kolourpaint.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kolourpaint.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kolourpaint.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kolourpaint.svgz
+debian/tmp/usr/share/man/man1/kolourpaint.1
 
 debian/icons/kolourpaint.xpm		/usr/share/pixmaps
 debian/icons/kolourpaint-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kolourpaint-trinity.manpages b/dilos/core/tdegraphics/debian/kolourpaint-trinity.manpages
deleted file mode 100644
index a10ddf05a..000000000
--- a/dilos/core/tdegraphics/debian/kolourpaint-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kolourpaint.1
diff --git a/dilos/core/tdegraphics/debian/kooka-trinity.install b/dilos/core/tdegraphics/debian/kooka-trinity.install
index ffbb637f1..fe6816b0a 100644
--- a/dilos/core/tdegraphics/debian/kooka-trinity.install
+++ b/dilos/core/tdegraphics/debian/kooka-trinity.install
@@ -27,6 +27,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/kooka/shortcut1.png
 debian/tmp/usr/share/doc/tde/HTML/en/kooka/toolbar.png
 debian/tmp/usr/share/doc/tde/HTML/en/kooka/toolbar1.png
 debian/tmp/usr/share/doc/tde/HTML/en/kooka/toolbar2.png
+debian/tmp/usr/share/man/man1/kooka.1
 
 debian/icons/kooka.xpm		/usr/share/pixmaps
 debian/icons/kooka-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kooka-trinity.manpages b/dilos/core/tdegraphics/debian/kooka-trinity.manpages
deleted file mode 100644
index 319f8652c..000000000
--- a/dilos/core/tdegraphics/debian/kooka-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kooka.1
diff --git a/dilos/core/tdegraphics/debian/kpdf-trinity.install b/dilos/core/tdegraphics/debian/kpdf-trinity.install
index fb8abd831..f5b8e3582 100644
--- a/dilos/core/tdegraphics/debian/kpdf-trinity.install
+++ b/dilos/core/tdegraphics/debian/kpdf-trinity.install
@@ -16,6 +16,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kpdf.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kpdf.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kpdf.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kpdf.svgz
+debian/tmp/usr/share/man/man1/kpdf.1
 debian/tmp/usr/share/services/kpdf_part.desktop
 
 debian/icons/kpdf.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kpdf-trinity.manpages b/dilos/core/tdegraphics/debian/kpdf-trinity.manpages
deleted file mode 100644
index 36f3caafb..000000000
--- a/dilos/core/tdegraphics/debian/kpdf-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpdf.1
diff --git a/dilos/core/tdegraphics/debian/kpovmodeler-trinity.install b/dilos/core/tdegraphics/debian/kpovmodeler-trinity.install
index 28809ac03..2faf42861 100644
--- a/dilos/core/tdegraphics/debian/kpovmodeler-trinity.install
+++ b/dilos/core/tdegraphics/debian/kpovmodeler-trinity.install
@@ -421,6 +421,7 @@ debian/tmp/usr/share/icons/hicolor/48x48/apps/kpovmodeler.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+debian/tmp/usr/share/man/man1/kpovmodeler.1
 
 debian/icons/kpovmodeler.xpm		/usr/share/pixmaps
 debian/icons/kpovmodeler-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kpovmodeler-trinity.manpages b/dilos/core/tdegraphics/debian/kpovmodeler-trinity.manpages
deleted file mode 100644
index 11c1a16f8..000000000
--- a/dilos/core/tdegraphics/debian/kpovmodeler-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpovmodeler.1
diff --git a/dilos/core/tdegraphics/debian/kruler-trinity.install b/dilos/core/tdegraphics/debian/kruler-trinity.install
index 47786961b..bf393a2a1 100644
--- a/dilos/core/tdegraphics/debian/kruler-trinity.install
+++ b/dilos/core/tdegraphics/debian/kruler-trinity.install
@@ -14,6 +14,7 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/kruler.png
 debian/tmp/usr/share/icons/hicolor/22x22/apps/kruler.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kruler.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kruler.png
+debian/tmp/usr/share/man/man1/kruler.1
 
 debian/icons/kruler.xpm		/usr/share/pixmaps
 debian/icons/kruler-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kruler-trinity.manpages b/dilos/core/tdegraphics/debian/kruler-trinity.manpages
deleted file mode 100644
index aac20ba29..000000000
--- a/dilos/core/tdegraphics/debian/kruler-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kruler.1
diff --git a/dilos/core/tdegraphics/debian/ksnapshot-trinity.install b/dilos/core/tdegraphics/debian/ksnapshot-trinity.install
index d341a9170..9de040c4e 100644
--- a/dilos/core/tdegraphics/debian/ksnapshot-trinity.install
+++ b/dilos/core/tdegraphics/debian/ksnapshot-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/ksnapshot.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/ksnapshot.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/ksnapshot.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/ksnapshot.svgz
+debian/tmp/usr/share/man/man1/ksnapshot.1
 
 debian/icons/ksnapshot.xpm		/usr/share/pixmaps
 debian/icons/ksnapshot-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/ksnapshot-trinity.manpages b/dilos/core/tdegraphics/debian/ksnapshot-trinity.manpages
deleted file mode 100644
index efb781eba..000000000
--- a/dilos/core/tdegraphics/debian/ksnapshot-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ksnapshot.1
diff --git a/dilos/core/tdegraphics/debian/kuickshow-trinity.install b/dilos/core/tdegraphics/debian/kuickshow-trinity.install
index 638de1d0a..bd8b03f92 100644
--- a/dilos/core/tdegraphics/debian/kuickshow-trinity.install
+++ b/dilos/core/tdegraphics/debian/kuickshow-trinity.install
@@ -20,6 +20,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/kuickshow/screenshot.png
 debian/tmp/usr/share/icons/hicolor/16x16/apps/kuickshow.png
 debian/tmp/usr/share/icons/hicolor/22x22/apps/kuickshow.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kuickshow.png
+debian/tmp/usr/share/man/man1/kuickshow.1
 
 debian/icons/kuickshow.xpm		/usr/share/pixmaps
 debian/icons/kuickshow-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/kuickshow-trinity.manpages b/dilos/core/tdegraphics/debian/kuickshow-trinity.manpages
deleted file mode 100644
index 3eadda903..000000000
--- a/dilos/core/tdegraphics/debian/kuickshow-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kuickshow.1
diff --git a/dilos/core/tdegraphics/debian/kview-trinity.install b/dilos/core/tdegraphics/debian/kview-trinity.install
index 25cd6e78a..23fcf6255 100644
--- a/dilos/core/tdegraphics/debian/kview-trinity.install
+++ b/dilos/core/tdegraphics/debian/kview-trinity.install
@@ -52,6 +52,7 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/kview.png
 debian/tmp/usr/share/icons/hicolor/22x22/apps/kview.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kview.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kview.png
+debian/tmp/usr/share/man/man1/kview.1
 debian/tmp/usr/share/services/tdeconfiguredialog/kviewcanvasconfig.desktop
 debian/tmp/usr/share/services/tdeconfiguredialog/kviewgeneralconfig.desktop
 debian/tmp/usr/share/services/tdeconfiguredialog/kviewpluginsconfig.desktop
diff --git a/dilos/core/tdegraphics/debian/kview-trinity.manpages b/dilos/core/tdegraphics/debian/kview-trinity.manpages
deleted file mode 100644
index bad8bf322..000000000
--- a/dilos/core/tdegraphics/debian/kview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kview.1
diff --git a/dilos/core/tdegraphics/debian/kviewshell-trinity.install b/dilos/core/tdegraphics/debian/kviewshell-trinity.install
index 111b6f2ae..e1a8cb1b5 100644
--- a/dilos/core/tdegraphics/debian/kviewshell-trinity.install
+++ b/dilos/core/tdegraphics/debian/kviewshell-trinity.install
@@ -23,6 +23,7 @@ debian/tmp/usr/share/config.kcfg/kviewshell.kcfg
 debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kviewshell.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kviewshell.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kviewshell.png
+debian/tmp/usr/share/man/man1/kviewshell.1
 debian/tmp/usr/share/services/emptymultipage.desktop
 debian/tmp/usr/share/services/djvumultipage.desktop
 debian/tmp/usr/share/servicetypes/tdemultipage.desktop
diff --git a/dilos/core/tdegraphics/debian/kviewshell-trinity.manpages b/dilos/core/tdegraphics/debian/kviewshell-trinity.manpages
deleted file mode 100644
index 89af3c5f2..000000000
--- a/dilos/core/tdegraphics/debian/kviewshell-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kviewshell.1
diff --git a/dilos/core/tdegraphics/debian/libkscan-dev-trinity.install b/dilos/core/tdegraphics/debian/libkscan-dev-trinity.install
deleted file mode 100644
index e3501d75a..000000000
--- a/dilos/core/tdegraphics/debian/libkscan-dev-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/libkscan.so
diff --git a/dilos/core/tdegraphics/debian/libkscan-trinity-dev.install b/dilos/core/tdegraphics/debian/libkscan-trinity-dev.install
new file mode 100644
index 000000000..ad0460ce2
--- /dev/null
+++ b/dilos/core/tdegraphics/debian/libkscan-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/*/libkscan.so
+debian/tmp/usr/share/cmake/libkscan.cmake
diff --git a/dilos/core/tdegraphics/debian/libpoppler-tqt-dev.install b/dilos/core/tdegraphics/debian/libpoppler-tqt-dev.install
index cbf3b6f80..132c75791 100644
--- a/dilos/core/tdegraphics/debian/libpoppler-tqt-dev.install
+++ b/dilos/core/tdegraphics/debian/libpoppler-tqt-dev.install
@@ -2,3 +2,4 @@ debian/tmp/usr/include/poppler-link-qt3.h
 debian/tmp/usr/include/poppler-page-transition.h
 debian/tmp/usr/include/poppler-qt.h
 debian/tmp/usr/lib/*/pkgconfig/poppler-tqt.pc
+debian/tmp/usr/share/cmake/libpoppler-tqt.cmake
diff --git a/dilos/core/tdegraphics/debian/man/kcolorchooser.1 b/dilos/core/tdegraphics/debian/man/kcolorchooser.1
deleted file mode 100644
index d0fd9cfbb..000000000
--- a/dilos/core/tdegraphics/debian/man/kcolorchooser.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KCOLORCHOOSER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kcolorchooser \- TDE Color Chooser
-.SH SYNOPSIS
-.B kcolorchooser
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kcolorchooser
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-TDE Color Chooser
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH AUTHOR
-KColorChooser was written by
-.nh
-Waldo Bastian <bastian@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kcoloredit.1 b/dilos/core/tdegraphics/debian/man/kcoloredit.1
deleted file mode 100644
index 3318864e0..000000000
--- a/dilos/core/tdegraphics/debian/man/kcoloredit.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.TH KCOLOREDIT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kcoloredit \- TDE Color Palette Editor
-.SH SYNOPSIS
-.B kcoloredit
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kcoloredit
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B KColorEdit
-is a palette files editor. It can be used for editing color palettes and for color choosing and naming.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-File
-file to open
-.SH "SEE ALSO"
-The full documentation for
-.B kcoloredit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kcoloredit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KColorEdit was written by
-.nh
-Artur Rataj <art@zeus.polsl.gliwice.pl>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kdvi.1 b/dilos/core/tdegraphics/debian/man/kdvi.1
deleted file mode 100644
index f1df971ad..000000000
--- a/dilos/core/tdegraphics/debian/man/kdvi.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH KDVI "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kdvi \- TDE DVI Viewer
-.SH SYNOPSIS
-.B kviewshell
-[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kdvi
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KDVI
-is a plugin for the KViewshell program which allows KViewshell to
-display DVI-files (.dvi) which are produced by the TeX typesetting
-system. KDVI supports many extensions of the DVI standard, for
-instance the inclusion of PostScript graphics or hyperlinks. More
-details, examples and all the technical specifications can be found in
-the file KDVI-features.dvi (or see KDVI-features.tex for the TeX
-source of that file). 
-.P
-For up-to-date information, consult KDVI's home page. 
-.P
-TeX is a high-end typesetting system geared towards scientific, and in
-particular mathematical typesetting. More information about TeX and
-DVI can be found on the homepage of the TeX user group or the German
-German DANTE e.V..  
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-part
-The part to use
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
-.TP
-\fB\-\-paper\fR
-Sets paper size (not implemented at the moment, only for compatibility with lyx)
-.TP
-file(s)
-Files to load
-.SH "SEE ALSO"
-The full documentation for
-.B kdvi
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kdvi
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KViewShell was written by
-.nh
-Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe,
-Markku Hihnala,
-David Faure,
-Daniel Duley,
-Espen Sand and
-Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kfax.1 b/dilos/core/tdegraphics/debian/man/kfax.1
deleted file mode 100644
index ac7583ccf..000000000
--- a/dilos/core/tdegraphics/debian/man/kfax.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.TH KFAX "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kfax \- TDE Fax Viewer
-.SH SYNOPSIS
-.B kfax
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kfax
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-A program to display raw and tiffed fax images (g3, g3-2d, g4).
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-f\fR, \fB\-\-fine\fR
-Fine resolution
-.TP
-\fB\-n\fR, \fB\-\-normal\fR
-Normal resolution
-.TP
-\fB\-\-height\fR
-Height (number of fax lines)
-.TP
-\fB\-w\fR, \fB\-\-width\fR
-Width (dots per fax line)
-.TP
-\fB\-l\fR, \fB\-\-landscape\fR
-Turn image 90 degrees (landscape mode)
-.TP
-\fB\-u\fR, \fB\-\-upsidedown\fR
-Turn image upside down
-.TP
-\fB\-i\fR, \fB\-\-invert\fR
-Invert black and white.
-.TP
-\fB\-m\fR, \fB\-\-mem\fR <bytes>
-Limit memory use to 'bytes'. [8M]
-.TP
-\fB\-r\fR, \fB\-\-reverse\fR
-Fax data is packed lsb first
-.TP
-\fB\-2\fR
-Raw files are g3-2d
-.TP
-\fB\-4\fR
-Raw files are g4
-.SS "Arguments:"
-.TP
-file(s)
-Fax file(s) to show
-.SH "SEE ALSO"
-The full documentation for
-.B kfax
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kfax
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KFax was written by
-.nh
-Bernd Johannes Wuebben <wuebben@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kfaxview.1 b/dilos/core/tdegraphics/debian/man/kfaxview.1
deleted file mode 100644
index 592c64c09..000000000
--- a/dilos/core/tdegraphics/debian/man/kfaxview.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.TH KFAXVIEWER "1" "October 2007" TDE "TDE Application"
-.SH NAME
-kfaxviewer \- TDE fax viewer using kviewshell
-.SH SYNOPSIS
-.B kfaxview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
-.SH DESCRIPTION
-This manual page briefly documents the
-.B kfaxview
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program doesn't have a manual page.
-.PP
-A fax viewer for TDE using kviewshell.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another KFaxView instance.
-If it is, bring up the other KFaxView. Otherwise, load the file.
-.TP
-\fB\-g\fR, \fB\-\-goto\fR <pagenumber>
-Navigate to this page
-.TP
-.SS "Arguments:"
-.TP
-file(s)
-Files to load
-.SH AUTHOR
-KFaxview was written by
-.nh
-Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Francesco Pedrini<francesco.pedrini@gmail.com>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-
diff --git a/dilos/core/tdegraphics/debian/man/kghostview.1 b/dilos/core/tdegraphics/debian/man/kghostview.1
deleted file mode 100644
index be63ba0f3..000000000
--- a/dilos/core/tdegraphics/debian/man/kghostview.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH KGHOSTVIEW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kghostview \- TDE PS/PDF Viewer
-.SH SYNOPSIS
-.B kghostview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KGhostView
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B  KGhostView
-displays and prints PostScript (.ps, .eps) and Portable
-Document Format (.pdf) files. It a port to TDE of Tim Theisen's
-Ghostview program which uses Alladin Ghostscript to view documents
-prepared in Adobe's PostScript page description
-language. PostScript is the major page description language for
-printing on UNIX(rg systems and this application can be used to preview
-material intended for printing or for reading documents online.  
-.P
-You can use KGhostView with all recent versions of Ghostscript. Newer
-versions offer much improved performance which you can take advantage
-of with KGhostView.  
-.P
-If a document does not conform to the Adobe document structuring
-convention the functionality of the viewer is limited. For example, if
-there is no table of contents, skipping around the document and
-marking pages is not possible. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-URL
-Location to open
-.SH "SEE ALSO"
-The full documentation for
-.B KGhostView
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kghostview
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KGhostView was written by
-.nh
-Wilco Greven <greven@kde.org>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe <donohoe@kde.org>,
-David Faure <faure@kde.org>,
-Daniel Duley <mosfet@kde.org> and
-Espen Sand <espen@kde.org>
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kolourpaint.1 b/dilos/core/tdegraphics/debian/man/kolourpaint.1
deleted file mode 100644
index 42a126a85..000000000
--- a/dilos/core/tdegraphics/debian/man/kolourpaint.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH KPAINT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kolourpaint \- TDE Paint Program
-.SH SYNOPSIS
-.B kolourpaint
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KPaint
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KPaint
-is a simple bitmap drawing program that can also be used to modify
-existing image files and convert between image file formats. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file
-File or URL to open
-.SH "SEE ALSO"
-The full documentation for
-.B KPaint
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kolourpaint
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KPaint was written by
-.nh
-Richard J. Moore <rich@kde.org>,
-Robert Williams <rwilliams@jrcmaui.com>,
-Mario Weilguni <mweilguni@kde.org>,
-Christian Oppel <uzs84g@uni-bonn.de>,
-John Califf <jcaliff@compuzone.net> and
-Laurent Montel <lmontel@mandrakesoft.com>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kooka.1 b/dilos/core/tdegraphics/debian/man/kooka.1
deleted file mode 100644
index a8f34e419..000000000
--- a/dilos/core/tdegraphics/debian/man/kooka.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH KOOKA "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kooka \- TDE Scan & OCR Program
-.SH SYNOPSIS
-.B kooka
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kooka
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kooka
-is a TDE application which provides access to scanner
-hardware using the SANE library.
-.P
-Kooka helps you scan, save your
-image in the correct image format and perform \fBO\fRptical
-\fBC\fRharacter \fBR\fRecognition on it,using \fIgocr\fR, Joerg
-Schulenburg's and friends' Open Source ocr program.
-.P
-Kooka is a TDE application that enables easy scanning using SANE
-libraries. Therefore, SANE the package must be installed to use
-Kooka. Clear and concise use was the focus of its development. 
-.P
-Character recognition is also provided by the built-in text
-recognition program gocr. Install gocr to use this
-functionality. After character recognition is complete, the recognized
-material can be opened in the text editor Kate with just one click,
-where you can edit the contents. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-d\fR
-the SANE compatible device specification (e.g. umax:/dev/sg0) []
-.TP
-\fB\-g\fR
-gallery mode - do not connect to scanner []
-.SH "SEE ALSO"
-The full documentation for
-.B Kooka
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kooka
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-Kooka was written by
-.nh
-Klaas Freitag <freitag@suse.de> and
-Mat Colton <mat@colton.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kpdf.1 b/dilos/core/tdegraphics/debian/man/kpdf.1
deleted file mode 100644
index fc0c59534..000000000
--- a/dilos/core/tdegraphics/debian/man/kpdf.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPDF 1 "June 2006" "Trinity Desktop Environment" "pdf viewer"
-.SH NAME
-kpdf
-\- a TDE pdf viewer based on xpdf
-.SH SYNOPSIS
-\fBkpdf\fP [Qt\-options] [TDE\-options] [URL]
-.SH DESCRIPTION
-\fBkpdf\fP is a TDE PDF viewer based on \fBxpdf\fP code. Although being based on \fBxpdf\fP code, \fBkpdf\fP has some unique features like continuous mode and presentation support.
-.sp 1
-The PDF format is widely used for publishing documents that are mostly not meant to be edited again. \fBkpdf\fP is only a viewer for these files and therefore it doesn't provide any functionality to edit or create PDF documents.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Document to open
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-\fBxpdf\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kpdf/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kpdf/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Wilco Greven <greven@kde.org>
-.br
-Christophe Devriese <oelewapperke@oelewapperke.org>
-.br
-Laurent Montel <montel@kde.org>
-.br
-Albert Astals Cid <astals11@terra.es>
-.br
-Enrico Ros <eros.kde@email.it>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdegraphics/debian/man/kpovmodeler.1 b/dilos/core/tdegraphics/debian/man/kpovmodeler.1
deleted file mode 100644
index 3d536d26e..000000000
--- a/dilos/core/tdegraphics/debian/man/kpovmodeler.1
+++ /dev/null
@@ -1,82 +0,0 @@
-.TH KPOVMODELER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kpovmodeler \- TDE Povray Modeler
-.SH SYNOPSIS
-.B kpovmodeler
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Povray Modeler
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KPovModeler
-is a 3D modeling application to generate POV-Ray scenes.
-.P
-While it is not necessary to fully understand the POV-Ray application
-in order to make good use of KPovModeler, it is highly recommended
-that you read and try to understand the POV-Ray documentation. 
-.P
-To find out more about POV-Ray go to www.povray.org.
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file
-File to open
-.SH OPTIONS
-.TP
-\fB\-\-no\-opengl\fR
-Disables OpenGL rendering
-.SH "SEE ALSO"
-The full documentation for
-.B Povray Modeler
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kpovmodeler
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KPovModeler was written by
-.nh
-Andreas Zehender <zehender@kde.org>,
-Luis Passos Carvalho <lpassos@mail.telepac.pt>,
-Philippe Van Hecke <lephiloux@tiscalinet.be> and
-.hy
-Leonardo Skorianez <skorianez@bol.com.br>.
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kruler.1 b/dilos/core/tdegraphics/debian/man/kruler.1
deleted file mode 100644
index 9e32021cd..000000000
--- a/dilos/core/tdegraphics/debian/man/kruler.1
+++ /dev/null
@@ -1,81 +0,0 @@
-.TH KRULER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kruler \- TDE Screen Ruler
-.SH SYNOPSIS
-.B kruler
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KRuler
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B KRuler
-is a very simple application, with only one aim in life. To
-measure distances on your screen. 
-.P
-To start KRuler, choose Graphics->TDE Screen Ruler from your T menu.
-.P
-left mouse button clicking on the KRuler will turn the cursor into a
-hand icon, and enable you to drag KRuler around the screen. 
-.P
-When you move the mouse over KRuler, your cursor will turn into an
-elongated arrow, with a circle at one end. As you move the cursor,
-KRuler will display how far from the point marked 0 the circle on the
-end of the cursor currently is. KRuler will also display the HTML
-color code of the color currently under the circle. This is very
-useful for picking out colors from an image. If you move the mouse far
-enough that the arrow cursor is no longer touching KRuler, the cursor
-will revert to normal, allowing you to carry on working with your
-other applications. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH "SEE ALSO"
-The full documentation for
-.B KRuler
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kruler
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDE Screen Ruler was written by
-.nh
-Till Krech <till@snafu.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/ksnapshot.1 b/dilos/core/tdegraphics/debian/man/ksnapshot.1
deleted file mode 100644
index 250ca0ef6..000000000
--- a/dilos/core/tdegraphics/debian/man/ksnapshot.1
+++ /dev/null
@@ -1,71 +0,0 @@
-.TH KSNAPSHOT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-ksnapshot \- TDE Screen Capture Program
-.SH SYNOPSIS
-.B ksnapshot
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KSnapshot
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KSnapshot
-is a simple applet for taking screenshots. It is capable of
-capturing images of either the whole desktop or just a single
-window. The images can then be saved in a variety of formats. 
-.PP
-TDE Screenshot utility
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH "SEE ALSO"
-The full documentation for
-.B KSnapshot
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/ksnapshot
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KSnapshot was written by
-.nh
-Richard J. Moore <rich@kde.org>,
-Matthias Ettrich <ettrich@kde.org> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kuickshow.1 b/dilos/core/tdegraphics/debian/man/kuickshow.1
deleted file mode 100644
index bf5caf30c..000000000
--- a/dilos/core/tdegraphics/debian/man/kuickshow.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH KUICKSHOW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kuickshow \- TDE Image Viewer
-.SH SYNOPSIS
-.B kuickshow
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfiles\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kuickshow
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KuickShow
-is a comfortable image browser/viewer. It displays a
-filebrowser where you can select images which are then shown.
-.P
-The following image formats are supported:
-.P
-.RS 
-\(bu jpg
-.br
-\(bu gif
-.br
-\(bu tiff
-.br
-\(bu png
-.br
-\(bu bmp
-.br
-\(bu psd
-.br
-\(bu xmp
-.br
-\(bu xbm
-.br
-\(bu eim
-.RE
-.P
-Images can be displayed either in their own window, as large as the
-image, or fullscreen. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-lastdir\fR
-Start in the last visited directory, not the current working directory
-.SS "Arguments:"
-.TP
-files
-Optional image filenames/urls to show
-.SH "SEE ALSO"
-The full documentation for
-.B Kuickshow
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kuickshow
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KuickShow was written by
-.nh
-Carsten Pfeiffer <pfeiffer@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kview.1 b/dilos/core/tdegraphics/debian/man/kview.1
deleted file mode 100644
index 64a2b6928..000000000
--- a/dilos/core/tdegraphics/debian/man/kview.1
+++ /dev/null
@@ -1,78 +0,0 @@
-.TH KVIEW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kview \- TDE Image Viewer
-.SH SYNOPSIS
-.B kview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KView
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KView
-is an image viewer for the Trinity desktop. You can view graphics of
-many different formats such as PostScript, TIFF etc. By saving your
-files in a different format than the original you can easily convert
-images to other graphics formats. In addition, KView provides some
-nice little features for doing simple image processing, like
-stretching/shrinking, rotation and filtering. You can tile your images
-directly onto the desktop as a background picture, or arrange them in
-a little slideshow. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-URL
-Image to open
-.SH "SEE ALSO"
-The full documentation for
-.B KView
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kview
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KView was written by
-.nh
-Matthias Kretz <kretz@kde.org>,
-Sirtaj Singh Kang <taj@kde.org>
-and Simon Hausmann <hausmann@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/kviewshell.1 b/dilos/core/tdegraphics/debian/man/kviewshell.1
deleted file mode 100644
index 83d0e24da..000000000
--- a/dilos/core/tdegraphics/debian/man/kviewshell.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH KVIEWSHELL "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kviewshell \- Generic framework for viewer applications
-.SH SYNOPSIS
-.B kviewshell
-[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kviewshell
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-Generic framework for viewer applications.
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-part
-The part to use
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
-.TP
-\fB\-\-paper\fR
-Sets paper size (not implemented at the moment, only for compatibility with lyx)
-.TP
-file(s)
-Files to load
-.SH AUTHOR
-KViewShell was written by
-.nh
-Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe,
-Markku Hihnala,
-David Faure,
-Daniel Duley,
-Espen Sand,
-and Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/man/tdeiconedit.1 b/dilos/core/tdegraphics/debian/man/tdeiconedit.1
deleted file mode 100644
index 70bcb510a..000000000
--- a/dilos/core/tdegraphics/debian/man/tdeiconedit.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-tdeiconedit \- TDE Icon Editor
-.SH SYNOPSIS
-.B tdeiconedit
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile(s)\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B TDEIconEdit
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B TDEIconEdit
-is designed to help create icons for TDE using the standard
-icon palette.  
-.PP
-TDE Icon Editor
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file(s)
-Icon file(s) to open
-.SH "SEE ALSO"
-The full documentation for
-.B TDEIconEdit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/tdeiconedit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com>
-and Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdegraphics/debian/rules b/dilos/core/tdegraphics/debian/rules
index 316afdc09..39c6437f1 100755
--- a/dilos/core/tdegraphics/debian/rules
+++ b/dilos/core/tdegraphics/debian/rules
@@ -25,9 +25,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DBUILD_ALL="ON" \
- -DWITH_TIFF="ON" \
- -DWITH_OPENEXR="ON" \
- -DWITH_PDF="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
  -DCMAKE_C_COMPILER=gcc \
  -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
 
@@ -49,54 +47,3 @@ binary-post-install/kuickshow-trinity::
 ifeq ($(DEB_HOST_ARCH), powerpc)
 	chrpath -d -k debian/kuickshow-trinity/usr/lib/libtdeinit_kuickshow.so
 endif
-
-#shlibs_ver = 4:3.5.0-1
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
-
-#binary-post-install/kpdf-trinity::
-#	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/usr/share/
-
-#binary-post-install/kghostview-trinity::
-#	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/usr/share/
-
-binary-post-install/kcolorchooser-trinity::
-	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/usr/share/
-
-#binary-post-install/kdvi-trinity::
-#	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/usr/share/
-
-#binary-post-install/kfaxview-trinity::
-#	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/usr/share/
-
-#binary-post-install/tdeiconedit-trinity::
-#	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/usr/share/
-
-#binary-post-install/kooka-trinity::
-#	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/usr/share/
-
-#binary-post-install/kpovmodeler-trinity::
-#	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/usr/share/
-
-#binary-post-install/ksnapshot-trinity::
-#	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/usr/share/
-
-#binary-post-install/kview-trinity::
-#	mv debian/kview-trinity/usr/share/man debian/kview-trinity/usr/share/
-
-#binary-post-install/kcoloredit-trinity::
-#	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/usr/share/
-
-#binary-post-install/kfax-trinity::
-#	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/usr/share/
-
-#binary-post-install/kolourpaint-trinity::
-#	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/usr/share/
-
-#binary-post-install/kruler-trinity::
-#	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/usr/share/
-
-#binary-post-install/kuickshow-trinity::
-#	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/usr/share/
-
-#binary-post-install/kviewshell-trinity::
-#	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/usr/share/
diff --git a/dilos/core/tdegraphics/debian/tdegraphics-trinity-dev.install b/dilos/core/tdegraphics/debian/tdegraphics-trinity-dev.install
index e28160a1f..b603b9f83 100644
--- a/dilos/core/tdegraphics/debian/tdegraphics-trinity-dev.install
+++ b/dilos/core/tdegraphics/debian/tdegraphics-trinity-dev.install
@@ -193,4 +193,4 @@ debian/tmp/usr/lib/*/libksvg.so
 debian/tmp/usr/lib/*/libtext2path.la
 debian/tmp/usr/lib/*/libtext2path.so
 
-debian/tmp/usr/share/cmake
+debian/tmp/usr/share/cmake/kviewshell.cmake
diff --git a/dilos/core/tdegraphics/debian/tdeiconedit-trinity.install b/dilos/core/tdegraphics/debian/tdeiconedit-trinity.install
index 55b9e0c89..04a9e736b 100644
--- a/dilos/core/tdegraphics/debian/tdeiconedit-trinity.install
+++ b/dilos/core/tdegraphics/debian/tdeiconedit-trinity.install
@@ -36,6 +36,7 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/tdeiconedit.png
 debian/tmp/usr/share/icons/hicolor/22x22/apps/tdeiconedit.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/tdeiconedit.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/tdeiconedit.png
+debian/tmp/usr/share/man/man1/tdeiconedit.1
 
 debian/icons/tdeiconedit.xpm		/usr/share/pixmaps
 debian/icons/tdeiconedit-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdegraphics/debian/tdeiconedit-trinity.manpages b/dilos/core/tdegraphics/debian/tdeiconedit-trinity.manpages
deleted file mode 100644
index e975ab6b6..000000000
--- a/dilos/core/tdegraphics/debian/tdeiconedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdeiconedit.1
diff --git a/dilos/core/tdelibs/debian/control b/dilos/core/tdelibs/debian/control
index bb7d0c393..2b07b8517 100644
--- a/dilos/core/tdelibs/debian/control
+++ b/dilos/core/tdelibs/debian/control
@@ -9,8 +9,9 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharu
  libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev [!solaris-any],
  libattr1-dev [!solaris-any], libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any],
  aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev,
- liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
+ libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev,
+ liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
+ libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev,
  libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
@@ -102,8 +103,9 @@ Breaks: kdelibs4-trinity-dev (<< 4:14.0.0~)
 Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev [!solaris-any], libattr1-dev [!solaris-any],
  libaspell-dev, hspell, libbz2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
- libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
+ libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
+ libopenexr-dev (>= 1.2.2-3), libpcre3-dev,
+ liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
  libsasl2-dev, libxcomposite-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqtinterface-dev,
diff --git a/dilos/core/tdelibs/debian/tdelibs-data-trinity.install b/dilos/core/tdelibs/debian/tdelibs-data-trinity.install
index 0abd36eb0..1144a1dbe 100644
--- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.install
+++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.install
@@ -1749,6 +1749,7 @@ debian/tmp/usr/share/apps/LICENSES/LGPL_V2
 debian/tmp/usr/share/apps/LICENSES/LGPL_V3
 debian/tmp/usr/share/apps/LICENSES/QPL_V1.0
 debian/tmp/usr/share/apps/proxyscout/eventsrc
+debian/tmp/usr/share/apps/tdemarkdown
 debian/tmp/usr/share/autostart/tdeab2tdeabc.desktop
 debian/tmp/usr/share/doc/tde/HTML/en/common/10.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/1.png
@@ -1762,6 +1763,9 @@ debian/tmp/usr/share/doc/tde/HTML/en/common/8.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/9.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/appheader.html
 debian/tmp/usr/share/doc/tde/HTML/en/common/artistic-license.html
+debian/tmp/usr/share/doc/tde/HTML/en/common/block_title_bottom.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/block_title_mid.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/block_title_top.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/bottom1.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/bottom2.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/bottom-left.png
@@ -1778,30 +1782,39 @@ debian/tmp/usr/share/doc/tde/HTML/en/common/favicon.ico
 debian/tmp/usr/share/doc/tde/HTML/en/common/fdl-license
 debian/tmp/usr/share/doc/tde/HTML/en/common/fdl-license.html
 debian/tmp/usr/share/doc/tde/HTML/en/common/fdl-notice.html
+debian/tmp/usr/share/doc/tde/HTML/en/common/flat.css
 debian/tmp/usr/share/doc/tde/HTML/en/common/footer.html
 debian/tmp/usr/share/doc/tde/HTML/en/common/gpl-license
 debian/tmp/usr/share/doc/tde/HTML/en/common/gpl-license.html
 debian/tmp/usr/share/doc/tde/HTML/en/common/grad.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/header.html
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-common.css
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-default.css
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/usr/share/doc/tde/HTML/en/common/kde_gear_64.png
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/usr/share/doc/tde/HTML/en/common/kde_logo_bg.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/kde_logo.png
-debian/tmp/usr/share/doc/tde/HTML/en/common/tde-web.css
 debian/tmp/usr/share/doc/tde/HTML/en/common/kmenu.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/lgpl-license
 debian/tmp/usr/share/doc/tde/HTML/en/common/lgpl-license.html
 debian/tmp/usr/share/doc/tde/HTML/en/common/mainfooter.html
 debian/tmp/usr/share/doc/tde/HTML/en/common/mainheader.html
+debian/tmp/usr/share/doc/tde/HTML/en/common/print.css
 debian/tmp/usr/share/doc/tde/HTML/en/common/qpl-license.html
 debian/tmp/usr/share/doc/tde/HTML/en/common/shadow.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/tabs.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-common.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-docs.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-localised.css.template
+debian/tmp/usr/share/doc/tde/HTML/en/common/tde-web.css
+debian/tmp/usr/share/doc/tde/HTML/en/common/top.jpg
+debian/tmp/usr/share/doc/tde/HTML/en/common/top-left.jpg
 debian/tmp/usr/share/doc/tde/HTML/en/common/top-left.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/top-middle.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/top-right-konqueror.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/top-right.jpg
+debian/tmp/usr/share/doc/tde/HTML/en/common/top-right.png
+debian/tmp/usr/share/doc/tde/HTML/en/common/top-trinity.jpg
 debian/tmp/usr/share/doc/tde/HTML/en/common/web-docbottom.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/web-doctop.png
 debian/tmp/usr/share/doc/tde/HTML/en/common/x11-license.html
@@ -1905,6 +1918,7 @@ debian/tmp/usr/share/services/tdetexteditor_insertfile.desktop
 debian/tmp/usr/share/services/tdetexteditor_isearch.desktop
 debian/tmp/usr/share/services/tdetexteditor_kdatatool.desktop
 debian/tmp/usr/share/services/kxzfilter.desktop
+debian/tmp/usr/share/services/markdown_part.desktop
 debian/tmp/usr/share/services/metainfo.protocol
 debian/tmp/usr/share/services/mms.protocol
 debian/tmp/usr/share/services/mmst.protocol
diff --git a/dilos/core/tdelibs/debian/tdelibs14-trinity.install b/dilos/core/tdelibs/debian/tdelibs14-trinity.install
index 607958946..2c8ee9899 100644
--- a/dilos/core/tdelibs/debian/tdelibs14-trinity.install
+++ b/dilos/core/tdelibs/debian/tdelibs14-trinity.install
@@ -195,6 +195,8 @@ debian/tmp/usr/lib/*/trinity/libtdeprint_management_module.la
 debian/tmp/usr/lib/*/trinity/libtdeprint_management_module.so
 debian/tmp/usr/lib/*/trinity/libtdehtmlpart.la
 debian/tmp/usr/lib/*/trinity/libtdehtmlpart.so
+debian/tmp/usr/lib/*/trinity/libtdemarkdown.la
+debian/tmp/usr/lib/*/trinity/libtdemarkdown.so
 debian/tmp/usr/lib/*/trinity/libtdemultipart.la
 debian/tmp/usr/lib/*/trinity/libtdemultipart.so
 debian/tmp/usr/lib/*/trinity/libshellscript.la
diff --git a/dilos/core/tdemultimedia/debian/juk-trinity.install b/dilos/core/tdemultimedia/debian/juk-trinity.install
index 1441b8966..0852cb408 100644
--- a/dilos/core/tdemultimedia/debian/juk-trinity.install
+++ b/dilos/core/tdemultimedia/debian/juk-trinity.install
@@ -22,6 +22,7 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/juk.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/juk.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/juk.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/juk.png
+debian/tmp/usr/share/man/man1/juk.1
 
 debian/icons/juk.xpm		/usr/share/pixmaps
 debian/icons/juk-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdemultimedia/debian/juk-trinity.manpages b/dilos/core/tdemultimedia/debian/juk-trinity.manpages
deleted file mode 100644
index cc1b91a74..000000000
--- a/dilos/core/tdemultimedia/debian/juk-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/juk-trinity.1
diff --git a/dilos/core/tdemultimedia/debian/kaboodle-trinity.install b/dilos/core/tdemultimedia/debian/kaboodle-trinity.install
index 10ebd1855..bd3af8fcc 100644
--- a/dilos/core/tdemultimedia/debian/kaboodle-trinity.install
+++ b/dilos/core/tdemultimedia/debian/kaboodle-trinity.install
@@ -15,6 +15,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/kaboodle.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kaboodle.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kaboodle.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kaboodle.png
+debian/tmp/usr/share/man/man1/kaboodle.1
 debian/tmp/usr/share/services/kaboodle_component.desktop
 debian/tmp/usr/share/services/kaboodleengine.desktop
 
diff --git a/dilos/core/tdemultimedia/debian/kaboodle-trinity.manpages b/dilos/core/tdemultimedia/debian/kaboodle-trinity.manpages
deleted file mode 100644
index 56aa78551..000000000
--- a/dilos/core/tdemultimedia/debian/kaboodle-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kaboodle-trinity.1
diff --git a/dilos/core/tdemultimedia/debian/kaudiocreator-trinity.install b/dilos/core/tdemultimedia/debian/kaudiocreator-trinity.install
index ae0d88505..5d2a5982f 100644
--- a/dilos/core/tdemultimedia/debian/kaudiocreator-trinity.install
+++ b/dilos/core/tdemultimedia/debian/kaudiocreator-trinity.install
@@ -35,6 +35,7 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/kaudiocreator.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kaudiocreator.png
 debian/tmp/usr/share/icons/locolor/16x16/apps/kaudiocreator.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/kaudiocreator.png
+debian/tmp/usr/share/man/man1/kaudiocreator.1
 
 debian/icons/kaudiocreator.xpm		/usr/share/pixmaps
 debian/icons/kaudiocreator-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdemultimedia/debian/kaudiocreator-trinity.manpages b/dilos/core/tdemultimedia/debian/kaudiocreator-trinity.manpages
deleted file mode 100644
index e3f09d6dd..000000000
--- a/dilos/core/tdemultimedia/debian/kaudiocreator-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kaudiocreator-trinity.1
diff --git a/dilos/core/tdemultimedia/debian/kmix-trinity.install b/dilos/core/tdemultimedia/debian/kmix-trinity.install
index 29d80a5d3..a35228747 100644
--- a/dilos/core/tdemultimedia/debian/kmix-trinity.install
+++ b/dilos/core/tdemultimedia/debian/kmix-trinity.install
@@ -48,6 +48,8 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/kmix.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kmix.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kmix.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kmix.png
+debian/tmp/usr/share/man/man1/kmix.1
+debian/tmp/usr/share/man/man1/kmixctrl.1
 debian/tmp/usr/share/services/kmixctrl_restore.desktop
 
 debian/icons/kmix.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdemultimedia/debian/kmix-trinity.manpages b/dilos/core/tdemultimedia/debian/kmix-trinity.manpages
deleted file mode 100644
index e0adce8b6..000000000
--- a/dilos/core/tdemultimedia/debian/kmix-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kmix-trinity.1
-debian/man/kmixctrl-trinity.1
diff --git a/dilos/core/tdemultimedia/debian/krec-trinity.install b/dilos/core/tdemultimedia/debian/krec-trinity.install
index ca8589abc..0f01ad8b0 100644
--- a/dilos/core/tdemultimedia/debian/krec-trinity.install
+++ b/dilos/core/tdemultimedia/debian/krec-trinity.install
@@ -32,6 +32,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/krec.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/krec.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/krec.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/krec.png
+debian/tmp/usr/share/man/man1/krec.1
 debian/tmp/usr/share/services/kcm_krec.desktop
 debian/tmp/usr/share/services/kcm_krec_files.desktop
 debian/tmp/usr/share/services/krec_exportogg.desktop
diff --git a/dilos/core/tdemultimedia/debian/krec-trinity.manpages b/dilos/core/tdemultimedia/debian/krec-trinity.manpages
deleted file mode 100644
index 8a59c57a8..000000000
--- a/dilos/core/tdemultimedia/debian/krec-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/krec-trinity.1
diff --git a/dilos/core/tdemultimedia/debian/man/juk-trinity.1 b/dilos/core/tdemultimedia/debian/man/juk-trinity.1
deleted file mode 100644
index 0981892b5..000000000
--- a/dilos/core/tdemultimedia/debian/man/juk-trinity.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH "JuK" "1" "April 2006"
-.SH "NAME"
-juk \- music organizer and player for TDE
-.SH "SYNOPSIS"
-\fBjuk\fR
-.SH "DESCRIPTION"
-.LP 
-
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-.
-.SH "OPTIONS"
-.l
-\fIjuk\fP does not accept any command-line options.
-.
-
-.SH "DCOP"
-
-\fIjuk\fP has a DCOP (Desktop Communications Protocol) interface
-that may be used to start, stop, skip forward to the next song,
-etc.  This may be done from the command line using \fIdcop\fP
-as follows:
-
-.RS
-$ dcop juk Player forward
-
-$ dcop juk Player back
-
-$ dcop juk Player stop
-
-$ dcop juk Player play
-.RE
-
-.SH "AUTHOR"
-This page was written by David Schleef <ds@schleef.org> for Debian,
-but may be used elsewhere.
-
diff --git a/dilos/core/tdemultimedia/debian/man/kaboodle-trinity.1 b/dilos/core/tdemultimedia/debian/man/kaboodle-trinity.1
deleted file mode 100644
index 72ff225fa..000000000
--- a/dilos/core/tdemultimedia/debian/man/kaboodle-trinity.1
+++ /dev/null
@@ -1,261 +0,0 @@
-.lf 1 info/tdemultimedia.kaboodle.1
-.TH KABOODLE 1 "May 2003" TDE "TDE Application"
-.SH NAME
-kaboodle \- TDE simple and lean Media Player
-.SH SYNOPSIS
-.B kaboodle
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kaboodle
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kaboodle
-is a simple KMedia (aRts) player for TDE, which can play standalone,
-or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too.
-It is meant for simple stuff like playing a quick video or sound file. 
-.B Kaboodle
-does not accept plugins, does not have a playlist or volume control and other such features.
-.P
-To get a media-player with a full-fledged user interface, look at
-.BR noatun (1)
-.SH OPTIONS
-.SS "Arguments:"
-.TP
-URL
-URL of media file to play
-.SS "General Options"
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.lf 1 info/kdetqtoptions
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
-icon, which can either be an absolute filename path, or otherwise the
-icon is sought for in places according to the normal TDE rules.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
-of the icon, according to the same rules as for the \-\-icon parameter.
-.TP
-.BI \-\-config \ filename
-Use an alternative configuration file, instead of the default, which
-is normally located in
-.I /usr/share/config
-or in
-.RB $ TDEHOME\fI/share/config
-.TP
-.BI \-\-dcopserver \ server
-Set the address of the DCOP server to attach to.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps. This option has the same
-effect as definiting the environment variable TDE_DEBUG.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-The geometry parameter follows the normal X convention for geometry,
-which is on the form:
-.RS
-.IP
-[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
-.P
-Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
-height, of the main application window. Both in pixels. A value of 0
-specifies the default size. The optional \fIxpos\fR and \fIypos\fR
-specifies the x,y-position that which is desired for the application
-window. Specifying negative values for x or y implies that the x or y
-position is to be measured from the left or bottom screen edge,
-instead of as in the normal case, with positive values, from the left
-and top edges. 
-.RE
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-Defines the default application font. The \fIfontname\fP should be in
-the X logical font name description format XLFD. For a full description of
-the format see
-.I /usr/X11R6/lib/X11/doc/xlfd.TXT
-Note that the application might override the font specified with
-its own font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-Sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-Sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-Sets the default button color.
-.TP
-.BI \-\-name \ name
-Sets the application name.
-.TP
-.BI \-\-title \ title
-Sets the application title. This option might, or might not appear
-in the title bar caption, depending on the application. To change the caption, use the 
-.B \-\-caption
-option instead. 
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-Sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirror reverses the whole layout of widgets. This means that menus
-will go in the opposite direction, the scroll bar will be on the
-opposite side, etc. For a normal western layout that means that menus
-and tool bars will go from the right edge to the left, the vertical
-scroll bar will be on the left side and so on.
-
-.lf 53 info/tdemultimedia.kaboodle.1
-.SH ENVIRONMENT
-.lf 1 info/kdeenviron
-.SS "standard TDE environment variables"
-.IP TDE_LANG
-Language locale setting to use. This option makes it possible to set
-another language environment for a program than what is the default. The
-correct language pack for this language has to be installed for this option
-to work. The default language when there is none set is en_US. When
-deciding upon a language, the following resources are looked up, in
-order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
-LANG.
-.IP TDE_UTF8_FILENAMES
-Assume that all filenames are in UTF-8 format regardless of the
-current language setting. Otherwise the filename format is defined by
-the language.
-.IP TDE_MULTIHEAD
-If this variable has the value
-.B true
-multihead multiple display mode is enabled. The TDE display will be
-shared over more than one screen.
-.IP DISPLAY
-Specifies the X display to run TDE on.
-.IP TDESYCOCA
-Specifies and alternative path for the 
-.I tdesycoca
-TDE system configuration cache file.
-The default path is
-/tmp/tde-$USER/tdesycoca
-.IP DCOPSERVER
-Specifies an alternative path for the DCOP server file. The default
-file is
-$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
-.IP SESSION_MANAGER
-The session manager to use. This option is set automatically by TDE
-and is a network path to the session manager socket.
-.IP HOME
-Path to the home directory for the current user. 
-.IP TDEHOME
-The TDE per-user setting directory. Default if not specified is
-.I $HOME/.trinity
-.lf 55 info/tdemultimedia.kaboodle.1
-.SH FILES
-.TP
-.I $HOME/.trinity/share/config/kaboodlerc
-configuration file.
-.SH AUTHOR
-Kaboodle was written by
-.nh
-.ad l
-Neil Stevens <neil@qualityassistant.com>,
-Nikolas Zimmermann <wildfox@kde.org>,
-and Charles Samuels <charles@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-.BR noatun (1)
-.br
-The full documentation for
-.B kaboodle
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kaboodle
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kaboodle
diff --git a/dilos/core/tdemultimedia/debian/man/kaudiocreator-trinity.1 b/dilos/core/tdemultimedia/debian/man/kaudiocreator-trinity.1
deleted file mode 100644
index 35600bcda..000000000
--- a/dilos/core/tdemultimedia/debian/man/kaudiocreator-trinity.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.TH kaudiocreator 1 "Nov 2005" "Trinity Desktop Environment" ""
-.SH NAME
-kaudiocreator \- CD ripper and audio encoder front-end
-.SH SYNOPSIS
-kaudiocreator [Qt-options] [TDE-options] 
-.SH DESCRIPTION
-.B kaudiocreator 
-is the CD ripper and audio encoder front-end for the Trinity Desktop Environment. It
-supports many encoders like 
-.BR lame (1),
-.BR oggenc (1),
-.BR flac (1),
-and performs CDDB queries.
-
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the title bar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the title bar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible window manager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
- 
-
-.SH AUTHOR
-Benjamin Meyer <ben+kaudiocreator@meyerhome.net>
-
-Please use <http://bugs.trinitydesktop.org> to report bugs, do not mail the authors
-directly.
-
-
-This man-page was written by Francois Wendling <frwendling@free.fr>
diff --git a/dilos/core/tdemultimedia/debian/man/kmix-trinity.1 b/dilos/core/tdemultimedia/debian/man/kmix-trinity.1
deleted file mode 100644
index e603facb3..000000000
--- a/dilos/core/tdemultimedia/debian/man/kmix-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH KMIX 1 "August, 15 2003"
-.SH NAME
-Kmix \- TDE audio mini-mixer
-.SH SYNOPSIS
-.B kmix 
-.RI [ OPTIONS ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmix
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fBKmix\fP is a mini audio mixer for TDE. It allows the user to change
-volume settings for each sound device (master, CD, line, mic, ...).
-.SH OPTIONS
-A summary of options for Kmix is included below.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-
-.SH SEE ALSO
-.BR kmixctrl (1),
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmix was written by the KDE project.
diff --git a/dilos/core/tdemultimedia/debian/man/kmixctrl-trinity.1 b/dilos/core/tdemultimedia/debian/man/kmixctrl-trinity.1
deleted file mode 100644
index 58a586b18..000000000
--- a/dilos/core/tdemultimedia/debian/man/kmixctrl-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KMIXCTRL 1 "August, 25 2003"
-.SH NAME
-kmixctrl \- Settings loader/saver for kmix
-.SH SYNOPSIS
-.B kmixctrl 
-.RI [ OPTIONS ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmixctrl
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fBkmixctrl\fP is used to save or restore the settings of \fIkmix\fP.
-.SH OPTIONS
-A summary of options for kmixctrl is included below.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-s, \-\-save
-Save the current settings as default
-.TP
-.B \-r, \-\-restore
-Restores the default settings
-
-.SH SEE ALSO
-.BR kmix (1),
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmixctrl was written by the KDE project.
diff --git a/dilos/core/tdemultimedia/debian/man/krec-trinity.1 b/dilos/core/tdemultimedia/debian/man/krec-trinity.1
deleted file mode 100644
index 9e2c57e3c..000000000
--- a/dilos/core/tdemultimedia/debian/man/krec-trinity.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH krec "1" "July 2004" "Debian" "User Commands"
-.SH NAME
-krec \- A voice recording program
-.SH SYNOPSIS
-.B krec
-[\fIoptions\fR]
-.SH DESCRIPTION
-This is a recording tool for TDE.
-It uses aRts, just look at the audiomanager
-and you will find it there accepting sound
-for recording.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-
-
-.SH USAGE
-Details  are shown in the built-in help system to krec.  Run krec and go to help-krec handbook to access this data
-	
-.SH AUTHORS
-krec is (C)2002-2003 By Arnold Krille (arnold@arnoldarts.de)
-.P
-This man page was written and maintained by Ryan Waye (rmw998@gmail.com) 
-.PP
-.
-.
-.SH "STANDARD DISCLAIMER"
-Use only at your own risk!
-There may be errors and inaccuracies that could be damaging to your system or
-your eye.
-Proceed with caution, and although this is highly unlikely, the authors don't
-take any responsibility for that!
-.PP
-
-This document is licensed under the GPL.
-.P
-KDE: 3.2.2
-.P
-KRec: 0.5
diff --git a/dilos/core/tdemultimedia/debian/man/noatun-trinity.1 b/dilos/core/tdemultimedia/debian/man/noatun-trinity.1
deleted file mode 100644
index 1ed42ae02..000000000
--- a/dilos/core/tdemultimedia/debian/man/noatun-trinity.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH NOATUN 1 "June 2006" "Trinity Desktop Environment" "Media Player"
-.SH NAME
-noatun
-\- fully-featured plugin-based media player for TDE
-.SH SYNOPSIS
-\fBnoatun\fP [Qt\-options] [TDE\-options] [URL] 
-.SH DESCRIPTION
-\fBNoatun\fP is a fully\-featured plugin\-based media player for TDE.
-It is an elaborate front-end to aRts - the Analog Real\-Time Synthesizer.
-By default aRts supports MP3 and MPEG\-1. Vorbis is also supported.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Files/URLs to open
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-To find additional playobjects, go to \fBhttp://noatun.kde.org/plugins.phtml\fP, or \fBhttp://mpeglib.sf.net\fP.
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can enter the URL
-.BR help:/noatun/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/noatun/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Charles Samuels <charles@kde.org>
-.br
-Stefan Westerfeld <stefan@space.twc.de>
-.br
-Martin Vogt <mvogt@rhrk.uni\-kl.de>
-.br
-Malte Starostik <malte@kde.org>
-.br
-Nikolas Zimmermann <wildfox@kde.org>
-.br
-Stefan Schimanski <1Stein@gmx.de>
-.br
-Stefan Gehn <metz@gehn.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdemultimedia/debian/noatun-trinity.install b/dilos/core/tdemultimedia/debian/noatun-trinity.install
index 912cace44..c47920e4d 100644
--- a/dilos/core/tdemultimedia/debian/noatun-trinity.install
+++ b/dilos/core/tdemultimedia/debian/noatun-trinity.install
@@ -323,6 +323,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/noatun.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/noatun.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/noatun.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/noatun.png
+debian/tmp/usr/share/man/man1/noatun.1
 debian/tmp/usr/share/mimelnk/interface/x-winamp-skin.desktop
 
 debian/icons/noatun.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdemultimedia/debian/noatun-trinity.manpages b/dilos/core/tdemultimedia/debian/noatun-trinity.manpages
deleted file mode 100644
index e5196f799..000000000
--- a/dilos/core/tdemultimedia/debian/noatun-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/noatun-trinity.1
diff --git a/dilos/core/tdenetwork/debian/kdict-trinity.install b/dilos/core/tdenetwork/debian/kdict-trinity.install
index c3ac57162..982ec3754 100644
--- a/dilos/core/tdenetwork/debian/kdict-trinity.install
+++ b/dilos/core/tdenetwork/debian/kdict-trinity.install
@@ -24,6 +24,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kdict.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kdict.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kdict.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kdict.svgz
+debian/tmp/usr/share/man/man1/kdict.1
 
 debian/icons/kdict-16.xpm	/usr/share/pixmaps
 debian/icons/kdict.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdenetwork/debian/kdict-trinity.manpages b/dilos/core/tdenetwork/debian/kdict-trinity.manpages
deleted file mode 100644
index 3128a0e9a..000000000
--- a/dilos/core/tdenetwork/debian/kdict-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdict-trinity.1
diff --git a/dilos/core/tdenetwork/debian/kget-trinity.install b/dilos/core/tdenetwork/debian/kget-trinity.install
index 618f2163f..dc488268e 100644
--- a/dilos/core/tdenetwork/debian/kget-trinity.install
+++ b/dilos/core/tdenetwork/debian/kget-trinity.install
@@ -73,6 +73,7 @@ debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kget.png
 debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kget_list.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kget.png
 debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kget_list.png
+debian/tmp/usr/share/man/man1/kget.1
 debian/tmp/usr/share/mimelnk/application/x-kgetlist.desktop
 debian/tmp/usr/share/sounds/KGet_Added.ogg
 debian/tmp/usr/share/sounds/KGet_Finished.ogg
diff --git a/dilos/core/tdenetwork/debian/kget-trinity.manpages b/dilos/core/tdenetwork/debian/kget-trinity.manpages
deleted file mode 100644
index 585b03129..000000000
--- a/dilos/core/tdenetwork/debian/kget-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kget-trinity.1
diff --git a/dilos/core/tdenetwork/debian/kopete-trinity.install b/dilos/core/tdenetwork/debian/kopete-trinity.install
index 2e4478efc..28ab451bb 100644
--- a/dilos/core/tdenetwork/debian/kopete-trinity.install
+++ b/dilos/core/tdenetwork/debian/kopete-trinity.install
@@ -330,7 +330,6 @@ debian/tmp/usr/share/icons/crystalsvg/16x16/actions/jabber_invisible.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/actions/jabber_na.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/actions/jabber_offline.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/actions/jabber_online.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/actions/jabber_original.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/actions/jabber_raw.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/actions/jabber_serv_off.png
 debian/tmp/usr/share/icons/crystalsvg/16x16/actions/jabber_serv_on.png
@@ -446,7 +445,6 @@ debian/tmp/usr/share/icons/hicolor/16x16/actions/jabber_invisible.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/jabber_na.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/jabber_offline.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/jabber_online.png
-debian/tmp/usr/share/icons/hicolor/16x16/actions/jabber_original.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/jabber_raw.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/jabber_serv_off.png
 debian/tmp/usr/share/icons/hicolor/16x16/actions/jabber_serv_on.png
@@ -476,6 +474,7 @@ debian/tmp/usr/share/icons/hicolor/48x48/apps/jabber_protocol.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kopete.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kopete.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kopete2.svgz
+debian/tmp/usr/share/man/man1/kopete.1
 debian/tmp/usr/share/mimelnk/application/x-icq.desktop
 debian/tmp/usr/share/mimelnk/application/x-kopete-emoticons.desktop
 debian/tmp/usr/share/services/aim.protocol
diff --git a/dilos/core/tdenetwork/debian/kopete-trinity.manpages b/dilos/core/tdenetwork/debian/kopete-trinity.manpages
deleted file mode 100644
index 214a24d2e..000000000
--- a/dilos/core/tdenetwork/debian/kopete-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kopete-trinity.1
diff --git a/dilos/core/tdenetwork/debian/kwifimanager-trinity.install b/dilos/core/tdenetwork/debian/kwifimanager-trinity.install
index 2b13c9206..47ddce17e 100644
--- a/dilos/core/tdenetwork/debian/kwifimanager-trinity.install
+++ b/dilos/core/tdenetwork/debian/kwifimanager-trinity.install
@@ -29,6 +29,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kwifimanager.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kwifimanager.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kwifimanager.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kwifimanager.svgz
+debian/tmp/usr/share/man/man1/kwifimanager.1
 
 debian/icons/kwifimanager-16.xpm	/usr/share/pixmaps
 debian/icons/kwifimanager.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdenetwork/debian/kwifimanager-trinity.manpages b/dilos/core/tdenetwork/debian/kwifimanager-trinity.manpages
deleted file mode 100644
index 4f390510b..000000000
--- a/dilos/core/tdenetwork/debian/kwifimanager-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kwifimanager-trinity.1
diff --git a/dilos/core/tdenetwork/debian/lisa-trinity.install b/dilos/core/tdenetwork/debian/lisa-trinity.install
index 1e64a3ed2..cab76e2c2 100644
--- a/dilos/core/tdenetwork/debian/lisa-trinity.install
+++ b/dilos/core/tdenetwork/debian/lisa-trinity.install
@@ -15,6 +15,8 @@ debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/lanbrowser/index.docbook
 debian/tmp/usr/share/doc/tde/HTML/en/lisa/common
 debian/tmp/usr/share/doc/tde/HTML/en/lisa/index.cache.bz2
 debian/tmp/usr/share/doc/tde/HTML/en/lisa/index.docbook
+debian/tmp/usr/share/man/man8/lisa.8
+debian/tmp/usr/share/man/man8/reslisa.8
 debian/tmp/usr/share/services/lan.protocol
 debian/tmp/usr/share/services/rlan.protocol
 
diff --git a/dilos/core/tdenetwork/debian/lisa-trinity.manpages b/dilos/core/tdenetwork/debian/lisa-trinity.manpages
deleted file mode 100644
index 306f0c52e..000000000
--- a/dilos/core/tdenetwork/debian/lisa-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/lisa-trinity.8
-debian/man/reslisa-trinity.8
diff --git a/dilos/core/tdenetwork/debian/man/kdict-trinity.1 b/dilos/core/tdenetwork/debian/man/kdict-trinity.1
deleted file mode 100644
index aff5138c4..000000000
--- a/dilos/core/tdenetwork/debian/man/kdict-trinity.1
+++ /dev/null
@@ -1,180 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDICT 1 "June 2006" "Trinity Desktop Environment" "TDE Dictionary Client"
-.SH NAME
-kdict
-\- The TDE Dictionary Client
-.SH SYNOPSIS
-\fBkdict\fP [Qt\-options] [TDE\-options] [options] [word/phrase] 
-.SH DESCRIPTION
-\fBKDict\fP is a graphical client for the \fBDICT Protocol\fP. It enables you to search through dictionary databases for a word or phrase, then displays suitable definitions. \fBKDict\fP tries to ease basic as well as advanced queries. A separate list offers a convenient way to deal with the enormous number of matching words that a advanced query can return.
-.sp 1
-The remainder of \fBKDict\fP's user interface resembles a web browser. For instance, you can jump to the definition of a synonym by simply clicking on the highlighted word. The back/forward functionality is also implemented, enabling you to quickly go back to the result of previous queries.
-.sp 1
-\fBKDict\fP is able to process the content of the clipboard, so it's easy to combine \fBKDict\fP with your web browser or text editor.
-.sp 1
-If your machine is behind a firewall, has no permanent internet connection or the server of dict.org is too slow for you, you can set up your own local server, all you need is available at \fBwww.dict.org\fP. The advantages of a local server are optimal performance and the ability to install additional databases of your choice.
-.SH OPTIONS
-.SS
-.SS Arguments:
-word/phrase               Lookup the given word/phrase
-.SS Options:
-.TP
-.B \-c,  \-\-clipboard  
-Define X11-clipboard content (selected text)
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-.SH FILES
-.I ~/.trinity/share/config/kdictrc
-.br
-.I ~/.trinity/share/config/kdict_panelappletrc
-.RS
-\fBkdict\fP configuration files
-.SH SEE ALSO
-.TP
-\fBwww.dict.org\fP
-DICT Development Group home page
-.RE
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdict/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdict/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Christian Gebauer <gebauer@kde.org>
-.br
-Matthias Hoelzer <hoelzer@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdenetwork/debian/man/kget-trinity.1 b/dilos/core/tdenetwork/debian/man/kget-trinity.1
deleted file mode 100644
index 72b2d3305..000000000
--- a/dilos/core/tdenetwork/debian/man/kget-trinity.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KGET 1 "June 2006" "Trinity Desktop Environment" "download manager"
-.SH NAME
-kget
-\- An advanced download manager for TDE
-.SH SYNOPSIS
-\fBkget\fP [Qt\-options] [TDE\-options] [options] [URL(s)] 
-.SH DESCRIPTION
-\fBKGet\fP is an advanced download manager for TDE. It allows you to group downloads. In some cases, \fBKGet\fP can resume these downloads even if you shutdown your computer before the downloads have completed.
-.sp 1
-To download a document or package, drag and drop the URL on to \fBKGet\fP.
-.SH OPTIONS
-.SS
-.SS Arguments:
-URL(s)                    URL(s) to download
-.SS Options:
-.TP
-.B  \-\-showDropTarget  
-Start KGet with drop target
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kget/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kget/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Matej Moss
-.br
-Patrick  Charbonnier <pch@freeshell.org>
-.br
-Carsten Pfeiffer <pfeiffer@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdenetwork/debian/man/kopete-trinity.sgml b/dilos/core/tdenetwork/debian/man/kopete-trinity.sgml
deleted file mode 100644
index 87922999d..000000000
--- a/dilos/core/tdenetwork/debian/man/kopete-trinity.sgml
+++ /dev/null
@@ -1,334 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-  -->
-
-  <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
-  <!ENTITY dhsurname   "<surname>Stone</surname>">
-  <!ENTITY dhdate      "<date>April 20, 2002</date>">
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>dstone@kde.org</email>">
-  <!ENTITY dhusername  "Daniel Stone">
-  <!ENTITY dhucpackage "<refentrytitle>KOPETE</refentrytitle>">
-  <!ENTITY dhpackage   "kopete">
-
-  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2001</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>A TDE-based Instant Messaging client.</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-tde<replaceable></replaceable></option></arg>
-      <arg><option>--help-qt<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable> -v</replaceable></option></arg>
-      <arg><option>--license<replaceable></replaceable</option></arg>
-      <arg><option>--author<replaceable></replaceable></option></arg>
-      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--cmap<replaceable></replaceable></option></arg>
-      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--nograb<replaceable></replaceable></option></arg>
-      <arg><option>--dograb<replaceable></replaceable></option></arg>
-      <arg><option>--sync<replaceable></replaceable></option></arg>
-      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
-      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
-      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
-      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
-      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
-      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
-      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
-      <arg><option>--noxim<replaceable></replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> is a TDE-based multi-protocol Instant
-    Messaging client. Currently, it supports AIM, ICQ, MSN, IRC and Jabber.
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below. However, the ordering is very strict -
-      --help/-h must come before hostname.</para>
-    <variablelist>
-      <varlistentry>
-        <term><option>-v</option>
-	  <option>--version</option>
-	</term>
-	<listitem>
-	  <para>Show version information.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--author</option>
-	</term>
-	<listitem>
-	  <para>Show information about the author.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--license</option>
-	</term>
-	<listitem>
-	  <para>Show license information.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--caption &lt;caption&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the caption of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--icon &lt;icon&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the icon of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--miniicon &lt;icon&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the mini-icon of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--dcopserver &lt;server&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the DCOP server to use.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--nocrashhandler</option>
-	</term>
-	<listitem>
-	  <para>Disable TDE crash handler (enables core dumps).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--waitforwm</option>
-	</term>
-	<listitem>
-	  <para>Waits for a compatible window manager to start.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--style &lt;style&gt;</option>
-	</term>
-	<listitem>
-	  <para>Sets the application's GUI style (overrides TDE).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--geometry &lt;geometry&gt;</option>
-	</term>
-	<listitem>
-	  <para>Sets the geometry of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--display &lt;display&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specifies the X display to use.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--session &lt;sessionid&gt;</option>
-	</term>
-	<listitem>
-	  <para>Restores the application for the given session ID.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cmap</option>
-	</term>
-	<listitem>
-	  <para>Forces use of an internal colour map on an 8-bit display.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--ncols &lt;count&gt;</option>
-	</term>
-	<listitem>
-	  <para>Limits the number of colours allowed in an 8-bit display.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--nograb</option>
-	</term>
-	<listitem>
-	  <para>Forces Qt to never grab the mouse or keyboard.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--dograb</option>
-	</term>
-	<listitem>
-	  <para>Overrides --nograb, which may be implicitly set.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--sync</option>
-	</term>
-	<listitem>
-	  <para>Forces synchronous mode (for debugging).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--font &lt;font&gt;</option>
-	  <option>--fn &lt;font&gt;</option></term>
-	<listitem>
-	  <para>Sets the default application font.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--background &lt;colour&gt;</option>
-	  <option>--bg &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default background colour and application
-	  pallette.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--foreground &lt;colour&gt;</option>
-	  <option>--fg &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default foreground colour.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--button &lt;colour&gt;</option>
-	  <option>--btn &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default button colour.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--name &lt;name&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets the application name.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--title &lt;name&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets the application title.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--visual TrueColor</option>
-	  </term>
-	<listitem>
-	  <para>Forces the application to use a True Colour visual on 8-bit
-	  displays.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--inputstyle &lt;style&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets X Input Method (XIM) input style. Possible values are: 
-	  onthespot, overthespot, offthespot, and root.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--im &lt;server&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets X Input Method (XIM) server.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--noxim</option>
-	  </term>
-	<listitem>
-	  <para>Disables X Input Method (XIM) support.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the <acronym>GNU</acronym> General Public License
-      version 2 or any later version published by the Free Software Foundation.</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/dilos/core/tdenetwork/debian/man/kwifimanager-trinity.1 b/dilos/core/tdenetwork/debian/man/kwifimanager-trinity.1
deleted file mode 100644
index 5f12be561..000000000
--- a/dilos/core/tdenetwork/debian/man/kwifimanager-trinity.1
+++ /dev/null
@@ -1,121 +0,0 @@
-.TH KWIFIMANAGER "1" "October 2006" "kwifimanager" "User Commands"
-.SH NAME
-kwifimanager \- manual page for kwifimanager
-.SH SYNOPSIS
-.B kwifimanager
-[\fIOPTIONS\fR]
-.SH DESCRIPTION
-\fBkwifimanager\fR is a TDE wireless management program.
-.SH GENERIC OPTIONS:
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show QT specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR,  \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.SH QT OPTIONS:
-.TP
-\fB\-\-display <displayname>\fR
-Use the X-server display 'displayname'
-.TP
-\fB\-\-session <sessionId>\fR
-Restore the application for the given 'sessionId'
-.TP
-\fB\-\-cmap\fR
-Causes the application to install a private color map on an 8-bit display
-.TP
-\fB\-\-ncols <count>\fR
-Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification
-.TP
-\fB\-\-nograb\fR
-Tells Qt to never grab the mouse or the keyboard
-.TP
-\fB\-\-dograb\fR
-Running under a debugger can cause an implicit -nograb, use -dograb to override
-.TP
-\fB\-\-sync\fR
-Switches to synchronous mode for debugging
-.TP
-\fB\-\-fn, \-\-font <fontname>\fR
-Defines the application font
-.TP
-\fB\-\-bg, \-\-background <color>\fR
-Sets the default background color and an application palette (light and dark shades are calculated)
-.TP
-\fB\-\-fg, \-\-foreground <color>\fR
-Sets the default foreground color
-.TP
-\fB\-\-btn, \-\-button <color>\fR
-Sets the default button color
-.TP
-\fB\-\-name <name>\fR
-Sets the application name
-.TP
-\fB\-\-title <title>\fR
-Sets the application title (caption)
-.TP
-\fB\-\-visual TrueColor\fR
-Forces the application to use a TrueColor visual on an 8-bit display
-.TP
-\fB\-\-inputstyle <inputstyle>\fR
-Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root
-.TP
-\fB\-\-im <XIM server>\fR
-Set XIM server
-.TP
-\fB\-\-noxim\fR
-Disable XIM
-.TP
-\fB\-\-reverse\fR
-Mirrors the whole layout of widgets
-.SH TDE OPTIONS:
-.TP
-\fB\-\-caption <caption>\fR
-Use 'caption' as name in the titlebar
-.TP
-\fB\-\-icon <icon>\fR
-Use 'icon' as the application icon
-.TP
-\fB\-\-miniicon <icon>\fR
-Use 'icon' as the icon in the titlebar
-.TP
-\fB\-\-config <filename>\fR
-Use alternative configuration file
-.TP
-\fB\-\-dcopserver <server>\fR
-Use the DCOP Server specified by 'server'
-.TP
-\fB\-\-nocrashhandler\fR
-Disable crash handler, to get core dumps
-.TP
-\fB\-\-waitforwm\fR
-Waits for a WM_NET compatible windowmanager
-.TP
-\fB\-\-style <style>\fR
-Sets the application GUI style
-.TP
-\fB\-\-geometry <geometry>\fR
-Sets the client geometry of the main widget - see man X for the argument format
-.SH AUTHOR
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-This manual page was written by Chris Bier <chris.bier@cymor.com>.
-Based on the xchat man page written by Davide Puricelli <evo@debian.org>,
-and the kwifimanager help options.  It was written for the Debian GNU/Linux
-system (but may be used by others).
diff --git a/dilos/core/tdenetwork/debian/man/lisa-trinity.8 b/dilos/core/tdenetwork/debian/man/lisa-trinity.8
deleted file mode 100644
index 7015757c5..000000000
--- a/dilos/core/tdenetwork/debian/man/lisa-trinity.8
+++ /dev/null
@@ -1,77 +0,0 @@
-.TH "lisa" "8" "December 2005" 
-
-.SH "NAME" 
-lisa \-  LAN Information Server
-
-.SH "SYNOPSIS"
-.PP 
-.B lisa 
-[options]
-
-.SH "DESCRIPTION" 
-.PP 
-This manual page documents briefly the 
-.B lisa
-command. 
-.PP
-.B lisa
-is intended to provide a kind of "network neighbourhood" but only relaying on
-the TCP/IP protocol stack, no smb or whatever. The list of running hosts is
-provided via TCP port 7741.
-
-.SH "OPTIONS" 
-.TP
-.B \-c, \-\-config=\fIFILE\fR
-Read
-.I FILE
-instead of $(HOME)/.lisarc and /etc/lisarc. 
-.TP
-.BI "\-p, \-\-port" " PORTNR"
-Start the server on the portnumber
-.IR PORTNR .
-If you use this, LISa won't be able to
-cooperate with other LISa's in the network.
-.TP
-.B \-q, \-\-quiet
-Start quiet without the greeting message.
-.TP
-.B \-u, \-\-unix
-Deprecated.
-.TP
-.B \-k, \-\-kde1
-Deprecated.
-.TP
-.B \-K, \-\-kde2
-Deprecated.
-.TP
-.B \-h, \-\-help
-Show usage.
-.TP
-.B \-v, \-\-version
-Print out a short version info.
-
-.SH SIGNALS
-.PP
-If you send the Hangup-Signal to \fBlisa\fR, it will reread its
-configuration file (killall -HUP lisa).
-.PP
-If you send the User1-Signal to \fBlisa\fR, it will print some status
-information to the standard output (killall -USR1 lisa). You won't see 
-anything if the console from which \fBlisa\fR was started has terminated.
-
-.SH "SEE ALSO"
-.TP
-.BR reslisa (8)
-.TP
-.I /usr/share/doc/lisa/README.gz
-
-.SH "AUTHOR" 
-.PP
-.B LISa
-is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>.
-.PP 
-This manual page was written by Francois Wendling <frwendling@free.fr>. 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. 
-
diff --git a/dilos/core/tdenetwork/debian/man/reslisa-trinity.8 b/dilos/core/tdenetwork/debian/man/reslisa-trinity.8
deleted file mode 100644
index 159b5b7b8..000000000
--- a/dilos/core/tdenetwork/debian/man/reslisa-trinity.8
+++ /dev/null
@@ -1,72 +0,0 @@
-.TH "reslisa" "8" "December 2005" 
-
-.SH "NAME" 
-reslisa \-  Restricted LAN Information Server
-
-.SH "SYNOPSIS"
-.PP 
-.B reslisa 
-[options]
-
-.SH "DESCRIPTION" 
-.PP 
-This manual page documents briefly the 
-.B reslisa
-command. 
-.PP
-If you have very strict security rules in your network or you don't want to
-have another port open or whatever, you can use 
-.B resLISa
-instead of
-.BR lisa (1).
-
-.SH "OPTIONS" 
-.TP
-.B \-c, \-\-config=\fIFILE\fR
-Read
-.I FILE
-instead of $(HOME)/.reslisarc and /etc/reslisarc. 
-.TP
-.B \-q, \-\-quiet
-Start quiet without the greeting message.
-.TP
-.B \-u, \-\-unix
-Deprecated.
-.TP
-.B \-k, \-\-kde1
-Deprecated.
-.TP
-.B \-K, \-\-kde2
-Deprecated.
-.TP
-.B \-h, \-\-help
-Show usage.
-.TP
-.B \-v, \-\-version
-Print out a short version info.
-
-.SH SIGNALS
-.PP
-If you send the Hangup-Signal to \fBreslisa\fR, it will reread its
-configuration file (killall -HUP reslisa).
-.PP
-If you send the User1-Signal to \fBreslisa\fR, it will print some status
-information to the standard output (killall -USR1 reslisa). You won't see 
-anything if the console from which \fBreslisa\fR was started has terminated.
-
-.SH "SEE ALSO"
-.TP
-.BR lisa (8)
-.TP
-.I /usr/share/doc/lisa/README.gz
-
-.SH "AUTHOR" 
-.PP
-.B LISa
-is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>.
-.PP 
-This manual page was written by Francois Wendling <frwendling@free.fr>. 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. 
-
diff --git a/dilos/core/tdesdk/debian/kapptemplate-trinity.install b/dilos/core/tdesdk/debian/kapptemplate-trinity.install
index dc3babbd3..95a06fcce 100644
--- a/dilos/core/tdesdk/debian/kapptemplate-trinity.install
+++ b/dilos/core/tdesdk/debian/kapptemplate-trinity.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/bin/kapptemplate
 debian/tmp/usr/share/apps/kapptemplate
+debian/tmp/usr/share/man/man1/kapptemplate.1
diff --git a/dilos/core/tdesdk/debian/kapptemplate-trinity.manpages b/dilos/core/tdesdk/debian/kapptemplate-trinity.manpages
deleted file mode 100644
index e558b802c..000000000
--- a/dilos/core/tdesdk/debian/kapptemplate-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kapptemplate.1
diff --git a/dilos/core/tdesdk/debian/kbabel-trinity.install b/dilos/core/tdesdk/debian/kbabel-trinity.install
index 1c16cad35..1478fe909 100644
--- a/dilos/core/tdesdk/debian/kbabel-trinity.install
+++ b/dilos/core/tdesdk/debian/kbabel-trinity.install
@@ -87,6 +87,9 @@ debian/tmp/usr/share/icons/locolor/16x16/apps/kbabeldict.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/catalogmanager.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/kbabel.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/kbabeldict.png
+debian/tmp/usr/share/man/man1/catalogmanager.1
+debian/tmp/usr/share/man/man1/kbabel.1
+debian/tmp/usr/share/man/man1/kbabeldict.1
 debian/tmp/usr/share/services/dbsearchengine.desktop
 debian/tmp/usr/share/services/tdefile_po.desktop
 debian/tmp/usr/share/services/pothumbnail.desktop
diff --git a/dilos/core/tdesdk/debian/kbabel-trinity.manpages b/dilos/core/tdesdk/debian/kbabel-trinity.manpages
deleted file mode 100644
index e85be5938..000000000
--- a/dilos/core/tdesdk/debian/kbabel-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/catalogmanager.1
-debian/man/kbabel.1
-debian/man/kbabeldict.1
diff --git a/dilos/core/tdesdk/debian/kbugbuster-trinity.install b/dilos/core/tdesdk/debian/kbugbuster-trinity.install
index 6b570513b..b5ee3602f 100644
--- a/dilos/core/tdesdk/debian/kbugbuster-trinity.install
+++ b/dilos/core/tdesdk/debian/kbugbuster-trinity.install
@@ -18,5 +18,6 @@ debian/tmp/usr/share/icons/hicolor/64x64/apps/kbugbuster.png
 debian/tmp/usr/share/icons/hicolor/128x128/apps/kbugbuster.png
 debian/tmp/usr/share/icons/locolor/16x16/apps/kbugbuster.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/kbugbuster.png
+debian/tmp/usr/share/man/man1/kbugbuster.1
 debian/tmp/usr/share/services/tderesources/kcal/bugzilla.desktop
 debian/icons/kbugbuster.xpm /usr/share/pixmaps
diff --git a/dilos/core/tdesdk/debian/kbugbuster-trinity.manpages b/dilos/core/tdesdk/debian/kbugbuster-trinity.manpages
deleted file mode 100644
index 8fc558a77..000000000
--- a/dilos/core/tdesdk/debian/kbugbuster-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kbugbuster.1
diff --git a/dilos/core/tdesdk/debian/kmtrace-trinity.install b/dilos/core/tdesdk/debian/kmtrace-trinity.install
index 88041eb17..1ac5e06c2 100644
--- a/dilos/core/tdesdk/debian/kmtrace-trinity.install
+++ b/dilos/core/tdesdk/debian/kmtrace-trinity.install
@@ -7,3 +7,7 @@ debian/tmp/usr/lib/kmtrace/libktrace.la
 debian/tmp/usr/lib/kmtrace/libktrace.so
 debian/tmp/usr/lib/kmtrace/libktrace_s.a
 debian/tmp/usr/share/apps/kmtrace/kde.excludes
+debian/tmp/usr/share/man/man1/demangle.1
+debian/tmp/usr/share/man/man1/kminspector.1
+debian/tmp/usr/share/man/man1/kmmatch.1
+debian/tmp/usr/share/man/man1/kmtrace.1
diff --git a/dilos/core/tdesdk/debian/kmtrace-trinity.manpages b/dilos/core/tdesdk/debian/kmtrace-trinity.manpages
deleted file mode 100644
index 92133295d..000000000
--- a/dilos/core/tdesdk/debian/kmtrace-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/demangle.1
-debian/man/kmtrace.1
-debian/man/kminspector.1
-debian/man/kmmatch.1
diff --git a/dilos/core/tdesdk/debian/kompare-trinity.install b/dilos/core/tdesdk/debian/kompare-trinity.install
index 5569a831f..bdeaf3d1b 100644
--- a/dilos/core/tdesdk/debian/kompare-trinity.install
+++ b/dilos/core/tdesdk/debian/kompare-trinity.install
@@ -29,4 +29,5 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kompare.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kompare.png
 debian/tmp/usr/share/icons/hicolor/128x128/apps/kompare.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kompare.svgz
+debian/tmp/usr/share/man/man1/kompare.1
 debian/icons/kompare.xpm /usr/share/pixmaps
diff --git a/dilos/core/tdesdk/debian/kompare-trinity.manpages b/dilos/core/tdesdk/debian/kompare-trinity.manpages
deleted file mode 100644
index acf918455..000000000
--- a/dilos/core/tdesdk/debian/kompare-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kompare.1
diff --git a/dilos/core/tdesdk/debian/kspy-trinity.install b/dilos/core/tdesdk/debian/kspy-trinity.install
index 440d444eb..653a913e0 100644
--- a/dilos/core/tdesdk/debian/kspy-trinity.install
+++ b/dilos/core/tdesdk/debian/kspy-trinity.install
@@ -3,3 +3,4 @@ debian/tmp/usr/lib/*/libkspy.la
 debian/tmp/usr/lib/*/libkspy.so
 debian/tmp/usr/lib/*/libkspy.so.1
 debian/tmp/usr/lib/*/libkspy.so.1.2.0
+debian/tmp/usr/share/man/man1/testkspy.1
diff --git a/dilos/core/tdesdk/debian/kspy-trinity.manpages b/dilos/core/tdesdk/debian/kspy-trinity.manpages
deleted file mode 100644
index 34831ba91..000000000
--- a/dilos/core/tdesdk/debian/kspy-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/testkspy.1
diff --git a/dilos/core/tdesdk/debian/kuiviewer-trinity.install b/dilos/core/tdesdk/debian/kuiviewer-trinity.install
index f6c61971a..34d5b7860 100644
--- a/dilos/core/tdesdk/debian/kuiviewer-trinity.install
+++ b/dilos/core/tdesdk/debian/kuiviewer-trinity.install
@@ -11,6 +11,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kuiviewer.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kuiviewer.png
 debian/tmp/usr/share/icons/locolor/16x16/apps/kuiviewer.png
 debian/tmp/usr/share/icons/locolor/32x32/apps/kuiviewer.png
+debian/tmp/usr/share/man/man1/kuiviewer.1
 debian/tmp/usr/share/services/designerthumbnail.desktop
 debian/tmp/usr/share/services/kuiviewer_part.desktop
 debian/icons/kuiviewer.xpm /usr/share/pixmaps
diff --git a/dilos/core/tdesdk/debian/kuiviewer-trinity.manpages b/dilos/core/tdesdk/debian/kuiviewer-trinity.manpages
deleted file mode 100644
index abcf3310b..000000000
--- a/dilos/core/tdesdk/debian/kuiviewer-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kuiviewer.1
diff --git a/dilos/core/tdesdk/debian/libcvsservice0-trinity.install b/dilos/core/tdesdk/debian/libcvsservice0-trinity.install
index 8ce362249..99a5d2ad1 100644
--- a/dilos/core/tdesdk/debian/libcvsservice0-trinity.install
+++ b/dilos/core/tdesdk/debian/libcvsservice0-trinity.install
@@ -8,4 +8,6 @@ debian/tmp/usr/lib/*/trinity/cvsaskpass.la
 debian/tmp/usr/lib/*/trinity/cvsaskpass.so
 debian/tmp/usr/lib/*/trinity/cvsservice.la
 debian/tmp/usr/lib/*/trinity/cvsservice.so
+debian/tmp/usr/share/man/man1/cvsaskpass.1
+debian/tmp/usr/share/man/man1/cvsservice.1
 debian/tmp/usr/share/services/cvsservice.desktop
diff --git a/dilos/core/tdesdk/debian/libcvsservice0-trinity.manpages b/dilos/core/tdesdk/debian/libcvsservice0-trinity.manpages
deleted file mode 100644
index 9afa8b3e7..000000000
--- a/dilos/core/tdesdk/debian/libcvsservice0-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/cvsaskpass.1
-debian/man/cvsservice.1
diff --git a/dilos/core/tdesdk/debian/man/adddebug.1 b/dilos/core/tdesdk/debian/man/adddebug.1
deleted file mode 100644
index d78dad43c..000000000
--- a/dilos/core/tdesdk/debian/man/adddebug.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ADDDEBUG 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-adddebug \- modifies Makefile(s) to add debug info
-.SH SYNOPSIS
-.B adddebug
-.RB "[ " \-k " ] [ " \-n " ] [ " \-r " ]"
-.SH DESCRIPTION
-\fBadddebug\fP modifies the \fIMakefile\fP in the current directory
-(and optionally in its subdirectories) to add debug info (\fI\-g3\fP).
-It will also remove optimisations (\fI\-O[1-9]?\fP), and can optionally
-remove \fI\-DNDEBUG\fP and \fI\-DNO_DEBUG\fP as well.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-.B \-k
-Keep optimisations (do not remove \fI\-O[1-9]?\fP flags which are
-removed by default).
-.TP
-.B \-n
-Compile without \fINDEBUG\fP and \fINO_DEBUG\fP being defined (this
-makes kdDebug calls work).
-.TP
-.B \-r
-Recursively search through all subdirectories of the current directory
-and operate on every Makefile that is found.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/build-progress.sh.1 b/dilos/core/tdesdk/debian/man/build-progress.sh.1
deleted file mode 100644
index 28c9d9016..000000000
--- a/dilos/core/tdesdk/debian/man/build-progress.sh.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BUILD-PROGRESS.SH 1 "June 16, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-build-progress.sh \- show kde-build progress in your konsole/xterm title bar
-.SH SYNOPSIS
-.B build-progress.sh
-.SH DESCRIPTION
-\fBbuild-progress.sh\fP can be used to watch the progress of a large TDE
-build in the title bar of your konsole or xterm.
-.PP
-The TDE build must be running elsewhere as a separate process, and it
-must be done using
-.BR kde-build (1).
-.PP
-When you run build-progress.sh, it will sit in a permanent loop while
-kde-build runs.  The title bar of the konsole/xterm in which you ran
-build-progress.sh will be continually updated with the directory in
-which the TDE build is currently working.
-.PP
-You must run build-progress.sh from the top-level directory of the TDE
-build tree.  This directory must contain a file named
-\fIkde-buildrc\fP (which is also used by kde-build).  This
-\fIkde-buildrc\fP must contain valid settings for
-\fITDELOGDIR\fP and \fITDESRCDIR\fP, or else build-progress.sh will
-fail to work.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH FILES
-.TP
-\fIkde-buildrc\fP
-This file must be contained in the current directory, which must be the
-root of the TDE build tree.  See
-.BR kde-build (1)
-for further information.
-.SH SEE ALSO
-.BR kde-build (1).
-.SH AUTHOR
-build-progress.sh was written by Malte Starostik <malte@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/catalogmanager.1 b/dilos/core/tdesdk/debian/man/catalogmanager.1
deleted file mode 100644
index db8b17613..000000000
--- a/dilos/core/tdesdk/debian/man/catalogmanager.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CATALOGMANAGER 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-catalogmanager \- advanced catalog manager for KBabel
-.SH SYNOPSIS
-.B catalogmanager
-.RI "[ " generic-options " ]"
-[ \fB\-\-project\fP \fIconfig-file\fP ]
-.SH DESCRIPTION
-\fBCatalogManager\fP is part of a suite of programs for editing gettext
-message files (PO-files).  This suite is designed to help you translate fast
-and consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager (this program)
-is a multi functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the catalogmanager-specific options.
-For a full summary of options, run \fIcatalogmanager \-\-help\fP.
-.TP
-\fB\-\-project\fP \fIconfig-file\fP
-Load the configuration from the given file.
-.SH SEE ALSO
-.BR kbabel (1),
-.BR kbabeldict (1).
-.PP
-Full user documentation for KBabel is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cheatmake.1 b/dilos/core/tdesdk/debian/man/cheatmake.1
deleted file mode 100644
index 098449a0b..000000000
--- a/dilos/core/tdesdk/debian/man/cheatmake.1
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CHEATMAKE 1 "September 27, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cheatmake \- fool make into not rebuilding certain files
-.SH SYNOPSIS
-.B cheatmake hidechange
-.I file
-.br
-.B cheatmake show
-.br
-.B cheatmake why
-.I file
-.SH DESCRIPTION
-\fBcheatmake\fP is used to save time when recompiling.  It can fool \fBmake\fP
-into skipping files that haven't changed in a meaningful way.  This can be
-used for instance when you change a comment in a file but none of the actual
-code.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-The different modes of operation are as follows.
-.TP
-\fBhidechange\fP \fIfile\fP
-Hides the fact that the given file has changed by moving its timestamp
-back into the past.  Use this option with care!
-.TP
-\fBshow\fP
-Lists which files make currently needs to rebuild.
-.TP
-\fBwhy\fP \fIfile\fP
-Explains why make must rebuild the given file.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR make (1).
-.SH AUTHOR
-cheatmake was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/create_cvsignore.1 b/dilos/core/tdesdk/debian/man/create_cvsignore.1
deleted file mode 100644
index ce63f6f55..000000000
--- a/dilos/core/tdesdk/debian/man/create_cvsignore.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CREATE_CVSIGNORE 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-create_cvsignore \- creates preliminary .cvsignore in current directory
-.SH SYNOPSIS
-.B create_cvsignore
-[ \fB\-r\fP ]
-.SH DESCRIPTION
-\fBcreate_cvsignore\fP is used to create a preliminary \fI.cvsignore\fP
-file in the current directory.  It does this by adding some standard
-stuff according to what it finds in \fIMakefile.am\fP.
-.PP
-No lines will be removed from any existing \fI.cvsignore\fP.
-If there is not already a \fI.cvsignore\fP, it will be added to the CVS
-repository.
-.PP
-Note that you must have a \fIMakefile.am\fP in the current directory for
-this tool to work.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB-r\fP
-Recursively process this directory and all directories beneath it.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/create_makefile.1 b/dilos/core/tdesdk/debian/man/create_makefile.1
deleted file mode 100644
index e128f23e9..000000000
--- a/dilos/core/tdesdk/debian/man/create_makefile.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CREATE_MAKEFILE 1 "September 26, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-create_makefile \- creates Makefile.in and Makefile from a Makefile.am
-.SH SYNOPSIS
-.B create_makefile
-.I relativepath/Makefile
-.br
-.B create_makefile
-.I relativepath
-.SH DESCRIPTION
-\fBcreate_makefile\fP creates the \fIMakefile.in\fP and \fIMakefile\fP
-in a subdirectory containing a \fIMakefile.am\fP.
-This script saves time compared to re-running configure completely.
-.PP
-Note that you must supply the path to the desired \fIMakefile\fP, not the
-existing \fIMakefile.am\fP (though the final \fI/Makefile\fP may be omitted).
-.PP
-This script may be run from the toplevel directory (the
-one containing \fIconfigure\fP) or from one of its subdirectories.
-Note that \fIrelativepath\fP must be a relative path, not an absolute path.
-.PP
-If the source directory is different from the build directory (see the
-environment variables below), it will be assumed that the \fIMakefile.am\fP
-and \fIMakefile.in\fP belong beneath the source directory and that the
-\fIMakefile\fP belongs beneath the build directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR create_makefiles (1).
-.SH AUTHOR
-create_makefile was written by David Faure <faure@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/create_makefiles.1 b/dilos/core/tdesdk/debian/man/create_makefiles.1
deleted file mode 100644
index 2efc03795..000000000
--- a/dilos/core/tdesdk/debian/man/create_makefiles.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CREATE_MAKEFILES 1 "September 27, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-create_makefiles \- recreates all Makefiles beneath a directory
-.SH SYNOPSIS
-.B create_makefiles
-.I dir
-.SH DESCRIPTION
-\fBcreate_makefiles\fP recreates all \fIMakefile\fPs in
-\fIdir\fP and its (recursed) subdirectories from the corresponding
-\fIMakefile.am\fP templates.
-.PP
-This script must be run from the toplevel directory (the
-one containing \fIconfigure\fP).
-This script saves time compared to re-running configure completely.
-.PP
-If the source directory is different from the build directory (see the
-environment variables below), it will be assumed that each \fIMakefile.am\fP
-and \fIMakefile.in\fP belongs beneath the source directory and that each
-\fIMakefile\fP belongs beneath the build directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR create_makefile (1).
-.SH AUTHOR
-create_makefiles was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvs-clean.1 b/dilos/core/tdesdk/debian/man/cvs-clean.1
deleted file mode 100644
index 0706e485c..000000000
--- a/dilos/core/tdesdk/debian/man/cvs-clean.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVS-CLEAN 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvs\-clean \- delete all files and directories not registered with CVS
-.SH SYNOPSIS
-.B cvs\-clean
-[ \fB-n, \-\-dry-run\fP ]
-[ \fB-h, \-\-help\fP ]
-.SH DESCRIPTION
-\fBcvs\-clean\fP recursively deletes everything in or beneath the
-current directory that is not known to CVS (i.e., that has not been
-checked out of or checked into a CVS repository).
-.PP
-A list of all files and directories that are deleted will be written to
-the console.
-.PP
-This script behaves similarly to the \fIcvs-clean\fP target from the
-file \fIadmin/Makefile.common\fP found in most TDE application sources.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB-n, \-\-dry-run\fP
-Print the intended actions to the console, but do not change anything on
-the filesystem.
-.TP
-\fB-h, \-\-help\fP
-Display usage information.
-.SH SEE ALSO
-.BR cvs (1).
-.SH AUTHOR
-This utility was written by Oswald Buddenhagen <ossi@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvs2dist.1 b/dilos/core/tdesdk/debian/man/cvs2dist.1
deleted file mode 100644
index f0bc71a3e..000000000
--- a/dilos/core/tdesdk/debian/man/cvs2dist.1
+++ /dev/null
@@ -1,201 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVS2DIST 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvs2dist \- convert subdirectories within TDE CVS into standalone
-source packages
-.SH SYNOPSIS
-.B cvsdist
-.I path-to-module
-.I directory-in-module
-[ \fB\-n, \-\-name\fP \fIname\fP ]
-[ \fB\-v, \-\-version\fP \fIversion\fP ]
-[ \fB\-\-admin-dir\fP \fIdir\fP ]
-[ \fB\-\-cvs-root\fP \fIroot\fP ]
-[ \fB\-B, \-\-branch\fP \fIbranch\fP ]
-[ \fB\-\-no-i18n\fP ]
-[ \fB\-\-no-i18n-lang\fP \fIlanguages\fP ]
-[ \fB\-\-log=\fP\fIlogfile\fP | \fB\-l\fP ]
-[ \fB\-m, \-\-make-unpackaged\fP ]
-[ \fB\-g, \-\-no-gzip\fP ]
-[ \fB\-b, \-\-no-bz2, \-\-no-bzip2\fP ]
-[ \fB\-o, \-\-only-directory\fP ]
-[ \fB\-r, \-\-required-header\fP \fIheader\fP ]
-[ \fB\-e, \-\-required-header-error-message\fP \fImessage\fP ]
-[ \fB\-d, \-\-remove-hidden\fP ]
-[ \fB\-\-replace-files\fP \fIpairs\fP ]
-[[--] \fIaddfile\fP ... ]
-.PP
-.B cvsdist
-\fB\-h, \-\-help\fP
-.SH DESCRIPTION
-Each module in the TDE CVS tree contains a large number of applications
-all bundled together.
-\fBcvs2dist\fP is used to extract a single application or component from
-one of these large CVS modules and bundle it into a standalone package.
-The application or component will be bundled into a standard
-distribution tarball (with a configure script and so on) that users can
-download, build and install.
-.PP
-By default, cvs2dist automatically tries to check out all translations
-of strings and documentation from the corresponding parts of the
-\fItde-i18n\fP CVS module and include them in the final packages.
-This can be suppressed or modified using the options \-\-no-i18n or
-\-\-no-i18n-lang.
-.PP
-The initial argument \fIpath-to-module\fP should specify where the CVS
-module has been checked out on your system, and the second argument
-\fIdirectory-in-module\fP should specify which directory within this
-module is to be packaged (all subdirectories beneath it will be included
-and so on).  See the EXAMPLE section below for details.
-.PP
-Both gzip and bzip2 compressed tarballs will be created by default and
-will be called \fIname[-version].tar.gz\fP and \fIname[-version].tar.bz2\fP.
-The \fIname\fP component will be the last directory component of
-\fIdirectory-in-module\fP unless otherwise specified by \-\-name, and
-the \fIversion\fP component will not be included unless it is specified by
-\-\-version.
-.PP
-Additional files from outside the CVS tree can be included in the final
-packages by passing them after all other options (these are the
-\fIaddfile\fP arguments displayed above).  These additional files will
-be placed in the top level directory of the final packages.
-The \-\- that precedes them is optional.
-.PP
-Many options are available for customising these procedures, as seen below.
-Note that cvs2dist will remove any temporary files that it creates.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-n, \-\-name\fP \fIname\fP
-The name of the package (to be used in the names of the final tarballs
-and directories).  Specifically, the compressed tarballs will be called
-\fIname-version.tar.gz\fP and \fIname-version.tar.bz2\fP (see the
-\-\-version option below for further information).
-This package name defaults to the last directory component of
-\fIdirectory-in-module\fP.
-.TP
-\fB\-v, \-\-version\fP \fIversion\fP
-The version of the package (to be used in the names of the final
-tarballs and directories).  If this is not supplied, no version is used
-at all (i.e., the compressed tarballs will just be called \fIname.tar.gz\fP
-and \fIname.tar.bz2\fP).
-.TP
-\fB\-\-admin-dir\fP \fIdir\fP
-The location of \fIadmin/\fP on the filesystem.  Symbolic links may
-be used.  Defaults to \fIpath-to-module/admin\fP.
-.TP
-\fB\-\-cvs-root\fP \fIroot\fP
-The value to use as CVSROOT when checking out translations from CVS.
-Defaults to the CVSROOT environment variable.
-If \-\-no-i18n is passed then this option has no effect.
-.TP
-\fB\-B, \-\-branch\fP \fIbranch\fP
-Use the given CVS branch for checking out translations from CVS.
-If \-\-no-i18n is passed then this option has no effect.
-.TP
-\fB\-\-no-i18n\fP
-Do not check out any translations from CVS.
-.TP
-\fB\-\-no-i18n-lang\fP \fIlanguages\fP
-Exclude the given language(s) when checking out translations from CVS.
-The list of languages should be comma-separated,
-such as \fI\-\-no-i18n-lang uk,de,en_GB\fP .
-.TP
-\fB\-\-log=\fP\fIlogfile\fP
-Log all proceedings to the given logfile.  Note that the = is essential,
-and may not be omitted.
-.TP
-\fB\-l\fP
-Log all proceedings to the default logfile in the current directory.
-.TP
-\fB\-m, \-\-make-unpackaged\fP
-In addition to the compressed tarballs, an unpacked distribution will be
-created in the current directory.
-.TP
-\fB\-g, \-\-no-gzip\fP
-Do not create a gzip package (\fIname-version.tar.gz\fP).
-.TP
-\fB\-b, \-\-no-bz2, \-\-no-bzip2\fP
-Do not create a bzip2 package (\fIname-version.tar.bz2\fP).
-.TP
-\fB\-o, \-\-only-directory\fP
-Alias for \-mgb.  No packages will be created, only an unpacked directory.
-.TP
-\fB\-r, \-\-required-header\fP \fIheader\fP
-When the user runs configure, an error will be generated if
-\fIheader\fP is not found on the user's system.
-.TP
-\fB\-e, \-\-required-header-error-message\fP \fImessage\fP
-The error to display to a user when the header passed with
-\-\-required-header is not found on the user's system.  Defaults to a
-sensible message.
-.TP
-\fB\-d, \-\-remove-hidden\fP
-Remove hidden files and directories (e.g., dotfiles) from the packages.
-.TP
-\fB\-h, \-\-help\fP
-Display instructions on how to use cvs2dist.
-.TP
-\fB\-\-replace-files\fP \fIpairs\fP
-Move one or more files around in the final distribution packages.
-The \fIpairs\fP argument should be a comma-separated list of
-replacements to make.  Each replacement specifies a single file to move, and
-should be of the form \fIsource\fP@\fIdest\fP.
-.br
-For each replacement, the source file will be moved to the
-destination file (in particular, the source file will be deleted).
-All filenames are relative to the top-level directory
-of the package.  Spaces in filenames are not allowed.
-.br
-Please be careful when using this option!  Try to avoid the use of ..
-in the filenames, since it may cause unexpected problems.
-.br
-An example of this option might be
-\fI\-\-replace-files take_this_file@move_it_here,configure.in.bot.dist@configure.in.bot\fP .
-.SH EXAMPLE
-The following example creates packages of the kolf picture plugin from
-the CVS source tree currently checked out in \fI/sources\fP.
-.PP
-.RS
-\fIexample$\fP cvs2dist /sources/tdegames kolf/objects/picture
-\-n kolf-picture \-v 0.9 \-r "kolf/game.h" \-\-log ~/tmp/extra-file
-.RE
-.PP
-The packages will be named \fIkolf-picture-0.9\fP and
-the process will be logged.  For configure to succeed when a user builds
-these packages, the header \fIkolf/game.h\fP must be installed or an
-error will occur.  The additional file \fI~/tmp/extra-file\fP will be
-included in the packages even though it is not part of the CVS source tree.
-.SH FILES
-.TP
-\fI~/.cvs2distrc\fP
-Any options found in this file will be
-added to the beginning of the command-line arguments.
-.SH SEE ALSO
-.BR cvs (1).
-.PP
-For the latest updates to this script, see the cvs2dist website
-\fIhttp://www.katzbrown.com/shiritsu/programming/cvs2dist/\fP.
-.SH AUTHOR
-cvs2dist was written by Jason Katz-Brown <jason@katzbrown.com>,
-Sebastian Stein <seb.stein@hpfsc.de>, Dominique Devriese <devriese@kde.org>
-and Michael Buesch <mbuesch@freenet.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvsaskpass.1 b/dilos/core/tdesdk/debian/man/cvsaskpass.1
deleted file mode 100644
index d4b7e5dfd..000000000
--- a/dilos/core/tdesdk/debian/man/cvsaskpass.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSASKPASS 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsaskpass \- prompt for a password for the CVS DCOP service
-.SH SYNOPSIS
-.B cvsaskpass
-.RI "[ " generic-options " ]"
-.I prompt
-.SH DESCRIPTION
-This utility displays a dialog box prompting the user for the password to
-a CVS repository, then writes the password to standard output and exits.
-You should not need to run this program directly \- it is designed for
-the internal use of
-.BR cvsservice (1).
-.PP
-The prompt should be of the following form:
-.RS
-.PP
-\fIuser\fP@\fIhost\fP's password:
-.RE
-.PP
-This will allow the dialog box to display the details of the CVS
-repository to the user.
-.PP
-This utility is part of the CVS service provided with Cervisia, which in
-turn is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIcvsaskpass \-\-help\fP.
-.SH RETURN VALUE
-If a password was succefully obtained, 0 is returned.  If no prompt was
-supplied on the command-line or if the dialog was cancelled, 1 is returned.
-.SH SEE ALSO
-.BR cervisia (1),
-.BR cvsservice (1),
-.BR dcop (1).
-.PP
-Details of how to use the CVS service from within another script or C++
-program can be found in \fI/usr/share/doc/libcvsservice0/DESIGN\fP.
-.SH AUTHOR
-The CVS service was written by Christian Loose <christian.loose@kdemail.net>.
-.br
-Cervisia was written by Bernd Gehrmann <bernd@physik.hu-berlin.de>,
-Christian Loose <christian.loose@kdemail.net>,
-Andre Woebbeking <woebbeking@web.de>,
-Carlos Woelz <carloswoelz@imap-mail.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvsbackport.1 b/dilos/core/tdesdk/debian/man/cvsbackport.1
deleted file mode 100644
index 7181ac671..000000000
--- a/dilos/core/tdesdk/debian/man/cvsbackport.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSBACKPORT 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsbackport \- backport the last change in HEAD to a branch
-.SH SYNOPSIS
-.B cvsbackport
-\fIfile\fP ...
-.SH DESCRIPTION
-For each file given on the command line,
-\fBcvsbackport\fP will attempt to determine the last change made to
-the file in HEAD and then backport that change to a CVS branch (the
-branch name is hard-coded; see below).
-.PP
-The changes to be backported will be displayed on screen, and you will
-have the chance to confirm or abort before any commits are made.
-.PP
-The files must be checked out from HEAD when you run this utility.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNINGS
-The branch tag is hard-coded into the script (currently it is set to
-KDE_3_4_BRANCH).
-.PP
-If you abort (i.e., you do not make the suggested commits), your files
-will be checked out from the branch (and not from HEAD as they were
-before).
-.SH SEE ALSO
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This utility was written by Dirk Mueller and David Faure.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvscheck.1 b/dilos/core/tdesdk/debian/man/cvscheck.1
deleted file mode 100644
index 3d79c255b..000000000
--- a/dilos/core/tdesdk/debian/man/cvscheck.1
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSCHECK 1 "March 26, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvscheck \- offline status report for files in a checked-out CVS module
-.SH SYNOPSIS
-.B cvscheck
-[ \fB\-u, \-\-unknown\fP ]
-[ \fB\-m, \-\-modified\fP ]
-[ \fB\-\-missing\fP ]
-[ \fB\-t, \-\-tagged\fP ]
-[ \fB\-a, \-\-added\fP ]
-[ \fB\-r, \-\-removed\fP ]
-[ \fB\-c, \-\-conflicts\fP ]
-[ \fB\-l, \-\-local\fP ]
-[ \fIdir\fP ... ]
-.SH DESCRIPTION
-\fBcvscheck\fP prints information about the status of your local CVS
-checkout without communicating with the server.  This means it is
-extremely fast and does not require a network connection.
-.PP
-The given directories and all of their subdirectories will be processed
-recursively (though see the \-\-local option below).
-If no directory is given, the current directory and its
-recursed subdirectories will be used.
-.PP
-Each file with an interesting status will be printed with a status
-character in front of its name.  The status characters are as follows.
-.TP
-? \fIfoobar.c\fP
-The file is not known to CVS.  Maybe you should add it?
-.TP
-M \fIfoobar.c\fP
-The file is for sure locally modified.
-.TP
-m \fIfoobar.c\fP
-The file \fImight\fP have local changes.  You should diff with the
-server to make sure.
-.TP
-C \fIfoobar.c\fP
-The file has a CVS conflict and therefore cannot be committed.
-.TP
-U \fIfoobar.c\fP
-The file is in CVS but is somehow missing in your local checkout.
-.TP
-T \fIfoobar.c\fP
-The file has an unusual sticky CVS tag.
-.TP
-A \fIfoobar.c\fP
-You have "cvs add"ed this file but you have not yet committed.
-.TP
-R \fIfoobar.c\fP
-You have "cvs remove"d this file but you have not yet committed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-By default cvscheck will display the status for all files in and
-beneath the requested directories.  The following options however can be
-used to display only files with a particular status and/or in a
-particular directory.
-.TP
-\fB\-u, \-\-unknown\fP
-Show only unknown (?) files.
-.TP
-\fB\-m, \-\-modified\fP
-Show only modified (m/M) files.
-.TP
-\fB\-\-missing\fP
-Show only missing (U) files.
-.TP
-\fB\-t, \-\-tagged\fP
-Show only tagged (T) files.
-.TP
-\fB\-a, \-\-added\fP
-Show only added (A) files.
-.TP
-\fB\-r, \-\-removed\fP
-Show only removed (R) files.
-.TP
-\fB\-c, \-\-conflicts\fP
-Show only conflict (C) files.
-.TP
-\fB\-l, \-\-local\fP
-Do not recurse.  That is, process the given directory but none of its
-subdirectories.
-.SH SEE ALSO
-.BR cvs (1).
-.SH AUTHOR
-cvscheck was written by Dirk Mueller <mueller@kde.org> and
-Sirtaj Singh Kang <taj@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvsforwardport.1 b/dilos/core/tdesdk/debian/man/cvsforwardport.1
deleted file mode 100644
index 0ca6d29f5..000000000
--- a/dilos/core/tdesdk/debian/man/cvsforwardport.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSFORWARDPORT 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsforwardport \- forwardport the last change in a branch to HEAD
-.SH SYNOPSIS
-.B cvsforwardport
-\fIfile\fP ...
-.SH DESCRIPTION
-For each file given on the command line,
-\fBcvsforwardport\fP will attempt to determine the last change made to
-the file in the primary CVS branch and then forwardport that change to HEAD.
-The branch name is hard-coded; see below.
-.PP
-The changes to be forwardported will be displayed on screen, and you will
-have the chance to confirm or abort before any commits are made.
-.PP
-The files must be checked out from the branch when you run this utility.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNINGS
-The branch tag is hard-coded into the script (currently it is set to
-KDE_3_4_BRANCH).
-.PP
-If you abort (i.e., you do not make the suggested commits), your files
-will be checked out from HEAD (and not from the branch as they were
-before).
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This utility was written by Dirk Mueller and David Faure.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvslastchange.1 b/dilos/core/tdesdk/debian/man/cvslastchange.1
deleted file mode 100644
index b651e4414..000000000
--- a/dilos/core/tdesdk/debian/man/cvslastchange.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSLASTCHANGE 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvslastchange \- display the last committed changes for a file
-.SH SYNOPSIS
-.B cvslastchange
-\fIfile\fP [ \fIrevision\fP ]
-.br
-.B cvslastchange
-\fBM\fP +\fIdigits\fP -\fIdigits\fP
-.I file revision
-.SH DESCRIPTION
-\fBcvslastchange\fP displays the last changes committed to the CVS
-for the given file.
-It does this by launching '\fIcvs log\fP' and '\fIcvs diff\fP'.
-.PP
-If a revision is passed, the changes committed for that particular revision
-will be displayed.  Otherwise the currently checked out revision will be used.
-.PP
-This tool works with other branches as well as with HEAD.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fBM\fP +\fIdigits\fP -\fIdigits\fP
-These options are currently ignored.
-.SH ENVIRONMENT VARIABLES
-.TP
-CVSLASTCHANGE_KEEP_WHITESPACE
-Define this variable if you do not want the whitespace to be modified
-in any way when displaying changes.  Usually the whitespace is tidied
-up a little before the changes are displayed on screen.
-.br
-This variable is useful if you are using cvslastchange to extract a
-patch that can be applied elsewhere.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvslastlog.1 b/dilos/core/tdesdk/debian/man/cvslastlog.1
deleted file mode 100644
index 445a1a74a..000000000
--- a/dilos/core/tdesdk/debian/man/cvslastlog.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSLASTLOG 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvslastlog \- prints the log of the last commit for a file
-.SH SYNOPSIS
-.B cvslastlog
-.I file
-.SH DESCRIPTION
-\fBcvslastlog\fP shows the log associated with the last CVS commit for the
-given file.
-It depends on the version of the local file, not the one on the server.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-cvslastlog was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvsrevertlast.1 b/dilos/core/tdesdk/debian/man/cvsrevertlast.1
deleted file mode 100644
index aedf45aa6..000000000
--- a/dilos/core/tdesdk/debian/man/cvsrevertlast.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSREVERTLAST 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsrevertlast \- revert files in CVS by one version
-.SH SYNOPSIS
-.B cvsrevertlast
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBcvsrevertlast\fP is used to revert all the files on the command line
-by one version in CVS.  The files will not be committed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1).
-.SH AUTHOR
-This utility was written by Charles Samuels <charles@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cvsservice.1 b/dilos/core/tdesdk/debian/man/cvsservice.1
deleted file mode 100644
index 9d5c791d7..000000000
--- a/dilos/core/tdesdk/debian/man/cvsservice.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSSERVICE 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsservice \- a DCOP service for accessing CVS repositories
-.SH SYNOPSIS
-.B cvsservice
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-The CVS service is a DCOP service for accessing and working with
-remote CVS repositories.  Applications may link with this library to
-access the DCOP service directly from C++.  Alternatively, scripts may
-access the service using the standard
-.BR dcop (1)
-command-line tool.
-.PP
-DCOP is the Desktop Communication Protocol used throughout TDE.
-.PP
-The CVS DCOP service consists of the following three parts:
-.TP
-\fBCvsService\fP
-The main interface to the functionality of the
-.BR cvs (1)
-command line client.  There is one method for each CVS command, e.g., add,
-checkout, commit, etc.  The methods assemble the command line
-arguments, create a CvsJob and return a DCOPRef object for it
-to the caller.  There is one instance of this service for each
-application instance.
-.TP
-\fBRepository\fP
-This DCOPObject manages the configuration data of the current
-CVS repository.  The data is automatically updated when other
-service instances change it.
-.TP
-\fBCvsJob\fP
-This class represents a CVS job.  You can execute and cancel it,
-and you can retrieve the output of the cvs client by either
-connecting to the proper DCOP signals or by using the output()
-method.  There are two types of jobs.  First the non-concurrent
-job which has to run alone, like cvs update or import.  Second
-the jobs which can run concurrently like cvs log or annotate.
-.PP
-The CVS service is provided with Cervisia, which is part of the TDE
-Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIcvsservice \-\-help\fP.
-.SH SEE ALSO
-.BR cervisia (1),
-.BR cvs (1),
-.BR cvsaskpass (1),
-.BR dcop (1).
-.PP
-Details of how to use the CVS service from within a shell script, a C++
-program or through the JavaScript bindings can be found in
-\fI/usr/share/doc/libcvsservice0/DESIGN\fP.
-.SH AUTHOR
-The CVS service was written by Christian Loose <christian.loose@kdemail.net>.
-.br
-Cervisia was written by Bernd Gehrmann <bernd@physik.hu-berlin.de>,
-Christian Loose <christian.loose@kdemail.net>,
-Andre Woebbeking <woebbeking@web.de>,
-Carlos Woelz <carloswoelz@imap-mail.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/cxxmetric.1 b/dilos/core/tdesdk/debian/man/cxxmetric.1
deleted file mode 100644
index a8a855cde..000000000
--- a/dilos/core/tdesdk/debian/man/cxxmetric.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CXXMETRIC 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cxxmetric \- simple source metrics for C and C++
-.SH SYNOPSIS
-.B cxxmetric
-.RI "[ " file " ... ]"
-.SH DESCRIPTION
-\fBcxxmetric\fP counts lines of code, comment and blank space and
-calculates various other statistics for each given source file.
-Source files must be in C or C++.
-.PP
-If no source files are specified then all C/C++ files in or beneath the
-current directory will be used.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/demangle.1 b/dilos/core/tdesdk/debian/man/demangle.1
deleted file mode 100644
index 8f4f3922f..000000000
--- a/dilos/core/tdesdk/debian/man/demangle.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH DEMANGLE 1 "February 25, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-demangle \- undo C++ name mangling for symbols
-.SH SYNOPSIS
-.B demangle
-.SH DESCRIPTION
-\fBDemangle\fP reads a list of C++ mangled symbol names from standard
-input and converts these names to human-readable form on standard
-output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLE
-Create a file called \fInames\fP containing the following mangled symbol
-names:
-.PP
-.RS
-_ZNK6Object10metaObjectEv
-.br
-_ZN8QPtrListI5ArrowE5clearEv
-.br
-_ZTC4Kolf0_11TDEMainWindow
-.RE
-.PP
-These names can then be demangled as follows:
-.PP
-.RS
-\fIexample$\fP demangle < names
-.br
-Object::metaObject() const
-.br
-QPtrList<Arrow>::clear()
-.br
-construction vtable for TDEMainWindow-in-Kolf
-.RE
-.SH SEE ALSO
-.BR kminspector (1),
-.BR kmmatch (1),
-.BR kmtrace (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/dprof2calltree.1 b/dilos/core/tdesdk/debian/man/dprof2calltree.1
deleted file mode 100644
index 88bcd0b0d..000000000
--- a/dilos/core/tdesdk/debian/man/dprof2calltree.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH DPROF2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-dprof2calltree \- convert perl's DProf profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B dprof2calltree
-\fB\-f\fP \fIinput\fP
-[ \fB\-o\fP \fIoutput\fP ]
-.SH DESCRIPTION
-\fBdprof2calltree\fP reads the \fItmon.out\fP profiling data output by
-Perl's Devel::DProf profiling package, and converts it into calltree format
-for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP \fIinput\fP
-Specifies the DProf \fItmon.out\fP file to convert.
-.TP
-\fB\-o\fP \fIoutput\fP
-Write the calltree output to the given file for use by KCachegrind.
-If omitted, the output will be written to file of the form
-\fIcachgrind.out.<input>\fP.
-.SH EXAMPLE
-If you run a perl script as:
-.PP
-.RS
-perl -d:DProf yourscript.pl
-.RE
-.PP
-then this will write profiling data to \fItmon.out\fP.  You can then
-work with this data in KCachegrind as follows:
-.PP
-.RS
-dprof2calltree -f tmin.out -o cachegrind.out.foo
-.br
-tdecachegrind cachegrind.out.foo
-.RE
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by George Schlossnagle <george@omniti.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/extend_dmalloc.1 b/dilos/core/tdesdk/debian/man/extend_dmalloc.1
deleted file mode 100644
index 0078442ef..000000000
--- a/dilos/core/tdesdk/debian/man/extend_dmalloc.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTEND_DMALLOC 1 "April 29, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extend_dmalloc \- analyse return-addresses from dmalloc logfiles
-.SH SYNOPSIS
-.B extend_dmalloc
-.I dmalloc-log binary
-.SH DESCRIPTION
-\fBextend_dmalloc\fP will run
-.BR gdb (1)
-to get information on the return-addresses from a
-.BR dmalloc (1)
-logfile.  Specifically it will examine any \fIra=\fP lines and try to
-get the corresponding line numbers.
-.PP
-The argument \fIbinary\fP must be the binary that generated the log
-\fIdmalloc-log\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH NOTES
-You may wish to direct the output from extend_dmalloc to a file, since
-otherwise gdb seems to prompt for a return as if you are at the end of a
-page.
-.SH AUTHOR
-extend_dmalloc was written by Gray Watson <gray.watson@letters.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/extractattr.1 b/dilos/core/tdesdk/debian/man/extractattr.1
deleted file mode 100644
index 7e506e449..000000000
--- a/dilos/core/tdesdk/debian/man/extractattr.1
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTRACTATTR 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extractattr \- extract element attributes from UI and XML GUI files
-.SH SYNOPSIS
-.B extractattr
-\fB\-\-attr=\fP\fIname\fP
-[ \fB\-\-attr=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.PP
-.B extractattr \-\-help
-.SH DESCRIPTION
-\fBextractattr\fP finds all of the given element attributes within the
-given files.  It then writes the corresponding \fIi18n()\fP calls to
-standard output (usually redirected to rc.cpp) so that xgettext can parse
-them.  Only the attributes specified by \fB\-\-attr\fP will be extracted.
-.PP
-Both Qt designer (.ui) files and XML GUI (.rc) files are understood.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\-attr=\fP\fIname\fP
-Specifies an attribute to be extracted.  This option may be used
-multiple times.
-.br
-The \fIname\fP argument must be of the form
-\fIElement\fP,\fIattribute\fP or
-\fIElement\fP,\fIattribute\fP,\fIcontext\fP.
-.br
-The context is optional, and is used in constructing the i18n() calls.
-If specified it will override the default context set by \fB\-\-context\fP.
-.TP
-\fB\-\-context=\fP\fIname\fP
-Give all i18n() calls the given context: i18n("\fIname\fP", ...).
-.TP
-\fB\-\-help\fP
-Display a summary of options.
-.SH EXAMPLE
-extractattr \-\-attr=Title,data \-\-attr=Description,data,Stencils file.ui
-.SH AUTHOR
-This utility was written by Richard Evans <rich@ridas.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/extractrc.1 b/dilos/core/tdesdk/debian/man/extractrc.1
deleted file mode 100644
index 130fdb089..000000000
--- a/dilos/core/tdesdk/debian/man/extractrc.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTRACTRC 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extractrc \- extract message strings from UI and XML GUI files
-.SH SYNOPSIS
-.B extractrc
-[ \fB\-\-tag\-group=\fP\fIgroup\fP ]
-[ \fB\-\-tag=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.PP
-.B extractrc \-\-help
-.SH DESCRIPTION
-\fBextractrc\fP finds all text tags and other message strings within the
-given files.  It then writes the corresponding \fIi18n()\fP calls to
-standard output (usually redirected to rc.cpp) so that xgettext can parse
-them.
-.PP
-It understands both Qt designer (.ui) files and XML GUI (.rc) files.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Note that the old \fB\-\-lines\fP option is deprecated; source line
-numbers are now always included in comments.
-.TP
-\fB\-\-tag\-group=\fP\fIgroup\fP
-Use a predefined group of tags that we are interested in.
-Valid groups are default, koffice and none.
-The default group will be used if this option is omitted.
-.TP
-\fB\-\-tag=\fP\fIname\fP
-Extract also the contents of the tag \fIname\fP.
-This option may be used multiple times
-(e.g., \-\-tag=tag_one \-\-tag=tag_two).
-.TP
-\fB\-\-context=\fP\fIname\fP
-Give all i18n() calls the given context: i18n("\fIname\fP", ...).
-.TP
-\fB\-\-help\fP
-Display a summary of options.
-.SH AUTHOR
-This utility was written by Richard Evans <rich@ridas.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/findmissingcrystal.1 b/dilos/core/tdesdk/debian/man/findmissingcrystal.1
deleted file mode 100644
index 32b23294e..000000000
--- a/dilos/core/tdesdk/debian/man/findmissingcrystal.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FINDMISSINGCRYSTAL 1 "February 6, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-findmissingcrystal \- determine which TDE Crystal icons are the same as
-the TDE Classic hicolor icons
-.SH SYNOPSIS
-.B findmissingcrystal
-.I module
-.SH DESCRIPTION
-\fBfindmissingcrystal\fP is a small utility that runs through the icons
-in the given TDE module and determines which Crystal icons from that
-module are identical to the old TDE Classic hicolor icons.
-.PP
-This script \fBmust\fP be run from the top-level directory of a TDE source
-tree (i.e., the directory containing \fItdelibs\fP, \fItdebase\fP, etc.).
-It is assumed that \fImodule\fP is a top-level module in the source tree,
-and it is also assumed that the source tree contains the \fItdeartwork\fP
-module (which contains the old hicolor icons).
-.PP
-For each Crystal icon in the given module, a message will be output
-describing whether the icon is new (no matching hicolor icon was found),
-different from the hicolor icon or the same as the hicolor icon.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/fixkdeincludes.1 b/dilos/core/tdesdk/debian/man/fixkdeincludes.1
deleted file mode 100644
index 6c5bea183..000000000
--- a/dilos/core/tdesdk/debian/man/fixkdeincludes.1
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FIXTDEINCLUDES 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fixkdeincludes \- reduce the number of #includes in TDE source files
-.SH SYNOPSIS
-.B fixkdeincludes
-[ \fB\-v, \-\-verbose\fP ]
-[ \fB\-e, \-\-experimental\fP ]
-[ \fB\-m, \-\-modify\fP ]
-[ \fIfile\fP ... ]
-.br
-.B fixkdeincludes \-\-help
-.SH DESCRIPTION
-\fBfixkdeincludes\fP tries to reduce the number of #includes in C++ source
-files.  Much of its processing is specific to TDE sources and so it
-might not work so well with sources for non-TDE applications.
-.PP
-The following problems are identified by fixkdeincludes:
-.PP
-.RS
-Including headers that are no longer supported but which exist for
-compatibility with older Qt/KDE versions;
-.PP
-Including the same file multiple times;
-.PP
-Using #include <...> instead of #include "...".
-.RE
-.PP
-There is also an experimental mode which tries removing each #include
-one at a time (with a few exceptions) to see whether the source still
-compiles.  Note that this experimental mode will modify the original sources.
-.PP
-By default the sources will not be modified; the identified problems
-will simply be written to standard output.
-.PP
-The list of C++ sources to examine should be given on the command-line.
-If no files are given, all C++ sources in or beneath the current
-directory will be examined (with the exception of directories whose
-\fIMakefile.am\fP contains \-UTQT_NO_COMPAT or \-UTDE_NO_COMPAT).
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-v, \-\-verbose\fP
-Verbose mode.  Additional debugging information is written to standard output.
-.TP
-\fB\-e, \-\-experimental\fP
-Experimental mode, as described above in detail.  Note that this option
-implies \fB\-\-modify\fP.
-.TP
-\fB\-m, \-\-modify\fP
-As well as writing messages to standard output, actually modify the
-original sources to fix any problems that were found.
-.SH AUTHOR
-fixkdeincludes was written by Dirk Mueller <mueller@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/fixuifiles.1 b/dilos/core/tdesdk/debian/man/fixuifiles.1
deleted file mode 100644
index 17ce46a61..000000000
--- a/dilos/core/tdesdk/debian/man/fixuifiles.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FIXUIFILES 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fixuifiles \- remove undesirable features from TQt/TDE .ui files
-.SH SYNOPSIS
-.B fixuifiles
-[ \fB\-v, \-\-verbose\fP ]
-[ \fB\-\-omitqtcheck\fP ]
-[ \fIfile\fP ... ]
-.br
-.B fixuifiles \-\-help
-.SH DESCRIPTION
-\fBfixuifiles\fP processes one or more TQt/TDE user interface definition
-files (.ui files) and tries to remove some of the insanities found
-therein.  If no filenames are given, fixuifiles will process all .ui
-files in or beneath the current directory.
-.PP
-The following problems are fixed:
-.PP
-.RS
-Too high minimum Qt version;
-.PP
-Hardcoded untranslatable Alt+Letter accels (auto-added by Qt Designer);
-.PP
-Captions that are equal to class names (auto-added by Qt Designer).
-.RE
-.PP
-The threshold Qt version can be set
-using either a \fI.qt_minversion\fP file (containing simply the Qt version
-number) or a \fIconfigure.in.in\fP file (containing an appropriate
-MIN_CONFIG macro).  These files may be in the directory containing the .ui
-file or any parent directory.  If no threshold Qt version is found,
-a sensible default will be used.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-v, \-\-verbose\fP
-Verbose mode.  Additional debugging information is written to standard output.
-.TP
-\fB\-\-omitqtcheck\fP
-Do not check the minimum Qt version.
-.SH AUTHOR
-fixuifiles was written by David Faure <faure@kde.org> and
-Dirk Mueller <mueller@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/hotshot2calltree.1 b/dilos/core/tdesdk/debian/man/hotshot2calltree.1
deleted file mode 100644
index 8c4d4441c..000000000
--- a/dilos/core/tdesdk/debian/man/hotshot2calltree.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH HOTSHOT2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-hotshot2calltree \- convert hotshot profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B hotshot2calltree
-[ \fB\-\-file\-limit\fP \fIlimit\fP ]
-\fB\-o\fP \fIoutput\fP \fIinput\fP [ \fIinput\fP ... ]
-.SH DESCRIPTION
-\fBhotshot2calltree\fP reads one or more pstat profiling data files
-as output by the hotshot python profiler, and converts them into
-calltree format for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-o\fP \fIoutput\fP
-Write the calltree output into the given file for use by KCachegrind.
-This may be \fB\-\fP if you wish to write to standard output.
-.TP
-\fIinput\fP ...
-Read the hotshot profiling data from the given file(s).
-.TP
-\fB\-\-file\-limit\fP \fIlimit\fP
-Stop after the given number of input files.
-.SH EXAMPLE
-Suppose that you have used hotshot to profile a python app, with results
-dumped to the file \fIpythongrind.prof\fP.  You may then work with this
-data in KCachegrind as follows.
-.PP
-.RS
-hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof
-.br
-tdecachegrind cachegrind.out.0
-.RE
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Jorg Beyer <job@webde-ag.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kapptemplate.1 b/dilos/core/tdesdk/debian/man/kapptemplate.1
deleted file mode 100644
index 1010ecd52..000000000
--- a/dilos/core/tdesdk/debian/man/kapptemplate.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KAPPTEMPLATE 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kapptemplate \- creates a framework to develop a TDE application
-.SH SYNOPSIS
-.B kapptemplate
-[ \fB\-\-noinit\fP ] [ \fB\-\-default\fP ]
-.RB "[ " \-\-full\-app " | " \-\-kpart\-app " | " \-\-kpart\-plugin
-.RB " | " \-\-existing " ]"
-.PP
-.B kapptemplate \-\-help
-.SH DESCRIPTION
-\fBKAppTemplate\fP is a shell script that will create the necessary
-framework to develop various TDE applications.  It takes care of the
-autoconf/automake code as well as providing a skeleton and example of
-what the code typically looks like.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.SS General Options
-.TP
-\-\-help
-Display a full summary of options.
-.TP
-\-\-noinit
-Don't run 'make \-f Makefile.cvs'.
-.TP
-\-\-default
-Use default values instead of prompting.
-.SS Framework Types
-.TP
-\-\-full\-app
-Create a full featured TDE application.
-.TP
-\-\-kpart\-app
-Create a full featured KPart application.
-.TP
-\-\-kpart\-plugin
-Create a KPart plugin framework.
-.TP
-\-\-existing
-Converting existing source to an automake/autoconf TDE framework.
-.SH FILES
-.TP
-.I ~/.kapptemplate
-Stores default values.
-.SH SEE ALSO
-The original documentation from the program author
-is available in \fI/usr/share/doc/kapptemplate/\fP.
-.SH AUTHOR
-KAppTemplate was written by Kurt Granroth <granroth@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kbabel.1 b/dilos/core/tdesdk/debian/man/kbabel.1
deleted file mode 100644
index 047e3626d..000000000
--- a/dilos/core/tdesdk/debian/man/kbabel.1
+++ /dev/null
@@ -1,74 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBABEL 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbabel \- a PO-file editor for TDE
-.SH SYNOPSIS
-.B kbabel
-.RI "[ " generic-options " ]"
-[ \fB\-\-gotomsgid\fP \fImsgid\fP ] [ \fB\-\-nosplash\fP ]
-[ \fB\-\-project\fP \fIconfig-file\fP ]
-.RI "[ " file " ]"
-.SH DESCRIPTION
-\fBKBabel\fP is part of a suite of programs for editing gettext message
-files (PO-files).  It is designed to help you translate fast and
-consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel (this
-program) is an advanced and easy to use PO-file editor with full navigational
-and editing capabilities, syntax checking and statistics.  CatalogManager is
-a multi functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbabel-specific options.
-For a full summary of options, run \fIkbabel \-\-help\fP.
-.TP
-\fB\-\-gotomsgid\fP \fImsgid\fP
-Go to the entry with the given message ID.
-.TP
-.B \-\-nosplash
-Disable splashscreen at startup.
-.TP
-\fB\-\-project\fP \fIconfig-file\fP
-Load the configuration from the given file.
-.SH SEE ALSO
-.BR catalogmanager (1),
-.BR kbabeldict (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kbabeldict.1 b/dilos/core/tdesdk/debian/man/kbabeldict.1
deleted file mode 100644
index ffd9b4658..000000000
--- a/dilos/core/tdesdk/debian/man/kbabeldict.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBABELDICT 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbabeldict \- the KBabel dictionary for translators
-.SH SYNOPSIS
-.B kbabeldict
-.RI "[ " generic-options " ]"
-.RB "[ " \-\-nosplash " ]"
-.SH DESCRIPTION
-\fBKBabelDict\fP is part of a suite of programs for editing gettext message
-files (PO-files).  This suite is designed to help you translate fast and
-consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager is a multi
-functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict (this program) is a dictionary to assist
-with searching for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbabeldict-specific options.
-For a full summary of options, run \fIkbabeldict \-\-help\fP.
-.TP
-.B \-\-nosplash
-Disable splashscreen at startup.
-.SH SEE ALSO
-.BR kbabel (1),
-.BR catalogmanager (1).
-.PP
-Full user documentation for KBabel is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kbugbuster.1 b/dilos/core/tdesdk/debian/man/kbugbuster.1
deleted file mode 100644
index 29b9c38d7..000000000
--- a/dilos/core/tdesdk/debian/man/kbugbuster.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBUGBUSTER 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbugbuster \- front end for the TDE bug tracking system
-.SH SYNOPSIS
-.B kbugbuster
-.RI "[ " generic-options " ]"
-[ \fB\-d, \-\-disconnected\fP ]
-[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
-[ \fB\-\-bug\fP \fInumber\fP ]
-.SH DESCRIPTION
-\fBKBugBuster\fP is a GUI front end for the TDE bug tracking system.
-It allows the user to view and manipulate bug reports and provides a
-variety of options for searching through reports.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbugbuster-specific options.
-For a full summary of options, run \fIkbugbuster \-\-help\fP.
-.TP
-[ \fB\-d, \-\-disconnected\fP ]
-Start in disconnected mode.
-.TP
-[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
-Start with the bug list for the given package.
-.TP
-[ \fB\-\-bug\fP \fInumber\fP ]
-Start with the given bug report.
-.SH AUTHOR
-KBugBuster was written by Martijn Klingens <klingens@kde.org>,
-Simon Hausmann <hausmann@kde.org>, Cornelius Schumacher <schumacher@kde.org>
-and David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kdedoc.1 b/dilos/core/tdesdk/debian/man/kdedoc.1
deleted file mode 100644
index 1911442c2..000000000
--- a/dilos/core/tdesdk/debian/man/kdedoc.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDEDOC 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kdedoc \- view documentation for a TDE class
-.SH SYNOPSIS
-.B kdedoc
-.I classname
-.SH DESCRIPTION
-\fBkdedoc\fP opens the documentation for the TDE class \fIclassname\fP
-in kfm/konqueror.  Note that the class name is case sensitive.  It is
-assumed that you have the tdelibs documentation installed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLES
-To bring up help on the class TDEAboutDialog:
-.PP
-.RS
-kdedoc TDEAboutDialog
-.RE
-.SH DEBIAN USERS
-The tdelibs documentation is in the Debian package \fItdelibs4-doc\fP,
-which will need to be installed.
-.SH SEE ALSO
-.BR qtdoc (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kdelnk2desktop.py.1 b/dilos/core/tdesdk/debian/man/kdelnk2desktop.py.1
deleted file mode 100644
index 41cce73a5..000000000
--- a/dilos/core/tdesdk/debian/man/kdelnk2desktop.py.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KDELNK2DESKTOP.PY 1 "November 14, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kdelnk2desktop.py \- converts .kdelnk to .desktop
-.SH SYNOPSIS
-.B kdelnk2desktop.py
-.RI "[ " kdelnk-file " ] ..."
-.SH DESCRIPTION
-\fBkdelnk2desktop.py\fP is used to convert
-a \fI.kdelnk\fP file (used by KDE 1) into a \fI.desktop\fP
-file (used by KDE 2 and later).
-.PP
-File \fIkdelnk-file\fP must have a name ending in \fI.kdelnk\fP.
-After kdelnk2desktop.py is run, this will be replaced by a new file
-ending in \fI.desktop\fP.  The original \fIkdelnk-file\fP will be
-removed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNING
-If \fIkdelnk-file\fP does not end in \fI.kdelnk\fP,
-the results of this script are unpredictable.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kdemangen.pl.1 b/dilos/core/tdesdk/debian/man/kdemangen.pl.1
deleted file mode 100644
index 8acd79df1..000000000
--- a/dilos/core/tdesdk/debian/man/kdemangen.pl.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KDEMANGEN.PL 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kdemangen.pl \- automatically create a draft manpage for a TDE app
-.SH SYNOPSIS
-.B kdemangen.pl
-.I /path/to/application
-.SH DESCRIPTION
-\fBkdemangen.pl\fP will automatically create a draft manpage for a TDE
-application.  Manpages are always better when hand-tailored, but this
-should give you a fairly good start.
-.PP
-To create the manpage, it will use the \-\-author and \-\-help\-all
-output for the application passed on the command line.
-It will also use the description in the
-Debian control file if one is available.  To make use of this additional
-feature, you must run kdemangen.pl from within the \fIdebian/\fP
-subdirectory of the application sources.
-.PP
-The new manpage will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNING
-This utility will only work for a full TDE application that uses
-TDECmdLineArgs (which most full TDE applications do).
-.SH EXAMPLE
-.RS
-cd /path/to/tde/srcs/tdeedu/debian
-.br
-kdemangen /usr/bin/kstars > kstars.1
-.RE
-.SH AUTHOR
-kdemangen.pl was written by Dominique Devriese <devriese@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kminspector.1 b/dilos/core/tdesdk/debian/man/kminspector.1
deleted file mode 100644
index 29cb70e5b..000000000
--- a/dilos/core/tdesdk/debian/man/kminspector.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMINSPECTOR 1 "February 25, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kminspector \- run a program with the TDE memory leak tracer
-.SH SYNOPSIS
-.B kminspector
-\fIprogram\fP [ \fIprogram-args\fP ]
-.SH DESCRIPTION
-\fBKMinspector\fP runs the given program, examines its memory
-allocation behaviour using \fIlibktrace\fP and pipes the resulting
-allocation tree through \fIless\fP.
-.PP
-The given program does not need to be specially compiled.
-.PP
-This utility is provided with KMtrace,
-a TDE tool to assist with malloc debugging using
-glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
-current (9/9/2000) glibc versions only logs the return-address of the
-malloc/free call. The library included with KMtrace
-logs a complete backtrace upon malloc/free.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kmmatch (1),
-.BR kmtrace (1).
-.PP
-Much more extensive documentation for KMtrace can be found in
-\fI/usr/share/doc/kmtrace/README\fP.
-.SH AUTHOR
-KMtrace was written by Waldo Bastian <bastian@kde.org>,
-Mike Haertel <mike@ai.mit.edu> and Andi Kleen <ak@suse.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kmmatch.1 b/dilos/core/tdesdk/debian/man/kmmatch.1
deleted file mode 100644
index d80c15542..000000000
--- a/dilos/core/tdesdk/debian/man/kmmatch.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMMATCH 1 "February 26, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmmatch \- search for symbols in a map file
-.SH SYNOPSIS
-.B kmmatch
-.I map-file call-file
-.SH DESCRIPTION
-\fBKMMatch\fP determines which symbols from a given set (\fIcall-file\fP) are
-present in a given map file.
-.PP
-The \fImap-file\fP should contain output from \fInm\fP (which extracts
-information from object files).  It must \fBnot\fP contain any blank
-lines or header information (such as the name of the object file); this
-means you may need to strip the first few lines of \fInm\fP output from
-the \fImap-file\fP.
-.PP
-The \fIcall-file\fP should contain a list of symbols (such as function
-calls made by a program), one per line.
-.PP
-This utility will find which of the symbols in \fIcall-file\fP are
-present in \fImap-file\fP and write them to standard error, one per
-line, in the order in which they appear in \fIcall-file\fP.
-.PP
-Note that this utility is called \fBmatch\fP in the original TDE
-distribution; it has been renamed to \fBkmmatch\fP in Debian to
-avoid conflicts with unrelated packages.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kminspector (1),
-.BR kmtrace (1),
-.BR nm (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kmtrace.1 b/dilos/core/tdesdk/debian/man/kmtrace.1
deleted file mode 100644
index 14f5f9fc8..000000000
--- a/dilos/core/tdesdk/debian/man/kmtrace.1
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMTRACE 1 "February 25, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmtrace \- a TDE memory leak tracer
-.SH SYNOPSIS
-.B kmtrace
-[ \fIgeneric-options\fP ]
-[ \fB\-x, \-\-exclude\fP \fIfile\fP ]
-[ \fB\-e, \-\-exe\fP \fIfile\fP ]
-[ \fB\-t, \-\-tree\fP \fIfile\fP
-[ \fB\-\-th, \-\-treethreshold\fP \fIvalue\fP ]
-[ \fB\-\-td, \-\-treedepth\fP \fIvalue\fP ]]
-[ \fItrace-log\fP ]
-.SH DESCRIPTION
-\fBKMtrace\fP is a TDE tool to assist with malloc debugging using
-glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
-current (9/9/2000) glibc versions only logs the return-address of the
-malloc/free call. The library included with KMtrace
-logs a complete backtrace upon malloc/free.
-.PP
-KMtrace will investigate the trace log specified on the command line,
-or \fIktrace.out\fP if no trace log is specified.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kmtrace-specific options.
-For a full summary of options, run \fIkmtrace \-\-help\fP.
-.TP
-\fB\-x, \-\-exclude\fP \fIfile\fP
-File containing symbols to exclude from output.
-.TP
-\fB\-e, \-\-exe\fP \fIfile\fP
-Executable to use for looking up unknown symbols.
-.TP
-\fB\-t, \-\-tree\fP \fIfile\fP
-Write a tree of the allocations to the given file.
-.TP
-\fB\-\-th, \-\-treethreshold\fP \fIvalue\fP
-When writing the allocations tree, hide subtrees allocating less than the
-given memory amount.
-.TP
-\fB\-\-td, \-\-treedepth\fP \fIvalue\fP
-When writing the allocations tree, hide subtrees that are deeper than the
-specified depth.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kminspector (1),
-.BR kmmatch (1).
-.PP
-Much more extensive documentation can be found in
-\fI/usr/share/doc/kmtrace/README\fP.
-.SH AUTHOR
-KMtrace was written by Waldo Bastian <bastian@kde.org>,
-Mike Haertel <mike@ai.mit.edu> and Andi Kleen <ak@suse.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kompare.1 b/dilos/core/tdesdk/debian/man/kompare.1
deleted file mode 100644
index e777752e1..000000000
--- a/dilos/core/tdesdk/debian/man/kompare.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOMPARE 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kompare \- a TDE GUI for viewing differences between files
-.SH SYNOPSIS
-.B kompare
-[ \fIgeneric-options\fP ]
-.br
-.B kompare
-[ \fIgeneric-options\fP ] [ \fB\-c\fP ] \fIURL1 URL2\fP
-.br
-.B kompare
-[ \fIgeneric-options\fP ] [ \fB\-o\fP [ \fB\-n\fP ]] \fIdiff\fP
-.br
-.B kompare
-[ \fIgeneric-options\fP ] \fB\-b\fP \fIURL diff\fP
-.SH DESCRIPTION
-\fBKompare\fP is a graphical user interface for viewing the differences
-between two files.  It will also optionally create a diff file.
-.PP
-Depending upon what is passed on the command line, Kompare can compare
-documents, display diff files and blend diff files back into original
-documents.
-.PP
-If an url is given as - then Kompare will read the corresponding file
-from standard input.  Thus (for instance) Kompare can be used as:
-.PP
-.RS
-cvs diff | kompare \-o \-
-.RE
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kompare-specific options.
-For a full summary of options, run \fIkompare \-\-help\fP.
-.TP
-\fB\-b\fP \fIURL diff\fP
-Blends \fIdiff\fP into URL.  \fIdiff\fP is expected to be diff output and
-\fIURL\fP the file or folder that the diff output needs to be blended into.
-.TP
-\fB\-c\fP \fIURL1 URL2\fP
-Compares \fIURL1\fP with \fIURL2\fP.  This is the default mode if two
-URLs are passed.
-.TP
-\fB\-n\fP
-Used with \fB\-o\fP to stop Kompare from checking for the original file.
-.TP
-\fB\-o\fP \fIdiff\fP
-Opens the given diff file.  This is the default mode if only one URL is
-passed.
-.br
-Kompare will check to see if it can find
-the original file(s).  If it can, it will blend the original file(s) into
-the diff output and show the result in the viewer.  Passing \fB\-n\fP
-will disable this check.
-.SH SEE ALSO
-The original documentation from the program author
-is available in \fI/usr/share/doc/kompare/\fP.
-.SH AUTHOR
-Kompare was written by John Firebaugh <jfirebaugh@kde.org>,
-Otto Bruggeman <otto.bruggeman@home.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/kuiviewer.1 b/dilos/core/tdesdk/debian/man/kuiviewer.1
deleted file mode 100644
index 5439127ae..000000000
--- a/dilos/core/tdesdk/debian/man/kuiviewer.1
+++ /dev/null
@@ -1,65 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUIVIEWER 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kuiviewer \- a viewer for Qt Designer user interface files
-.SH SYNOPSIS
-.B kuiviewer
-.RI "[ " generic-options " ]"
-.RI "[ " ui-file ... " ]"
-.PP
-.B kuiviewer
-.RI "[ " generic-options " ]"
-{ \fB\-s, \-\-takescreenshot\fP \fIfilename\fP }
-[ \fB\-w, \-\-screenshotwidth\fP \fIint\fP ]
-[ \fB\-h, \-\-screenshotheight\fP \fIint\fP ]
-.I ui-file
-.SH DESCRIPTION
-\fBKUIViewer\fP is a utility to display and test the user interface (.ui)
-files generated by \fBQt Designer\fP.  The interfaces can be displayed in a
-variety of different widget styles.
-.PP
-Normally KUIViewer launches a full GUI, allowing the user to interact with
-the given interface.
-By passing the \fB\-\-takescreenshot\fP option, you can make KUIViewer dump a
-screenshot of the interface instead and exit immediately.  Other options
-are available to control precisely how this screenshot is constructed.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kuiviewer-specific options.
-For a full summary of options, run \fIkuiviewer \-\-help\fP.
-.TP
-\fB\-s, \-\-takescreenshot\fP \fIfilename\fP
-Take a screenshot of the given interface and exit immediately.
-The \fIfilename\fP argument specifies where the screenshot will be saved.
-This screenshot will be saved in PNG format.
-.TP
-\fB\-w, \-\-screenshotwidth\fP \fIint\fP
-Before taking a screenshot, resize the interface to the given width.
-.TP
-\fB\-h, \-\-screenshotheight\fP \fIint\fP
-Before taking a screenshot, resize the interface to the given height.
-.SH SEE ALSO
-.BR designer (1).
-.SH AUTHOR
-KUIViewer was written by Richard Moore <rich@kde.org>,
-Ian Reinhart Geiser <geiseri@kde.org> and
-Benjamin C. Meyer <ben+kuiviewer@meyerhome.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/licensecheck.1 b/dilos/core/tdesdk/debian/man/licensecheck.1
deleted file mode 100644
index 48728f2c2..000000000
--- a/dilos/core/tdesdk/debian/man/licensecheck.1
+++ /dev/null
@@ -1,37 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH LICENSECHECK 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-licensecheck \- simple license checker for source files
-.SH SYNOPSIS
-.B licensecheck
-.RB "[ " \-v " ]"
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBlicensecheck\fP examines the comments at the beginning of each given
-source file and tries to determine which license the file is placed
-under.  It does this by searching for blocks of text that it recognises
-as belonging to various licenses.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-.B \-v
-Verbose mode.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/makeobj.1 b/dilos/core/tdesdk/debian/man/makeobj.1
deleted file mode 100644
index 50a9f864f..000000000
--- a/dilos/core/tdesdk/debian/man/makeobj.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH MAKEOBJ 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-makeobj \- run make from the correct directory
-.SH SYNOPSIS
-.B makeobj
-[ \fImake-argument\fP ... ]
-.SH DESCRIPTION
-\fBmakeobj\fP is a wrapper around \fBmake\fP which basically checks
-whether it's in the source directory or the build directory and changes
-to the correct directory before calling make.
-.PP
-The command-line arguments will (generally) be passed directly to make.
-.PP
-This script is useful if the source directory is different from the
-build directory and the Makefiles are kept in the build directory, as is
-common for instance when building the TDE sources.  This script can however
-be used in more standard scenarios (such as non-TDE projects for which the
-source and build directories are the same), where it will behave just like
-make.
-.PP
-One of the environment variables OBJ_SUBDIR or OBJ_REPLACEMENT
-should be set to indicate where the build directory is in relation to
-the source directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-Note that only one of OBJ_SUBDIR and OBJ_REPLACEMENT should be used.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#src/tdesdk#src/tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR make (1),
-.BR sed (1).
-.SH AUTHOR
-makeobj was written by Stephan Kulow <coolo@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/memprof2calltree.1 b/dilos/core/tdesdk/debian/man/memprof2calltree.1
deleted file mode 100644
index d4f52ead4..000000000
--- a/dilos/core/tdesdk/debian/man/memprof2calltree.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH MEMPROF2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-memprof2calltree \- convert memprof profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B memprof2calltree
-.SH DESCRIPTION
-\fBmemprof2calltree\fP reads the memory profiles of memprof and
-converts them into calltree format for use by KCachegrind.
-.PP
-The memprof data must be supplied on standard input, and the
-corresponding calltree data will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/op2calltree.1 b/dilos/core/tdesdk/debian/man/op2calltree.1
deleted file mode 100644
index 0242e6cd6..000000000
--- a/dilos/core/tdesdk/debian/man/op2calltree.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH OP2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-op2calltree \- convert OProfile profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B op2calltree
-.SH DESCRIPTION
-\fBop2calltree\fP reads the profiling data output by OProfile v0.8 and
-converts it into calltree format for use by KCachegrind.
-.PP
-The OProfile data must be supplied on standard input, and should be
-obtained by running:
-.PP
-.RS
-opreport \-gdf
-.RE
-.PP
-This converter will then write a separate calltree data file for each
-application, to a file of the form \fIoprof.out.<app>\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/package_crystalsvg.1 b/dilos/core/tdesdk/debian/man/package_crystalsvg.1
deleted file mode 100644
index 32d8644e9..000000000
--- a/dilos/core/tdesdk/debian/man/package_crystalsvg.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PACKAGE_CRYSTALSVG 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-package_crystalsvg \- bundle up Crystal SVG sources from a TDE checkout
-.SH SYNOPSIS
-.B package_crystalsvg
-.SH DESCRIPTION
-\fBpackage_crystalsvg\fP assumes that the current directory contains one
-or more checked-out TDE modules.  It searches these modules for Crystal
-SVG vector sources (.svgz or .svg.gz files)
-and packages them up into a tarball.  The tarball will also
-contain \fIFILES\fP (describing the contents of the tarball and which
-TDE modules/paths they were copied from) as well as some other bits and
-pieces.
-.PP
-Note that you must at least have tdelibs checked out for this utility to
-run.
-.PP
-The final tarball will be created in the current working directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-package_crystalsvg was written by Frans Englich <frans.englich@telia.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/png2mng.pl.1 b/dilos/core/tdesdk/debian/man/png2mng.pl.1
deleted file mode 100644
index c86c17275..000000000
--- a/dilos/core/tdesdk/debian/man/png2mng.pl.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PNG2MNG.PL 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-png2mng.pl \- combine a set of PNG images into an animated MNG image
-.SH SYNOPSIS
-.B png2mng.pl
-.I basename width height
-.SH DESCRIPTION
-\fBpng2mng.pl\fP reads a sequence of PNG images and combines them into
-a single animated MNG image.
-.PP
-The individual PNG images should be numbered consecutively from zero up,
-and should have names of the form
-.I basenameXXXX
-where
-.I XXXX
-is the four-digit sequence number (0000, 0001, 0002, etc).
-The width and height of the PNG images should
-also be included on the command line.
-.PP
-The final animated MNG image will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLE
-The following example will combine the files hi32-action-kde-0000.png,
-hi32-action-kde-0001.png, hi32-action-kde-0002.png, etc., and write
-the resulting animated image to hi32-action-kde.mng:
-.PP
-.RS
-png2mng.pl hi32-action-kde- 32 32 > hi32-action-kde.mng
-.RE
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/po2xml.1 b/dilos/core/tdesdk/debian/man/po2xml.1
deleted file mode 100644
index d2f7fe5df..000000000
--- a/dilos/core/tdesdk/debian/man/po2xml.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PO2XML 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-po2xml \- translates a DocBook XML file using a PO-file
-.SH SYNOPSIS
-.B po2xml
-.I original-XML translated-PO
-.SH DESCRIPTION
-\fBpo2xml\fP is a command-line tool that translates the DocBook
-XML file \fIoriginal-XML\fP using the gettext message file
-\fItranslated-PO\fP.  The resulting translated XML file is sent to standard
-output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR split2po (1),
-.BR swappo (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/pprof2calltree.1 b/dilos/core/tdesdk/debian/man/pprof2calltree.1
deleted file mode 100644
index b5cf9082c..000000000
--- a/dilos/core/tdesdk/debian/man/pprof2calltree.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PPROF2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-pprof2calltree \- convert APD profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B pprof2calltree
-\fB\-f\fP \fIinput\fP
-.SH DESCRIPTION
-\fBpprof2calltree\fP reads the pprof profiling data output by
-APD (http://pecl.php.net/apd/), and converts it into calltree format
-for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP \fIinput\fP
-Specifies the APD pprof trace file to convert.  This generally has a
-name of the form \fIpprof.XXXXX.Y\fP.  The calltree output for
-KCachegrind will then be written to the file \fIcachegrind.out.XXXXX.Y\fP.
-.SH EXAMPLE
-Suppose you profile a script with APD and obtain the pprof trace file
-\fIpprof.12345.1\fP.  You can then work with this data in KCachegrind as
-follows.
-.PP
-.RS
-pprof2calltree -f pprof.12345.1
-.br
-tdecachegrind cachegrind.out.12345.1
-.RE
-.PP
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by George Schlossnagle <george@omniti.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/pruneemptydirs.1 b/dilos/core/tdesdk/debian/man/pruneemptydirs.1
deleted file mode 100644
index 108c7e4db..000000000
--- a/dilos/core/tdesdk/debian/man/pruneemptydirs.1
+++ /dev/null
@@ -1,65 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PRUNEEMPTYDIRS 1 "September 27, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-pruneemptydirs \- detects stale source dirs in a CVS tree
-.SH SYNOPSIS
-.B pruneemptydirs
-[ \fB\-f\fP ]
-.SH DESCRIPTION
-\fBpruneemptydirs\fP is used to clean up a local CVS tree.
-It detects directories containing remnants of old stuff which has been
-removed from the CVS.  Such stale directories often break compilation.
-The current directory and all directories beneath it will be examined.
-.PP
-Note that this tool does not remove anything; it simply prints what to
-do as a series of remove commands.  You can copy and paste these commands,
-or use them with eval in a script.
-.PP
-This tool works better if the source directory is not the same as the
-build directory, since it will not print directories containing old
-executables.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP
-Actually perform the deletions instead of just printing them out.
-Use this option with care (no warranties, etc.)!
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH AUTHOR
-pruneemptydirs was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/qtdoc.1 b/dilos/core/tdesdk/debian/man/qtdoc.1
deleted file mode 100644
index 3b7c09f60..000000000
--- a/dilos/core/tdesdk/debian/man/qtdoc.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH QTDOC 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-qtdoc \- view documentation for a Qt class
-.SH SYNOPSIS
-.B qtdoc
-.RI "[ " classname " ]"
-.SH DESCRIPTION
-\fBqtdoc\fP opens a Qt help page in kfm/konqueror.
-If \fIclassname\fP is given, it opens the help page for that class (note
-that the class name is case insensitive).  Otherwise the main Qt help
-page is opened.  It is assumed that you have the Qt documentation
-installed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-.TP
-QTDIR
-The directory beneath which the Qt documentation is installed.
-Thus the main Qt help page should be in \fI$QTDIR/doc/html/\fP.
-If $QTDIR is not set, \fI/usr/share/qt3\fP will be assumed.
-.SH EXAMPLES
-To bring up help on class QString:
-.PP
-.RS
-qtdoc QString
-.RE
-.SH DEBIAN USERS
-The Qt documentation is in the Debian package \fIqt3-doc\fP, which will
-need to be installed.
-.SH SEE ALSO
-.BR kdedoc (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/split2po.1 b/dilos/core/tdesdk/debian/man/split2po.1
deleted file mode 100644
index 539e2f6c8..000000000
--- a/dilos/core/tdesdk/debian/man/split2po.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH SPLIT2PO 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-split2po \- creates a PO-file from two DocBook XML files
-.SH SYNOPSIS
-.B split2po
-.I original-XML translated-XML
-.SH DESCRIPTION
-\fBsplit2po\fP is a command-line tool that takes the two given DocBook
-XML files and produces a gettext message file (PO-file) that represents
-the changes between them.  The resulting PO-file is sent to standard
-output.
-.PP
-.I translated-XML
-must be the result of translating
-.I original-XML
-into another language.  It is this translation that the resulting
-PO-file will represent.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-.TP
-NO_CREDITS
-If set, the "ROLES_OF_TRANSLATORS" and "CREDIT_FOR_TRANSLATORS" messages
-will be omitted.  By default these are always included at the end of
-the PO-file, with empty message strings.
-.br
-These messages are used with TDE documentation, so you may wish to set
-NO_CREDITS if you are working with some other type of non-TDE documentation.
-.TP
-REPORT_MISMATCHES
-Set this variable to "no" if you wish mismatch reporting to be
-suppressed.  By default, any apparent mismatches between the two XML
-files will be noted on standard error.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR swappo (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/swappo.1 b/dilos/core/tdesdk/debian/man/swappo.1
deleted file mode 100644
index bb1289d9b..000000000
--- a/dilos/core/tdesdk/debian/man/swappo.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH SWAPPO 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-swappo \- swap msgid and msgstr fields in a PO-file
-.SH SYNOPSIS
-.B swappo
-.I PO-file
-.SH DESCRIPTION
-\fBswappo\fP reads the given PO-file and swaps the \fImsgid\fP and
-\fImsgstr\fP fields for every message.  The result is a new PO-file that
-translates in the opposite direction.  For example, if \fIPO-file\fP
-translates from English to French, the new PO-file will translate from
-French to English.
-.PP
-The new PO-file will be written to standard output.  The old PO-file
-will remain untouched.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/tdecachegrind.1 b/dilos/core/tdesdk/debian/man/tdecachegrind.1
deleted file mode 100644
index d5f3ea064..000000000
--- a/dilos/core/tdesdk/debian/man/tdecachegrind.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDECACHEGRIND 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdecachegrind \- a visualisation tool for valgrind profiling output
-.SH SYNOPSIS
-.B tdecachegrind
-.RI "[ " generic-options " ]"
-[ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ]
-.SH DESCRIPTION
-\fBKCachegrind\fP is a visualisation tool for the profiling data generated
-by \fBcalltree\fP, a profiling skin for \fBvalgrind\fP.  Applications can be
-profiled using calltree without being recompiled, and shared libraries
-and plugin architectures are supported.
-.PP
-For visualising the output from other profiling tools, several converters
-are available.  On Debian systems these can be found in the
-\fItdecachegrind-converters\fP package.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the tdecachegrind-specific options.
-For a full summary of options, run \fItdecachegrind \-\-help\fP.
-.TP
-\fB\-r\fP \fIexec\fP
-Run the program \fIexec\fP under cachegrind.
-.TP
-\fItrace-file\fP
-Visualise data from the given trace.
-.SH SEE ALSO
-.BR calltree (1),
-.BR dprof2calltree (1),
-.BR hotshot2calltree (1),
-.BR memprof2calltree (1),
-.BR op2calltree (1),
-.BR pprof2calltree (1),
-.BR valgrind (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/tdecachegrind/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/tdecachegrind/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/tdecachegrind/\fP.
-.SH AUTHOR
-KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/tdekillall.1 b/dilos/core/tdesdk/debian/man/tdekillall.1
deleted file mode 100644
index 92bf4380c..000000000
--- a/dilos/core/tdesdk/debian/man/tdekillall.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDEKILLALL 1 "April 29, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdekillall \- kills processes started with tdeinit
-.SH SYNOPSIS
-.B tdekillall
-[ \fB\-\fP\fIsignal\fP ] \fIprocess-name\fP
-.SH DESCRIPTION
-\fBtdekillall\fP kills all processes with a particular name
-that were started through tdeinit.  Specifically, it kills all processes
-\fBtdeinit:\fP \fIprocess-name\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\fP\fIsignal\fP
-Kill the processes with signal \fIsignal\fP.  This option defaults to
-SIGTERM.  Run \fIkill \-l\fP for a list of possible signals.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/testkspy.1 b/dilos/core/tdesdk/debian/man/testkspy.1
deleted file mode 100644
index afdc702a4..000000000
--- a/dilos/core/tdesdk/debian/man/testkspy.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TESTKSPY 1 "May 3, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-testkspy \- show off KSpy's capabilities
-.SH SYNOPSIS
-.B testkspy
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBtestkspy\fP is a small application that shows off KSpy's capabilities.
-It simply uses KSpy to spy on itself.
-.PP
-\fBKSpy\fP is a tiny library which can be used to graphically display
-the TQObjects in use by a TQt/TDE app.  In addition to the object tree,
-you can also view the properties, signals and slots of any QObject.
-.PP
-Basically it provides much the same info as QObject::dumpObjectTree() and
-QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
-minimal overhead for the application, because the kspy library is
-loaded dynamically using KLibLoader.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fItestkspy \-\-help\fP.
-.SH SEE ALSO
-Instructions on using KSpy with your own applications can be found in
-\fI/usr/share/doc/kspy/README\fP.
-.SH AUTHOR
-KSpy was written by Richard Moore <rich@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/transxx.1 b/dilos/core/tdesdk/debian/man/transxx.1
deleted file mode 100644
index 6dba22392..000000000
--- a/dilos/core/tdesdk/debian/man/transxx.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TRANSXX 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-transxx \- create a basic fleshed-out PO-file from a PO-template file
-.SH SYNOPSIS
-.B transxx
-[ \fB\-\-text\fP \fItranslation\fP ]
-.I template
-.SH DESCRIPTION
-\fBtransxx\fP is a command-line tool that produces a basic fleshed-out
-PO-file from a PO-template file.  Some of the formatting and
-structure of the \fImsgid\fP strings will be copied to the \fImsgstr\fP
-strings, but otherwise text will be translated to "xx".
-.PP
-The fleshed-out PO-file is sent to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\-text\fP \fItranslation\fP
-Use the given translation everywhere instead of "xx".
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR swappo (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/umbrello.1 b/dilos/core/tdesdk/debian/man/umbrello.1
deleted file mode 100644
index 3c5d77d5e..000000000
--- a/dilos/core/tdesdk/debian/man/umbrello.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH UMBRELLO 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-umbrello \- a UML modelling tool and code generator
-.SH SYNOPSIS
-.B umbrello
-.RI "[ " generic-options " ]"
-[ \fIfile\fP ]
-.SH DESCRIPTION
-\fBUmbrello UML Modeller\fP is a Unified Modelling Language editor for TDE.
-With UML you can create diagrams of software and other systems in an
-industry standard format.  Umbrello can also generate code from your
-UML diagrams in a number of programming languages.
-.PP
-The program supports class diagrams, sequence diagrams, collaboration
-diagrams, use case diagrams, state diagrams, activity diagrams, component
-diagrams and deployment diagrams.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIumbrello \-\-help\fP.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/umbrello/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/umbrello/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/umbrello/\fP.
-.SH AUTHOR
-Umbrello was written by Paul Hensgen <phensgen@users.sourceforge.net> and
-many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/xml2pot.1 b/dilos/core/tdesdk/debian/man/xml2pot.1
deleted file mode 100644
index 0b1a293d5..000000000
--- a/dilos/core/tdesdk/debian/man/xml2pot.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH XML2POT 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-xml2pot \- creates a PO-template file from a DocBook XML file
-.SH SYNOPSIS
-.B xml2pot
-.I original-XML
-.SH DESCRIPTION
-\fBxml2pot\fP is a command-line tool that produces a gettext message
-template file from the DocBook XML file \fIoriginal-XML\fP.
-The template file is sent to standard output.
-.PP
-The resulting template file can be used to create gettext message files
-(PO-files) for a variety of languages.  These can then be used in conjunction
-with
-.BR po2xml (1)
-to translate the original XML file into these other languages.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR swappo (1),
-.BR transxx (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/man/zonetab2pot.py.1 b/dilos/core/tdesdk/debian/man/zonetab2pot.py.1
deleted file mode 100644
index d6a4330ad..000000000
--- a/dilos/core/tdesdk/debian/man/zonetab2pot.py.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ZONETAB2POT.PY 1 "November 14, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-zonetab2pot.py \- converts a timezone list to a PO-file template
-.SH SYNOPSIS
-.B zonetab2pot.py
-[ \fItimezone-list\fP ]
-.SH DESCRIPTION
-\fBzonetab2pot.py\fP reads the timezone list given on the command-line
-and converts it to a gettext message file (PO-file) template containing
-the names of the individual timezones.
-.PP
-The given timezone list should be in the same format as the system
-\fIzone.tab\fP.  If no timezone list is specified on the command-line,
-\fI/usr/share/zoneinfo/zone.tab\fP will be used.
-.PP
-The new PO-file template will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-zonetab2pot.py was written by Lukas Tinkl <lukas@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/dilos/core/tdesdk/debian/poxml-trinity.install b/dilos/core/tdesdk/debian/poxml-trinity.install
index 4ca90f97f..3d5031b89 100644
--- a/dilos/core/tdesdk/debian/poxml-trinity.install
+++ b/dilos/core/tdesdk/debian/poxml-trinity.install
@@ -3,3 +3,8 @@ debian/tmp/usr/bin/split2po
 debian/tmp/usr/bin/swappo
 debian/tmp/usr/bin/transxx
 debian/tmp/usr/bin/xml2pot
+debian/tmp/usr/share/man/man1/po2xml.1
+debian/tmp/usr/share/man/man1/split2po.1
+debian/tmp/usr/share/man/man1/swappo.1
+debian/tmp/usr/share/man/man1/transxx.1
+debian/tmp/usr/share/man/man1/xml2pot.1
diff --git a/dilos/core/tdesdk/debian/poxml-trinity.manpages b/dilos/core/tdesdk/debian/poxml-trinity.manpages
deleted file mode 100644
index 05e2191bf..000000000
--- a/dilos/core/tdesdk/debian/poxml-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/po2xml.1
-debian/man/split2po.1
-debian/man/swappo.1
-debian/man/transxx.1
-debian/man/xml2pot.1
diff --git a/dilos/core/tdesdk/debian/rules b/dilos/core/tdesdk/debian/rules
index 5aafe0e4e..2321e5f11 100755
--- a/dilos/core/tdesdk/debian/rules
+++ b/dilos/core/tdesdk/debian/rules
@@ -43,25 +43,10 @@ DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
 DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
 
 binary-install/tdesdk-scripts-trinity::
-#	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/kdemangen.1 \
-#		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdemangen.pl.1
-#	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/png2mng.1 \
-#		debian/tdesdk-scripts-trinity/usr/share/man/man1/png2mng.pl.1
-#	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/kdelnk2desktop.1 \
-#		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdelnk2desktop.py.1
-#	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/zonetab2pot.1 \
-#		debian/tdesdk-scripts-trinity/usr/share/man/man1/zonetab2pot.py.1
-#	mv -f debian/tdesdk-scripts-trinity/usr/share/man/sh/man1/build-progress.1 \
-#		debian/tdesdk-scripts-trinity/usr/share/man/man1/build-progress.sh.1
 #	mv -f debian/tdesdk-scripts-trinity/usr/bin/svn-clean \
 #		debian/tdesdk-scripts-trinity/usr/bin/svn-clean-kde
 #	mv -f debian/tdesdk-scripts-trinity/usr/bin/svnversions \
 #		debian/tdesdk-scripts-trinity/usr/bin/svnversion-kde
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/pl
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/py
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/sh
-#	mv debian/tdesdk-scripts-trinity/usr/share/man/man1/* debian/tdesdk-scripts-trinity/usr/share/man/man1/
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man
 	install -p -D -m644 scripts/kde-buildrc \
 		debian/tdesdk-scripts-trinity/usr/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
 
@@ -83,37 +68,3 @@ binary-install/kapptemplate-trinity::
 			Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \
 		chmod 755 debian/kapptemplate-trinity/usr/share/apps/kapptemplate/admin/$$admindirfile; \
 	done
-#	mv debian/kapptemplate-trinity/usr/share/man debian/kapptemplate-trinity/usr/share/
-
-#binary-install/kbabel-trinity::
-#	mv debian/kbabel-trinity/usr/share/man debian/kbabel-trinity/usr/share/
-
-#binary-install/kbugbuster-trinity::
-#	mv debian/kbugbuster-trinity/usr/share/man debian/kbugbuster-trinity/usr/share/
-
-#binary-install/kmtrace-trinity::
-#	mv debian/kmtrace-trinity/usr/share/man debian/kmtrace-trinity/usr/share/
-
-#binary-install/kompare-trinity::
-#	mv debian/kompare-trinity/usr/share/man debian/kompare-trinity/usr/share/
-
-#binary-install/kspy-trinity::
-#	mv debian/kspy-trinity/usr/share/man debian/kspy-trinity/usr/share/
-
-#binary-install/kuiviewer-trinity::
-#	mv debian/kuiviewer-trinity/usr/share/man debian/kuiviewer-trinity/usr/share/
-
-#binary-install/libcvsservice0-trinity::
-#	mv debian/libcvsservice0-trinity/usr/share/man debian/libcvsservice0-trinity/usr/share/
-
-#binary-install/poxml-trinity::
-#	mv debian/poxml-trinity/usr/share/man debian/poxml-trinity/usr/share/
-
-#binary-install/tdecachegrind-converters-trinity::
-#	mv debian/tdecachegrind-converters-trinity/usr/share/man debian/tdecachegrind-converters-trinity/usr/share/
-
-#binary-install/tdecachegrind-trinity::
-#	mv debian/tdecachegrind-trinity/usr/share/man debian/tdecachegrind-trinity/usr/share/
-
-#binary-install/umbrello-trinity::
-#	mv debian/umbrello-trinity/usr/share/man debian/umbrello-trinity/usr/share/
diff --git a/dilos/core/tdesdk/debian/tdecachegrind-converters-trinity.install b/dilos/core/tdesdk/debian/tdecachegrind-converters-trinity.install
index 6f28285de..b69fb978d 100644
--- a/dilos/core/tdesdk/debian/tdecachegrind-converters-trinity.install
+++ b/dilos/core/tdesdk/debian/tdecachegrind-converters-trinity.install
@@ -3,3 +3,8 @@ debian/tmp/usr/bin/hotshot2calltree
 debian/tmp/usr/bin/memprof2calltree
 debian/tmp/usr/bin/op2calltree
 debian/tmp/usr/bin/pprof2calltree
+debian/tmp/usr/share/man/man1/dprof2calltree.1
+debian/tmp/usr/share/man/man1/hotshot2calltree.1
+debian/tmp/usr/share/man/man1/memprof2calltree.1
+debian/tmp/usr/share/man/man1/op2calltree.1
+debian/tmp/usr/share/man/man1/pprof2calltree.1
diff --git a/dilos/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages b/dilos/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages
deleted file mode 100644
index 977c48e2d..000000000
--- a/dilos/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/dprof2calltree.1
-debian/man/hotshot2calltree.1
-debian/man/memprof2calltree.1
-debian/man/op2calltree.1
-debian/man/pprof2calltree.1
diff --git a/dilos/core/tdesdk/debian/tdecachegrind-trinity.install b/dilos/core/tdesdk/debian/tdecachegrind-trinity.install
index 866ce5ac5..b675fcf98 100644
--- a/dilos/core/tdesdk/debian/tdecachegrind-trinity.install
+++ b/dilos/core/tdesdk/debian/tdecachegrind-trinity.install
@@ -15,5 +15,6 @@ debian/tmp/usr/share/icons/locolor/32x32/apps/tdecachegrind.png
 debian/tmp/usr/share/icons/locolor/16x16/apps/tdecachegrind.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/tdecachegrind.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/tdecachegrind.png
+debian/tmp/usr/share/man/man1/tdecachegrind.1
 debian/tmp/usr/share/mimelnk/application/x-tdecachegrind.desktop
 debian/icons/tdecachegrind.xpm /usr/share/pixmaps
diff --git a/dilos/core/tdesdk/debian/tdecachegrind-trinity.manpages b/dilos/core/tdesdk/debian/tdecachegrind-trinity.manpages
deleted file mode 100644
index 367c3db5d..000000000
--- a/dilos/core/tdesdk/debian/tdecachegrind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdecachegrind.1
diff --git a/dilos/core/tdesdk/debian/tdesdk-scripts-trinity.install b/dilos/core/tdesdk/debian/tdesdk-scripts-trinity.install
index 09a53d9ca..4bf609e80 100644
--- a/dilos/core/tdesdk/debian/tdesdk-scripts-trinity.install
+++ b/dilos/core/tdesdk/debian/tdesdk-scripts-trinity.install
@@ -50,15 +50,48 @@ debian/tmp/usr/bin/svngettags
 debian/tmp/usr/bin/svnchangesince
 debian/tmp/usr/bin/svn-clean
 debian/tmp/usr/share/apps/katepart/syntax/tdesvn-buildrc.xml
+debian/tmp/usr/share/doc/tde/HTML/en/tdesvn-build/common
+debian/tmp/usr/share/doc/tde/HTML/en/tdesvn-build/index.cache.bz2
+debian/tmp/usr/share/doc/tde/HTML/en/tdesvn-build/index.docbook
+
 debian/tmp/usr/share/man/man1/cvsblame.1
 debian/tmp/usr/share/man/man1/cvsversion.1
-debian/tmp/usr/share/man/man1/kde-build.1
 debian/tmp/usr/share/man/man1/includemocs.1
+debian/tmp/usr/share/man/man1/kde-build.1
 debian/tmp/usr/share/man/man1/noncvslist.1
 debian/tmp/usr/share/man/man1/tdesvn-build.1
-debian/tmp/usr/share/doc/tde/HTML/en/tdesvn-build/common
-debian/tmp/usr/share/doc/tde/HTML/en/tdesvn-build/index.cache.bz2
-debian/tmp/usr/share/doc/tde/HTML/en/tdesvn-build/index.docbook
+
+debian/tmp/usr/share/man/man1/adddebug.1
+debian/tmp/usr/share/man/man1/build-progress.sh.1
+debian/tmp/usr/share/man/man1/cheatmake.1
+debian/tmp/usr/share/man/man1/create_cvsignore.1
+debian/tmp/usr/share/man/man1/create_makefile.1
+debian/tmp/usr/share/man/man1/create_makefiles.1
+debian/tmp/usr/share/man/man1/cvs-clean.1
+debian/tmp/usr/share/man/man1/cvs2dist.1
+debian/tmp/usr/share/man/man1/cvsbackport.1
+debian/tmp/usr/share/man/man1/cvscheck.1
+debian/tmp/usr/share/man/man1/cvsforwardport.1
+debian/tmp/usr/share/man/man1/cvslastchange.1
+debian/tmp/usr/share/man/man1/cvslastlog.1
+debian/tmp/usr/share/man/man1/cvsrevertlast.1
+debian/tmp/usr/share/man/man1/cxxmetric.1
+debian/tmp/usr/share/man/man1/extend_dmalloc.1
+debian/tmp/usr/share/man/man1/extractattr.1
+debian/tmp/usr/share/man/man1/extractrc.1
+debian/tmp/usr/share/man/man1/findmissingcrystal.1
+debian/tmp/usr/share/man/man1/fixkdeincludes.1
+debian/tmp/usr/share/man/man1/fixuifiles.1
+debian/tmp/usr/share/man/man1/kdedoc.1
+debian/tmp/usr/share/man/man1/kdelnk2desktop.py.1
+debian/tmp/usr/share/man/man1/kdemangen.pl.1
+debian/tmp/usr/share/man/man1/makeobj.1
+debian/tmp/usr/share/man/man1/package_crystalsvg.1
+debian/tmp/usr/share/man/man1/png2mng.pl.1
+debian/tmp/usr/share/man/man1/pruneemptydirs.1
+debian/tmp/usr/share/man/man1/qtdoc.1
+debian/tmp/usr/share/man/man1/tdekillall.1
+debian/tmp/usr/share/man/man1/zonetab2pot.py.1
 scripts/kde-devel-gdb /usr/share/tdesdk-scripts
 scripts/kde-devel-vim.vim /usr/share/tdesdk-scripts
 scripts/kde-emacs/*.el /usr/share/emacs/site-lisp/tdesdk-scripts
diff --git a/dilos/core/tdesdk/debian/tdesdk-scripts-trinity.manpages b/dilos/core/tdesdk/debian/tdesdk-scripts-trinity.manpages
deleted file mode 100644
index bcab66ddd..000000000
--- a/dilos/core/tdesdk/debian/tdesdk-scripts-trinity.manpages
+++ /dev/null
@@ -1,31 +0,0 @@
-debian/man/adddebug.1
-debian/man/build-progress.sh.1
-debian/man/cheatmake.1
-debian/man/create_cvsignore.1
-debian/man/create_makefile.1
-debian/man/create_makefiles.1
-debian/man/cvs-clean.1
-debian/man/cvs2dist.1
-debian/man/cvsbackport.1
-debian/man/cvscheck.1
-debian/man/cvsforwardport.1
-debian/man/cvslastchange.1
-debian/man/cvslastlog.1
-debian/man/cvsrevertlast.1
-debian/man/cxxmetric.1
-debian/man/extend_dmalloc.1
-debian/man/extractattr.1
-debian/man/extractrc.1
-debian/man/fixkdeincludes.1
-debian/man/fixuifiles.1
-debian/man/findmissingcrystal.1
-debian/man/kdedoc.1
-debian/man/tdekillall.1
-debian/man/kdelnk2desktop.py.1
-debian/man/kdemangen.pl.1
-debian/man/makeobj.1
-debian/man/package_crystalsvg.1
-debian/man/png2mng.pl.1
-debian/man/pruneemptydirs.1
-debian/man/qtdoc.1
-debian/man/zonetab2pot.py.1
diff --git a/dilos/core/tdesdk/debian/umbrello-trinity.install b/dilos/core/tdesdk/debian/umbrello-trinity.install
index 806efe5ca..4d4a72efe 100644
--- a/dilos/core/tdesdk/debian/umbrello-trinity.install
+++ b/dilos/core/tdesdk/debian/umbrello-trinity.install
@@ -48,5 +48,6 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/umbrello.png
 debian/tmp/usr/share/icons/hicolor/16x16/mimetypes/umbrellofile.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/umbrello.png
 debian/tmp/usr/share/icons/hicolor/32x32/mimetypes/umbrellofile.png
+debian/tmp/usr/share/man/man1/umbrello.1
 debian/tmp/usr/share/mimelnk/application/x-umbrello.desktop
 debian/icons/umbrello.xpm /usr/share/pixmaps
diff --git a/dilos/core/tdesdk/debian/umbrello-trinity.manpages b/dilos/core/tdesdk/debian/umbrello-trinity.manpages
deleted file mode 100644
index 537bedefe..000000000
--- a/dilos/core/tdesdk/debian/umbrello-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/umbrello.1
diff --git a/dilos/core/tdetoys/debian/control b/dilos/core/tdetoys/debian/control
index 3e295b5f4..296f05ede 100644
--- a/dilos/core/tdetoys/debian/control
+++ b/dilos/core/tdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdetoys-trinity
diff --git a/dilos/core/tdetoys/debian/kweather-trinity.install b/dilos/core/tdetoys/debian/kweather-trinity.install
index 6a29ce741..3dfc38fc9 100644
--- a/dilos/core/tdetoys/debian/kweather-trinity.install
+++ b/dilos/core/tdetoys/debian/kweather-trinity.install
@@ -10,7 +10,11 @@ debian/tmp/usr/lib/*/trinity/kweatherreport.so
 debian/tmp/usr/lib/*/trinity/kweatherreport.la
 debian/tmp/usr/lib/*/trinity/weather_panelapplet.la
 debian/tmp/usr/lib/*/trinity/weather_panelapplet.so
+debian/tmp/usr/lib/*/trinity/weather_sidebar.la
+debian/tmp/usr/lib/*/trinity/weather_sidebar.so
 debian/tmp/usr/share/apps/kicker/applets/kweather.desktop
+debian/tmp/usr/share/apps/konqsidebartng/add/weatherbar_add.desktop
+debian/tmp/usr/share/apps/konqsidebartng/entries/weatherbar.desktop
 debian/tmp/usr/share/apps/kweather
 debian/tmp/usr/share/apps/kweatherservice/stations.dat
 debian/tmp/usr/share/apps/kweatherservice/weather_stations.desktop
diff --git a/dilos/core/tdeutils/debian/ark-trinity.install b/dilos/core/tdeutils/debian/ark-trinity.install
index 8c5ab8f78..446478a12 100644
--- a/dilos/core/tdeutils/debian/ark-trinity.install
+++ b/dilos/core/tdeutils/debian/ark-trinity.install
@@ -31,6 +31,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/ark.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/ark.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/ark.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/ark.svgz
+debian/tmp/usr/share/man/man1/ark.1
 debian/tmp/usr/share/services/ark_part.desktop
 
 debian/icons/ark.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdeutils/debian/ark-trinity.manpages b/dilos/core/tdeutils/debian/ark-trinity.manpages
deleted file mode 100644
index 37ed04716..000000000
--- a/dilos/core/tdeutils/debian/ark-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ark-trinity.1
diff --git a/dilos/core/tdeutils/debian/kcalc-trinity.install b/dilos/core/tdeutils/debian/kcalc-trinity.install
index 80b14d4b4..1af520a8e 100644
--- a/dilos/core/tdeutils/debian/kcalc-trinity.install
+++ b/dilos/core/tdeutils/debian/kcalc-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kcalc.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kcalc.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kcalc.png
 debian/tmp/usr/share/icons/hicolor/scalable/apps/kcalc.svgz
+debian/tmp/usr/share/man/man1/kcalc.1
 
 debian/icons/kcalc.xpm		/usr/share/pixmaps
 debian/icons/kcalc-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdeutils/debian/kcalc-trinity.manpages b/dilos/core/tdeutils/debian/kcalc-trinity.manpages
deleted file mode 100644
index ee2f0ad0a..000000000
--- a/dilos/core/tdeutils/debian/kcalc-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcalc-trinity.1
diff --git a/dilos/core/tdeutils/debian/kcharselect-trinity.install b/dilos/core/tdeutils/debian/kcharselect-trinity.install
index dbbd237f1..22b047981 100644
--- a/dilos/core/tdeutils/debian/kcharselect-trinity.install
+++ b/dilos/core/tdeutils/debian/kcharselect-trinity.install
@@ -11,6 +11,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/kcharselect/index.docbook
 debian/tmp/usr/share/icons/hicolor/16x16/apps/kcharselect.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kcharselect.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kcharselect.png
+debian/tmp/usr/share/man/man1/kcharselect.1
 
 debian/icons/kcharselect.xpm		/usr/share/pixmaps
 debian/icons/kcharselect-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdeutils/debian/kcharselect-trinity.manpages b/dilos/core/tdeutils/debian/kcharselect-trinity.manpages
deleted file mode 100644
index 6a1e28fb7..000000000
--- a/dilos/core/tdeutils/debian/kcharselect-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcharselect-trinity.1
diff --git a/dilos/core/tdeutils/debian/kdf-trinity.install b/dilos/core/tdeutils/debian/kdf-trinity.install
index 14e5488fa..b71905ad5 100644
--- a/dilos/core/tdeutils/debian/kdf-trinity.install
+++ b/dilos/core/tdeutils/debian/kdf-trinity.install
@@ -28,6 +28,8 @@ debian/tmp/usr/share/icons/hicolor/48x48/apps/kdf.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kwikdisk.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kdf.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kwikdisk.png
+debian/tmp/usr/share/man/man1/kdf.1
+debian/tmp/usr/share/man/man1/kwikdisk.1
 
 debian/icons/kdf.xpm		/usr/share/pixmaps
 debian/icons/kdf-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdeutils/debian/kdf-trinity.manpages b/dilos/core/tdeutils/debian/kdf-trinity.manpages
deleted file mode 100644
index ac5e86975..000000000
--- a/dilos/core/tdeutils/debian/kdf-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kdf-trinity.1
-debian/man/kwikdisk-trinity.1
diff --git a/dilos/core/tdeutils/debian/kedit-trinity.install b/dilos/core/tdeutils/debian/kedit-trinity.install
index e115f38e2..48d39d8c9 100644
--- a/dilos/core/tdeutils/debian/kedit-trinity.install
+++ b/dilos/core/tdeutils/debian/kedit-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/kedit.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kedit.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kedit.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kedit.png
+debian/tmp/usr/share/man/man1/kedit.1
 
 debian/icons/kedit.xpm		/usr/share/pixmaps
 debian/icons/kedit-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdeutils/debian/kedit-trinity.manpages b/dilos/core/tdeutils/debian/kedit-trinity.manpages
deleted file mode 100644
index 84374715a..000000000
--- a/dilos/core/tdeutils/debian/kedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kedit-trinity.1
diff --git a/dilos/core/tdeutils/debian/kfloppy-trinity.install b/dilos/core/tdeutils/debian/kfloppy-trinity.install
index 6ca52725c..968300104 100644
--- a/dilos/core/tdeutils/debian/kfloppy-trinity.install
+++ b/dilos/core/tdeutils/debian/kfloppy-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/usr/share/icons/hicolor/22x22/apps/kfloppy.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kfloppy.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kfloppy.png
 debian/tmp/usr/share/icons/hicolor/64x64/apps/kfloppy.png
+debian/tmp/usr/share/man/man1/kfloppy.1
 
 debian/icons/kfloppy.xpm		/usr/share/pixmaps
 debian/icons/kfloppy-16.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdeutils/debian/kfloppy-trinity.manpages b/dilos/core/tdeutils/debian/kfloppy-trinity.manpages
deleted file mode 100644
index 02c1ea86f..000000000
--- a/dilos/core/tdeutils/debian/kfloppy-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfloppy-trinity.1
diff --git a/dilos/core/tdeutils/debian/kgpg-trinity.install b/dilos/core/tdeutils/debian/kgpg-trinity.install
index 86a3993d8..59a3bc2da 100644
--- a/dilos/core/tdeutils/debian/kgpg-trinity.install
+++ b/dilos/core/tdeutils/debian/kgpg-trinity.install
@@ -39,6 +39,7 @@ debian/tmp/usr/share/icons/hicolor/16x16/apps/kgpg.png
 debian/tmp/usr/share/icons/hicolor/22x22/apps/kgpg.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/kgpg.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/kgpg.png
+debian/tmp/usr/share/man/man1/kgpg.1
 
 debian/icons/kgpg.xpm		/usr/share/pixmaps
 debian/icons/kgpg-16.xpm	/usr/share/pixmaps
diff --git a/dilos/core/tdeutils/debian/kgpg-trinity.manpages b/dilos/core/tdeutils/debian/kgpg-trinity.manpages
deleted file mode 100644
index 111b73663..000000000
--- a/dilos/core/tdeutils/debian/kgpg-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kgpg-trinity.1
diff --git a/dilos/core/tdeutils/debian/khexedit-trinity.install b/dilos/core/tdeutils/debian/khexedit-trinity.install
index 922ac03c1..80a9b6a97 100644
--- a/dilos/core/tdeutils/debian/khexedit-trinity.install
+++ b/dilos/core/tdeutils/debian/khexedit-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/khexedit/khexedit1.png
 debian/tmp/usr/share/icons/hicolor/16x16/apps/khexedit.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/khexedit.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/khexedit.png
+debian/tmp/usr/share/man/man1/khexedit.1
 debian/tmp/usr/share/services/kbyteseditwidget.desktop
 debian/tmp/usr/share/services/khexedit2part.desktop
 
diff --git a/dilos/core/tdeutils/debian/khexedit-trinity.manpages b/dilos/core/tdeutils/debian/khexedit-trinity.manpages
deleted file mode 100644
index 41235ebfd..000000000
--- a/dilos/core/tdeutils/debian/khexedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/khexedit-trinity.1
diff --git a/dilos/core/tdeutils/debian/man/ark-trinity.1 b/dilos/core/tdeutils/debian/man/ark-trinity.1
deleted file mode 100644
index d738284f4..000000000
--- a/dilos/core/tdeutils/debian/man/ark-trinity.1
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH Ark "1" "May 2006" "Ark" "User Commands"
-.SH NAME
-Ark \- manual page for Ark
-.SH SYNOPSIS
-.B ark
-[\fIQt-options\fR] [\fITDE-options\fR] [\fITDE-tempfile-options\fR] [\fIoptions\fR] [\fIfolder\fR] [\fIfiles\fR] [\fIarchive\fR]
-.SH DESCRIPTION
-TDE Archiving tool
-Ark is a graphical program for managing various archive formats within the
-TDE environment. Archives can be viewed, extracted, created and modified
-from within Ark.
-The program can handle various formats such as tar, gzip, bzip2, zip, rar and
-lha (if the appropriate command-line programs are installed).
-Ark can work closely with Konqueror in the TDE environment to handle archives,
-if you install the Konqueror Integration plugin available in the konq-plugins
-package.
-.SS "Generic options"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-tde\-tempfile\fR
-Show TDE\-tempfile specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-extract\fR
-Open extract dialog, quit when finished
-.TP
-\fB\-\-extract\-to\fR
-Extract 'archive' to 'folder'. Quit when finished.
-\&'folder' will be created if it does not exist.
-.TP
-\fB\-\-add\fR
-Ask for the name of the archive to add 'files' to. Quit when finished.
-.TP
-\fB\-\-add\-to\fR
-Add 'files' to 'archive'. Quit when finished.
-\&'archive' will be created if it does not exist.
-.TP
-\fB\-\-guess\-name\fR
-Used with '\-\-extract\-to'. When specified, 'archive'
-will be extracted to a subfolder of 'folder'
-whose name will be the name of 'archive' without the filename extension.
-.SS "Arguments"
-.TP
-folder
-Folder to extract to
-.TP
-files
-Files to be added
-.TP
-archive
-Open 'archive'
-.SH AUTHOR
-Ark was written by Matthias Elter <elter@kde.org> and many others.
-.br
-Ark is released under the GNU General Public License.
-.PP
-This manual page was written by Sune Vuorela <debian@pusling.com>
-for the Debian Project, and is released under the same terms as the program.
diff --git a/dilos/core/tdeutils/debian/man/kcalc-trinity.1 b/dilos/core/tdeutils/debian/man/kcalc-trinity.1
deleted file mode 100644
index eff470650..000000000
--- a/dilos/core/tdeutils/debian/man/kcalc-trinity.1
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCALC 1 "June 2006" "Trinity Desktop Environment" "TDE Calculator"
-.SH NAME
-kcalc
-\- TDE Calculator
-.SH SYNOPSIS
-\fBkcalc\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKCalc\fP is a scientific calculator for TDE. In addition to the usual functionality offered by most scientific calculators, \fBKCalc\fP offers a number of features:
-.br
-.IP "     \-"
-\fBKCalc\fP provides trigonometric functions, logic operations, and it is able to do statistical calculations.
-.IP "     \-"
-\fBKCalc\fP allows you to cut and paste numbers from/into its display.
-.IP "     \-"
-\fBKCalc\fP features a results\-stack which lets you conveniently recall previous results.
-.IP "     \-"
-You can configure \fBKCalc\fP's display colors and font.
-.IP "     \-"
-You can configure \fBKCalc\fP's precision and the number of digits after the period.
-.IP "     \-"
-\fBKCalc\fP offers a great number of useful  key\-bindings, which make using \fBKCalc\fP without using a pointing device easy.
-.PP
-Hint: Pressing (and holding) the Ctrl\-key, displays on every button, the corresponding key\-binding.
-
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-
-.SH FILES
-.TP
-.I ~/.trinity/share/config/kcalcrc
-\fBkcalc\fP configuration file
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kcalc/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kcalc/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Klaus Niederkruger <kniederk@math.uni\-koeln.de>
-.br
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-Evan Teran <eteran@alum.rit.edu>
-.br
-Espen Sand <espen@kde.org>
-.br
-Chris Howells <howells@kde.org>
-.br
-Aaron J. Seigo <aseigo@olympusproject.org>
-.br
-Charles Samuels <charles@altair.dhs.org>
-.br
-René Mérou <ochominutosdearco@yahoo.es>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdeutils/debian/man/kcharselect-trinity.1 b/dilos/core/tdeutils/debian/man/kcharselect-trinity.1
deleted file mode 100644
index 8eac79da4..000000000
--- a/dilos/core/tdeutils/debian/man/kcharselect-trinity.1
+++ /dev/null
@@ -1,257 +0,0 @@
-.lf 1 info/tdeutils.kcharselect.1
-.TH KCHARSELECT 1 "May 2003" TDE "TDE Application"
-.SH NAME
-kcharselect \- TDE Character Selector
-.SH SYNOPSIS
-.B kcharselect
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KCharSelect
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-Using
-.B KCharSelect
-one can view all the glyphs, organized by character table, available from any
-installed font.  One can also assemble a string of characters by clicking on
-characters in the table.  The string can be exported to the clipboard for
-later use.
-.PP
-.B KCharSelect
-is helpful for determining which characters in a font have glyphs as well as
-for selecting characters that may be difficult to produce.
-.P
-This program is part of the official TDE utils module.
-.SH OPTIONS
-.SS "General Options"
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.lf 1 info/kdetqtoptions
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
-icon, which can either be an absolute filename path, or otherwise the
-icon is sought for in places according to the normal TDE rules.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
-of the icon, according to the same rules as for the \-\-icon parameter.
-.TP
-.BI \-\-config \ filename
-Use an alternative configuration file, instead of the default, which
-is normally located in
-.I /usr/share/config
-or in
-.RB $ TDEHOME\fI/share/config
-.TP
-.BI \-\-dcopserver \ server
-Set the address of the DCOP server to attach to.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps. This option has the same
-effect as definiting the environment variable TDE_DEBUG.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-The geometry parameter follows the normal X convention for geometry,
-which is on the form:
-.RS
-.IP
-[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
-.P
-Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
-height, of the main application window. Both in pixels. A value of 0
-specifies the default size. The optional \fIxpos\fR and \fIypos\fR
-specifies the x,y-position that which is desired for the application
-window. Specifying negative values for x or y implies that the x or y
-position is to be measured from the left or bottom screen edge,
-instead of as in the normal case, with positive values, from the left
-and top edges. 
-.RE
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-Defines the default application font. The \fIfontname\fP should be in
-the X logical font name description format XLFD. For a full description of
-the format see
-.I /usr/X11R6/lib/X11/doc/xlfd.TXT
-Note that the application might override the font specified with
-its own font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-Sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-Sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-Sets the default button color.
-.TP
-.BI \-\-name \ name
-Sets the application name.
-.TP
-.BI \-\-title \ title
-Sets the application title. This option might, or might not appear
-in the title bar caption, depending on the application. To change the caption, use the 
-.B \-\-caption
-option instead. 
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-Sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirror reverses the whole layout of widgets. This means that menus
-will go in the opposite direction, the scroll bar will be on the
-opposite side, etc. For a normal western layout that means that menus
-and tool bars will go from the right edge to the left, the vertical
-scroll bar will be on the left side and so on.
-
-.lf 48 info/tdeutils.kcharselect.1
-.SH ENVIRONMENT
-.lf 1 info/kdeenviron
-.SS "standard TDE environment variables"
-.IP TDE_LANG
-Language locale setting to use. This option makes it possible to set
-another language environment for a program than what is the default. The
-correct language pack for this language has to be installed for this option
-to work. The default language when there is none set is en_US. When
-deciding upon a language, the following resources are looked up, in
-order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
-LANG.
-.IP TDE_UTF8_FILENAMES
-Assume that all filenames are in UTF-8 format regardless of the
-current language setting. Otherwise the filename format is defined by
-the language.
-.IP TDE_MULTIHEAD
-If this variable has the value
-.B true
-multihead multiple display mode is enabled. The TDE display will be
-shared over more than one screen.
-.IP DISPLAY
-Specifies the X display to run TDE on.
-.IP TDESYCOCA
-Specifies and alternative path for the 
-.I tdesycoca
-TDE system configuration cache file.
-The default path is
-/tmp/tde-$USER/tdesycoca
-.IP DCOPSERVER
-Specifies an alternative path for the DCOP server file. The default
-file is
-$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
-.IP SESSION_MANAGER
-The session manager to use. This option is set automatically by TDE
-and is a network path to the session manager socket.
-.IP HOME
-Path to the home directory for the current user. 
-.IP TDEHOME
-The TDE per-user setting directory. Default if not specified is
-.I $HOME/.trinity
-.lf 50 info/tdeutils.kcharselect.1
-.SH FILES
-.TP
-.I $HOME/.trinity/share/config/kcharselectrc
-configuration file.
-.SH AUTHOR
-KCharSelect was written by
-.nh
-.ad l
-Reginald Stadlbauer <reggie@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-The full documentation for
-.B KCharSelect
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kcharselect
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kcharselect
-
diff --git a/dilos/core/tdeutils/debian/man/kdf-trinity.1 b/dilos/core/tdeutils/debian/man/kdf-trinity.1
deleted file mode 100644
index 58bbbec90..000000000
--- a/dilos/core/tdeutils/debian/man/kdf-trinity.1
+++ /dev/null
@@ -1,154 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDF 1 "June 2006" "Trinity Desktop Environment" "TDE free disk space utility"
-.SH NAME
-kdf
-\- TDE free disk space utility
-.SH SYNOPSIS
-\fBkdf\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKDiskFree\fP displays available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.
-.sp 1
-\fBKDiskFree\fP is similar to \fBkwikdisk\fP and is useful if you want to keep a \fBKDiskFree\fP window available at all times.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-
-.SH SEE ALSO
-\fBkwikdisk\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdf/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdf/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Kropfberger <michael.kropfberger@gmx.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdeutils/debian/man/kedit-trinity.1 b/dilos/core/tdeutils/debian/man/kedit-trinity.1
deleted file mode 100644
index ebf6a588b..000000000
--- a/dilos/core/tdeutils/debian/man/kedit-trinity.1
+++ /dev/null
@@ -1,165 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE text editor"
-.SH NAME
-kedit
-\- TDE text editor
-.SH SYNOPSIS
-\fBkedit\fP [Qt\-options] [TDE\-options] [options] \fIfile\fP
-.SH DESCRIPTION
-\fBKEdit\fP is a text editor for the Trinity Desktop. It is a small editor which can be used with \fBKonqueror\fP for text and configuration file browsing. \fBKEdit\fP also serves well for creating small plain text documents. It is not meant to be a programmers editor, in particular it is not meant to replace any of the more powerful editors such as \fBKate\fP, \fBXEmacs\fP or \fBEmacs\fP.
-.sp 1
-\fBKEdit\fP's functionality will intentionally remain rather limited to ensure a reasonably fast start.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File or URL to open
-.SS Options:
-.TP
-.B  \-\-encoding  <encoding>
-Encoding to use for the following documents
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-\fBkate\fP(1), \fBkwrite\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kedit/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kedit/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdeutils/debian/man/kfloppy-trinity.1 b/dilos/core/tdeutils/debian/man/kfloppy-trinity.1
deleted file mode 100644
index 412893a1a..000000000
--- a/dilos/core/tdeutils/debian/man/kfloppy-trinity.1
+++ /dev/null
@@ -1,182 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KFLOPPY 1 "June 2006" "Trinity Desktop Environment" "TDE Floppy Disk Utility"
-.SH NAME
-kfloppy
-\- TDE Floppy Disk Utility
-.SH SYNOPSIS
-\fBkfloppy\fP [Qt\-options] [TDE\-options] [device] 
-.SH DESCRIPTION
-\fBKfloppy Formatter\fP is a utility that provides a straightforward graphical means to format 3.5" and 5.25" floppy disks.
-.sp 1
-Starting \fBKfloppy\fP opens a single window by which the user may choose appropriate settings and control the formatting process.
-.sp 1
-\fBCaution\fP
-.br
-Make sure that your floppy disk is not mounted. \fBKfloppy\fP cannot format a mounted floppy disk.
-.sp 1
-\fBKfloppy\fP offers the following settings for floppy size:
-.RS 3
-.TP
-\- 3.5" 1.44MB
-.TP
-\- 3.5" 720KB
-.TP
-\- 5.25" 1.2MB
-.TP
-\- 5.25" 360KB
-.TP
-\- Auto-Detect
-.RE
-.sp 1
-\fBNote\fP
-.br
-The 800KB disk format used by Mac floppy drives cannot be supported on PC floppy drives since they are not capable of formatting disks in that fashion.
-.sp 1
-\fBKfloppy\fP supports the file systems DOS, ext2 and Minix.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B device
-Default device
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kfloppy/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kfloppy/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdeutils/debian/man/kgpg-trinity.1 b/dilos/core/tdeutils/debian/man/kgpg-trinity.1
deleted file mode 100644
index 9ea82bb85..000000000
--- a/dilos/core/tdeutils/debian/man/kgpg-trinity.1
+++ /dev/null
@@ -1,187 +0,0 @@
-.TH KGPG "1" "December 2002" "TDE" "TDE Application"
-.SH NAME
-kgpg \- a TDE frontend for GNU Privacy Guard (GnuPG)
-.SH SYNOPSIS
-.B kgpg
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kgpg
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kgpg
-is a simple graphical interface for gpg (http://gnupg.org).
-Basically, It allows you to encrypt and decrypt files or messages, and to manage your keys. 
-.PP
-Kgpg can be used in different ways: 
-.IP "1 -" 4
-Open Kgpg. You will see an editor. Just type or paste your text in the editor. You can then easily encrypt/decrypt the text. 
-.IP "2 -" 4
-On your Desktop or from a Konqueror window, right click on a file and you will see an encrypt file entry in the menu. just select it to encrypt the file. In the same way, simply left click on an encrypted file to decrypt it. 
-.IP "3 -" 4
-If you enable Kgpg's Klipper action, as soon as you copy an encrypted text to the clipboard, a popup menu will ask you if you want to decrypt it. 
-.SH OPTIONS
-.TP
-.B \-e
-encrypt file
-.TP
-.B \-s
-show encrypted file
-.TP
-.B \-S
-sign file
-.TP
-.B \-V
-verify signature
-.SS "Arguments:"
-.TP 12
-file
-file to open
-.SS "Generic options:"
-.TP 12
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-title \ title
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-kgpg was written by
-.nh
-.ad l
-y0k0 <bj@altern.org>,
-.br
-.hy
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-The full documentation for
-.B Kgpg
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kgpg
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kgpg
-
diff --git a/dilos/core/tdeutils/debian/man/khexedit-trinity.1 b/dilos/core/tdeutils/debian/man/khexedit-trinity.1
deleted file mode 100644
index 968d438f5..000000000
--- a/dilos/core/tdeutils/debian/man/khexedit-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHEXEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE hex editor"
-.SH NAME
-khexedit
-\- TDE hex editor
-.SH SYNOPSIS
-\fBkhexedit\fP [Qt\-options] [TDE\-options] [options] [file(s)] 
-.SH DESCRIPTION
-\fBKHexEdit\fP is an editor for the raw data of binary files. It includes find/replace functions, bookmarks, many configuration options, drag and drop support and other powerful features.
-.sp 1
-When a document is opened, the bytes are displayed in hexadecimal format in the data editor window. The data can be edited, cut, copied, pasted, dragged and dropped much as text is in an text editor or word processor. A cursor marks the current position. Pressing the Insert key toggles between overwrite and insert text entry modes. The data can also be displayed as octal, binary or decimal values, by choosing the desired format in the View menu.
-.sp 1
-The offset column on the left indicates the position of a particular byte in the file. The text field on the right displays the ASCII encoding of the file. The cursor position and edits in the data editor window are reflected in the text field. The text field can also be edited, and those changes are reflected in the data editor window.
-.sp 1
-The search bar allows the user to search for a specific value \-\- hexadecimal, octal, binary, decimal or text.
-.sp 1
-The conversion field displays the value of the byte at the cursor position in a variety of bases. It also displays the value of all standard data types starting at the cursor.
-.sp 1
-Multiple documents can be open at the same time but only one can be active. Use the Documents menu to select which document will be active.
-.SH OPTIONS
-.SS
-.SS Arguments:
-file(s)                   File(s) to open
-.SS Options:
-.TP
-.B  \-\-offset  <offset>
-Jump to 'offset'
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/khexedit/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/khexedit/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Espen Sand <espensa@online.no>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdeutils/debian/man/kwikdisk-trinity.1 b/dilos/core/tdeutils/debian/man/kwikdisk-trinity.1
deleted file mode 100644
index 74aaad6ca..000000000
--- a/dilos/core/tdeutils/debian/man/kwikdisk-trinity.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWIKDISK 1 "June 2006" "Trinity Desktop Environment" "TDE Free disk space utility"
-.SH NAME
-kwikdisk
-\- TDE Free disk space utility
-.SH SYNOPSIS
-\fBkwikdisk\fB [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBkwikdisk\fP is a kicker applet to display the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their free space, type and mount point. It also allows you to mount and unmount drives.
-.sp 1
-\fBkwikdisk\fP is similar to \fBKDiskFree\fP, but takes up less screen space.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-
-.SH SEE ALSO
-\fBkdf\fP(1)
-.SH AUTHORS
-.nf
-Michael Kropfberger <michael.kropfberger@gmx.net>
-.br
-Espen Sand <espen@kde.org>
-.br
-Stanislav Karchebny <Stanislav.Karchebny@kdemail.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdeutils/debian/man/superkaramba-trinity.1 b/dilos/core/tdeutils/debian/man/superkaramba-trinity.1
deleted file mode 100644
index ab0ec0f49..000000000
--- a/dilos/core/tdeutils/debian/man/superkaramba-trinity.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH SUPERKARAMBA 1 "juli  27, 2003"
-.SH NAME
-superkaramba \- a program based on karamba improving the eyecandy of TDE.
-.SH SYNOPSIS
-.B superkaramba
-[\fIQt-options\fR] [\fITDE-options\fR] \fIfile\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B superkaramba
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.PP
-.B Superkaramba
-is a tool based on karamba that allows anyone to easily create and run little
-interactive widgets on a Trinity desktop. Widgets are defined in a simple text file
-and can be augmented with Python code to make them interactive.
-.SH OPTIONS
-A summary of options are included below.
-.TP
-.B \-\-help
-Show summary of options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show license information
-.TP
-.B file
-A required argument 'file'
-.SH AUTHOR
-.B Superkaramba
-was written by Adam Geitgey <adam@rootnode.org> and Hans Karlsson
-<d98hk@efd.lth.se>.
-.PP
-This manual page was written by Jean-Michel Kelbert <kelbert@debian.org>,
-for the Debian project (but may be used by others).
diff --git a/dilos/core/tdeutils/debian/man/tdefilereplace-trinity.1 b/dilos/core/tdeutils/debian/man/tdefilereplace-trinity.1
deleted file mode 100644
index 63557c928..000000000
--- a/dilos/core/tdeutils/debian/man/tdefilereplace-trinity.1
+++ /dev/null
@@ -1,160 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEFILEREPLACE 1 "June 2006" "Trinity Desktop Environment" "Batch search and replace tool"
-.SH NAME
-tdefilereplace
-\- Batch search and replace tool
-.SH SYNOPSIS
-\fBtdefilereplace\fP [Qt\-options] [TDE\-options] [PATH] 
-.SH DESCRIPTION
-\fBKFileReplace\fP is an application used to search and replace a list of strings in a file tree. The strings may be literal or Qt\-like regular expressions. There are also other options to tune your search.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B PATH
-Starting folder
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdefilereplace/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdefilereplace/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Andras Mantia <amantia@kde.org>
-.br
-Emiliano Gulmini <emi_barbarossa@yahoo.it>
-.br
-Francois Dupou <dupoux@dupoux.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/dilos/core/tdeutils/debian/superkaramba-trinity.install b/dilos/core/tdeutils/debian/superkaramba-trinity.install
index 00b6eb4e1..3dd8dbdad 100644
--- a/dilos/core/tdeutils/debian/superkaramba-trinity.install
+++ b/dilos/core/tdeutils/debian/superkaramba-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/usr/share/icons/crystalsvg/64x64/apps/superkaramba.png
 debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
 debian/tmp/usr/share/icons/crystalsvg/scalable/apps/superkaramba.svgz
 debian/tmp/usr/share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+debian/tmp/usr/share/man/man1/superkaramba.1
 debian/tmp/usr/share/mimelnk/application/x-superkaramba.desktop
 
 debian/icons/superkaramba.xpm		/usr/share/pixmaps
diff --git a/dilos/core/tdeutils/debian/superkaramba-trinity.manpages b/dilos/core/tdeutils/debian/superkaramba-trinity.manpages
deleted file mode 100644
index 730ac7f62..000000000
--- a/dilos/core/tdeutils/debian/superkaramba-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/superkaramba-trinity.1
diff --git a/dilos/core/tdeutils/debian/tdefilereplace-trinity.install b/dilos/core/tdeutils/debian/tdefilereplace-trinity.install
index abf956163..f62358d08 100644
--- a/dilos/core/tdeutils/debian/tdefilereplace-trinity.install
+++ b/dilos/core/tdeutils/debian/tdefilereplace-trinity.install
@@ -11,4 +11,5 @@ debian/tmp/usr/share/doc/tde/HTML/en/tdefilereplace/*.png
 debian/tmp/usr/share/icons/hicolor/22x22/apps/tdefilereplace.png
 debian/tmp/usr/share/icons/hicolor/32x32/apps/tdefilereplace.png
 debian/tmp/usr/share/icons/hicolor/48x48/apps/tdefilereplace.png
+debian/tmp/usr/share/man/man1/tdefilereplace.1
 debian/tmp/usr/share/services/tdefilereplacepart.desktop
diff --git a/dilos/core/tdeutils/debian/tdefilereplace-trinity.manpages b/dilos/core/tdeutils/debian/tdefilereplace-trinity.manpages
deleted file mode 100644
index 694a538a0..000000000
--- a/dilos/core/tdeutils/debian/tdefilereplace-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdefilereplace-trinity.1
diff --git a/dilos/dependencies/arts/debian/docs b/dilos/dependencies/arts/debian/docs
new file mode 100644
index 000000000..6f7727790
--- /dev/null
+++ b/dilos/dependencies/arts/debian/docs
@@ -0,0 +1,2 @@
+README.md
+TODO
diff --git a/dilos/dependencies/arts/debian/libarts1c2a-trinity.install b/dilos/dependencies/arts/debian/libarts1c2a-trinity.install
index d0eb2e316..3281c7b85 100644
--- a/dilos/dependencies/arts/debian/libarts1c2a-trinity.install
+++ b/dilos/dependencies/arts/debian/libarts1c2a-trinity.install
@@ -60,3 +60,5 @@ debian/tmp/usr/lib/*/mcop/kmedia2.mcopclass
 debian/tmp/usr/lib/*/mcop/kmedia2.mcoptype
 debian/tmp/usr/lib/*/mcop/soundserver.mcopclass
 debian/tmp/usr/lib/*/mcop/soundserver.mcoptype
+debian/tmp/usr/share/man/man1/artscat-trinity.1
+debian/tmp/usr/share/man/man1/artsdsp-trinity.1
diff --git a/dilos/dependencies/arts/debian/libarts1c2a-trinity.manpages b/dilos/dependencies/arts/debian/libarts1c2a-trinity.manpages
deleted file mode 100644
index 8d7f5c573..000000000
--- a/dilos/dependencies/arts/debian/libarts1c2a-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/out/artscat-trinity.1
-debian/man/artsdsp-trinity.1
-
diff --git a/dilos/dependencies/arts/debian/libartsc0-dev-trinity.manpages b/dilos/dependencies/arts/debian/libartsc0-dev-trinity.manpages
deleted file mode 100644
index cef6ee689..000000000
--- a/dilos/dependencies/arts/debian/libartsc0-dev-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/artsc-config-trinity.1
diff --git a/dilos/dependencies/arts/debian/libartsc0-trinity-dev.install b/dilos/dependencies/arts/debian/libartsc0-trinity-dev.install
index 47133e9b8..6f8af8383 100644
--- a/dilos/dependencies/arts/debian/libartsc0-trinity-dev.install
+++ b/dilos/dependencies/arts/debian/libartsc0-trinity-dev.install
@@ -4,6 +4,7 @@ debian/tmp/usr/include/artsc/artsc_export.h
 debian/tmp/usr/lib/*/libartsc.la
 debian/tmp/usr/lib/*/libartsc.so
 debian/tmp/usr/lib/*/libartsgsl.a
+debian/tmp/usr/share/man/man1/artsc-config-trinity.1
 
 debian/tmp/usr/lib/*/pkgconfig/arts.pc
 debian/tmp/usr/lib/*/pkgconfig/artsc.pc
diff --git a/dilos/dependencies/arts/debian/man/artsc-config-trinity.sgml b/dilos/dependencies/arts/debian/man/artsc-config-trinity.sgml
deleted file mode 100644
index 8072e337d..000000000
--- a/dilos/dependencies/arts/debian/man/artsc-config-trinity.sgml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSC-CONFIG</refentrytitle>">
-  <!ENTITY dhpackage   "artsc-config">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>Get information about a libartsc installation</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--arts-prefix<replaceable></replaceable></option></arg>
-      <arg><option>--arts-version<replaceable></replaceable></option></arg>
-      <arg><option>--cflags<replaceable></replaceable></option></arg>
-      <arg><option>--libs<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable></replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> displays information about a previous libartsc installation.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--arts-prefix</option>
-        </term>
-        <listitem>
-          <para>This is the prefix used when libartsc was installed.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--arts-version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed arts.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cflags</option>
-        </term>
-        <listitem>
-          <para>Set of compiler options (CFLAGS) to use when compiling files that use libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--libs</option>
-        </term>
-        <listitem>
-          <para>Shows the complete set of libs and other linker options you will need in order to link your application with libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed libartsc.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (but may be used by
-      others).  Permission is granted to copy, distribute and/or
-      modify this document under the terms of the &gnu; General Public
-      License, Version 2 or any later version published by the Free
-      Software Foundation.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/dilos/dependencies/arts/debian/man/artscat-trinity.sgml b/dilos/dependencies/arts/debian/man/artscat-trinity.sgml
deleted file mode 100644
index 7dff34d95..000000000
--- a/dilos/dependencies/arts/debian/man/artscat-trinity.sgml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSCAT</refentrytitle>">
-  <!ENTITY dhpackage   "artscat">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>pipe data to sound device</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable> options </replaceable></option></arg>
-      <arg><option><replaceable> filename </replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> pipes data from a pipe to the sound device through arts.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-b <replaceable>bits</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of bits (8 or 16)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-c <replaceable>channels</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of channels (1 or 2)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h</option>
-        </term>
-        <listitem>
-          <para>display help and exit</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-r <replaceable>samplingrate</replaceable></option>
-        </term>
-        <listitem>
-          <para>set samplingrate to use</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-t <replaceable>title</replaceable></option>
-        </term>
-        <listitem>
-          <para>set stream title</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-        </term>
-        <listitem>
-          <para>show version</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (but may be used by
-      others).  Permission is granted to copy, distribute and/or
-      modify this document under the terms of the &gnu; General Public
-      License, Version 2 or any later version published by the Free
-      Software Foundation.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/dilos/dependencies/arts/debian/man/artsdsp-trinity.1 b/dilos/dependencies/arts/debian/man/artsdsp-trinity.1
deleted file mode 100644
index 2615f47c2..000000000
--- a/dilos/dependencies/arts/debian/man/artsdsp-trinity.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.TH ARTSDSP "1" "February 2008" "artsdsp" "User Commands"
-.SH NAME
-artsdsp \- manual page for artsdsp
-.SH DESCRIPTION
-artsdsp \- attempt to reroute audio device to artsd
-.PP
-artsdsp [options] binary
-.PP
-options:
-.TP
-.B \-h, \-\-help
-Show brief help.
-.TP
-.B \-n, \-\-name\fR=\fINAME\fR
-Use name to identify player to artsd.
-.TP
-.B \-m, \-\-mmap
-Emulate memory mapping (i.e. for quake).
-.TP
-.B \-s, \-\-single\-threaded
-Use the single\-threaded version.
-.TP
-.B \-v, \-\-verbose
-Show parameters.
-.TP
-.B \-V, \-\-version
-Show version.
-.PP
-This manual page was written by Fathi Boudra <fabo@debian.org>,
-for the Debian project (but may be used by others).
-
diff --git a/dilos/dependencies/python-tqt/debian/control b/dilos/dependencies/python-tqt/debian/control
deleted file mode 100644
index 9fc68128b..000000000
--- a/dilos/dependencies/python-tqt/debian/control
+++ /dev/null
@@ -1,126 +0,0 @@
-Source: python-tqt
-Section: python
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-all-dbg [!solaris-any], dh-python
-Standards-Version: 3.8.4
-
-Package: python-tqt
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends}
-Replaces: python-tqt (<< 4:14.0.0~)
-Breaks: python-tqt (<< 4:14.0.0~)
-Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
-Provides: ${python:Provides}
-Description: TQt bindings for Python
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- At this moment PyTQt offers a vast subset of TQt API. There are
- some minor issues related to the differences between C++ and Python
- (types, etc), but usually you'll be able to write code pretty much the
- same way in both languages (with syntax differences, of course)
-
-Package: python-tqt-dbg
-Architecture: linux-any
-Priority: extra
-Replaces: python-tqt-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-dbg (<< 4:14.0.0~)
-Section: debug
-Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends}
-Description: TQt bindings for Python (debug extension)
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-tqt-gl
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
-Replaces: python-tqt-gl (<< 4:14.0.0~)
-Breaks: python-tqt-gl (<< 4:14.0.0~)
-Suggests: python-tqt-doc
-Provides: ${python:Provides}
-Description: TQt OpenGL bindings for Python
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
-
-Package: python-tqt-gl-dbg
-Priority: extra
-Section: debug
-Replaces: python-tqt-gl-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-gl-dbg (<< 4:14.0.0~)
-Architecture: linux-any
-Depends: ${shlibs:Depends}, python-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt OpenGL bindings for Python (debug extension)
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-tqtext
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
-Replaces: python-tqtext (<< 4:14.0.0~)
-Breaks: python-tqtext (<< 4:14.0.0~)
-Provides: ${python:Provides}
-Description: TQt extensions for PyTQt
- PyTQt Extensions. Contains:
- .
-   * QScintilla: a featureful TQt source code editing component based
-                 on Scintilla.
-
-Package: python-tqtext-dbg
-Priority: extra
-Section: debug
-Replaces: python-tqtext-dbg (<< 4:14.0.0~)
-Breaks: python-tqtext-dbg (<< 4:14.0.0~)
-Architecture: linux-any
-Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt debug extensions for PyTQt
- PyTQt debug Extensions. Contains:
- .
-   * QScintilla: a featureful TQt source code editing component based
-                 on Scintilla.
-
-Package: pytqt-tools
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: pytqt-tools (<< 4:14.0.0~)
-Breaks: pytqt-tools (<< 4:14.0.0~)
-Description: pyuic and pylupdate for TQt
- pyuic is the PyTQt counterpart for TQt's uic. It takes an XML
- user interface file and generates Python code.
- .
- pylupdate is the counterpart for TQt's lupdate. It updates TQt
- Linguist translation files from Python code.
-
-Package: python-tqt-dev
-Depends: python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Suggests: python-sip-tqt-dev
-Replaces: python-tqt-dev (<< 4:14.0.0~)
-Breaks: python-tqt-dev (<< 4:14.0.0~)
-Architecture: all
-Description: TQt bindings for Python - Development files
- Development .sip files with definitions of PyTQt classes. They
- are needed to build PyTQt, but also as building blocks of other
- packages based on them, like PyTDE.
-
-Package: python-tqt-doc
-Section: doc
-Architecture: all
-Replaces: python-tqt-doc (<< 4:14.0.0~)
-Breaks: python-tqt-doc (<< 4:14.0.0~)
-Depends: ${misc:Depends}
-Suggests: python-tqt
-Description: TQt bindings for Python - Documentation and examples
- Documentation and examples for the PyTQt (bindings that allow
- the use of TQt library from within a Python script).
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples b/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples
deleted file mode 100644
index 3162f69a8..000000000
--- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-examples3/*
-
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python-tqt-gl.install
deleted file mode 100644
index 288f3cb88..000000000
--- a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtgl.so
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt.install b/dilos/dependencies/python-tqt/debian/python-tqt.install
deleted file mode 100644
index 61a9363d0..000000000
--- a/dilos/dependencies/python-tqt/debian/python-tqt.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtcanvas.so
-usr/lib/python*/*-packages/python_tqt/qtnetwork.so
-usr/lib/python*/*-packages/python_tqt/qtsql.so
-usr/lib/python*/*-packages/python_tqt/qttable.so
-usr/lib/python*/*-packages/python_tqt/qtui.so
-usr/lib/python*/*-packages/python_tqt/qtxml.so
-usr/lib/python*/*-packages/python_tqt/qt.so
diff --git a/dilos/dependencies/python-tqt/debian/python-tqtext.install b/dilos/dependencies/python-tqt/debian/python-tqtext.install
deleted file mode 100644
index 582be1bb1..000000000
--- a/dilos/dependencies/python-tqt/debian/python-tqtext.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtext.so
diff --git a/dilos/dependencies/python-tqt/debian/rules b/dilos/dependencies/python-tqt/debian/rules
deleted file mode 100755
index 0056ca307..000000000
--- a/dilos/dependencies/python-tqt/debian/rules
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-# 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
-
-export DH_OPTIONS
-
--include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
-py_sitename = site-packages
-py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-py_sitename_sh = $(py_sitename)
-py_libdir_sh = $(py_libdir)
-endif
-
-
-DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc
-INSTDIR=$(CURDIR)/debian
-
-export TQTDIR=/usr/share/tqt3
-export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
-else
-	CXXFLAGS += -O1
-endif
-CXXFLAGS += "-I/usr/include/tqt"
-
-PYTHONS	:= $(shell pyversions -vr debian/control)
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
-
-GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
-ifneq (,$(filter $(GCCVER),4.2 4.3))
-	SPLIT=40
-else
-	SPLIT=10
-endif
-
-.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
-
-#configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
-configure: $(PYTHONS:%=build-%/configure-stamp)
-build-%/configure-stamp:
-	dh_testdir
-	mkdir -p build-$*
-	cd build-$* && echo yes \
-                | python$* ../configure.py \
-                        -c -n /usr/include/tqscintilla \
-                        -e python$* \
-                        -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-                        -l /usr/include/python$* \
-                        -v /usr/share/sip/tqt \
-                        -m /usr/lib/python$*/config \
-                        CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
-	touch $@
-
-dbg-build-%/configure-stamp:
-	dh_testdir
-	mkdir -p dbg-build-$*
-	cd dbg-build-$* && echo yes \
-                | python$*-dbg ../configure.py \
-                        -c -n /usr/include/tqscintilla \
-                        -e python$* \
-                        -o /usr/lib -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-                        -l /usr/include/python$*_d \
-                        -v /usr/share/sip/tqt \
-                        -m /usr/lib/python$*/config_d \
-                        CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
-	touch $@
-
-#build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
-build build-arch: $(PYTHONS:%=build-%/build-stamp)
-build-indep:
-
-build-%/build-stamp: build-%/configure-stamp
-	dh_testdir
-	$(MAKE) -C build-$*
-	touch $@
-
-dbg-build-%/build-stamp: dbg-build-%/configure-stamp
-	dh_testdir
-	$(MAKE) -C dbg-build-$*
-	touch $@
-
-install-indep: configure
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
-	for version in ${PYTHONS}; do\
-		pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
-		mkdir -p debian/python-tqt-dev/$$pylib;\
-		install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
-	done
-	dh_install -i
-
-install-arch: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k -a
-	dh_installdirs -a
-	for version in ${PYTHONS}; do \
-	  $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
-	done
-	for version in ${PYTHONS}; do \
-	  pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
-	  mkdir -p debian/python-tqt/$$pylib;\
-	  cp -a debian/tmp/$$pylib/__init__.py \
-	        debian/python-tqt/$$pylib/__init__.py;\
-	done
-
-	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) 
-	rm -f *-stamp
-	dh_clean
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_installdocs -A NEWS THANKS
-	dh_installexamples
-	dh_link
-#	dh_strip
-	dh_compress -X.py -X.bmp -X.ui -X.sql
-	dh_fixperms
-	${DH_PYTHON2}
-	dh_sip_tqt
-	dh_lintian
-	dh_installdeb
-	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build build-arch clean binary-indep binary-arch binary configure
diff --git a/dilos/dependencies/python-tqt/debian/README.Debian b/dilos/dependencies/pytqt/debian/README.Debian
index 33603ec40..33603ec40 100644
--- a/dilos/dependencies/python-tqt/debian/README.Debian
+++ b/dilos/dependencies/pytqt/debian/README.Debian
diff --git a/dilos/dependencies/python-tqt/debian/changelog b/dilos/dependencies/pytqt/debian/changelog
index 95e2f0cce..95e2f0cce 100644
--- a/dilos/dependencies/python-tqt/debian/changelog
+++ b/dilos/dependencies/pytqt/debian/changelog
diff --git a/dilos/dependencies/pytqt/debian/compat b/dilos/dependencies/pytqt/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/dilos/dependencies/pytqt/debian/control b/dilos/dependencies/pytqt/debian/control
new file mode 100644
index 000000000..7af5607d6
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/control
@@ -0,0 +1,200 @@
+Source: python-tqt
+Section: python
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
+Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python3-all-dev, python3-all-dbg [!solaris-any], libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, python-support (>= 0.7.1) | dh-python
+Standards-Version: 3.8.4
+XS-Python-Version: >= 2.3
+X-Python3-Version: >= 3.0
+
+Package: python-tqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends}
+Replaces: python-tqt (<< 4:14.0.0~)
+Breaks: python-tqt (<< 4:14.0.0~)
+Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python:Provides}
+Description: TQt bindings for Python
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ At this moment PyTQt offers a vast subset of TQt API. There are
+ some minor issues related to the differences between C++ and Python
+ (types, etc), but usually you'll be able to write code pretty much the
+ same way in both languages (with syntax differences, of course)
+
+Package: python-tqt-dbg
+Architecture: linux-any
+Priority: extra
+Replaces: python-tqt-dbg (<< 4:14.0.0~)
+Breaks: python-tqt-dbg (<< 4:14.0.0~)
+Section: debug
+Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends}
+Description: TQt bindings for Python (debug extension)
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-tqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends}
+Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python3:Provides}
+Description: TQt bindings for Python 3
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ At this moment PyTQt offers a vast subset of TQt API. There are
+ some minor issues related to the differences between C++ and Python
+ (types, etc), but usually you'll be able to write code pretty much the
+ same way in both languages (with syntax differences, of course)
+
+Package: python3-tqt-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends}
+Description: TQt bindings for Python 3 (debug extension)
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-tqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
+Replaces: python-tqt-gl (<< 4:14.0.0~)
+Breaks: python-tqt-gl (<< 4:14.0.0~)
+Suggests: python-tqt-doc
+Provides: ${python:Provides}
+Description: TQt OpenGL bindings for Python
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+
+Package: python-tqt-gl-dbg
+Priority: extra
+Section: debug
+Replaces: python-tqt-gl-dbg (<< 4:14.0.0~)
+Breaks: python-tqt-gl-dbg (<< 4:14.0.0~)
+Architecture: linux-any
+Depends: ${shlibs:Depends}, python-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt OpenGL bindings for Python (debug extension)
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-tqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends}
+Suggests: python-tqt-doc
+Provides: ${python3:Provides}
+Description: TQt OpenGL bindings for Python 3
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+
+Package: python3-tqt-gl-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt-gl (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt OpenGL bindings for Python 3 (debug extension)
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-tqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
+Replaces: python-tqtext (<< 4:14.0.0~)
+Breaks: python-tqtext (<< 4:14.0.0~)
+Provides: ${python:Provides}
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: python-tqtext-dbg
+Priority: extra
+Section: debug
+Replaces: python-tqtext-dbg (<< 4:14.0.0~)
+Breaks: python-tqtext-dbg (<< 4:14.0.0~)
+Architecture: linux-any
+Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt debug extensions for PyTQt
+ PyTQt debug Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: python3-tqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends}
+Provides: ${python3:Provides}
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: python3-tqtext-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt debug extensions for PyTQt
+ PyTQt debug Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: pytqt-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: pytqt-tools (<< 4:14.0.0~)
+Breaks: pytqt-tools (<< 4:14.0.0~)
+Description: pyuic and pylupdate for TQt
+ pyuic is the PyTQt counterpart for TQt's uic. It takes an XML
+ user interface file and generates Python code.
+ .
+ pylupdate is the counterpart for TQt's lupdate. It updates TQt
+ Linguist translation files from Python code.
+
+Package: python-tqt-dev
+Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Suggests: python3-sip-tqt-dev | python-sip-tqt-dev
+Replaces: python-tqt-dev (<< 4:14.0.0~)
+Breaks: python-tqt-dev (<< 4:14.0.0~)
+Architecture: all
+Description: TQt bindings for Python - Development files
+ Development .sip files with definitions of PyTQt classes. They
+ are needed to build PyTQt, but also as building blocks of other
+ packages based on them, like PyTDE.
+
+Package: python-tqt-doc
+Section: doc
+Architecture: all
+Replaces: python-tqt-doc (<< 4:14.0.0~)
+Breaks: python-tqt-doc (<< 4:14.0.0~)
+Depends: ${misc:Depends}
+Suggests: python-tqt
+Description: TQt bindings for Python - Documentation and examples
+ Documentation and examples for the PyTQt (bindings that allow
+ the use of TQt library from within a Python script).
diff --git a/dilos/dependencies/python-tqt/debian/copyright b/dilos/dependencies/pytqt/debian/copyright
index 715a83f24..715a83f24 100644
--- a/dilos/dependencies/python-tqt/debian/copyright
+++ b/dilos/dependencies/pytqt/debian/copyright
diff --git a/dilos/dependencies/python-tqt/debian/docs b/dilos/dependencies/pytqt/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/dilos/dependencies/python-tqt/debian/docs
+++ b/dilos/dependencies/pytqt/debian/docs
diff --git a/dilos/dependencies/python-tqt/debian/manpages/pylupdate.1 b/dilos/dependencies/pytqt/debian/manpages/pylupdate.1
index 4d2c8919a..4d2c8919a 100644
--- a/dilos/dependencies/python-tqt/debian/manpages/pylupdate.1
+++ b/dilos/dependencies/pytqt/debian/manpages/pylupdate.1
diff --git a/dilos/dependencies/python-tqt/debian/manpages/pyuic.1 b/dilos/dependencies/pytqt/debian/manpages/pyuic.1
index f1ffa41ff..f1ffa41ff 100644
--- a/dilos/dependencies/python-tqt/debian/manpages/pyuic.1
+++ b/dilos/dependencies/pytqt/debian/manpages/pyuic.1
diff --git a/dilos/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/dilos/dependencies/pytqt/debian/patches/debian_configure_changes.diff
index 131e9dbdc..131e9dbdc 100644
--- a/dilos/dependencies/python-tqt/debian/patches/debian_configure_changes.diff
+++ b/dilos/dependencies/pytqt/debian/patches/debian_configure_changes.diff
diff --git a/dilos/dependencies/python-tqt/debian/patches/series b/dilos/dependencies/pytqt/debian/patches/series
index 573069d8d..573069d8d 100644
--- a/dilos/dependencies/python-tqt/debian/patches/series
+++ b/dilos/dependencies/pytqt/debian/patches/series
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs b/dilos/dependencies/pytqt/debian/python-tqt-dev.dirs
index ae635cbcd..ae635cbcd 100644
--- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs
+++ b/dilos/dependencies/pytqt/debian/python-tqt-dev.dirs
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.install b/dilos/dependencies/pytqt/debian/python-tqt-dev.install
index 7b6aca191..7b6aca191 100644
--- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.install
+++ b/dilos/dependencies/pytqt/debian/python-tqt-dev.install
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/dilos/dependencies/pytqt/debian/python-tqt-dev.lintian-overrides
index 36e6c1349..36e6c1349 100644
--- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/dilos/dependencies/pytqt/debian/python-tqt-dev.lintian-overrides
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs b/dilos/dependencies/pytqt/debian/python-tqt-doc.dirs
index 43a4fa9fa..43a4fa9fa 100644
--- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ b/dilos/dependencies/pytqt/debian/python-tqt-doc.dirs
diff --git a/dilos/dependencies/pytqt/debian/python-tqt-doc.examples b/dilos/dependencies/pytqt/debian/python-tqt-doc.examples
new file mode 100644
index 000000000..c48447a3e
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/python-tqt-doc.examples
@@ -0,0 +1,2 @@
+examples/*
+
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.install b/dilos/dependencies/pytqt/debian/python-tqt-doc.install
index 65f82036b..65f82036b 100644
--- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.install
+++ b/dilos/dependencies/pytqt/debian/python-tqt-doc.install
diff --git a/dilos/dependencies/pytqt/debian/python-tqt-gl.install b/dilos/dependencies/pytqt/debian/python-tqt-gl.install
new file mode 100644
index 000000000..d58e26ab5
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/python-tqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python2.*/*-packages/python_tqt/qtgl.so
diff --git a/dilos/dependencies/pytqt/debian/python-tqt.install b/dilos/dependencies/pytqt/debian/python-tqt.install
new file mode 100644
index 000000000..4ec8f4d19
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/python-tqt.install
@@ -0,0 +1,7 @@
+usr/lib/python2.*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python2.*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python2.*/*-packages/python_tqt/qtsql.so
+usr/lib/python2.*/*-packages/python_tqt/qttable.so
+usr/lib/python2.*/*-packages/python_tqt/qtui.so
+usr/lib/python2.*/*-packages/python_tqt/qtxml.so
+usr/lib/python2.*/*-packages/python_tqt/qt.so
diff --git a/dilos/dependencies/pytqt/debian/python-tqtext.install b/dilos/dependencies/pytqt/debian/python-tqtext.install
new file mode 100644
index 000000000..00345e2e7
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/python-tqtext.install
@@ -0,0 +1 @@
+usr/lib/python2.*/*-packages/python_tqt/qtext.so
diff --git a/dilos/dependencies/pytqt/debian/python3-tqt-gl.install b/dilos/dependencies/pytqt/debian/python3-tqt-gl.install
new file mode 100644
index 000000000..ead3920cf
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/python3-tqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtgl.so
diff --git a/dilos/dependencies/pytqt/debian/python3-tqt.install b/dilos/dependencies/pytqt/debian/python3-tqt.install
new file mode 100644
index 000000000..4ceda8c75
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/python3-tqt.install
@@ -0,0 +1,7 @@
+usr/lib/python3*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python3*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python3*/*-packages/python_tqt/qtsql.so
+usr/lib/python3*/*-packages/python_tqt/qttable.so
+usr/lib/python3*/*-packages/python_tqt/qtui.so
+usr/lib/python3*/*-packages/python_tqt/qtxml.so
+usr/lib/python3*/*-packages/python_tqt/qt.so
diff --git a/dilos/dependencies/pytqt/debian/python3-tqtext.install b/dilos/dependencies/pytqt/debian/python3-tqtext.install
new file mode 100644
index 000000000..4d58d8a28
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/python3-tqtext.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtext.so
diff --git a/dilos/dependencies/python-tqt/debian/pytqt-tools.install b/dilos/dependencies/pytqt/debian/pytqt-tools.install
index 1df36c612..1df36c612 100644
--- a/dilos/dependencies/python-tqt/debian/pytqt-tools.install
+++ b/dilos/dependencies/pytqt/debian/pytqt-tools.install
diff --git a/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages b/dilos/dependencies/pytqt/debian/pytqt-tools.manpages
index 7d27d0034..7d27d0034 100644
--- a/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages
+++ b/dilos/dependencies/pytqt/debian/pytqt-tools.manpages
diff --git a/dilos/dependencies/pytqt/debian/rules b/dilos/dependencies/pytqt/debian/rules
new file mode 100755
index 000000000..85cc0b06d
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/rules
@@ -0,0 +1,202 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# 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
+
+export DH_OPTIONS
+
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+py_sitename = site-packages
+py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+py_sitename_sh = $(py_sitename)
+py_libdir_sh = $(py_libdir)
+endif
+
+
+DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc
+INSTDIR=$(CURDIR)/debian
+
+export TQTDIR=/usr/share/tqt3
+export QMAKESPEC=$(TQTDIR)/mkspecs/linux-g++
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CXXFLAGS += -O0
+else
+	CXXFLAGS += -O1
+endif
+CXXFLAGS += "-I/usr/include/tqt"
+
+PYTHONS	:= $(shell pyversions -vr debian/control) $(shell py3versions -vd)
+
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
+DEB_PARALLEL_JOBS ?= 40
+
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+
+#configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+configure: $(PYTHONS:%=build-%/configure-stamp)
+
+build-%/configure-stamp:
+	dh_testdir
+	mkdir -p build-$*
+	cd build-$* && echo yes \
+                | python$* ../configure.py \
+                        -c -n /usr/include/tqt3 \
+                        -e python$* \
+                        -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
+                        -l /usr/include/python$* \
+                        -v /usr/share/sip/tqt \
+                        -m /usr/lib/python$*/config \
+                        -z \
+                        CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
+	touch $@
+
+dbg-build-%/configure-stamp:
+	dh_testdir
+	mkdir -p dbg-build-$*
+	cd dbg-build-$* && echo yes \
+                | python$*-dbg ../configure.py \
+                        -c -n /usr/include/tqt3 \
+                        -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
+                        -l /usr/include/python$*_d \
+                        -v /usr/share/sip/tqt \
+                        -m /usr/lib/python$*/config_d \
+                        -z \
+                        CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
+	touch $@
+
+#build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+build build-arch: $(PYTHONS:%=build-%/build-stamp)
+build-indep:
+
+build-%/build-stamp: build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C build-$*
+	touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C dbg-build-$*
+	touch $@
+
+install-indep: configure
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i
+	dh_installdirs -i
+	for version in ${PYTHONS}; do\
+		pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/python_tqt;\
+		mkdir -p debian/python-tqt-dev/$$pylib;\
+		install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
+	done
+	dh_install -i
+
+install-arch: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k -a
+	dh_installdirs -a
+
+	for p in $(PYTHONS) ; do \
+		$(MAKE) -f debian/rules install-arch-$$p;\
+	done
+
+	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+
+	for i in $$(find debian/python3-*-dbg -name '*.so'); do \
+	  b=$$(basename $$i .so); \
+	  mv $$i $$(dirname $$i)/$${b}_d.so; \
+	done
+	find debian/python3-*-dbg ! -type d \
+                ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+	find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+install-arch-3.%:
+	$(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+#	$(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-tqt-dbg
+	mkdir -p debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+	cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+	      debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+#	mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+#	mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+#	   debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+#	mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+#	mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+#	   debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+
+install-arch-%:
+	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+#	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-tqt-dbg
+	mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+	cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+	      debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+#	mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+#	mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+#	   debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+#	mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+#	mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+#	   debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) 
+	rm -f *-stamp
+	dh_clean
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installman
+	dh_installchangelogs ChangeLog
+	dh_installdocs -A NEWS THANKS
+	dh_installexamples
+	dh_link
+#	dh_strip
+	dh_compress -X.py -X.bmp -X.ui -X.sql
+	dh_fixperms
+ifneq (dh_pysupport,${DH_PYTHON2})
+	${DH_PYTHON2} --no-dbg-cleaning
+else
+	${DH_PYTHON2}
+endif
+	dh_python3 --no-dbg-cleaning
+	dh_sip_tqt
+	dh_sip3_tqt
+	dh_lintian
+	dh_installdeb
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
+
+# Build architecture independant packages using the common target.
+binary-indep: install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build build-arch clean binary-indep binary-arch binary configure
diff --git a/dilos/dependencies/pytqt/debian/source/format b/dilos/dependencies/pytqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/dilos/dependencies/pytqt/debian/source/options b/dilos/dependencies/pytqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/dilos/dependencies/pytqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/dilos/dependencies/python-tqt/debian/watch b/dilos/dependencies/pytqt/debian/watch
index 506321d38..506321d38 100644
--- a/dilos/dependencies/python-tqt/debian/watch
+++ b/dilos/dependencies/pytqt/debian/watch
diff --git a/dilos/dependencies/sip4-tqt/debian/control b/dilos/dependencies/sip4-tqt/debian/control
index cdb796e02..08cddf311 100644
--- a/dilos/dependencies/sip4-tqt/debian/control
+++ b/dilos/dependencies/sip4-tqt/debian/control
@@ -4,20 +4,21 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), libtqtinterface-dev
+Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python3-all-dev, python3-all-dbg [!solaris-any], python-support (>= 0.7.1) | dh-python, libtqtinterface-dev, bison, flex
 Standards-Version: 3.8.4
 XS-Python-Version: all
+X-Python3-Version: >= 3.0
 
 Package: python-sip-tqt
 Architecture: any
 Section: python
 Replaces: python-sip-tqt (<< 4:14.0.0~)
 Breaks: python-sip-tqt (<< 4:14.0.0~)
-Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1
+Provides: ${python:Provides}
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4 (<< 4.10)
 Description: Python/C++ bindings generator runtime library
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
 
@@ -31,7 +32,7 @@ Provides: ${python:Provides}
 Depends: python-sip-tqt (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4-dbg (<< 4.10)
 Description: Python/C++ bindings generator runtime library (debug extension)
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
@@ -47,17 +48,56 @@ Recommends: python-sip-tqt (>= ${source:Version})
 Provides: python-sip-dev, python-sip4-dev, sip4
 Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10)
 Description: Python/C++ bindings generator development files
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ SIP-TQt was originally designed to generate Python bindings for TDE and so
+ has explicit support for the signal slot mechanism used by the TQt/TDE
+ class libraries.
+ .
+ Features:
+     - connecting TQt signals to Python functions and class methods
+     - connecting Python signals to TQt slots
+     - overloading virtual member functions with Python class methods
+     - protected member functions
+     - abstract classes
+     - enumerated types
+     - global class instances
+     - static member functions.
+ .
+ This package contains the code generator tool and the development headers
+ needed to develop Python bindings with sip-tqt.
+
+Package: python3-sip-tqt
+Architecture: any
+Section: python
+Provides: ${python3:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ This package provides SIP-TQt with support for Python 3
+
+Package: python3-sip-tqt-dev
+Architecture: any
+Section: python
+Depends: ${python:Depends}, python3-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
+Recommends: python3-sip-tqt (>= ${source:Version})
+Description: Python/C++ bindings generator development files
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
- SIP was originally designed to generate Python bindings for TDE and so
+ SIP-TQt was originally designed to generate Python bindings for TDE and so
  has explicit support for the signal slot mechanism used by the TQt/TDE
  class libraries.
  .
  Features:
-     - connecting Qt signals to Python functions and class methods
-     - connecting Python signals to Qt slots
+     - connecting TQt signals to Python functions and class methods
+     - connecting Python signals to TQt slots
      - overloading virtual member functions with Python class methods
      - protected member functions
      - abstract classes
@@ -66,5 +106,16 @@ Description: Python/C++ bindings generator development files
      - static member functions.
  .
  This package contains the code generator tool and the development headers
- needed to develop Python bindings with sip.
+ needed to develop Python 3 bindings with sip-tqt.
 
+Package: python3-sip-tqt-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ This package contains debugging symbols for python3-sip-tqt
diff --git a/dilos/dependencies/sip4-tqt/debian/dh_sip3_tqt b/dilos/dependencies/sip4-tqt/debian/dh_sip3_tqt
new file mode 100644
index 000000000..9b6387689
--- /dev/null
+++ b/dilos/dependencies/sip4-tqt/debian/dh_sip3_tqt
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_sip3_tqt - set the correct dependencies for Python 3 packages using sip
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_sip3_tqt>
+
+=head1 DESCRIPTION
+
+dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be
+used by Python 3 extensions built with sip3-tqt in order to depend on a version of
+python3-sip-tqt that exports the correct public API.
+
+=cut
+
+init();
+
+my $sip3_tqt_provides = `dpkg -s python3-sip-tqt`;
+$sip3_tqt_provides =~ /^Provides:\s*(.+)$/m;
+
+my @sip3_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1)));
+
+my $sip3_tqt_api_version=$sip3_tqt_apis[-1];
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+        addsubstvar($package, "sip3-tqt:Depends", $sip3_tqt_api_version);
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+
+=head1 AUTHORS
+
+Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
+
+=cut
diff --git a/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt b/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt
index b1a8c19e3..c92f23529 100644
--- a/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt
+++ b/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_sip_tqt - set the correct dependencies for Python packages using sip
+dh_sip_tqt - set the correct dependencies for Python packages using sip-tqt
 
 =cut
 
@@ -15,30 +15,30 @@ B<dh_sip_tqt>
 
 =head1 DESCRIPTION
 
-dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by
-Python extensions built with sip in order to depend on a version of python-sip
-that exports the correct public API. 
+dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be
+used by Python extensions built with sip-tqt in order to depend on a version of
+python-sip-tqt that exports the correct public API.
 
 =cut
 
 init();
 
-my $sip_provides = `dpkg -s python-sip-tqt`;
-$sip_provides =~ /^Provides:\s*(.+)$/m;
+my $sip_tqt_provides = `dpkg -s python-sip-tqt`;
+$sip_tqt_provides =~ /^Provides:\s*(.+)$/m;
 
-my @sip_apis = sort(grep(/sip\-api/, split(/,\s*/, $1)));
+my @sip_tqt_apis = sort(grep(/sip\-tqt\-api/, split(/,\s*/, $1)));
 
-my $sip_api_version=$sip_apis[-1];
+my $sip_tqt_api_version=$sip_tqt_apis[-1];
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
-        addsubstvar($package, "sip:Depends", $sip_api_version);
+        addsubstvar($package, "sip-tqt:Depends", $sip_tqt_api_version);
 }
 
 =head1 SEE ALSO
 
 L<debhelper(7)>
 
-This program is a part of python-sip-dev but is made to work with debhelper.
+This program is a part of python-sip-tqt-dev but is made to work with debhelper.
 
 =head1 AUTHORS
 
diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1 b/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1
new file mode 100644
index 000000000..a4284326a
--- /dev/null
+++ b/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1
@@ -0,0 +1,151 @@
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "DH_SIP3_TQT 1"
+.TH DH_SIP3_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+dh_sip3_tqt \- set the correct dependencies for Python 3 packages using sip-tqt
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBdh_sip3_tqt\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be used by
+Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt
+that exports the correct public \s-1API\s0.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIdebhelper\fR\|(7)
+.PP
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
index ea429fe9a..6f0edd8f1 100644
--- a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
+++ b/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
@@ -130,20 +130,20 @@
 .if n .ad l
 .nh
 .SH "NAME"
-dh_sip_tqt \- set the correct dependencies for Python packages using sip
+dh_sip_tqt \- set the correct dependencies for Python packages using sip-tqt
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 \&\fBdh_sip_tqt\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by
-Python extensions built with sip in order to depend on a version of python-sip
+dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be used by
+Python extensions built with sip-tqt in order to depend on a version of python-sip-tqt
 that exports the correct public \s-1API\s0.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIdebhelper\fR\|(7)
 .PP
-This program is a part of python-sip-dev but is made to work with debhelper.
+This program is a part of python-sip-tqt-dev but is made to work with debhelper.
 .SH "AUTHORS"
 .IX Header "AUTHORS"
 Torsten Marek <shlomme@debian.org>
diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
index 1df36c612..8b1c81fa9 100644
--- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
+++ b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
@@ -1 +1,2 @@
 usr/bin/*
+../../debian/dh_sip_tqt /usr/bin/
diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..01bc123e7 100644
--- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
+usr/lib/python2.*/*-packages/sip4_tqt/sip.so
diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
new file mode 100644
index 000000000..43fbfa385
--- /dev/null
+++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
@@ -0,0 +1 @@
+../../debian/dh_sip3_tqt /usr/bin/
diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
new file mode 100644
index 000000000..db0d5945a
--- /dev/null
+++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
@@ -0,0 +1 @@
+debian/manpages/dh_sip3_tqt.1
diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install
new file mode 100644
index 000000000..967fec5d9
--- /dev/null
+++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt.install
@@ -0,0 +1 @@
+usr/lib/python3.*/*-packages/sip4_tqt/sip.so
diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules
index 9fd544a5a..2ef6f1280 100755
--- a/dilos/dependencies/sip4-tqt/debian/rules
+++ b/dilos/dependencies/sip4-tqt/debian/rules
@@ -14,6 +14,10 @@ endif
 
 export DH_OPTIONS
 
+PY2_PROVIDES=sip-tqt-api-7.0, sip-tqt-api-7.1
+PY3_PROVIDES=sip-tqt-py3api-7.0, sip-tqt-py3api-7.1
+PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]")
+
 INSTDIR=$(CURDIR)/debian
 
 #CFLAGS=
@@ -24,7 +28,7 @@ else
 	CFLAGS += -O2 -g
 endif
 
-PYTHONS	:= $(shell pyversions -vr debian/control)
+PYTHONS := $(shell pyversions -vr) $(shell py3versions -vd)
 
 DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
 DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
@@ -49,7 +53,6 @@ build-%/configure-stamp:
 	cd build-$* \
 		&& python$* ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-			-g python$* \
 			-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" \
 			-p solaris-g++
 	touch $@
@@ -60,8 +63,6 @@ dbg-build-%/configure-stamp:
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-			-g python$* \
-			-e /usr/include/python$*_d \
 			-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
 	touch $@
 
@@ -85,12 +86,14 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
-	dh_clean
+	dh_clean debian/python3-sip.pydist
 
 install-arch: build
 	dh_testdir
 	dh_testroot
 	dh_prep -a
+	echo "python:Provides=$(PY2_PROVIDES)" >> debian/python-sip-tqt.substvars
+	echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip-tqt.substvars
 	dh_installdirs -a
 	# This is needed to enforce that the install-arch-% rules are
 	# not run in parallel. Both rules install into the same directory,
@@ -105,11 +108,32 @@ install-arch: build
 #		b=$$(basename $$i .so); \
 #		mv $$i $$(dirname $$i)/$${b}_d.so; \
 #	done
+#	for i in $$(find debian/python3-sip-tqt-dbg -name '*.so'); do \
+#		b=$$(basename $$i .so); \
+#		mv $$i $$(dirname $$i)/$${b}_d.so; \
+#	done
 #	find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
 #	find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \;
+#	find debian/python3-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
+#	find debian/python3-sip-tqt-dbg -depth -empty -exec rmdir {} \;
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-	install -m 755 -o root -g root debian/dh_sip_tqt debian/python-sip-tqt-dev/usr/bin
+
+install-arch-3.%:
+	$(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+#	$(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-sip-tqt-dbg
+	mkdir -p debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt
+	touch debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/__init__.py
+	install -m 644 -o root -g root debian/sipconfig_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig.py
+	install -m 644 -o root -g root build-3.$*/sipconfig.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig_nd.py
+#	install -m 644 -o root -g root dbg-build-3.$*/sipconfig.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig_d.py
+	mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	install -m 644 -o root -g root siplib/sip.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
+#	mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+#	ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip.h \
+#	    debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip.h
+	mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages/sip4_tqt
+	install -m 644 -o root -g root sipdistutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages/sip4_tqt
 
 install-arch-%:
 	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
@@ -119,11 +143,11 @@ install-arch-%:
 	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
 	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_nd.py
 #	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py
-	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*
-	install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/
-	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
-	ln -s ../python$*/sip.h \
-	    debian/python-sip-tqt-dev/usr/include/python$*_d/sip.h
+	mkdir -p debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
+#	mkdir -p debian/python-sip-tqt-dev$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+#	ln -s ../$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip.h \
+#	    debian/python-sip-tqt-dev/$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip.h
 	mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
 	install -m 644 -o root -g root sipdistutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
 
@@ -143,17 +167,23 @@ binary-common:
 ifneq (,$(findstring -a, $(DH_OPTIONS)))
 	DH_OPTIONS= dh_strip -ppython-sip-tqt-dev
 	DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg
+	DH_OPTIONS= dh_strip -ppython3-sip-tqt-dev
+	DH_OPTIONS= dh_strip -ppython3-sip-tqt -Npython3-sip-tqt-dev --dbg-package=python3-sip-tqt-dbg
 	rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
 #	mkdir -p debian/python-sip-tqt-dbg/usr/share/doc
 #	ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
+	rm -rf debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
+#	mkdir -p debian/python3-sip-tqt-dbg/usr/share/doc
+#	ln -s python3-sip-tqt debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
 endif
-	dh_compress 
+	dh_compress -X.inv
 	dh_fixperms
 ifneq (dh_pysupport,${DH_PYTHON2})
 	${DH_PYTHON2} --no-dbg-cleaning
 else
 	${DH_PYTHON2}
 endif
+	dh_python3 --no-dbg-cleaning
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff --git a/dilos/dependencies/sip4-tqt/debian/sipconfig.py b/dilos/dependencies/sip4-tqt/debian/sipconfig.py
index a9e761f08..32cf8d5e7 100644
--- a/dilos/dependencies/sip4-tqt/debian/sipconfig.py
+++ b/dilos/dependencies/sip4-tqt/debian/sipconfig.py
@@ -4,10 +4,10 @@ import sys
 
 if getattr(sys, "pydebug", False):
     try:
-        from sipconfig_d import *
-        from sipconfig_d import _pkg_config, _default_macros
+        from sip4_tqt.sipconfig_d import *
+        from sip4_tqt.sipconfig_d import _pkg_config, _default_macros
     except ImportError, msg:
         raise ImportError, 'No module named sipconfig; package python-sip-tqt-dbg not installed'
 else:
-    from sipconfig_nd import *
-    from sipconfig_nd import _pkg_config, _default_macros
+    from sip4_tqt.sipconfig_nd import *
+    from sip4_tqt.sipconfig_nd import _pkg_config, _default_macros
diff --git a/dilos/dependencies/sip4-tqt/debian/sipconfig_py3.py b/dilos/dependencies/sip4-tqt/debian/sipconfig_py3.py
new file mode 100644
index 000000000..3e6aa5aba
--- /dev/null
+++ b/dilos/dependencies/sip4-tqt/debian/sipconfig_py3.py
@@ -0,0 +1,13 @@
+# import the sipconfig.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+    try:
+        from sip4_tqt.sipconfig_d import *
+        from sip4_tqt.sipconfig_d import _pkg_config, _default_macros
+    except ImportError as msg:
+        raise ImportError('No module named sipconfig; package python-sip-tqt-dbg not installed')
+else:
+    from sip4_tqt.sipconfig_nd import *
+    from sip4_tqt.sipconfig_nd import _pkg_config, _default_macros
diff --git a/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl b/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/dilos/dependencies/tqscintilla/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/tqscintilla/debian/control b/dilos/dependencies/tqscintilla/debian/control
index adf09130c..9d4458b48 100644
--- a/dilos/dependencies/tqscintilla/debian/control
+++ b/dilos/dependencies/tqscintilla/debian/control
@@ -3,15 +3,17 @@ Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Torsten Marek <shlomme@debian.org>
-Build-Depends: debhelper (>= 9~), libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
 Standards-Version: 3.8.4
 
 Package: libtqscintilla7
 Section: libs
 Architecture: any
+Multi-Arch: same
 Replaces: libtqscintilla7 (<< 4:14.0.0~)
 Breaks: libtqscintilla7 (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
+Recommends: libtqscintilla7-i18n
 Description: TQt source code editing component based on Scintilla
  Scintilla is a free source code editing component. It has features found
  in standard editing components, as well as features especially useful
@@ -19,9 +21,23 @@ Description: TQt source code editing component based on Scintilla
  .
  TQScintilla is a port or Scintilla to the TQt GUI toolkit.
 
+Package: libtqscintilla7-i18n
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Replaces: libtqscintilla7 (<< 4:14.0.12~)
+Breaks: libtqscintilla7 (<< 4:14.0.12~)
+Description: i18n files for TQScintilla library
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ This package contains the internationalization files for the TQScintilla library.
+
 Package: libtqscintilla-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: foreign
 Replaces: libtqscintilla-dev (<< 4:14.0.0~)
 Breaks: libtqscintilla-dev (<< 4:14.0.0~)
 Depends: libtqscintilla7 (>= ${source:Version})
@@ -36,6 +52,7 @@ Description: TQt source code editing component - development files
 Package: libtqscintilla-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Replaces: libtqscintilla-doc (<< 4:14.0.0~)
 Breaks: libtqscintilla-doc (<< 4:14.0.0~)
 Suggests: libtqscintilla-dev
diff --git a/dilos/dependencies/tqscintilla/debian/dirs b/dilos/dependencies/tqscintilla/debian/dirs
deleted file mode 100644
index ca882bbb7..000000000
--- a/dilos/dependencies/tqscintilla/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/dilos/dependencies/tqscintilla/debian/docs b/dilos/dependencies/tqscintilla/debian/docs
index edc007104..50bd824bb 100644
--- a/dilos/dependencies/tqscintilla/debian/docs
+++ b/dilos/dependencies/tqscintilla/debian/docs
@@ -1 +1,2 @@
 NEWS
+README
diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install
index 146a60371..8a9449faa 100644
--- a/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install
+++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla-dev.install
@@ -1,2 +1,3 @@
 usr/include
-usr/lib/*/*.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so
diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install
index 005276324..d66379c9a 100644
--- a/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install
+++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla-doc.install
@@ -1 +1 @@
-usr/share/doc/libtqscintilla-doc
+usr/share/doc/libtqscintilla/HTML
diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
new file mode 100644
index 000000000..8fc621fc3
--- /dev/null
+++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
@@ -0,0 +1 @@
+usr/share/tqt3/translations/*.qm
diff --git a/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install b/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install
index 7b76fb1f7..b3c140659 100644
--- a/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install
+++ b/dilos/dependencies/tqscintilla/debian/libtqscintilla7.install
@@ -1,3 +1,2 @@
-usr/lib/*/*.so.*
-usr/lib/*/tqt3/plugins/designer/*.so
-usr/share/tqt3/translations/*.qm
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*.so
diff --git a/dilos/dependencies/tqscintilla/debian/rules b/dilos/dependencies/tqscintilla/debian/rules
index 14545306f..bcf875516 100755
--- a/dilos/dependencies/tqscintilla/debian/rules
+++ b/dilos/dependencies/tqscintilla/debian/rules
@@ -1,119 +1,20 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+#! /usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
 
-# 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)
+ifdef DEB_HOST_MULTIARCH
+  CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+  CMAKE_INSTALL_LIBDIR = lib
 endif
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-# This is the debhelper compatibility version to use.
-export TQTDIR=/usr/share/tqt3
-export QMAKESPEC=$(TQTDIR)/mkspecs/dilos-g++
-DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html
-HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla
-LIBSDEST=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-TRANSDEST=$(CURDIR)/debian/tmp/$(TQTDIR)/translations
-PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	cd qt; qmake "DESTDIR=$(CURDIR)/tmplib"
-	cd designer; qmake
-	touch configure-stamp
-
-build build-arch: build-stamp
-build-indep:
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	install -d $(CURDIR)/tmplib
-	$(MAKE) -C qt
-	$(MAKE) -C designer
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	[ ! -f qt/Makefile ] || $(MAKE) -C qt clean
-	[ ! -f designer/Makefile ] || $(MAKE) -C designer clean
-	-find -name 'Makefile' -exec rm {} \;
-	-rm -rf tmplib
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -d $(HEADERDEST)/private
-	install -d $(DOCDEST)
-	install -d $(TRANSDEST)
-	install -d $(LIBSDEST)
-	install -d $(PLUGINDEST)
-	for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done
-	for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done
-	for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done
-	for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done
-	mv designer/*.so $(PLUGINDEST)
-	for i in tmplib/*; do mv $$i $(LIBSDEST); done
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_install -i --sourcedir=$(CURDIR)/debian/tmp
-	dh_installdocs -i
-	dh_installchangelogs -i ChangeLog
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-	dh_installdocs -a
-	dh_installchangelogs -a ChangeLog
-	dh_link -a
-	dh_strip -a --ctfconvert-flags="-i" -Xlibqscintilla.so.7.0.1 -Xlibqscintillaplugin.so
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a -V
-	dh_installdeb -a
-	dh_shlibdeps -a --dpkg-shlibdeps-params=--ignore-missing-info
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -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/libraries/python-trinity/debian/NEWS.Debian b/dilos/libraries/pytde/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/dilos/libraries/python-trinity/debian/NEWS.Debian
+++ b/dilos/libraries/pytde/debian/NEWS.Debian
diff --git a/dilos/libraries/python-trinity/debian/changelog b/dilos/libraries/pytde/debian/changelog
index 12485eccd..12485eccd 100644
--- a/dilos/libraries/python-trinity/debian/changelog
+++ b/dilos/libraries/pytde/debian/changelog
diff --git a/dilos/libraries/pytde/debian/compat b/dilos/libraries/pytde/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/dilos/libraries/pytde/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/dilos/libraries/python-trinity/debian/control b/dilos/libraries/pytde/debian/control
index 85cb1de20..85cb1de20 100644
--- a/dilos/libraries/python-trinity/debian/control
+++ b/dilos/libraries/pytde/debian/control
diff --git a/dilos/libraries/python-trinity/debian/copyright b/dilos/libraries/pytde/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/dilos/libraries/python-trinity/debian/copyright
+++ b/dilos/libraries/pytde/debian/copyright
diff --git a/dilos/libraries/pytde/debian/patches/.gitignore b/dilos/libraries/pytde/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/dilos/libraries/pytde/debian/patches/.gitignore
diff --git a/dilos/libraries/python-trinity/debian/pytdeconfig.py b/dilos/libraries/pytde/debian/pytdeconfig.py
index eac264752..eac264752 100644
--- a/dilos/libraries/python-trinity/debian/pytdeconfig.py
+++ b/dilos/libraries/pytde/debian/pytdeconfig.py
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/dilos/libraries/pytde/debian/python-trinity-trinity-dev.dirs
index be8aad160..be8aad160 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-dev.dirs
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/dilos/libraries/pytde/debian/python-trinity-trinity-dev.install
index c523f227e..c523f227e 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-dev.install
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.dirs
index 96235463f..96235463f 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.dirs
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
index bb9705168..bb9705168 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.examples
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.install
index 20b273acb..20b273acb 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity-doc.install
diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install b/dilos/libraries/pytde/debian/python-trinity-trinity.install
index facee2907..facee2907 100644
--- a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install
+++ b/dilos/libraries/pytde/debian/python-trinity-trinity.install
diff --git a/dilos/libraries/python-trinity/debian/rules b/dilos/libraries/pytde/debian/rules
index 3bae8384b..3bae8384b 100755
--- a/dilos/libraries/python-trinity/debian/rules
+++ b/dilos/libraries/pytde/debian/rules
diff --git a/dilos/libraries/pytde/debian/source/format b/dilos/libraries/pytde/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/dilos/libraries/pytde/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/dilos/libraries/pytde/debian/source/options b/dilos/libraries/pytde/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/dilos/libraries/pytde/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/dilos/libraries/python-trinity/debian/watch b/dilos/libraries/pytde/debian/watch
index 8b3afcac0..8b3afcac0 100644
--- a/dilos/libraries/python-trinity/debian/watch
+++ b/dilos/libraries/pytde/debian/watch
diff --git a/freebsd/Makefile b/freebsd/Makefile
index e879038e4..af25914be 100644
--- a/freebsd/Makefile
+++ b/freebsd/Makefile
@@ -1,5 +1,6 @@
 
     SUBDIR =
+    SUBDIR += common
     SUBDIR += dependencies
     SUBDIR += core
     SUBDIR += libraries
diff --git a/freebsd/applications/Makefile b/freebsd/applications/Makefile
index 6f98fbc42..7a94d9066 100644
--- a/freebsd/applications/Makefile
+++ b/freebsd/applications/Makefile
@@ -1,67 +1,16 @@
 
     SUBDIR =
-    SUBDIR += abakus
-    SUBDIR += amarok
-    SUBDIR += basket
-    SUBDIR += bibletime
-    SUBDIR += codeine
-    SUBDIR += digikam
-    SUBDIR += dolphin
-    SUBDIR += filelight
-    SUBDIR += gtk-qt-engine
-    SUBDIR += gtk3-tqt-engine
-    SUBDIR += gwenview
-    SUBDIR += gwenview-i18n
-    SUBDIR += kaffeine
-    SUBDIR += kasablanca
-    SUBDIR += katapult
-    SUBDIR += kbarcode
-    SUBDIR += kbfx
-    SUBDIR += kbibtex
-    SUBDIR += kbiff
-    SUBDIR += kbookreader
-    SUBDIR += kchmviewer
-    SUBDIR += kcmautostart
-    SUBDIR += kcmldap
-    SUBDIR += kcmldapmanager
-    SUBDIR += kcpuload
-    SUBDIR += kdbg
-    SUBDIR += kdbusnotification
-    SUBDIR += kdiff3
-    SUBDIR += kdirstat
-    SUBDIR += keep
-    SUBDIR += kiosktool
-    SUBDIR += kkbswitch
-    SUBDIR += klamav
-    SUBDIR += knights
-    SUBDIR += knmap
-    SUBDIR += knowit
-    SUBDIR += knutclient
-    SUBDIR += kompose
-    SUBDIR += konversation
-    SUBDIR += kooldock
-    SUBDIR += krename
-    SUBDIR += kscope
-    SUBDIR += kshowmail
-    SUBDIR += kshutdown
-    SUBDIR += ksplash-engine-moodin
-    SUBDIR += ksquirrel
-    SUBDIR += kstreamripper
-    SUBDIR += ksystemlog
-    SUBDIR += kvkbd
-    SUBDIR += kxmleditor
-    SUBDIR += mathemagics
-    SUBDIR += tastymenu
-    SUBDIR += tde-style-baghira
-    SUBDIR += tde-style-domino
-    SUBDIR += tde-style-ia-ora
-    SUBDIR += tde-style-lipstik
-    SUBDIR += tde-style-qtcurve
-    SUBDIR += tde-systemsettings
-    SUBDIR += tdedocker
-    SUBDIR += tdeio-ftps
-    SUBDIR += tdepacman
-    SUBDIR += tdmtheme
-    SUBDIR += yakuake
+    SUBDIR += development
+    SUBDIR += games
+    SUBDIR += graphics
+    SUBDIR += internet
+    SUBDIR += misc
+    SUBDIR += multimedia
+    SUBDIR += office
+    SUBDIR += settings
+    SUBDIR += system
+    SUBDIR += tdeio
+    SUBDIR += themes
+    SUBDIR += utilities
 
 .include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/abakus/Makefile b/freebsd/applications/abakus/Makefile
deleted file mode 100644
index 5e36568cb..000000000
--- a/freebsd/applications/abakus/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		abakus-trinity
-COMMENT=		Calculator for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	a/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libartsc.so:${PORTSDIR}/x11/trinity/dependencies/arts \
-		${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-BUILD_DEPENDS+=	bison:${PORTSDIR}/devel/bison
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/abakus/distinfo b/freebsd/applications/abakus/distinfo
deleted file mode 100644
index 3938cdc8f..000000000
--- a/freebsd/applications/abakus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619432846
-SHA256 (TDE/applications/abakus-trinity_14.0.10.orig.tar.xz) = 7ff86a3ce38067938057abe3300a7143567a7cedd490ab3ff78282caf17d008e
-SIZE (TDE/applications/abakus-trinity_14.0.10.orig.tar.xz) = 279352
diff --git a/freebsd/applications/abakus/pkg-plist b/freebsd/applications/abakus/pkg-plist
deleted file mode 100644
index 7cecd4785..000000000
--- a/freebsd/applications/abakus/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-bin/abakus
-share/applications/tde/abakus.desktop
-share/apps/abakus/abakusui.rc
-share/doc/tde/HTML/en/abakus/abakus-degrees-mode.png
-share/doc/tde/HTML/en/abakus/abakus-dnd.png
-share/doc/tde/HTML/en/abakus/abakus-result.png
-share/doc/tde/HTML/en/abakus/common
-share/doc/tde/HTML/en/abakus/index.cache.bz2
-share/doc/tde/HTML/en/abakus/index.docbook
-share/doc/tde/HTML/en/abakus/kcalc-degrees-mode.png
-share/doc/tde/HTML/en/abakus/kcalc-fifty.png
-share/doc/tde/HTML/en/abakus/kcalc-result.png
-share/doc/tde/HTML/en/abakus/kcalc-sine.png
-share/doc/tde/HTML/en/abakus/kcalc-three.png
-share/icons/hicolor/64x64/apps/abakus.png
-share/locale/cs/LC_MESSAGES/abakus.mo
-share/locale/de/LC_MESSAGES/abakus.mo
-share/locale/it/LC_MESSAGES/abakus.mo
-share/locale/nl/LC_MESSAGES/abakus.mo
-share/locale/pt/LC_MESSAGES/abakus.mo
-share/locale/sk/LC_MESSAGES/abakus.mo
diff --git a/freebsd/applications/amarok/Makefile b/freebsd/applications/amarok/Makefile
deleted file mode 100644
index 7b86dc22d..000000000
--- a/freebsd/applications/amarok/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		amarok-trinity
-COMMENT=		Versatile and easy to use audio player for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	a/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		audio x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libartsc.so:${PORTSDIR}/x11/trinity/dependencies/arts \
-		${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/include/konqsidebarplugin.h:${PORTSDIR}/x11/trinity/core/tdebase \
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
-		libdbus-tqt-1.so:${PORTSDIR}/x11/trinity/dependencies/dbus-tqt \
-		libakode.so:${PORTSDIR}/x11/trinity/dependencies/akode \
-
-LIB_DEPENDS+=\
-		libgpod.so:${PORTSDIR}/audio/libgpod \
-		libmp4v2.so:${PORTSDIR}/multimedia/mp4v2 \
-		libmtp.so:${PORTSDIR}/multimedia/libmtp \
-		libnjb.so:${PORTSDIR}/audio/libnjb \
-		libSDL.so:${PORTSDIR}/devel/sdl12 \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04 \
-		libxine.so:${PORTSDIR}/multimedia/libxine \
-
-USE_MYSQL=		yes
-USE_PGSQL=		yes
-USE_SQLITE=		yes
-
-USE_RUBY=		yes
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON" \
-	-DWITH_IFP="OFF"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/amarok/distinfo b/freebsd/applications/amarok/distinfo
deleted file mode 100644
index 8d0c0da5f..000000000
--- a/freebsd/applications/amarok/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619437648
-SHA256 (TDE/applications/amarok-trinity_14.0.10.orig.tar.xz) = 95db5b446486ceb27199d1e9730223211b0ba7f72adf4aef1bb1963d9859ed12
-SIZE (TDE/applications/amarok-trinity_14.0.10.orig.tar.xz) = 10054548
diff --git a/freebsd/applications/amarok/pkg-plist b/freebsd/applications/amarok/pkg-plist
deleted file mode 100644
index 9e367bc02..000000000
--- a/freebsd/applications/amarok/pkg-plist
+++ /dev/null
@@ -1,1037 +0,0 @@
-bin/amarok
-bin/amarok_daapserver.rb
-bin/amarok_libvisual
-bin/amarok_proxy.rb
-bin/amarokapp
-bin/amarokcollectionscanner
-lib/libamarok.la
-lib/libamarok.so
-lib/libamarok.so.0
-lib/libamarok.so.0.0.0
-lib/ruby_lib/http11.rb
-lib/ruby_lib/libhttp11.la
-lib/ruby_lib/libhttp11.so
-lib/ruby_lib/libhttp11.so.0
-lib/ruby_lib/libhttp11.so.0.0.0
-lib/trinity/konqsidebar_universalamarok.la
-lib/trinity/konqsidebar_universalamarok.so
-lib/trinity/libamarok_aKode-engine.la
-lib/trinity/libamarok_aKode-engine.so
-lib/trinity/libamarok_daap-mediadevice.la
-lib/trinity/libamarok_daap-mediadevice.so
-lib/trinity/libamarok_generic-mediadevice.la
-lib/trinity/libamarok_generic-mediadevice.so
-lib/trinity/libamarok_ipod-mediadevice.la
-lib/trinity/libamarok_ipod-mediadevice.so
-lib/trinity/libamarok_massstorage-device.la
-lib/trinity/libamarok_massstorage-device.so
-lib/trinity/libamarok_mtp-mediadevice.la
-lib/trinity/libamarok_mtp-mediadevice.so
-lib/trinity/libamarok_nfs-device.la
-lib/trinity/libamarok_nfs-device.so
-lib/trinity/libamarok_njb-mediadevice.la
-lib/trinity/libamarok_njb-mediadevice.so
-lib/trinity/libamarok_smb-device.la
-lib/trinity/libamarok_smb-device.so
-lib/trinity/libamarok_void-engine_plugin.la
-lib/trinity/libamarok_void-engine_plugin.so
-lib/trinity/libamarok_xine-engine.la
-lib/trinity/libamarok_xine-engine.so
-lib/trinity/libamarok_yauap-engine_plugin.la
-lib/trinity/libamarok_yauap-engine_plugin.so
-share/applications/tde/amarok.desktop
-share/apps/amarok/amarokui.rc
-share/apps/amarok/data/Amarok_1.4_Welcome.ogg
-share/apps/amarok/data/Cool-Streams.xml
-share/apps/amarok/data/ball.png
-share/apps/amarok/data/dot.png
-share/apps/amarok/data/equalizer_presets.xml
-share/apps/amarok/data/firstrun.m3u
-share/apps/amarok/data/grid.png
-share/apps/amarok/data/magnatune_logo.png
-share/apps/amarok/data/wirl1.png
-share/apps/amarok/data/wirl2.png
-share/apps/amarok/images/amarok_cut.png
-share/apps/amarok/images/amarok_rocks.jpg
-share/apps/amarok/images/b_next.png
-share/apps/amarok/images/b_pause.png
-share/apps/amarok/images/b_play.png
-share/apps/amarok/images/b_prev.png
-share/apps/amarok/images/b_stop.png
-share/apps/amarok/images/back_stars_grey.png
-share/apps/amarok/images/currenttrack_bar_left.png
-share/apps/amarok/images/currenttrack_bar_mid.png
-share/apps/amarok/images/currenttrack_bar_right.png
-share/apps/amarok/images/currenttrack_pause.png
-share/apps/amarok/images/currenttrack_play.png
-share/apps/amarok/images/currenttrack_repeat.png
-share/apps/amarok/images/currenttrack_repeat_small.png
-share/apps/amarok/images/currenttrack_stop.png
-share/apps/amarok/images/currenttrack_stop_small.png
-share/apps/amarok/images/eq_active2.png
-share/apps/amarok/images/eq_inactive2.png
-share/apps/amarok/images/lastfm.png
-share/apps/amarok/images/loading1.png
-share/apps/amarok/images/loading2.png
-share/apps/amarok/images/menu_sidepixmap.png
-share/apps/amarok/images/more_albums.png
-share/apps/amarok/images/musicbrainz.png
-share/apps/amarok/images/nocover.png
-share/apps/amarok/images/pl_active2.png
-share/apps/amarok/images/pl_inactive2.png
-share/apps/amarok/images/sbinner_stars.png
-share/apps/amarok/images/shadow_albumcover.png
-share/apps/amarok/images/smallstar.png
-share/apps/amarok/images/splash_screen.jpg
-share/apps/amarok/images/star.png
-share/apps/amarok/images/time_minus.png
-share/apps/amarok/images/time_plus.png
-share/apps/amarok/images/vol_speaker.png
-share/apps/amarok/images/volumeslider-gradient.png
-share/apps/amarok/images/volumeslider-handle.png
-share/apps/amarok/images/volumeslider-handle_glow.png
-share/apps/amarok/images/volumeslider-inset.png
-share/apps/amarok/images/wizard_compact.png
-share/apps/amarok/images/wizard_xmms.png
-share/apps/amarok/images/xine_logo.png
-share/apps/amarok/ruby_lib/codes.rb
-share/apps/amarok/ruby_lib/gem_plugin.rb
-share/apps/amarok/ruby_lib/gemconfigure.rb
-share/apps/amarok/ruby_lib/mongrel.rb
-share/apps/amarok/ruby_lib/mongrel/cgi.rb
-share/apps/amarok/ruby_lib/mongrel/command.rb
-share/apps/amarok/ruby_lib/mongrel/configurator.rb
-share/apps/amarok/ruby_lib/mongrel/debug.rb
-share/apps/amarok/ruby_lib/mongrel/handlers.rb
-share/apps/amarok/ruby_lib/mongrel/init.rb
-share/apps/amarok/ruby_lib/mongrel/mime_types.yml
-share/apps/amarok/ruby_lib/mongrel/stats.rb
-share/apps/amarok/ruby_lib/mongrel/tcphack.rb
-share/apps/amarok/ruby_lib/rbconfig/datadir.rb
-share/apps/amarok/ruby_lib/rubygems.rb
-share/apps/amarok/ruby_lib/rubygems/builder.rb
-share/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
-share/apps/amarok/ruby_lib/rubygems/command.rb
-share/apps/amarok/ruby_lib/rubygems/config_file.rb
-share/apps/amarok/ruby_lib/rubygems/custom_require.rb
-share/apps/amarok/ruby_lib/rubygems/dependency_list.rb
-share/apps/amarok/ruby_lib/rubygems/doc_manager.rb
-share/apps/amarok/ruby_lib/rubygems/format.rb
-share/apps/amarok/ruby_lib/rubygems/gem_commands.rb
-share/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
-share/apps/amarok/ruby_lib/rubygems/gem_runner.rb
-share/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
-share/apps/amarok/ruby_lib/rubygems/installer.rb
-share/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
-share/apps/amarok/ruby_lib/rubygems/old_format.rb
-share/apps/amarok/ruby_lib/rubygems/open-uri.rb
-share/apps/amarok/ruby_lib/rubygems/package.rb
-share/apps/amarok/ruby_lib/rubygems/remote_installer.rb
-share/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
-share/apps/amarok/ruby_lib/rubygems/security.rb
-share/apps/amarok/ruby_lib/rubygems/source_index.rb
-share/apps/amarok/ruby_lib/rubygems/specification.rb
-share/apps/amarok/ruby_lib/rubygems/timer.rb
-share/apps/amarok/ruby_lib/rubygems/user_interaction.rb
-share/apps/amarok/ruby_lib/rubygems/validator.rb
-share/apps/amarok/ruby_lib/rubygems/version.rb
-share/apps/amarok/scripts/common/Publisher.py
-share/apps/amarok/scripts/common/Zeroconf.py
-share/apps/amarok/scripts/lyrics_astraweb/README
-share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
-share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
-share/apps/amarok/scripts/lyrics_lyrc/README
-share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
-share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
-share/apps/amarok/scripts/playlist2html/Playlist.py
-share/apps/amarok/scripts/playlist2html/PlaylistServer.py
-share/apps/amarok/scripts/playlist2html/PlaylistServer.spec
-share/apps/amarok/scripts/playlist2html/README
-share/apps/amarok/scripts/playlist2html/playlist2html.py
-share/apps/amarok/scripts/playlist2html/playlist2html.spec
-share/apps/amarok/scripts/ruby_debug/debug.rb
-share/apps/amarok/scripts/score_default/README
-share/apps/amarok/scripts/score_default/score_default.rb
-share/apps/amarok/scripts/score_default/score_default.spec
-share/apps/amarok/scripts/score_impulsive/README
-share/apps/amarok/scripts/score_impulsive/score_impulsive.rb
-share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
-share/apps/amarok/scripts/templates/amarok.rb
-share/apps/amarok/scripts/templates/python_qt_template.py
-share/apps/amarok/scripts/templates/ruby_qt_template.rb
-share/apps/amarok/scripts/webcontrol/Globals.py
-share/apps/amarok/scripts/webcontrol/Playlist.py
-share/apps/amarok/scripts/webcontrol/README
-share/apps/amarok/scripts/webcontrol/RequestHandler.py
-share/apps/amarok/scripts/webcontrol/WebControl.py
-share/apps/amarok/scripts/webcontrol/WebControl.spec
-share/apps/amarok/scripts/webcontrol/WebPublisher.py
-share/apps/amarok/scripts/webcontrol/amarok_cut.png
-share/apps/amarok/scripts/webcontrol/controlbackground.png
-share/apps/amarok/scripts/webcontrol/main.css
-share/apps/amarok/scripts/webcontrol/main.js
-share/apps/amarok/scripts/webcontrol/player_end.png
-share/apps/amarok/scripts/webcontrol/player_pause.png
-share/apps/amarok/scripts/webcontrol/player_play.png
-share/apps/amarok/scripts/webcontrol/player_start.png
-share/apps/amarok/scripts/webcontrol/player_stop.png
-share/apps/amarok/scripts/webcontrol/smallstar.png
-share/apps/amarok/scripts/webcontrol/star.png
-share/apps/amarok/scripts/webcontrol/template.thtml
-share/apps/amarok/scripts/webcontrol/vol_speaker.png
-share/apps/amarok/themes/TDE-lineart/background.png
-share/apps/amarok/themes/TDE-lineart/head.png
-share/apps/amarok/themes/TDE-lineart/stylesheet.css
-share/apps/amarok/themes/example/stylesheet.css
-share/apps/amarok/themes/reinhardt/images/background.png
-share/apps/amarok/themes/reinhardt/images/transparency.png
-share/apps/amarok/themes/reinhardt/stylesheet.css
-share/apps/konqsidebartng/add/amarok.desktop
-share/apps/konqsidebartng/entries/amarok.desktop
-share/apps/konqsidebartng/kicker_entries/amarok.desktop
-share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
-share/apps/konqueror/servicemenus/amarok_append.desktop
-share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-share/apps/profiles/amarok.profile.xml
-share/config.kcfg/amarok.kcfg
-share/config.kcfg/xinecfg.kcfg
-share/config/amarokrc
-share/doc/tde/HTML/da/amarok/advanced.docbook
-share/doc/tde/HTML/da/amarok/common
-share/doc/tde/HTML/da/amarok/config.docbook
-share/doc/tde/HTML/da/amarok/faq.docbook
-share/doc/tde/HTML/da/amarok/index.cache.bz2
-share/doc/tde/HTML/da/amarok/index.docbook
-share/doc/tde/HTML/da/amarok/quick.docbook
-share/doc/tde/HTML/da/amarok/requirements.docbook
-share/doc/tde/HTML/da/amarok/using.docbook
-share/doc/tde/HTML/de/amarok/add_dynamic.png
-share/doc/tde/HTML/de/amarok/advanced.docbook
-share/doc/tde/HTML/de/amarok/amarok_playlist.png
-share/doc/tde/HTML/de/amarok/analyzer.png
-share/doc/tde/HTML/de/amarok/buttons.png
-share/doc/tde/HTML/de/amarok/collection.png
-share/doc/tde/HTML/de/amarok/common
-share/doc/tde/HTML/de/amarok/config.docbook
-share/doc/tde/HTML/de/amarok/config_appearance.png
-share/doc/tde/HTML/de/amarok/config_collection.png
-share/doc/tde/HTML/de/amarok/config_engine.png
-share/doc/tde/HTML/de/amarok/config_general.png
-share/doc/tde/HTML/de/amarok/config_osd.png
-share/doc/tde/HTML/de/amarok/config_playback.png
-share/doc/tde/HTML/de/amarok/config_scrobbler.png
-share/doc/tde/HTML/de/amarok/context.png
-share/doc/tde/HTML/de/amarok/coverman.png
-share/doc/tde/HTML/de/amarok/dynamic_bar.png
-share/doc/tde/HTML/de/amarok/dynamic_settings.png
-share/doc/tde/HTML/de/amarok/equalizer.png
-share/doc/tde/HTML/de/amarok/faq.docbook
-share/doc/tde/HTML/de/amarok/file_browser.png
-share/doc/tde/HTML/de/amarok/index.cache.bz2
-share/doc/tde/HTML/de/amarok/index.docbook
-share/doc/tde/HTML/de/amarok/logo.png
-share/doc/tde/HTML/de/amarok/media_device.png
-share/doc/tde/HTML/de/amarok/menubar.png
-share/doc/tde/HTML/de/amarok/musicbrainz.png
-share/doc/tde/HTML/de/amarok/pl_browser.png
-share/doc/tde/HTML/de/amarok/pl_tip1.png
-share/doc/tde/HTML/de/amarok/play_list.png
-share/doc/tde/HTML/de/amarok/player_window.png
-share/doc/tde/HTML/de/amarok/playlist_browser.png
-share/doc/tde/HTML/de/amarok/playlist_window.png
-share/doc/tde/HTML/de/amarok/queue_manager.png
-share/doc/tde/HTML/de/amarok/quick.docbook
-share/doc/tde/HTML/de/amarok/requirements.docbook
-share/doc/tde/HTML/de/amarok/rmb_menu.png
-share/doc/tde/HTML/de/amarok/script_manager.png
-share/doc/tde/HTML/de/amarok/status_bar.png
-share/doc/tde/HTML/de/amarok/using.docbook
-share/doc/tde/HTML/de/amarok/vis_window.png
-share/doc/tde/HTML/en/amarok/add_dynamic.png
-share/doc/tde/HTML/en/amarok/advanced.docbook
-share/doc/tde/HTML/en/amarok/amarok_playlist.png
-share/doc/tde/HTML/en/amarok/analyzer.png
-share/doc/tde/HTML/en/amarok/buttons.png
-share/doc/tde/HTML/en/amarok/collection.png
-share/doc/tde/HTML/en/amarok/common
-share/doc/tde/HTML/en/amarok/config.docbook
-share/doc/tde/HTML/en/amarok/config_appearance.png
-share/doc/tde/HTML/en/amarok/config_collection.png
-share/doc/tde/HTML/en/amarok/config_engine.png
-share/doc/tde/HTML/en/amarok/config_general.png
-share/doc/tde/HTML/en/amarok/config_osd.png
-share/doc/tde/HTML/en/amarok/config_playback.png
-share/doc/tde/HTML/en/amarok/config_scrobbler.png
-share/doc/tde/HTML/en/amarok/coverman.png
-share/doc/tde/HTML/en/amarok/dynamic_bar.png
-share/doc/tde/HTML/en/amarok/dynamic_settings.png
-share/doc/tde/HTML/en/amarok/equalizer.png
-share/doc/tde/HTML/en/amarok/faq.docbook
-share/doc/tde/HTML/en/amarok/file_browser.png
-share/doc/tde/HTML/en/amarok/index.cache.bz2
-share/doc/tde/HTML/en/amarok/index.docbook
-share/doc/tde/HTML/en/amarok/logo.png
-share/doc/tde/HTML/en/amarok/media_device.png
-share/doc/tde/HTML/en/amarok/menubar.png
-share/doc/tde/HTML/en/amarok/musicbrainz.png
-share/doc/tde/HTML/en/amarok/pl_tip1.png
-share/doc/tde/HTML/en/amarok/play_list.png
-share/doc/tde/HTML/en/amarok/player_window.png
-share/doc/tde/HTML/en/amarok/playlist_browser.png
-share/doc/tde/HTML/en/amarok/playlist_window.png
-share/doc/tde/HTML/en/amarok/queue_manager.png
-share/doc/tde/HTML/en/amarok/quick.docbook
-share/doc/tde/HTML/en/amarok/requirements.docbook
-share/doc/tde/HTML/en/amarok/rmb_menu.png
-share/doc/tde/HTML/en/amarok/script_manager.png
-share/doc/tde/HTML/en/amarok/status_bar.png
-share/doc/tde/HTML/en/amarok/tab_lyrics.png
-share/doc/tde/HTML/en/amarok/tab_music.png
-share/doc/tde/HTML/en/amarok/tab_wiki.png
-share/doc/tde/HTML/en/amarok/using.docbook
-share/doc/tde/HTML/en/amarok/vis_window.png
-share/doc/tde/HTML/es/amarok/add_dynamic.png
-share/doc/tde/HTML/es/amarok/advanced.docbook
-share/doc/tde/HTML/es/amarok/amarok_playlist.png
-share/doc/tde/HTML/es/amarok/analyzer.png
-share/doc/tde/HTML/es/amarok/browser_choice.png
-share/doc/tde/HTML/es/amarok/buttons.png
-share/doc/tde/HTML/es/amarok/collection.png
-share/doc/tde/HTML/es/amarok/common
-share/doc/tde/HTML/es/amarok/config.docbook
-share/doc/tde/HTML/es/amarok/config_appearance.png
-share/doc/tde/HTML/es/amarok/config_collection.png
-share/doc/tde/HTML/es/amarok/config_engine.png
-share/doc/tde/HTML/es/amarok/config_general.png
-share/doc/tde/HTML/es/amarok/config_osd.png
-share/doc/tde/HTML/es/amarok/config_playback.png
-share/doc/tde/HTML/es/amarok/config_scrobbler.png
-share/doc/tde/HTML/es/amarok/context.png
-share/doc/tde/HTML/es/amarok/coverman.png
-share/doc/tde/HTML/es/amarok/dynamic_bar.png
-share/doc/tde/HTML/es/amarok/dynamic_mode1.png
-share/doc/tde/HTML/es/amarok/dynamic_mode2.png
-share/doc/tde/HTML/es/amarok/dynamic_settings.png
-share/doc/tde/HTML/es/amarok/equalizer.png
-share/doc/tde/HTML/es/amarok/faq.docbook
-share/doc/tde/HTML/es/amarok/file_browser.png
-share/doc/tde/HTML/es/amarok/index.cache.bz2
-share/doc/tde/HTML/es/amarok/index.docbook
-share/doc/tde/HTML/es/amarok/logo.png
-share/doc/tde/HTML/es/amarok/media_device.png
-share/doc/tde/HTML/es/amarok/menubar.png
-share/doc/tde/HTML/es/amarok/musicbrainz.png
-share/doc/tde/HTML/es/amarok/pl_browser.png
-share/doc/tde/HTML/es/amarok/pl_tip1.png
-share/doc/tde/HTML/es/amarok/play_list.png
-share/doc/tde/HTML/es/amarok/player_window.png
-share/doc/tde/HTML/es/amarok/playlist_browser.png
-share/doc/tde/HTML/es/amarok/playlist_window.png
-share/doc/tde/HTML/es/amarok/queue_manager.png
-share/doc/tde/HTML/es/amarok/quick.docbook
-share/doc/tde/HTML/es/amarok/requirements.docbook
-share/doc/tde/HTML/es/amarok/rmb_menu.png
-share/doc/tde/HTML/es/amarok/script_manager.png
-share/doc/tde/HTML/es/amarok/status_bar.png
-share/doc/tde/HTML/es/amarok/tab_lyrics.png
-share/doc/tde/HTML/es/amarok/tab_music.png
-share/doc/tde/HTML/es/amarok/tab_wiki.png
-share/doc/tde/HTML/es/amarok/using.docbook
-share/doc/tde/HTML/es/amarok/vis_window.png
-share/doc/tde/HTML/et/amarok/advanced.docbook
-share/doc/tde/HTML/et/amarok/common
-share/doc/tde/HTML/et/amarok/config.docbook
-share/doc/tde/HTML/et/amarok/develop.docbook
-share/doc/tde/HTML/et/amarok/faq.docbook
-share/doc/tde/HTML/et/amarok/feature_guide.docbook
-share/doc/tde/HTML/et/amarok/hidden.docbook
-share/doc/tde/HTML/et/amarok/howto.docbook
-share/doc/tde/HTML/et/amarok/index.cache.bz2
-share/doc/tde/HTML/et/amarok/index.docbook
-share/doc/tde/HTML/et/amarok/plugin.docbook
-share/doc/tde/HTML/et/amarok/quick.docbook
-share/doc/tde/HTML/et/amarok/requirements.docbook
-share/doc/tde/HTML/et/amarok/using.docbook
-share/doc/tde/HTML/fr/amarok/advanced.docbook
-share/doc/tde/HTML/fr/amarok/common
-share/doc/tde/HTML/fr/amarok/config.docbook
-share/doc/tde/HTML/fr/amarok/faq.docbook
-share/doc/tde/HTML/fr/amarok/feature_guide.docbook
-share/doc/tde/HTML/fr/amarok/index.cache.bz2
-share/doc/tde/HTML/fr/amarok/index.docbook
-share/doc/tde/HTML/fr/amarok/quick.docbook
-share/doc/tde/HTML/fr/amarok/requirements.docbook
-share/doc/tde/HTML/fr/amarok/using.docbook
-share/doc/tde/HTML/it/amarok/add_dynamic.png
-share/doc/tde/HTML/it/amarok/advanced.docbook
-share/doc/tde/HTML/it/amarok/amarok_playlist.png
-share/doc/tde/HTML/it/amarok/analyzer.png
-share/doc/tde/HTML/it/amarok/buttons.png
-share/doc/tde/HTML/it/amarok/collection.png
-share/doc/tde/HTML/it/amarok/common
-share/doc/tde/HTML/it/amarok/completo.png
-share/doc/tde/HTML/it/amarok/config.docbook
-share/doc/tde/HTML/it/amarok/config_appearance.png
-share/doc/tde/HTML/it/amarok/config_collection.png
-share/doc/tde/HTML/it/amarok/config_engine.png
-share/doc/tde/HTML/it/amarok/config_general.png
-share/doc/tde/HTML/it/amarok/config_osd.png
-share/doc/tde/HTML/it/amarok/config_playback.png
-share/doc/tde/HTML/it/amarok/config_scrobbler.png
-share/doc/tde/HTML/it/amarok/context.png
-share/doc/tde/HTML/it/amarok/coverman.png
-share/doc/tde/HTML/it/amarok/develop.docbook
-share/doc/tde/HTML/it/amarok/dynamic_bar.png
-share/doc/tde/HTML/it/amarok/dynamic_settings.png
-share/doc/tde/HTML/it/amarok/equalizer.png
-share/doc/tde/HTML/it/amarok/faq.docbook
-share/doc/tde/HTML/it/amarok/feature_guide.docbook
-share/doc/tde/HTML/it/amarok/file_browser.png
-share/doc/tde/HTML/it/amarok/hidden.docbook
-share/doc/tde/HTML/it/amarok/index.cache.bz2
-share/doc/tde/HTML/it/amarok/index.docbook
-share/doc/tde/HTML/it/amarok/media_device.png
-share/doc/tde/HTML/it/amarok/menubar.png
-share/doc/tde/HTML/it/amarok/pl_browser.png
-share/doc/tde/HTML/it/amarok/pl_tip1.png
-share/doc/tde/HTML/it/amarok/play_list.png
-share/doc/tde/HTML/it/amarok/player_window.png
-share/doc/tde/HTML/it/amarok/playlist_browser.png
-share/doc/tde/HTML/it/amarok/playlist_window.png
-share/doc/tde/HTML/it/amarok/plugin.docbook
-share/doc/tde/HTML/it/amarok/queue_manager.png
-share/doc/tde/HTML/it/amarok/quick.docbook
-share/doc/tde/HTML/it/amarok/requirements.docbook
-share/doc/tde/HTML/it/amarok/rmb_menu.png
-share/doc/tde/HTML/it/amarok/script_manager.png
-share/doc/tde/HTML/it/amarok/status_bar.png
-share/doc/tde/HTML/it/amarok/tab_lyrics.png
-share/doc/tde/HTML/it/amarok/tab_music.png
-share/doc/tde/HTML/it/amarok/tab_wiki.png
-share/doc/tde/HTML/it/amarok/using.docbook
-share/doc/tde/HTML/it/amarok/vis_window.png
-share/doc/tde/HTML/nl/amarok/add_dynamic.png
-share/doc/tde/HTML/nl/amarok/advanced.docbook
-share/doc/tde/HTML/nl/amarok/amarok_playlist.png
-share/doc/tde/HTML/nl/amarok/analyzer.png
-share/doc/tde/HTML/nl/amarok/buttons.png
-share/doc/tde/HTML/nl/amarok/collection.png
-share/doc/tde/HTML/nl/amarok/common
-share/doc/tde/HTML/nl/amarok/config.docbook
-share/doc/tde/HTML/nl/amarok/config_appearance.png
-share/doc/tde/HTML/nl/amarok/config_collection.png
-share/doc/tde/HTML/nl/amarok/config_engine.png
-share/doc/tde/HTML/nl/amarok/config_general.png
-share/doc/tde/HTML/nl/amarok/config_osd.png
-share/doc/tde/HTML/nl/amarok/config_playback.png
-share/doc/tde/HTML/nl/amarok/config_scrobbler.png
-share/doc/tde/HTML/nl/amarok/context.png
-share/doc/tde/HTML/nl/amarok/coverman.png
-share/doc/tde/HTML/nl/amarok/develop.docbook
-share/doc/tde/HTML/nl/amarok/dynamic_bar.png
-share/doc/tde/HTML/nl/amarok/dynamic_settings.png
-share/doc/tde/HTML/nl/amarok/equalizer.png
-share/doc/tde/HTML/nl/amarok/faq.docbook
-share/doc/tde/HTML/nl/amarok/feature_guide.docbook
-share/doc/tde/HTML/nl/amarok/file_browser.png
-share/doc/tde/HTML/nl/amarok/hidden.docbook
-share/doc/tde/HTML/nl/amarok/index.cache.bz2
-share/doc/tde/HTML/nl/amarok/index.docbook
-share/doc/tde/HTML/nl/amarok/logo.png
-share/doc/tde/HTML/nl/amarok/media_device.png
-share/doc/tde/HTML/nl/amarok/menubar.png
-share/doc/tde/HTML/nl/amarok/musicbrainz.png
-share/doc/tde/HTML/nl/amarok/pl_browser.png
-share/doc/tde/HTML/nl/amarok/pl_tip1.png
-share/doc/tde/HTML/nl/amarok/play_list.png
-share/doc/tde/HTML/nl/amarok/player_window.png
-share/doc/tde/HTML/nl/amarok/playlist_browser.png
-share/doc/tde/HTML/nl/amarok/playlist_window.png
-share/doc/tde/HTML/nl/amarok/plugin.docbook
-share/doc/tde/HTML/nl/amarok/queue_manager.png
-share/doc/tde/HTML/nl/amarok/quick.docbook
-share/doc/tde/HTML/nl/amarok/requirements.docbook
-share/doc/tde/HTML/nl/amarok/rmb_menu.png
-share/doc/tde/HTML/nl/amarok/script_manager.png
-share/doc/tde/HTML/nl/amarok/status_bar.png
-share/doc/tde/HTML/nl/amarok/tab_lyrics.png
-share/doc/tde/HTML/nl/amarok/tab_lyrics1.png
-share/doc/tde/HTML/nl/amarok/tab_music.png
-share/doc/tde/HTML/nl/amarok/tab_wiki.png
-share/doc/tde/HTML/nl/amarok/using.docbook
-share/doc/tde/HTML/nl/amarok/vis_window.png
-share/doc/tde/HTML/pl/amarok/advanced.docbook
-share/doc/tde/HTML/pl/amarok/common
-share/doc/tde/HTML/pl/amarok/config.docbook
-share/doc/tde/HTML/pl/amarok/faq.docbook
-share/doc/tde/HTML/pl/amarok/index.cache.bz2
-share/doc/tde/HTML/pl/amarok/index.docbook
-share/doc/tde/HTML/pl/amarok/quick.docbook
-share/doc/tde/HTML/pl/amarok/requirements.docbook
-share/doc/tde/HTML/pl/amarok/using.docbook
-share/doc/tde/HTML/pt/amarok/add_dynamic.png
-share/doc/tde/HTML/pt/amarok/advanced.docbook
-share/doc/tde/HTML/pt/amarok/amarok_playlist.png
-share/doc/tde/HTML/pt/amarok/analyzer.png
-share/doc/tde/HTML/pt/amarok/buttons.png
-share/doc/tde/HTML/pt/amarok/collection.png
-share/doc/tde/HTML/pt/amarok/common
-share/doc/tde/HTML/pt/amarok/config.docbook
-share/doc/tde/HTML/pt/amarok/config_appearance.png
-share/doc/tde/HTML/pt/amarok/config_collection.png
-share/doc/tde/HTML/pt/amarok/config_engine.png
-share/doc/tde/HTML/pt/amarok/config_general.png
-share/doc/tde/HTML/pt/amarok/config_osd.png
-share/doc/tde/HTML/pt/amarok/config_playback.png
-share/doc/tde/HTML/pt/amarok/config_scrobbler.png
-share/doc/tde/HTML/pt/amarok/coverman.png
-share/doc/tde/HTML/pt/amarok/develop.docbook
-share/doc/tde/HTML/pt/amarok/dynamic_bar.png
-share/doc/tde/HTML/pt/amarok/dynamic_settings.png
-share/doc/tde/HTML/pt/amarok/equalizer.png
-share/doc/tde/HTML/pt/amarok/faq.docbook
-share/doc/tde/HTML/pt/amarok/feature_guide.docbook
-share/doc/tde/HTML/pt/amarok/file_browser.png
-share/doc/tde/HTML/pt/amarok/hidden.docbook
-share/doc/tde/HTML/pt/amarok/index.cache.bz2
-share/doc/tde/HTML/pt/amarok/index.docbook
-share/doc/tde/HTML/pt/amarok/logo.png
-share/doc/tde/HTML/pt/amarok/media_device.png
-share/doc/tde/HTML/pt/amarok/menubar.png
-share/doc/tde/HTML/pt/amarok/musicbrainz.png
-share/doc/tde/HTML/pt/amarok/pl_tip1.png
-share/doc/tde/HTML/pt/amarok/play_list.png
-share/doc/tde/HTML/pt/amarok/player_window.png
-share/doc/tde/HTML/pt/amarok/playlist_browser.png
-share/doc/tde/HTML/pt/amarok/playlist_window.png
-share/doc/tde/HTML/pt/amarok/plugin.docbook
-share/doc/tde/HTML/pt/amarok/queue_manager.png
-share/doc/tde/HTML/pt/amarok/quick.docbook
-share/doc/tde/HTML/pt/amarok/requirements.docbook
-share/doc/tde/HTML/pt/amarok/rmb_menu.png
-share/doc/tde/HTML/pt/amarok/script_manager.png
-share/doc/tde/HTML/pt/amarok/status_bar.png
-share/doc/tde/HTML/pt/amarok/using.docbook
-share/doc/tde/HTML/pt/amarok/vis_window.png
-share/doc/tde/HTML/pt_BR/amarok/advanced.docbook
-share/doc/tde/HTML/pt_BR/amarok/common
-share/doc/tde/HTML/pt_BR/amarok/config.docbook
-share/doc/tde/HTML/pt_BR/amarok/faq.docbook
-share/doc/tde/HTML/pt_BR/amarok/feature_guide.docbook
-share/doc/tde/HTML/pt_BR/amarok/index.cache.bz2
-share/doc/tde/HTML/pt_BR/amarok/index.docbook
-share/doc/tde/HTML/pt_BR/amarok/quick.docbook
-share/doc/tde/HTML/pt_BR/amarok/requirements.docbook
-share/doc/tde/HTML/pt_BR/amarok/using.docbook
-share/doc/tde/HTML/ru/amarok/requirements.docbook
-share/doc/tde/HTML/sv/amarok/add_dynamic.png
-share/doc/tde/HTML/sv/amarok/advanced.docbook
-share/doc/tde/HTML/sv/amarok/amarok_playlist.png
-share/doc/tde/HTML/sv/amarok/analyzer.png
-share/doc/tde/HTML/sv/amarok/browser_choice.png
-share/doc/tde/HTML/sv/amarok/buttons.png
-share/doc/tde/HTML/sv/amarok/collection.png
-share/doc/tde/HTML/sv/amarok/common
-share/doc/tde/HTML/sv/amarok/config.docbook
-share/doc/tde/HTML/sv/amarok/config_appearance.png
-share/doc/tde/HTML/sv/amarok/config_collection.png
-share/doc/tde/HTML/sv/amarok/config_colors.png
-share/doc/tde/HTML/sv/amarok/config_engine.png
-share/doc/tde/HTML/sv/amarok/config_fonts.png
-share/doc/tde/HTML/sv/amarok/config_general.png
-share/doc/tde/HTML/sv/amarok/config_mysql.png
-share/doc/tde/HTML/sv/amarok/config_osd.png
-share/doc/tde/HTML/sv/amarok/config_playback.png
-share/doc/tde/HTML/sv/amarok/config_scrobbler.png
-share/doc/tde/HTML/sv/amarok/context.png
-share/doc/tde/HTML/sv/amarok/coverman.png
-share/doc/tde/HTML/sv/amarok/develop.docbook
-share/doc/tde/HTML/sv/amarok/dynamic_bar.png
-share/doc/tde/HTML/sv/amarok/dynamic_settings.png
-share/doc/tde/HTML/sv/amarok/equalizer.png
-share/doc/tde/HTML/sv/amarok/faq.docbook
-share/doc/tde/HTML/sv/amarok/feature_guide.docbook
-share/doc/tde/HTML/sv/amarok/file_browser.png
-share/doc/tde/HTML/sv/amarok/hidden.docbook
-share/doc/tde/HTML/sv/amarok/index.cache.bz2
-share/doc/tde/HTML/sv/amarok/index.docbook
-share/doc/tde/HTML/sv/amarok/media_device.png
-share/doc/tde/HTML/sv/amarok/menubar.png
-share/doc/tde/HTML/sv/amarok/pl_browser.png
-share/doc/tde/HTML/sv/amarok/pl_tip1.png
-share/doc/tde/HTML/sv/amarok/play_list.png
-share/doc/tde/HTML/sv/amarok/player_window.png
-share/doc/tde/HTML/sv/amarok/playlist_browser.png
-share/doc/tde/HTML/sv/amarok/playlist_window.png
-share/doc/tde/HTML/sv/amarok/plugin.docbook
-share/doc/tde/HTML/sv/amarok/queue_manager.png
-share/doc/tde/HTML/sv/amarok/quick.docbook
-share/doc/tde/HTML/sv/amarok/requirements.docbook
-share/doc/tde/HTML/sv/amarok/rmb_menu.png
-share/doc/tde/HTML/sv/amarok/script_manager.png
-share/doc/tde/HTML/sv/amarok/scripts_window.png
-share/doc/tde/HTML/sv/amarok/search.png
-share/doc/tde/HTML/sv/amarok/status_bar.png
-share/doc/tde/HTML/sv/amarok/streams.png
-share/doc/tde/HTML/sv/amarok/using.docbook
-share/doc/tde/HTML/sv/amarok/vis_window.png
-share/doc/tde/HTML/sv/amarok/welcome.png
-share/icons/crystalsvg/16x16/actions/covermanager.png
-share/icons/crystalsvg/16x16/actions/dynamic.png
-share/icons/crystalsvg/16x16/actions/equalizer.png
-share/icons/crystalsvg/16x16/actions/mini_dock.png
-share/icons/crystalsvg/16x16/actions/player_playlist_2.png
-share/icons/crystalsvg/16x16/actions/podcast.png
-share/icons/crystalsvg/16x16/actions/podcast_new.png
-share/icons/crystalsvg/16x16/actions/random.png
-share/icons/crystalsvg/16x16/actions/repeat_playlist.png
-share/icons/crystalsvg/16x16/actions/repeat_track.png
-share/icons/crystalsvg/16x16/actions/visualizations.png
-share/icons/crystalsvg/16x16/actions/wiki.png
-share/icons/crystalsvg/22x22/actions/amarok_podcast.png
-share/icons/crystalsvg/22x22/actions/amarok_podcast_new.png
-share/icons/crystalsvg/22x22/actions/amazon_locale.png
-share/icons/crystalsvg/22x22/actions/dynamic.png
-share/icons/crystalsvg/22x22/actions/player_playlist_2.png
-share/icons/crystalsvg/22x22/actions/random.png
-share/icons/crystalsvg/22x22/actions/repeat_playlist.png
-share/icons/crystalsvg/22x22/actions/visualizations.png
-share/icons/crystalsvg/64x64/actions/dynamic.png
-share/icons/crystalsvg/64x64/actions/podcast.png
-share/icons/crystalsvg/64x64/actions/podcast_new.png
-share/icons/crystalsvg/64x64/actions/random.png
-share/icons/crystalsvg/64x64/actions/repeat_playlist.png
-share/icons/hicolor/128x128/apps/amarok.png
-share/icons/hicolor/16x16/actions/amarok_add_lyrics.png
-share/icons/hicolor/16x16/actions/amarok_add_playlist.png
-share/icons/hicolor/16x16/actions/amarok_album.png
-share/icons/hicolor/16x16/actions/amarok_artist.png
-share/icons/hicolor/16x16/actions/amarok_audioscrobbler.png
-share/icons/hicolor/16x16/actions/amarok_back.png
-share/icons/hicolor/16x16/actions/amarok_burn.png
-share/icons/hicolor/16x16/actions/amarok_change_language.png
-share/icons/hicolor/16x16/actions/amarok_circle.png
-share/icons/hicolor/16x16/actions/amarok_clock.png
-share/icons/hicolor/16x16/actions/amarok_collection.png
-share/icons/hicolor/16x16/actions/amarok_configure.png
-share/icons/hicolor/16x16/actions/amarok_covermanager.png
-share/icons/hicolor/16x16/actions/amarok_device.png
-share/icons/hicolor/16x16/actions/amarok_download.png
-share/icons/hicolor/16x16/actions/amarok_dynamic.png
-share/icons/hicolor/16x16/actions/amarok_edit-copy.png
-share/icons/hicolor/16x16/actions/amarok_edit.png
-share/icons/hicolor/16x16/actions/amarok_equalizer.png
-share/icons/hicolor/16x16/actions/amarok_external.png
-share/icons/hicolor/16x16/actions/amarok_fastforward.png
-share/icons/hicolor/16x16/actions/amarok_favourite_genres.png
-share/icons/hicolor/16x16/actions/amarok_files.png
-share/icons/hicolor/16x16/actions/amarok_files2.png
-share/icons/hicolor/16x16/actions/amarok_info.png
-share/icons/hicolor/16x16/actions/amarok_lastfm.png
-share/icons/hicolor/16x16/actions/amarok_love.png
-share/icons/hicolor/16x16/actions/amarok_lyrics.png
-share/icons/hicolor/16x16/actions/amarok_magnatune.png
-share/icons/hicolor/16x16/actions/amarok_mostplayed.png
-share/icons/hicolor/16x16/actions/amarok_music.png
-share/icons/hicolor/16x16/actions/amarok_next.png
-share/icons/hicolor/16x16/actions/amarok_pause.png
-share/icons/hicolor/16x16/actions/amarok_play.png
-share/icons/hicolor/16x16/actions/amarok_playlist.png
-share/icons/hicolor/16x16/actions/amarok_playlist_clear.png
-share/icons/hicolor/16x16/actions/amarok_playlist_refresh.png
-share/icons/hicolor/16x16/actions/amarok_podcast.png
-share/icons/hicolor/16x16/actions/amarok_podcast2.png
-share/icons/hicolor/16x16/actions/amarok_queue.png
-share/icons/hicolor/16x16/actions/amarok_random.png
-share/icons/hicolor/16x16/actions/amarok_random_album.png
-share/icons/hicolor/16x16/actions/amarok_random_no.png
-share/icons/hicolor/16x16/actions/amarok_random_track.png
-share/icons/hicolor/16x16/actions/amarok_redo.png
-share/icons/hicolor/16x16/actions/amarok_refresh.png
-share/icons/hicolor/16x16/actions/amarok_remove.png
-share/icons/hicolor/16x16/actions/amarok_remove_from_playlist.png
-share/icons/hicolor/16x16/actions/amarok_repeat_album.png
-share/icons/hicolor/16x16/actions/amarok_repeat_no.png
-share/icons/hicolor/16x16/actions/amarok_repeat_playlist.png
-share/icons/hicolor/16x16/actions/amarok_repeat_track.png
-share/icons/hicolor/16x16/actions/amarok_rescan.png
-share/icons/hicolor/16x16/actions/amarok_rewind.png
-share/icons/hicolor/16x16/actions/amarok_save.png
-share/icons/hicolor/16x16/actions/amarok_scripts.png
-share/icons/hicolor/16x16/actions/amarok_search.png
-share/icons/hicolor/16x16/actions/amarok_settings_engine.png
-share/icons/hicolor/16x16/actions/amarok_settings_general.png
-share/icons/hicolor/16x16/actions/amarok_settings_indicator.png
-share/icons/hicolor/16x16/actions/amarok_settings_playback.png
-share/icons/hicolor/16x16/actions/amarok_settings_view.png
-share/icons/hicolor/16x16/actions/amarok_stop.png
-share/icons/hicolor/16x16/actions/amarok_track.png
-share/icons/hicolor/16x16/actions/amarok_undo.png
-share/icons/hicolor/16x16/actions/amarok_visualizations.png
-share/icons/hicolor/16x16/actions/amarok_zoom.png
-share/icons/hicolor/16x16/actions/collection.png
-share/icons/hicolor/16x16/apps/amarok.png
-share/icons/hicolor/22x22/actions/amarok_add_lyrics.png
-share/icons/hicolor/22x22/actions/amarok_add_playlist.png
-share/icons/hicolor/22x22/actions/amarok_album.png
-share/icons/hicolor/22x22/actions/amarok_artist.png
-share/icons/hicolor/22x22/actions/amarok_audioscrobbler.png
-share/icons/hicolor/22x22/actions/amarok_back.png
-share/icons/hicolor/22x22/actions/amarok_burn.png
-share/icons/hicolor/22x22/actions/amarok_change_language.png
-share/icons/hicolor/22x22/actions/amarok_circle.png
-share/icons/hicolor/22x22/actions/amarok_clock.png
-share/icons/hicolor/22x22/actions/amarok_collection.png
-share/icons/hicolor/22x22/actions/amarok_configure.png
-share/icons/hicolor/22x22/actions/amarok_covermanager.png
-share/icons/hicolor/22x22/actions/amarok_device.png
-share/icons/hicolor/22x22/actions/amarok_download.png
-share/icons/hicolor/22x22/actions/amarok_dynamic.png
-share/icons/hicolor/22x22/actions/amarok_edit-copy.png
-share/icons/hicolor/22x22/actions/amarok_edit.png
-share/icons/hicolor/22x22/actions/amarok_equalizer.png
-share/icons/hicolor/22x22/actions/amarok_external.png
-share/icons/hicolor/22x22/actions/amarok_fastforward.png
-share/icons/hicolor/22x22/actions/amarok_favourite_genres.png
-share/icons/hicolor/22x22/actions/amarok_files.png
-share/icons/hicolor/22x22/actions/amarok_files2.png
-share/icons/hicolor/22x22/actions/amarok_info.png
-share/icons/hicolor/22x22/actions/amarok_lastfm.png
-share/icons/hicolor/22x22/actions/amarok_love.png
-share/icons/hicolor/22x22/actions/amarok_lyrics.png
-share/icons/hicolor/22x22/actions/amarok_magnatune.png
-share/icons/hicolor/22x22/actions/amarok_mostplayed.png
-share/icons/hicolor/22x22/actions/amarok_music.png
-share/icons/hicolor/22x22/actions/amarok_next.png
-share/icons/hicolor/22x22/actions/amarok_pause.png
-share/icons/hicolor/22x22/actions/amarok_play.png
-share/icons/hicolor/22x22/actions/amarok_playlist.png
-share/icons/hicolor/22x22/actions/amarok_playlist_clear.png
-share/icons/hicolor/22x22/actions/amarok_playlist_refresh.png
-share/icons/hicolor/22x22/actions/amarok_podcast.png
-share/icons/hicolor/22x22/actions/amarok_podcast2.png
-share/icons/hicolor/22x22/actions/amarok_queue.png
-share/icons/hicolor/22x22/actions/amarok_random.png
-share/icons/hicolor/22x22/actions/amarok_random_album.png
-share/icons/hicolor/22x22/actions/amarok_random_no.png
-share/icons/hicolor/22x22/actions/amarok_random_track.png
-share/icons/hicolor/22x22/actions/amarok_redo.png
-share/icons/hicolor/22x22/actions/amarok_refresh.png
-share/icons/hicolor/22x22/actions/amarok_remove.png
-share/icons/hicolor/22x22/actions/amarok_remove_from_playlist.png
-share/icons/hicolor/22x22/actions/amarok_repeat_album.png
-share/icons/hicolor/22x22/actions/amarok_repeat_no.png
-share/icons/hicolor/22x22/actions/amarok_repeat_playlist.png
-share/icons/hicolor/22x22/actions/amarok_repeat_track.png
-share/icons/hicolor/22x22/actions/amarok_rescan.png
-share/icons/hicolor/22x22/actions/amarok_rewind.png
-share/icons/hicolor/22x22/actions/amarok_save.png
-share/icons/hicolor/22x22/actions/amarok_scripts.png
-share/icons/hicolor/22x22/actions/amarok_search.png
-share/icons/hicolor/22x22/actions/amarok_settings_engine.png
-share/icons/hicolor/22x22/actions/amarok_settings_general.png
-share/icons/hicolor/22x22/actions/amarok_settings_indicator.png
-share/icons/hicolor/22x22/actions/amarok_settings_playback.png
-share/icons/hicolor/22x22/actions/amarok_settings_view.png
-share/icons/hicolor/22x22/actions/amarok_stop.png
-share/icons/hicolor/22x22/actions/amarok_track.png
-share/icons/hicolor/22x22/actions/amarok_undo.png
-share/icons/hicolor/22x22/actions/amarok_visualizations.png
-share/icons/hicolor/22x22/actions/amarok_zoom.png
-share/icons/hicolor/22x22/actions/collection.png
-share/icons/hicolor/22x22/apps/amarok.png
-share/icons/hicolor/32x32/actions/amarok_add_lyrics.png
-share/icons/hicolor/32x32/actions/amarok_add_playlist.png
-share/icons/hicolor/32x32/actions/amarok_album.png
-share/icons/hicolor/32x32/actions/amarok_artist.png
-share/icons/hicolor/32x32/actions/amarok_audioscrobbler.png
-share/icons/hicolor/32x32/actions/amarok_back.png
-share/icons/hicolor/32x32/actions/amarok_burn.png
-share/icons/hicolor/32x32/actions/amarok_change_language.png
-share/icons/hicolor/32x32/actions/amarok_circle.png
-share/icons/hicolor/32x32/actions/amarok_clock.png
-share/icons/hicolor/32x32/actions/amarok_collection.png
-share/icons/hicolor/32x32/actions/amarok_configure.png
-share/icons/hicolor/32x32/actions/amarok_covermanager.png
-share/icons/hicolor/32x32/actions/amarok_device.png
-share/icons/hicolor/32x32/actions/amarok_download.png
-share/icons/hicolor/32x32/actions/amarok_dynamic.png
-share/icons/hicolor/32x32/actions/amarok_edit-copy.png
-share/icons/hicolor/32x32/actions/amarok_edit.png
-share/icons/hicolor/32x32/actions/amarok_equalizer.png
-share/icons/hicolor/32x32/actions/amarok_external.png
-share/icons/hicolor/32x32/actions/amarok_fastforward.png
-share/icons/hicolor/32x32/actions/amarok_favourite_genres.png
-share/icons/hicolor/32x32/actions/amarok_files.png
-share/icons/hicolor/32x32/actions/amarok_files2.png
-share/icons/hicolor/32x32/actions/amarok_info.png
-share/icons/hicolor/32x32/actions/amarok_lastfm.png
-share/icons/hicolor/32x32/actions/amarok_love.png
-share/icons/hicolor/32x32/actions/amarok_lyrics.png
-share/icons/hicolor/32x32/actions/amarok_magnatune.png
-share/icons/hicolor/32x32/actions/amarok_mostplayed.png
-share/icons/hicolor/32x32/actions/amarok_music.png
-share/icons/hicolor/32x32/actions/amarok_next.png
-share/icons/hicolor/32x32/actions/amarok_pause.png
-share/icons/hicolor/32x32/actions/amarok_play.png
-share/icons/hicolor/32x32/actions/amarok_playlist.png
-share/icons/hicolor/32x32/actions/amarok_playlist_clear.png
-share/icons/hicolor/32x32/actions/amarok_playlist_refresh.png
-share/icons/hicolor/32x32/actions/amarok_podcast.png
-share/icons/hicolor/32x32/actions/amarok_podcast2.png
-share/icons/hicolor/32x32/actions/amarok_queue.png
-share/icons/hicolor/32x32/actions/amarok_random.png
-share/icons/hicolor/32x32/actions/amarok_random_album.png
-share/icons/hicolor/32x32/actions/amarok_random_no.png
-share/icons/hicolor/32x32/actions/amarok_random_track.png
-share/icons/hicolor/32x32/actions/amarok_redo.png
-share/icons/hicolor/32x32/actions/amarok_refresh.png
-share/icons/hicolor/32x32/actions/amarok_remove.png
-share/icons/hicolor/32x32/actions/amarok_remove_from_playlist.png
-share/icons/hicolor/32x32/actions/amarok_repeat_album.png
-share/icons/hicolor/32x32/actions/amarok_repeat_no.png
-share/icons/hicolor/32x32/actions/amarok_repeat_playlist.png
-share/icons/hicolor/32x32/actions/amarok_repeat_track.png
-share/icons/hicolor/32x32/actions/amarok_rescan.png
-share/icons/hicolor/32x32/actions/amarok_rewind.png
-share/icons/hicolor/32x32/actions/amarok_save.png
-share/icons/hicolor/32x32/actions/amarok_scripts.png
-share/icons/hicolor/32x32/actions/amarok_search.png
-share/icons/hicolor/32x32/actions/amarok_settings_engine.png
-share/icons/hicolor/32x32/actions/amarok_settings_general.png
-share/icons/hicolor/32x32/actions/amarok_settings_indicator.png
-share/icons/hicolor/32x32/actions/amarok_settings_playback.png
-share/icons/hicolor/32x32/actions/amarok_settings_view.png
-share/icons/hicolor/32x32/actions/amarok_stop.png
-share/icons/hicolor/32x32/actions/amarok_track.png
-share/icons/hicolor/32x32/actions/amarok_undo.png
-share/icons/hicolor/32x32/actions/amarok_visualizations.png
-share/icons/hicolor/32x32/actions/amarok_zoom.png
-share/icons/hicolor/32x32/actions/audioscrobbler.png
-share/icons/hicolor/32x32/actions/collection.png
-share/icons/hicolor/32x32/apps/amarok.png
-share/icons/hicolor/48x48/actions/amarok_add_lyrics.png
-share/icons/hicolor/48x48/actions/amarok_add_playlist.png
-share/icons/hicolor/48x48/actions/amarok_album.png
-share/icons/hicolor/48x48/actions/amarok_artist.png
-share/icons/hicolor/48x48/actions/amarok_audioscrobbler.png
-share/icons/hicolor/48x48/actions/amarok_back.png
-share/icons/hicolor/48x48/actions/amarok_burn.png
-share/icons/hicolor/48x48/actions/amarok_change_language.png
-share/icons/hicolor/48x48/actions/amarok_circle.png
-share/icons/hicolor/48x48/actions/amarok_clock.png
-share/icons/hicolor/48x48/actions/amarok_collection.png
-share/icons/hicolor/48x48/actions/amarok_configure.png
-share/icons/hicolor/48x48/actions/amarok_covermanager.png
-share/icons/hicolor/48x48/actions/amarok_device.png
-share/icons/hicolor/48x48/actions/amarok_download.png
-share/icons/hicolor/48x48/actions/amarok_dynamic.png
-share/icons/hicolor/48x48/actions/amarok_edit-copy.png
-share/icons/hicolor/48x48/actions/amarok_edit.png
-share/icons/hicolor/48x48/actions/amarok_equalizer.png
-share/icons/hicolor/48x48/actions/amarok_external.png
-share/icons/hicolor/48x48/actions/amarok_fastforward.png
-share/icons/hicolor/48x48/actions/amarok_favourite_genres.png
-share/icons/hicolor/48x48/actions/amarok_files.png
-share/icons/hicolor/48x48/actions/amarok_files2.png
-share/icons/hicolor/48x48/actions/amarok_info.png
-share/icons/hicolor/48x48/actions/amarok_lastfm.png
-share/icons/hicolor/48x48/actions/amarok_love.png
-share/icons/hicolor/48x48/actions/amarok_lyrics.png
-share/icons/hicolor/48x48/actions/amarok_magnatune.png
-share/icons/hicolor/48x48/actions/amarok_mostplayed.png
-share/icons/hicolor/48x48/actions/amarok_music.png
-share/icons/hicolor/48x48/actions/amarok_next.png
-share/icons/hicolor/48x48/actions/amarok_pause.png
-share/icons/hicolor/48x48/actions/amarok_play.png
-share/icons/hicolor/48x48/actions/amarok_playlist.png
-share/icons/hicolor/48x48/actions/amarok_playlist_clear.png
-share/icons/hicolor/48x48/actions/amarok_playlist_refresh.png
-share/icons/hicolor/48x48/actions/amarok_podcast.png
-share/icons/hicolor/48x48/actions/amarok_podcast2.png
-share/icons/hicolor/48x48/actions/amarok_queue.png
-share/icons/hicolor/48x48/actions/amarok_random.png
-share/icons/hicolor/48x48/actions/amarok_random_album.png
-share/icons/hicolor/48x48/actions/amarok_random_no.png
-share/icons/hicolor/48x48/actions/amarok_random_track.png
-share/icons/hicolor/48x48/actions/amarok_redo.png
-share/icons/hicolor/48x48/actions/amarok_refresh.png
-share/icons/hicolor/48x48/actions/amarok_remove.png
-share/icons/hicolor/48x48/actions/amarok_remove_from_playlist.png
-share/icons/hicolor/48x48/actions/amarok_repeat_album.png
-share/icons/hicolor/48x48/actions/amarok_repeat_no.png
-share/icons/hicolor/48x48/actions/amarok_repeat_playlist.png
-share/icons/hicolor/48x48/actions/amarok_repeat_track.png
-share/icons/hicolor/48x48/actions/amarok_rescan.png
-share/icons/hicolor/48x48/actions/amarok_rewind.png
-share/icons/hicolor/48x48/actions/amarok_save.png
-share/icons/hicolor/48x48/actions/amarok_scripts.png
-share/icons/hicolor/48x48/actions/amarok_search.png
-share/icons/hicolor/48x48/actions/amarok_settings_engine.png
-share/icons/hicolor/48x48/actions/amarok_settings_general.png
-share/icons/hicolor/48x48/actions/amarok_settings_indicator.png
-share/icons/hicolor/48x48/actions/amarok_settings_playback.png
-share/icons/hicolor/48x48/actions/amarok_settings_view.png
-share/icons/hicolor/48x48/actions/amarok_stop.png
-share/icons/hicolor/48x48/actions/amarok_track.png
-share/icons/hicolor/48x48/actions/amarok_undo.png
-share/icons/hicolor/48x48/actions/amarok_visualizations.png
-share/icons/hicolor/48x48/actions/amarok_zoom.png
-share/icons/hicolor/48x48/actions/collection.png
-share/icons/hicolor/48x48/apps/amarok.png
-share/icons/hicolor/64x64/actions/amarok_add_lyrics.png
-share/icons/hicolor/64x64/actions/amarok_add_playlist.png
-share/icons/hicolor/64x64/actions/amarok_album.png
-share/icons/hicolor/64x64/actions/amarok_artist.png
-share/icons/hicolor/64x64/actions/amarok_audioscrobbler.png
-share/icons/hicolor/64x64/actions/amarok_back.png
-share/icons/hicolor/64x64/actions/amarok_burn.png
-share/icons/hicolor/64x64/actions/amarok_change_language.png
-share/icons/hicolor/64x64/actions/amarok_circle.png
-share/icons/hicolor/64x64/actions/amarok_clock.png
-share/icons/hicolor/64x64/actions/amarok_collection.png
-share/icons/hicolor/64x64/actions/amarok_configure.png
-share/icons/hicolor/64x64/actions/amarok_covermanager.png
-share/icons/hicolor/64x64/actions/amarok_device.png
-share/icons/hicolor/64x64/actions/amarok_download.png
-share/icons/hicolor/64x64/actions/amarok_dynamic.png
-share/icons/hicolor/64x64/actions/amarok_edit-copy.png
-share/icons/hicolor/64x64/actions/amarok_edit.png
-share/icons/hicolor/64x64/actions/amarok_equalizer.png
-share/icons/hicolor/64x64/actions/amarok_external.png
-share/icons/hicolor/64x64/actions/amarok_fastforward.png
-share/icons/hicolor/64x64/actions/amarok_favourite_genres.png
-share/icons/hicolor/64x64/actions/amarok_files.png
-share/icons/hicolor/64x64/actions/amarok_files2.png
-share/icons/hicolor/64x64/actions/amarok_info.png
-share/icons/hicolor/64x64/actions/amarok_love.png
-share/icons/hicolor/64x64/actions/amarok_lyrics.png
-share/icons/hicolor/64x64/actions/amarok_magnatune.png
-share/icons/hicolor/64x64/actions/amarok_mostplayed.png
-share/icons/hicolor/64x64/actions/amarok_music.png
-share/icons/hicolor/64x64/actions/amarok_next.png
-share/icons/hicolor/64x64/actions/amarok_pause.png
-share/icons/hicolor/64x64/actions/amarok_play.png
-share/icons/hicolor/64x64/actions/amarok_playlist.png
-share/icons/hicolor/64x64/actions/amarok_playlist_clear.png
-share/icons/hicolor/64x64/actions/amarok_playlist_refresh.png
-share/icons/hicolor/64x64/actions/amarok_podcast.png
-share/icons/hicolor/64x64/actions/amarok_podcast2.png
-share/icons/hicolor/64x64/actions/amarok_queue.png
-share/icons/hicolor/64x64/actions/amarok_random.png
-share/icons/hicolor/64x64/actions/amarok_random_album.png
-share/icons/hicolor/64x64/actions/amarok_random_no.png
-share/icons/hicolor/64x64/actions/amarok_random_track.png
-share/icons/hicolor/64x64/actions/amarok_redo.png
-share/icons/hicolor/64x64/actions/amarok_refresh.png
-share/icons/hicolor/64x64/actions/amarok_remove.png
-share/icons/hicolor/64x64/actions/amarok_remove_from_playlist.png
-share/icons/hicolor/64x64/actions/amarok_repeat_album.png
-share/icons/hicolor/64x64/actions/amarok_repeat_no.png
-share/icons/hicolor/64x64/actions/amarok_repeat_playlist.png
-share/icons/hicolor/64x64/actions/amarok_repeat_track.png
-share/icons/hicolor/64x64/actions/amarok_rescan.png
-share/icons/hicolor/64x64/actions/amarok_rewind.png
-share/icons/hicolor/64x64/actions/amarok_save.png
-share/icons/hicolor/64x64/actions/amarok_scripts.png
-share/icons/hicolor/64x64/actions/amarok_search.png
-share/icons/hicolor/64x64/actions/amarok_settings_engine.png
-share/icons/hicolor/64x64/actions/amarok_settings_general.png
-share/icons/hicolor/64x64/actions/amarok_settings_indicator.png
-share/icons/hicolor/64x64/actions/amarok_settings_playback.png
-share/icons/hicolor/64x64/actions/amarok_settings_view.png
-share/icons/hicolor/64x64/actions/amarok_stop.png
-share/icons/hicolor/64x64/actions/amarok_track.png
-share/icons/hicolor/64x64/actions/amarok_undo.png
-share/icons/hicolor/64x64/actions/amarok_visualizations.png
-share/icons/hicolor/64x64/actions/amarok_zoom.png
-share/icons/hicolor/64x64/actions/collection.png
-share/icons/hicolor/64x64/apps/amarok.png
-share/locale/af/LC_MESSAGES/amarok.mo
-share/locale/ar/LC_MESSAGES/amarok.mo
-share/locale/az/LC_MESSAGES/amarok.mo
-share/locale/be/LC_MESSAGES/amarok.mo
-share/locale/bg/LC_MESSAGES/amarok.mo
-share/locale/bn/LC_MESSAGES/amarok.mo
-share/locale/br/LC_MESSAGES/amarok.mo
-share/locale/ca/LC_MESSAGES/amarok.mo
-share/locale/cs/LC_MESSAGES/amarok.mo
-share/locale/cy/LC_MESSAGES/amarok.mo
-share/locale/da/LC_MESSAGES/amarok.mo
-share/locale/de/LC_MESSAGES/amarok.mo
-share/locale/el/LC_MESSAGES/amarok.mo
-share/locale/en_GB/LC_MESSAGES/amarok.mo
-share/locale/eo/LC_MESSAGES/amarok.mo
-share/locale/es/LC_MESSAGES/amarok.mo
-share/locale/et/LC_MESSAGES/amarok.mo
-share/locale/eu/LC_MESSAGES/amarok.mo
-share/locale/fa/LC_MESSAGES/amarok.mo
-share/locale/fi/LC_MESSAGES/amarok.mo
-share/locale/fr/LC_MESSAGES/amarok.mo
-share/locale/ga/LC_MESSAGES/amarok.mo
-share/locale/gl/LC_MESSAGES/amarok.mo
-share/locale/he/LC_MESSAGES/amarok.mo
-share/locale/hi/LC_MESSAGES/amarok.mo
-share/locale/hu/LC_MESSAGES/amarok.mo
-share/locale/id/LC_MESSAGES/amarok.mo
-share/locale/is/LC_MESSAGES/amarok.mo
-share/locale/it/LC_MESSAGES/amarok.mo
-share/locale/ja/LC_MESSAGES/amarok.mo
-share/locale/ka/LC_MESSAGES/amarok.mo
-share/locale/km/LC_MESSAGES/amarok.mo
-share/locale/ko/LC_MESSAGES/amarok.mo
-share/locale/ku/LC_MESSAGES/amarok.mo
-share/locale/lo/LC_MESSAGES/amarok.mo
-share/locale/lt/LC_MESSAGES/amarok.mo
-share/locale/mk/LC_MESSAGES/amarok.mo
-share/locale/ms/LC_MESSAGES/amarok.mo
-share/locale/nb/LC_MESSAGES/amarok.mo
-share/locale/nds/LC_MESSAGES/amarok.mo
-share/locale/ne/LC_MESSAGES/amarok.mo
-share/locale/nl/LC_MESSAGES/amarok.mo
-share/locale/nn/LC_MESSAGES/amarok.mo
-share/locale/pa/LC_MESSAGES/amarok.mo
-share/locale/pl/LC_MESSAGES/amarok.mo
-share/locale/pt/LC_MESSAGES/amarok.mo
-share/locale/pt_BR/LC_MESSAGES/amarok.mo
-share/locale/ro/LC_MESSAGES/amarok.mo
-share/locale/ru/LC_MESSAGES/amarok.mo
-share/locale/rw/LC_MESSAGES/amarok.mo
-share/locale/se/LC_MESSAGES/amarok.mo
-share/locale/sk/LC_MESSAGES/amarok.mo
-share/locale/sl/LC_MESSAGES/amarok.mo
-share/locale/sq/LC_MESSAGES/amarok.mo
-share/locale/sr/LC_MESSAGES/amarok.mo
-share/locale/sr@Latn/LC_MESSAGES/amarok.mo
-share/locale/ss/LC_MESSAGES/amarok.mo
-share/locale/sv/LC_MESSAGES/amarok.mo
-share/locale/ta/LC_MESSAGES/amarok.mo
-share/locale/tg/LC_MESSAGES/amarok.mo
-share/locale/th/LC_MESSAGES/amarok.mo
-share/locale/tr/LC_MESSAGES/amarok.mo
-share/locale/uk/LC_MESSAGES/amarok.mo
-share/locale/uz/LC_MESSAGES/amarok.mo
-share/locale/uz@cyrillic/LC_MESSAGES/amarok.mo
-share/locale/zh_CN/LC_MESSAGES/amarok.mo
-share/locale/zh_TW/LC_MESSAGES/amarok.mo
-share/man/man1/amarok.1.gz
-share/man/man1/amarok_libvisual.1.gz
-share/man/man1/amarokapp.1.gz
-share/man/man1/amarokcollectionscanner.1.gz
-share/services/amarok_aKode-engine.desktop
-share/services/amarok_daap-mediadevice.desktop
-share/services/amarok_generic-mediadevice.desktop
-share/services/amarok_ipod-mediadevice.desktop
-share/services/amarok_massstorage-device.desktop
-share/services/amarok_mtp-mediadevice.desktop
-share/services/amarok_nfs-device.desktop
-share/services/amarok_njb-mediadevice.desktop
-share/services/amarok_smb-device.desktop
-share/services/amarok_void-engine_plugin.desktop
-share/services/amarok_xine-engine.desktop
-share/services/amarok_yauap-engine_plugin.desktop
-share/services/amarokitpc.protocol
-share/services/amaroklastfm.protocol
-share/services/amarokpcast.protocol
-share/servicetypes/amarok_codecinstall.desktop
-share/servicetypes/amarok_plugin.desktop
diff --git a/freebsd/applications/basket/Makefile b/freebsd/applications/basket/Makefile
deleted file mode 100644
index d706b1c1c..000000000
--- a/freebsd/applications/basket/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		basket-trinity
-COMMENT=		Multi-purpose note-taking application for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	b/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		deskutils x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libkontact.so:${PORTSDIR}/x11/trinity/core/tdepim
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libgpgme.so:${PORTSDIR}/security/gpgme \
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/basket/distinfo b/freebsd/applications/basket/distinfo
deleted file mode 100644
index c6f615bfa..000000000
--- a/freebsd/applications/basket/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619438672
-SHA256 (TDE/applications/basket-trinity_14.0.10.orig.tar.xz) = 49f9d1c92550871a38f222250b6d0a574ee550cc365488786c79259faadfb813
-SIZE (TDE/applications/basket-trinity_14.0.10.orig.tar.xz) = 3646916
diff --git a/freebsd/applications/basket/pkg-plist b/freebsd/applications/basket/pkg-plist
deleted file mode 100644
index 4586f04d9..000000000
--- a/freebsd/applications/basket/pkg-plist
+++ /dev/null
@@ -1,125 +0,0 @@
-bin/basket
-lib/libbasketcommon.la
-lib/libbasketcommon.so
-lib/trinity/basketthumbcreator.la
-lib/trinity/basketthumbcreator.so
-lib/trinity/kcm_basket.la
-lib/trinity/kcm_basket.so
-lib/trinity/libbasketpart.la
-lib/trinity/libbasketpart.so
-lib/trinity/libkontact_basket.la
-lib/trinity/libkontact_basket.so
-share/applications/tde/basket.desktop
-share/apps/basket/backgrounds/abstract.png
-share/apps/basket/backgrounds/alien-artifact.png
-share/apps/basket/backgrounds/alien-artifact.png.config
-share/apps/basket/backgrounds/basket-title.png
-share/apps/basket/backgrounds/green-curves.png
-share/apps/basket/backgrounds/light.png
-share/apps/basket/backgrounds/painting.png
-share/apps/basket/backgrounds/pens.png
-share/apps/basket/backgrounds/pins.png
-share/apps/basket/backgrounds/previews/abstract.png
-share/apps/basket/backgrounds/previews/alien-artifact.png
-share/apps/basket/backgrounds/previews/basket-title.png
-share/apps/basket/backgrounds/previews/green-curves.png
-share/apps/basket/backgrounds/previews/light.png
-share/apps/basket/backgrounds/previews/painting.png
-share/apps/basket/backgrounds/previews/pens.png
-share/apps/basket/backgrounds/previews/pins.png
-share/apps/basket/backgrounds/previews/rainbow-balls.png
-share/apps/basket/backgrounds/previews/rounds-line.png
-share/apps/basket/backgrounds/previews/strings.png
-share/apps/basket/backgrounds/previews/todo.png
-share/apps/basket/backgrounds/previews/working.png
-share/apps/basket/backgrounds/rainbow-balls.png
-share/apps/basket/backgrounds/rounds-line.png
-share/apps/basket/backgrounds/strings.png
-share/apps/basket/backgrounds/todo.png
-share/apps/basket/backgrounds/working.png
-share/apps/basket/basket_part.rc
-share/apps/basket/basketui.rc
-share/apps/basket/images/insertion_help.png
-share/apps/basket/images/tag_export_help.png
-share/apps/basket/images/tag_export_on_every_lines_help.png
-share/apps/basket/welcome/Welcome_de.baskets
-share/apps/basket/welcome/Welcome_en_US.baskets
-share/apps/basket/welcome/Welcome_fr.baskets
-share/apps/basket/welcome/Welcome_it.baskets
-share/apps/basket/welcome/Welcome_ja.baskets
-share/apps/basket/welcome/Welcome_nn.baskets
-share/apps/basket/welcome/Welcome_pt.baskets
-share/apps/basket/welcome/Welcome_ru.baskets
-share/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
-share/config/magic/basket.magic
-share/config/magic/basket.magic.mgc
-share/doc/tde/HTML/en/basket/common
-share/doc/tde/HTML/en/basket/index.cache.bz2
-share/doc/tde/HTML/en/basket/index.docbook
-share/icons/crystalsvg/128x128/apps/basket.png
-share/icons/crystalsvg/128x128/mimetypes/baskets.png
-share/icons/crystalsvg/128x128/mimetypes/baskett.png
-share/icons/crystalsvg/16x16/actions/likeback_bug.png
-share/icons/crystalsvg/16x16/actions/likeback_dislike.png
-share/icons/crystalsvg/16x16/actions/likeback_feature.png
-share/icons/crystalsvg/16x16/actions/likeback_like.png
-share/icons/crystalsvg/16x16/actions/tag_checkbox.png
-share/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
-share/icons/crystalsvg/16x16/actions/tag_for_later.png
-share/icons/crystalsvg/16x16/actions/tag_fun.png
-share/icons/crystalsvg/16x16/actions/tag_important.png
-share/icons/crystalsvg/16x16/actions/tag_preference_bad.png
-share/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
-share/icons/crystalsvg/16x16/actions/tag_preference_good.png
-share/icons/crystalsvg/16x16/actions/tag_priority_high.png
-share/icons/crystalsvg/16x16/actions/tag_priority_low.png
-share/icons/crystalsvg/16x16/actions/tag_priority_medium.png
-share/icons/crystalsvg/16x16/actions/tag_progress_000.png
-share/icons/crystalsvg/16x16/actions/tag_progress_025.png
-share/icons/crystalsvg/16x16/actions/tag_progress_050.png
-share/icons/crystalsvg/16x16/actions/tag_progress_075.png
-share/icons/crystalsvg/16x16/actions/tag_progress_100.png
-share/icons/crystalsvg/16x16/apps/basket.png
-share/icons/crystalsvg/16x16/mimetypes/baskets.png
-share/icons/crystalsvg/16x16/mimetypes/baskett.png
-share/icons/crystalsvg/22x22/apps/basket.png
-share/icons/crystalsvg/22x22/mimetypes/baskets.png
-share/icons/crystalsvg/22x22/mimetypes/baskett.png
-share/icons/crystalsvg/32x32/apps/basket.png
-share/icons/crystalsvg/32x32/mimetypes/baskets.png
-share/icons/crystalsvg/32x32/mimetypes/baskett.png
-share/icons/crystalsvg/48x48/apps/basket.png
-share/icons/crystalsvg/48x48/mimetypes/baskets.png
-share/icons/crystalsvg/48x48/mimetypes/baskett.png
-share/icons/crystalsvg/64x64/apps/basket.png
-share/icons/crystalsvg/64x64/mimetypes/baskets.png
-share/icons/crystalsvg/64x64/mimetypes/baskett.png
-share/icons/crystalsvg/scalable/apps/basket.svg
-share/locale/cs/LC_MESSAGES/basket.mo
-share/locale/da/LC_MESSAGES/basket.mo
-share/locale/de/LC_MESSAGES/basket.mo
-share/locale/es/LC_MESSAGES/basket.mo
-share/locale/fr/LC_MESSAGES/basket.mo
-share/locale/it/LC_MESSAGES/basket.mo
-share/locale/ja/LC_MESSAGES/basket.mo
-share/locale/nl/LC_MESSAGES/basket.mo
-share/locale/nn/LC_MESSAGES/basket.mo
-share/locale/pl_PL/LC_MESSAGES/basket.mo
-share/locale/pt/LC_MESSAGES/basket.mo
-share/locale/ru/LC_MESSAGES/basket.mo
-share/locale/sk/LC_MESSAGES/basket.mo
-share/locale/tr/LC_MESSAGES/basket.mo
-share/locale/uk/LC_MESSAGES/basket.mo
-share/locale/zh_CN/LC_MESSAGES/basket.mo
-share/locale/zh_TW/LC_MESSAGES/basket.mo
-share/man/man1/basket.1.gz
-share/mimelnk/application/x-basket-archive.desktop
-share/mimelnk/application/x-basket-template.desktop
-share/services/basket_config_apps.desktop
-share/services/basket_config_baskets.desktop
-share/services/basket_config_general.desktop
-share/services/basket_config_new_notes.desktop
-share/services/basket_config_notes_appearance.desktop
-share/services/basket_part.desktop
-share/services/basketthumbcreator.desktop
-share/services/kontact/basket.desktop
diff --git a/freebsd/applications/bibletime/Makefile b/freebsd/applications/bibletime/Makefile
deleted file mode 100644
index bdf2adef8..000000000
--- a/freebsd/applications/bibletime/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		bibletime-trinity
-COMMENT=		A bible study tool for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	b/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		misc x11
-DIST_SUBDIR=		TDE/applications
-
-
-# Use gmake for automake build
-USES=	gmake
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/bin/xml2pot:${PORTSDIR}/x11/trinity/core/tdesdk
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libclucene-shared.so:${PORTSDIR}/textproc/clucene \
-		libsword.so:${PORTSDIR}/misc/sword \
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-autotools-prepare
-	${TDE_AUTOTOOLS_CONFIGURE}
-
-do-build: tde-autotools-build
-
-do-install: tde-autotools-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/bibletime/distinfo b/freebsd/applications/bibletime/distinfo
deleted file mode 100644
index 0ba855a2d..000000000
--- a/freebsd/applications/bibletime/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619438860
-SHA256 (TDE/applications/bibletime-trinity_14.0.10.orig.tar.xz) = 005d61f723211d50ea3f8ff56a17979a27836759ff9b7aa4dc0edf8074ab7816
-SIZE (TDE/applications/bibletime-trinity_14.0.10.orig.tar.xz) = 964828
diff --git a/freebsd/applications/codeine/Makefile b/freebsd/applications/codeine/Makefile
deleted file mode 100644
index edeb45c4c..000000000
--- a/freebsd/applications/codeine/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		codeine-trinity
-COMMENT=		Simple TDE video player
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	c/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
-
-LIB_DEPENDS+=	libxine.so:${PORTSDIR}/multimedia/libxine \
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/codeine/distinfo b/freebsd/applications/codeine/distinfo
deleted file mode 100644
index ae95d1cdf..000000000
--- a/freebsd/applications/codeine/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619438987
-SHA256 (TDE/applications/codeine-trinity_14.0.10.orig.tar.xz) = 03f7a115f7f534db124b43601b31fc7796330a87d84b045770728e4bd65de438
-SIZE (TDE/applications/codeine-trinity_14.0.10.orig.tar.xz) = 122448
diff --git a/freebsd/applications/development/Makefile b/freebsd/applications/development/Makefile
new file mode 100644
index 000000000..96e4fcbe4
--- /dev/null
+++ b/freebsd/applications/development/Makefile
@@ -0,0 +1,8 @@
+
+    SUBDIR =
+    SUBDIR += kdbg
+    SUBDIR += kdiff3
+    SUBDIR += kscope
+    SUBDIR += kxmleditor
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/development/kdbg/Makefile b/freebsd/applications/development/kdbg/Makefile
new file mode 100644
index 000000000..eddbb081d
--- /dev/null
+++ b/freebsd/applications/development/kdbg/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kdbg-trinity
+COMMENT=		Graphical debugger interface [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/development
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/development/kdbg/distinfo b/freebsd/applications/development/kdbg/distinfo
new file mode 100644
index 000000000..851a3d80d
--- /dev/null
+++ b/freebsd/applications/development/kdbg/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666617455
+SHA256 (TDE/applications/development/kdbg-trinity_14.0.13.orig.tar.xz) = 3a9015bc79382feb4e2bf436e22bcf8e1ec4a84e078fd014787c938eb7aa80e5
+SIZE (TDE/applications/development/kdbg-trinity_14.0.13.orig.tar.xz) = 217968
diff --git a/freebsd/applications/kdbg/pkg-descr b/freebsd/applications/development/kdbg/pkg-descr
index 1f3049906..1f3049906 100644
--- a/freebsd/applications/kdbg/pkg-descr
+++ b/freebsd/applications/development/kdbg/pkg-descr
diff --git a/freebsd/applications/kdbg/pkg-plist b/freebsd/applications/development/kdbg/pkg-plist
index e37f0cda7..e37f0cda7 100644
--- a/freebsd/applications/kdbg/pkg-plist
+++ b/freebsd/applications/development/kdbg/pkg-plist
diff --git a/freebsd/applications/development/kdiff3/Makefile b/freebsd/applications/development/kdiff3/Makefile
new file mode 100644
index 000000000..2b9c0ecf9
--- /dev/null
+++ b/freebsd/applications/development/kdiff3/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kdiff3-trinity
+COMMENT=		Compares and merges 2 or 3 files or directories
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/development
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libkonq.so:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/development/kdiff3/distinfo b/freebsd/applications/development/kdiff3/distinfo
new file mode 100644
index 000000000..019fadbce
--- /dev/null
+++ b/freebsd/applications/development/kdiff3/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666617504
+SHA256 (TDE/applications/development/kdiff3-trinity_14.0.13.orig.tar.xz) = 49cedee1e288cd4e72c4afb8820a7f83a0c14d4d9a21d2c17a02223fe7660595
+SIZE (TDE/applications/development/kdiff3-trinity_14.0.13.orig.tar.xz) = 747020
diff --git a/freebsd/applications/kdiff3/pkg-descr b/freebsd/applications/development/kdiff3/pkg-descr
index 844f83140..844f83140 100644
--- a/freebsd/applications/kdiff3/pkg-descr
+++ b/freebsd/applications/development/kdiff3/pkg-descr
diff --git a/freebsd/applications/development/kdiff3/pkg-plist b/freebsd/applications/development/kdiff3/pkg-plist
new file mode 100644
index 000000000..4170da36a
--- /dev/null
+++ b/freebsd/applications/development/kdiff3/pkg-plist
@@ -0,0 +1,252 @@
+bin/kdiff3
+lib/trinity/libkdiff3part.la
+lib/trinity/libkdiff3part.so
+lib/trinity/libkdiff3plugin.la
+lib/trinity/libkdiff3plugin.so
+share/applications/tde/kdiff3.desktop
+share/applnk/.hidden/kdiff3plugin.desktop
+share/apps/kdiff3/kdiff3_shell.rc
+share/apps/kdiff3part/kdiff3_part.rc
+share/doc/kdiff3/html/compilation.html
+share/doc/kdiff3/html/credits.html
+share/doc/kdiff3/html/dirbrowser.png
+share/doc/kdiff3/html/dirmerge.html
+share/doc/kdiff3/html/dirmergebig.png
+share/doc/kdiff3/html/dirmergeoptions.html
+share/doc/kdiff3/html/dirmergevisible.html
+share/doc/kdiff3/html/documentation.html
+share/doc/kdiff3/html/dothemerge.html
+share/doc/kdiff3/html/faq.html
+share/doc/kdiff3/html/features.html
+share/doc/kdiff3/html/find.html
+share/doc/kdiff3/html/index.html
+share/doc/kdiff3/html/installation.html
+share/doc/kdiff3/html/interpretinginformation.html
+share/doc/kdiff3/html/introduction.html
+share/doc/kdiff3/html/iteminfo.png
+share/doc/kdiff3/html/kpart.html
+share/doc/kdiff3/html/letter_by_letter.png
+share/doc/kdiff3/html/merge_current.png
+share/doc/kdiff3/html/merging.html
+share/doc/kdiff3/html/misc.html
+share/doc/kdiff3/html/navigation.html
+share/doc/kdiff3/html/new.png
+share/doc/kdiff3/html/open_dialog.png
+share/doc/kdiff3/html/opendialog.html
+share/doc/kdiff3/html/options.html
+share/doc/kdiff3/html/other.html
+share/doc/kdiff3/html/pasteinput.html
+share/doc/kdiff3/html/preprocessors.html
+share/doc/kdiff3/html/printing.html
+share/doc/kdiff3/html/requirements.html
+share/doc/kdiff3/html/saving.html
+share/doc/kdiff3/html/screenshot_diff.png
+share/doc/kdiff3/html/screenshot_merge.png
+share/doc/kdiff3/html/screenshots.html
+share/doc/kdiff3/html/selections.html
+share/doc/kdiff3/html/startingdirmerge.html
+share/doc/kdiff3/html/triple_diff.png
+share/doc/kdiff3/html/white_space.png
+share/doc/tde/HTML/da/kdiff3/common
+share/doc/tde/HTML/da/kdiff3/dirbrowser.png
+share/doc/tde/HTML/da/kdiff3/dirmergebig.png
+share/doc/tde/HTML/da/kdiff3/index.cache.bz2
+share/doc/tde/HTML/da/kdiff3/index.docbook
+share/doc/tde/HTML/da/kdiff3/iteminfo.png
+share/doc/tde/HTML/da/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/da/kdiff3/merge_current.png
+share/doc/tde/HTML/da/kdiff3/new.png
+share/doc/tde/HTML/da/kdiff3/open_dialog.png
+share/doc/tde/HTML/da/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/da/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/da/kdiff3/triple_diff.png
+share/doc/tde/HTML/da/kdiff3/white_space.png
+share/doc/tde/HTML/de/kdiff3/common
+share/doc/tde/HTML/de/kdiff3/dirbrowser.png
+share/doc/tde/HTML/de/kdiff3/dirmergebig.png
+share/doc/tde/HTML/de/kdiff3/index.cache.bz2
+share/doc/tde/HTML/de/kdiff3/index.docbook
+share/doc/tde/HTML/de/kdiff3/iteminfo.png
+share/doc/tde/HTML/de/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/de/kdiff3/merge_current.png
+share/doc/tde/HTML/de/kdiff3/new.png
+share/doc/tde/HTML/de/kdiff3/open_dialog.png
+share/doc/tde/HTML/de/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/de/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/de/kdiff3/triple_diff.png
+share/doc/tde/HTML/de/kdiff3/white_space.png
+share/doc/tde/HTML/en/kdiff3/common
+share/doc/tde/HTML/en/kdiff3/dirbrowser.png
+share/doc/tde/HTML/en/kdiff3/dirmergebig.png
+share/doc/tde/HTML/en/kdiff3/index.cache.bz2
+share/doc/tde/HTML/en/kdiff3/index.docbook
+share/doc/tde/HTML/en/kdiff3/iteminfo.png
+share/doc/tde/HTML/en/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/en/kdiff3/merge_current.png
+share/doc/tde/HTML/en/kdiff3/new.png
+share/doc/tde/HTML/en/kdiff3/open_dialog.png
+share/doc/tde/HTML/en/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/en/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/en/kdiff3/triple_diff.png
+share/doc/tde/HTML/en/kdiff3/white_space.png
+share/doc/tde/HTML/es/kdiff3/common
+share/doc/tde/HTML/es/kdiff3/dirbrowser.png
+share/doc/tde/HTML/es/kdiff3/dirmergebig.png
+share/doc/tde/HTML/es/kdiff3/index.cache.bz2
+share/doc/tde/HTML/es/kdiff3/index.docbook
+share/doc/tde/HTML/es/kdiff3/iteminfo.png
+share/doc/tde/HTML/es/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/es/kdiff3/merge_current.png
+share/doc/tde/HTML/es/kdiff3/new.png
+share/doc/tde/HTML/es/kdiff3/open_dialog.png
+share/doc/tde/HTML/es/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/es/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/es/kdiff3/triple_diff.png
+share/doc/tde/HTML/es/kdiff3/white_space.png
+share/doc/tde/HTML/et/kdiff3/common
+share/doc/tde/HTML/et/kdiff3/dirbrowser.png
+share/doc/tde/HTML/et/kdiff3/dirmergebig.png
+share/doc/tde/HTML/et/kdiff3/index.cache.bz2
+share/doc/tde/HTML/et/kdiff3/index.docbook
+share/doc/tde/HTML/et/kdiff3/iteminfo.png
+share/doc/tde/HTML/et/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/et/kdiff3/merge_current.png
+share/doc/tde/HTML/et/kdiff3/new.png
+share/doc/tde/HTML/et/kdiff3/open_dialog.png
+share/doc/tde/HTML/et/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/et/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/et/kdiff3/triple_diff.png
+share/doc/tde/HTML/et/kdiff3/white_space.png
+share/doc/tde/HTML/fr/kdiff3/common
+share/doc/tde/HTML/fr/kdiff3/dirbrowser.png
+share/doc/tde/HTML/fr/kdiff3/dirmergebig.png
+share/doc/tde/HTML/fr/kdiff3/index.cache.bz2
+share/doc/tde/HTML/fr/kdiff3/index.docbook
+share/doc/tde/HTML/fr/kdiff3/iteminfo.png
+share/doc/tde/HTML/fr/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/fr/kdiff3/merge_current.png
+share/doc/tde/HTML/fr/kdiff3/new.png
+share/doc/tde/HTML/fr/kdiff3/open_dialog.png
+share/doc/tde/HTML/fr/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/fr/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/fr/kdiff3/triple_diff.png
+share/doc/tde/HTML/fr/kdiff3/white_space.png
+share/doc/tde/HTML/it/kdiff3/common
+share/doc/tde/HTML/it/kdiff3/dirbrowser.png
+share/doc/tde/HTML/it/kdiff3/dirmergebig.png
+share/doc/tde/HTML/it/kdiff3/index.cache.bz2
+share/doc/tde/HTML/it/kdiff3/index.docbook
+share/doc/tde/HTML/it/kdiff3/iteminfo.png
+share/doc/tde/HTML/it/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/it/kdiff3/merge_current.png
+share/doc/tde/HTML/it/kdiff3/new.png
+share/doc/tde/HTML/it/kdiff3/open_dialog.png
+share/doc/tde/HTML/it/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/it/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/it/kdiff3/triple_diff.png
+share/doc/tde/HTML/it/kdiff3/white_space.png
+share/doc/tde/HTML/nl/kdiff3/common
+share/doc/tde/HTML/nl/kdiff3/dirbrowser.png
+share/doc/tde/HTML/nl/kdiff3/dirmergebig.png
+share/doc/tde/HTML/nl/kdiff3/index.cache.bz2
+share/doc/tde/HTML/nl/kdiff3/index.docbook
+share/doc/tde/HTML/nl/kdiff3/iteminfo.png
+share/doc/tde/HTML/nl/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/nl/kdiff3/merge_current.png
+share/doc/tde/HTML/nl/kdiff3/new.png
+share/doc/tde/HTML/nl/kdiff3/open_dialog.png
+share/doc/tde/HTML/nl/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/nl/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/nl/kdiff3/triple_diff.png
+share/doc/tde/HTML/nl/kdiff3/white_space.png
+share/doc/tde/HTML/pt/kdiff3/common
+share/doc/tde/HTML/pt/kdiff3/dirbrowser.png
+share/doc/tde/HTML/pt/kdiff3/dirmergebig.png
+share/doc/tde/HTML/pt/kdiff3/index.cache.bz2
+share/doc/tde/HTML/pt/kdiff3/index.docbook
+share/doc/tde/HTML/pt/kdiff3/iteminfo.png
+share/doc/tde/HTML/pt/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/pt/kdiff3/merge_current.png
+share/doc/tde/HTML/pt/kdiff3/new.png
+share/doc/tde/HTML/pt/kdiff3/open_dialog.png
+share/doc/tde/HTML/pt/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/pt/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/pt/kdiff3/triple_diff.png
+share/doc/tde/HTML/pt/kdiff3/white_space.png
+share/doc/tde/HTML/sv/kdiff3/common
+share/doc/tde/HTML/sv/kdiff3/dirbrowser.png
+share/doc/tde/HTML/sv/kdiff3/dirmergebig.png
+share/doc/tde/HTML/sv/kdiff3/index.cache.bz2
+share/doc/tde/HTML/sv/kdiff3/index.docbook
+share/doc/tde/HTML/sv/kdiff3/iteminfo.png
+share/doc/tde/HTML/sv/kdiff3/letter_by_letter.png
+share/doc/tde/HTML/sv/kdiff3/merge_current.png
+share/doc/tde/HTML/sv/kdiff3/new.png
+share/doc/tde/HTML/sv/kdiff3/open_dialog.png
+share/doc/tde/HTML/sv/kdiff3/screenshot_diff.png
+share/doc/tde/HTML/sv/kdiff3/screenshot_merge.png
+share/doc/tde/HTML/sv/kdiff3/triple_diff.png
+share/doc/tde/HTML/sv/kdiff3/white_space.png
+share/icons/hicolor/16x16/apps/kdiff3.png
+share/icons/hicolor/32x32/apps/kdiff3.png
+share/icons/locolor/16x16/apps/kdiff3.png
+share/icons/locolor/32x32/apps/kdiff3.png
+share/locale/ar/LC_MESSAGES/kdiff3.mo
+share/locale/az/LC_MESSAGES/kdiff3.mo
+share/locale/bg/LC_MESSAGES/kdiff3.mo
+share/locale/bg/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/br/LC_MESSAGES/kdiff3.mo
+share/locale/br/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/ca/LC_MESSAGES/kdiff3.mo
+share/locale/cs/LC_MESSAGES/kdiff3.mo
+share/locale/cs/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/cy/LC_MESSAGES/kdiff3.mo
+share/locale/da/LC_MESSAGES/kdiff3.mo
+share/locale/da/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/de/LC_MESSAGES/kdiff3.mo
+share/locale/de/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/el/LC_MESSAGES/kdiff3.mo
+share/locale/el/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/en_GB/LC_MESSAGES/kdiff3.mo
+share/locale/es/LC_MESSAGES/kdiff3.mo
+share/locale/et/LC_MESSAGES/kdiff3.mo
+share/locale/et/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/fr/LC_MESSAGES/kdiff3.mo
+share/locale/ga/LC_MESSAGES/kdiff3.mo
+share/locale/ga/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/gl/LC_MESSAGES/kdiff3.mo
+share/locale/hi/LC_MESSAGES/kdiff3.mo
+share/locale/hu/LC_MESSAGES/kdiff3.mo
+share/locale/is/LC_MESSAGES/kdiff3.mo
+share/locale/it/LC_MESSAGES/kdiff3.mo
+share/locale/it/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/ja/LC_MESSAGES/kdiff3.mo
+share/locale/ka/LC_MESSAGES/kdiff3.mo
+share/locale/lt/LC_MESSAGES/kdiff3.mo
+share/locale/nb/LC_MESSAGES/kdiff3.mo
+share/locale/nl/LC_MESSAGES/kdiff3.mo
+share/locale/nl/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/pl/LC_MESSAGES/kdiff3.mo
+share/locale/pt/LC_MESSAGES/kdiff3.mo
+share/locale/pt/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/pt_BR/LC_MESSAGES/kdiff3.mo
+share/locale/pt_BR/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/ro/LC_MESSAGES/kdiff3.mo
+share/locale/ru/LC_MESSAGES/kdiff3.mo
+share/locale/rw/LC_MESSAGES/kdiff3.mo
+share/locale/sk/LC_MESSAGES/kdiff3.mo
+share/locale/sk/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/sr/LC_MESSAGES/kdiff3.mo
+share/locale/sr@Latn/LC_MESSAGES/kdiff3.mo
+share/locale/sv/LC_MESSAGES/kdiff3.mo
+share/locale/sv/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/ta/LC_MESSAGES/kdiff3.mo
+share/locale/tg/LC_MESSAGES/kdiff3.mo
+share/locale/tr/LC_MESSAGES/kdiff3.mo
+share/locale/tr/LC_MESSAGES/kdiff3_plugin.mo
+share/locale/uk/LC_MESSAGES/kdiff3.mo
+share/locale/zh_CN/LC_MESSAGES/kdiff3.mo
+share/locale/zh_Hans/LC_MESSAGES/kdiff3_plugin.mo
+share/man/man1/kdiff3.1.gz
+share/services/kdiff3_plugin.desktop
+share/services/kdiff3part.desktop
diff --git a/freebsd/applications/development/kscope/Makefile b/freebsd/applications/development/kscope/Makefile
new file mode 100644
index 000000000..b71da6abb
--- /dev/null
+++ b/freebsd/applications/development/kscope/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kscope-trinity
+COMMENT=		Source editing environment for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/development
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/share/cmake/kate.cmake:${PORTSDIR}/x11/trinity/core/tdebase
+
+BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/development/kscope/distinfo b/freebsd/applications/development/kscope/distinfo
new file mode 100644
index 000000000..dd10f6734
--- /dev/null
+++ b/freebsd/applications/development/kscope/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666617551
+SHA256 (TDE/applications/development/kscope-trinity_14.0.13.orig.tar.xz) = c846c0f4c9389ff0d74c148dc384dcc032118bf6036582dfb283b7aa6c02f4bc
+SIZE (TDE/applications/development/kscope-trinity_14.0.13.orig.tar.xz) = 1058876
diff --git a/freebsd/applications/kscope/pkg-descr b/freebsd/applications/development/kscope/pkg-descr
index acac542ec..acac542ec 100644
--- a/freebsd/applications/kscope/pkg-descr
+++ b/freebsd/applications/development/kscope/pkg-descr
diff --git a/freebsd/applications/development/kscope/pkg-plist b/freebsd/applications/development/kscope/pkg-plist
new file mode 100644
index 000000000..97a7ecbdf
--- /dev/null
+++ b/freebsd/applications/development/kscope/pkg-plist
@@ -0,0 +1,52 @@
+bin/kscope
+share/applications/tde/kscope.desktop
+share/apps/kscope/kscope_config
+share/apps/kscope/kscopeui.rc
+share/apps/kscope/pics/bookmark.png
+share/apps/kscope/pics/call_graph.png
+share/apps/kscope/pics/called_tree.png
+share/apps/kscope/pics/calling_tree.png
+share/apps/kscope/pics/file_ro.png
+share/apps/kscope/pics/file_rw.png
+share/apps/kscope/pics/file_save.png
+share/apps/kscope/pics/query_locked.png
+share/apps/kscope/pics/query_unlocked.png
+share/apps/kscope/pics/tab_list.png
+share/doc/tde/HTML/en/kscope/about.docbook
+share/doc/tde/HTML/en/kscope/autocomp_dlg.png
+share/doc/tde/HTML/en/kscope/bookmarks.docbook
+share/doc/tde/HTML/en/kscope/bookmarks.png
+share/doc/tde/HTML/en/kscope/call_graph.png
+share/doc/tde/HTML/en/kscope/call_tree.png
+share/doc/tde/HTML/en/kscope/common
+share/doc/tde/HTML/en/kscope/config_dlg.docbook
+share/doc/tde/HTML/en/kscope/editing.docbook
+share/doc/tde/HTML/en/kscope/index.cache.bz2
+share/doc/tde/HTML/en/kscope/index.docbook
+share/doc/tde/HTML/en/kscope/main_menu.docbook
+share/doc/tde/HTML/en/kscope/main_window.docbook
+share/doc/tde/HTML/en/kscope/main_window.png
+share/doc/tde/HTML/en/kscope/pos_history.docbook
+share/doc/tde/HTML/en/kscope/pref_clrs.png
+share/doc/tde/HTML/en/kscope/pref_fonts.png
+share/doc/tde/HTML/en/kscope/pref_opts.png
+share/doc/tde/HTML/en/kscope/pref_progs.png
+share/doc/tde/HTML/en/kscope/project_details.png
+share/doc/tde/HTML/en/kscope/project_files.png
+share/doc/tde/HTML/en/kscope/project_make.png
+share/doc/tde/HTML/en/kscope/project_open.png
+share/doc/tde/HTML/en/kscope/project_opts.png
+share/doc/tde/HTML/en/kscope/project_types.png
+share/doc/tde/HTML/en/kscope/projects.docbook
+share/doc/tde/HTML/en/kscope/query_dlg.png
+share/doc/tde/HTML/en/kscope/query_filter.png
+share/doc/tde/HTML/en/kscope/query_system.docbook
+share/doc/tde/HTML/en/kscope/quick_start.docbook
+share/icons/hicolor/16x16/apps/kscope.png
+share/icons/hicolor/32x32/apps/kscope.png
+share/icons/locolor/16x16/apps/kscope.png
+share/icons/locolor/32x32/apps/kscope.png
+share/locale/de/LC_MESSAGES/kscope.mo
+share/locale/nl/LC_MESSAGES/kscope.mo
+share/locale/zh_CN/LC_MESSAGES/kscope.mo
+share/man/man1/kscope.1.gz
diff --git a/freebsd/applications/development/kxmleditor/Makefile b/freebsd/applications/development/kxmleditor/Makefile
new file mode 100644
index 000000000..fc1d8a816
--- /dev/null
+++ b/freebsd/applications/development/kxmleditor/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kxmleditor-trinity
+COMMENT=		XML Editor for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/development
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/development/kxmleditor/distinfo b/freebsd/applications/development/kxmleditor/distinfo
new file mode 100644
index 000000000..9e5b3a910
--- /dev/null
+++ b/freebsd/applications/development/kxmleditor/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666617611
+SHA256 (TDE/applications/development/kxmleditor-trinity_14.0.13.orig.tar.xz) = b5e35b9cbe76ddb631035a8e2e592ff05b224d87d6a4569bfbad6dfe0bcb1f35
+SIZE (TDE/applications/development/kxmleditor-trinity_14.0.13.orig.tar.xz) = 509792
diff --git a/freebsd/applications/kxmleditor/pkg-descr b/freebsd/applications/development/kxmleditor/pkg-descr
index 397a0a65d..397a0a65d 100644
--- a/freebsd/applications/kxmleditor/pkg-descr
+++ b/freebsd/applications/development/kxmleditor/pkg-descr
diff --git a/freebsd/applications/development/kxmleditor/pkg-plist b/freebsd/applications/development/kxmleditor/pkg-plist
new file mode 100644
index 000000000..81d8b0838
--- /dev/null
+++ b/freebsd/applications/development/kxmleditor/pkg-plist
@@ -0,0 +1,106 @@
+bin/kxmleditor
+lib/libkxmleditorpart.la
+lib/libkxmleditorpart.so
+lib/libkxmleditorpart.so.1
+lib/libkxmleditorpart.so.1.0.0
+share/applications/tde/kxmleditor.desktop
+share/apps/kxmleditor/icons/hicolor/16x16/actions/bookmark_next.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/bookmark_prev.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/collapse_node.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/expand_node.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_cdata.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_comment.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_delete_attribute.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_delete_contents.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_delete_element.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_delete_procins.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_edit_attribute.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_edit_contents.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_edit_element.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_edit_procins.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_insert_attribute.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_insert_contents.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_insert_element.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_insert_procins.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_move_item_down.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_move_item_up.png
+share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_text.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/bookmark_next.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/bookmark_prev.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/collapse_node.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/expand_node.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_delete_attribute.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_delete_contents.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_delete_element.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_delete_procins.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_edit_attribute.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_edit_contents.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_edit_element.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_edit_procins.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_insert_attribute.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_insert_contents.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_insert_element.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_insert_procins.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_move_item_down.png
+share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_move_item_up.png
+share/apps/kxmleditor/icons/hicolor/32x32/actions/bookmark_next.png
+share/apps/kxmleditor/icons/hicolor/32x32/actions/bookmark_prev.png
+share/apps/kxmleditor/icons/hicolor/32x32/actions/xml_move_item_down.png
+share/apps/kxmleditor/icons/hicolor/32x32/actions/xml_move_item_up.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/bookmark_next.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/bookmark_prev.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/collapse_node.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/expand_node.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_delete_attribute.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_delete_contents.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_delete_element.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_delete_procins.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_edit_attribute.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_edit_contents.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_edit_element.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_edit_procins.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_insert_attribute.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_insert_contents.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_insert_element.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_insert_procins.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_move_item_down.png
+share/apps/kxmleditor/icons/locolor/16x16/actions/xml_move_item_up.png
+share/apps/kxmleditor/kxedocument.rc
+share/apps/kxmleditor/kxmleditorpartBrowseUI.rc
+share/apps/kxmleditor/kxmleditorpartEditUI.rc
+share/apps/kxmleditor/kxmleditorshell.rc
+share/apps/kxmleditor/pics/xml_attribute.png
+share/apps/kxmleditor/pics/xml_cdata.png
+share/apps/kxmleditor/pics/xml_cdata_b.png
+share/apps/kxmleditor/pics/xml_comment.png
+share/apps/kxmleditor/pics/xml_comment_b.png
+share/apps/kxmleditor/pics/xml_contents.png
+share/apps/kxmleditor/pics/xml_contents_b.png
+share/apps/kxmleditor/pics/xml_element.png
+share/apps/kxmleditor/pics/xml_element_b.png
+share/apps/kxmleditor/pics/xml_procinstr.png
+share/apps/kxmleditor/pics/xml_procinstr_b.png
+share/apps/kxmleditor/pics/xml_text.png
+share/apps/kxmleditor/pics/xml_text_b.png
+share/doc/tde/HTML/en/kxmleditor/common
+share/doc/tde/HTML/en/kxmleditor/index.cache.bz2
+share/doc/tde/HTML/en/kxmleditor/index.docbook
+share/doc/tde/HTML/en/kxmleditor/screenshot.png
+share/doc/tde/HTML/en/kxmleditor/setuparchive.png
+share/doc/tde/HTML/en/kxmleditor/setupnewfiles.png
+share/doc/tde/HTML/en/kxmleditor/setupprinting.png
+share/doc/tde/HTML/en/kxmleditor/setuptextview.png
+share/doc/tde/HTML/en/kxmleditor/setuptreeview.png
+share/doc/tde/HTML/en/kxmleditor/specprocinstrdlg.png
+share/doc/tde/HTML/en/kxmleditor/tdeparts.png
+share/doc/tde/HTML/en/kxmleditor/texteditor.png
+share/doc/tde/HTML/en/kxmleditor/xml.png
+share/icons/hicolor/32x32/apps/kxmleditor.png
+share/icons/hicolor/48x48/apps/kxmleditor.png
+share/icons/locolor/16x16/apps/kxmleditor.png
+share/icons/locolor/32x32/apps/kxmleditor.png
+share/locale/de/LC_MESSAGES/kxmleditor.mo
+share/locale/fr/LC_MESSAGES/kxmleditor.mo
+share/locale/pl/LC_MESSAGES/kxmleditor.mo
+share/man/man1/kxmleditor.1.gz
+share/services/kxmleditorpart.desktop
diff --git a/freebsd/applications/digikam/Makefile b/freebsd/applications/digikam/Makefile
deleted file mode 100644
index 2b2e9108c..000000000
--- a/freebsd/applications/digikam/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		digikam-trinity
-COMMENT=		Digital photo management application for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	d/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		graphics x11
-DIST_SUBDIR=		TDE/applications
-
-
-# Use gmake for automake build
-USES=		gmake
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libkdcraw.so:${PORTSDIR}/x11/trinity/libraries/libkdcraw \
-		${TDE_PREFIX}/lib/libkexiv2.so:${PORTSDIR}/x11/trinity/libraries/libkexiv2 \
-		${TDE_PREFIX}/lib/libkipi.so:${PORTSDIR}/x11/trinity/libraries/libkipi
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-
-USE_SQLITE=		yes
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-autotools-prepare
-	${TDE_AUTOTOOLS_CONFIGURE}
-
-do-build: tde-autotools-build
-
-do-install: tde-autotools-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/digikam/distinfo b/freebsd/applications/digikam/distinfo
deleted file mode 100644
index 93be60f15..000000000
--- a/freebsd/applications/digikam/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619439052
-SHA256 (TDE/applications/digikam-trinity_14.0.10.orig.tar.xz) = ca3bec2124c996a57df0b57371162bc95180ee92560f0a09f076726141a2d472
-SIZE (TDE/applications/digikam-trinity_14.0.10.orig.tar.xz) = 54264168
diff --git a/freebsd/applications/dolphin/Makefile b/freebsd/applications/dolphin/Makefile
deleted file mode 100644
index 6f615a579..000000000
--- a/freebsd/applications/dolphin/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		dolphin-trinity
-COMMENT=		File manager for Trinity focusing on usability
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	d/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		deskutils x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/share/cmake/libkonq.cmake:${PORTSDIR}/x11/trinity/core/tdebase
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE}
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-	ln -s d3lphin ${STAGEDIR}${TDE_PREFIX}/bin/dolphin
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/dolphin/distinfo b/freebsd/applications/dolphin/distinfo
deleted file mode 100644
index 4f64f1ce9..000000000
--- a/freebsd/applications/dolphin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619441243
-SHA256 (TDE/applications/dolphin-trinity_14.0.10.orig.tar.xz) = 9d9feebaabb5a6ccab9f8ce11ebba2308165596537f1d2b7ff138a874581c8ed
-SIZE (TDE/applications/dolphin-trinity_14.0.10.orig.tar.xz) = 1162664
diff --git a/freebsd/applications/dolphin/pkg-plist b/freebsd/applications/dolphin/pkg-plist
deleted file mode 100644
index 85db2d897..000000000
--- a/freebsd/applications/dolphin/pkg-plist
+++ /dev/null
@@ -1,105 +0,0 @@
-bin/d3lphin
-bin/dolphin
-share/applications/tde/d3lphin.desktop
-share/apps/d3lphin/d3lphinui.rc
-share/apps/d3lphin/icons/hicolor/128x128/actions/preview.png
-share/apps/d3lphin/icons/hicolor/16x16/actions/editurl.png
-share/apps/d3lphin/icons/hicolor/16x16/actions/preview.png
-share/apps/d3lphin/icons/hicolor/22x22/actions/preview.png
-share/apps/d3lphin/icons/hicolor/32x32/actions/preview.png
-share/apps/d3lphin/icons/hicolor/48x48/actions/preview.png
-share/apps/d3lphin/icons/hicolor/64x64/actions/preview.png
-share/apps/d3lphin/servicemenus/amarok_addaspodcast.desktop
-share/apps/d3lphin/servicemenus/amarok_append.desktop
-share/apps/d3lphin/servicemenus/amarok_play_audiocd.desktop
-share/apps/d3lphin/servicemenus/ark_compress.desktop
-share/apps/d3lphin/servicemenus/ark_extract.desktop
-share/apps/d3lphin/servicemenus/ark_extract_subdir.desktop
-share/apps/d3lphin/servicemenus/compress.desktop
-share/apps/d3lphin/servicemenus/d3lphin_su.desktop
-share/apps/d3lphin/servicemenus/edit_as_root.desktop
-share/apps/d3lphin/servicemenus/encryptfile.desktop
-share/apps/d3lphin/servicemenus/encryptfolder.desktop
-share/apps/d3lphin/servicemenus/floppy_format.desktop
-share/apps/d3lphin/servicemenus/imageconverter.desktop
-share/apps/d3lphin/servicemenus/installfont.desktop
-share/apps/d3lphin/servicemenus/isoservice.desktop
-share/apps/d3lphin/servicemenus/jpegorient.desktop
-share/apps/d3lphin/servicemenus/k3b_audiocd_rip.desktop
-share/apps/d3lphin/servicemenus/k3b_cd_copy.desktop
-share/apps/d3lphin/servicemenus/k3b_create_audio_cd.desktop
-share/apps/d3lphin/servicemenus/k3b_create_video_cd.desktop
-share/apps/d3lphin/servicemenus/k3b_dvd_copy.desktop
-share/apps/d3lphin/servicemenus/k3b_handle_empty_cd.desktop
-share/apps/d3lphin/servicemenus/k3b_handle_empty_dvd.desktop
-share/apps/d3lphin/servicemenus/k3b_videodvd_rip.desktop
-share/apps/d3lphin/servicemenus/k3b_write_bin_image.desktop
-share/apps/d3lphin/servicemenus/k3b_write_iso_image.desktop
-share/apps/d3lphin/servicemenus/kdesktopSetAsBackground.desktop
-share/apps/d3lphin/servicemenus/konqgwenview.desktop
-share/apps/d3lphin/servicemenus/mail_as_attachment.desktop
-share/apps/d3lphin/servicemenus/media_eject.desktop
-share/apps/d3lphin/servicemenus/media_mount.desktop
-share/apps/d3lphin/servicemenus/media_realfolder.desktop
-share/apps/d3lphin/servicemenus/media_safelyremove.desktop
-share/apps/d3lphin/servicemenus/media_unmount.desktop
-share/apps/d3lphin/servicemenus/open_in_digikam.desktop
-share/apps/d3lphin/servicemenus/run_as_root.desktop
-share/apps/d3lphin/servicemenus/smb2rdc.desktop
-share/apps/d3lphin/servicemenus/terminalhere.desktop
-share/apps/d3lphin/servicemenus/text-ada-print.desktop
-share/apps/d3lphin/servicemenus/text-c++-print.desktop
-share/apps/d3lphin/servicemenus/text-c++h-print.desktop
-share/apps/d3lphin/servicemenus/text-ch-print.desktop
-share/apps/d3lphin/servicemenus/text-css-print.desktop
-share/apps/d3lphin/servicemenus/text-diff-print.desktop
-share/apps/d3lphin/servicemenus/text-html-print.desktop
-share/apps/d3lphin/servicemenus/text-java-print.desktop
-share/apps/d3lphin/servicemenus/text-log-print.desktop
-share/apps/d3lphin/servicemenus/text-makefile-print.desktop
-share/apps/d3lphin/servicemenus/text-pas-print.desktop
-share/apps/d3lphin/servicemenus/text-perl-print.desktop
-share/apps/d3lphin/servicemenus/text-print.desktop
-share/apps/d3lphin/servicemenus/text-python-print.desktop
-share/apps/d3lphin/servicemenus/text-tcl-print.desktop
-share/apps/d3lphin/servicemenus/text-tex-print.desktop
-share/apps/d3lphin/servicemenus/text-xml-print.desktop
-share/apps/d3lphin/servicemenus/text-xslt-print.desktop
-share/doc/tde/HTML/en/d3lphin/bookmarkbutton.png
-share/doc/tde/HTML/en/d3lphin/bookmarksidebar.png
-share/doc/tde/HTML/en/d3lphin/breadcrumb.png
-share/doc/tde/HTML/en/d3lphin/browsebutton.png
-share/doc/tde/HTML/en/d3lphin/common
-share/doc/tde/HTML/en/d3lphin/configurationwindow.png
-share/doc/tde/HTML/en/d3lphin/configurationwindow2.png
-share/doc/tde/HTML/en/d3lphin/configurationwindow3.png
-share/doc/tde/HTML/en/d3lphin/directorypath.png
-share/doc/tde/HTML/en/d3lphin/dolphin.png
-share/doc/tde/HTML/en/d3lphin/hiddenfolder.png
-share/doc/tde/HTML/en/d3lphin/index.cache.bz2
-share/doc/tde/HTML/en/d3lphin/index.docbook
-share/doc/tde/HTML/en/d3lphin/informationsidebar.png
-share/doc/tde/HTML/en/d3lphin/split.png
-share/doc/tde/HTML/en/d3lphin/systemmediadirectory.png
-share/doc/tde/HTML/en/d3lphin/toolbarbuttons.png
-share/doc/tde/HTML/en/d3lphin/workspacebuttons.png
-share/icons/hicolor/128x128/apps/d3lphin.png
-share/icons/hicolor/16x16/apps/d3lphin.png
-share/icons/hicolor/22x22/apps/d3lphin.png
-share/icons/hicolor/32x32/apps/d3lphin.png
-share/icons/hicolor/48x48/apps/d3lphin.png
-share/icons/hicolor/64x64/apps/d3lphin.png
-share/locale/cs/LC_MESSAGES/d3lphin.mo
-share/locale/de/LC_MESSAGES/d3lphin.mo
-share/locale/el/LC_MESSAGES/d3lphin.mo
-share/locale/es/LC_MESSAGES/d3lphin.mo
-share/locale/et/LC_MESSAGES/d3lphin.mo
-share/locale/fr/LC_MESSAGES/d3lphin.mo
-share/locale/he/LC_MESSAGES/d3lphin.mo
-share/locale/it/LC_MESSAGES/d3lphin.mo
-share/locale/nl/LC_MESSAGES/d3lphin.mo
-share/locale/pl/LC_MESSAGES/d3lphin.mo
-share/locale/pt/LC_MESSAGES/d3lphin.mo
-share/locale/ru/LC_MESSAGES/d3lphin.mo
-share/locale/sk/LC_MESSAGES/d3lphin.mo
-share/man/man1/d3lphin.1.gz
diff --git a/freebsd/applications/filelight/Makefile b/freebsd/applications/filelight/Makefile
deleted file mode 100644
index a239f3842..000000000
--- a/freebsd/applications/filelight/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		filelight-trinity
-COMMENT=		Show where your diskspace is being used
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	f/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		deskutils x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/filelight/distinfo b/freebsd/applications/filelight/distinfo
deleted file mode 100644
index 3a5a8f4a0..000000000
--- a/freebsd/applications/filelight/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619441280
-SHA256 (TDE/applications/filelight-trinity_14.0.10.orig.tar.xz) = d3644c0c34759c812828728262fafd6cdc6912b24c3f0284e18c1af4cfed29c3
-SIZE (TDE/applications/filelight-trinity_14.0.10.orig.tar.xz) = 452680
diff --git a/freebsd/applications/games/Makefile b/freebsd/applications/games/Makefile
new file mode 100644
index 000000000..d45079636
--- /dev/null
+++ b/freebsd/applications/games/Makefile
@@ -0,0 +1,6 @@
+
+    SUBDIR =
+    SUBDIR += knights
+    SUBDIR += tdepacman
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/games/knights/Makefile b/freebsd/applications/games/knights/Makefile
new file mode 100644
index 000000000..fb6e6b2b2
--- /dev/null
+++ b/freebsd/applications/games/knights/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		knights-trinity
+COMMENT=		A chess interface for the Trinity Desktop Environment
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/games
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/games/knights/distinfo b/freebsd/applications/games/knights/distinfo
new file mode 100644
index 000000000..bbdd70bed
--- /dev/null
+++ b/freebsd/applications/games/knights/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666617667
+SHA256 (TDE/applications/games/knights-trinity_14.0.13.orig.tar.xz) = 263dd9ee0d0364c00b050ddaf89cd6e3996fdabc23c9466a25166f44b2be7878
+SIZE (TDE/applications/games/knights-trinity_14.0.13.orig.tar.xz) = 587612
diff --git a/freebsd/applications/knights/pkg-descr b/freebsd/applications/games/knights/pkg-descr
index ce1f00c75..ce1f00c75 100644
--- a/freebsd/applications/knights/pkg-descr
+++ b/freebsd/applications/games/knights/pkg-descr
diff --git a/freebsd/applications/knights/pkg-plist b/freebsd/applications/games/knights/pkg-plist
index 5845e45ce..5845e45ce 100644
--- a/freebsd/applications/knights/pkg-plist
+++ b/freebsd/applications/games/knights/pkg-plist
diff --git a/freebsd/applications/games/tdepacman/Makefile b/freebsd/applications/games/tdepacman/Makefile
new file mode 100644
index 000000000..fe848ec40
--- /dev/null
+++ b/freebsd/applications/games/tdepacman/Makefile
@@ -0,0 +1,36 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdepacman-trinity
+COMMENT=		A pacman clone game for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/games
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/libdata/pkgconfig/libtdegames.pc:${PORTSDIR}/x11/trinity/core/tdegames
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DPKGCONFIG_INSTALL_DIR="${PREFIX}/libdata/pkgconfig"
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/games/tdepacman/distinfo b/freebsd/applications/games/tdepacman/distinfo
new file mode 100644
index 000000000..b9ce50142
--- /dev/null
+++ b/freebsd/applications/games/tdepacman/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666617720
+SHA256 (TDE/applications/games/tdepacman-trinity_14.0.13.orig.tar.xz) = abe7167a31db129f426b006d15e1806622d598ed1e72dc73360b72b02e635e30
+SIZE (TDE/applications/games/tdepacman-trinity_14.0.13.orig.tar.xz) = 109456
diff --git a/freebsd/applications/tdepacman/pkg-descr b/freebsd/applications/games/tdepacman/pkg-descr
index 4fbeff9e3..4fbeff9e3 100644
--- a/freebsd/applications/tdepacman/pkg-descr
+++ b/freebsd/applications/games/tdepacman/pkg-descr
diff --git a/freebsd/applications/games/tdepacman/pkg-plist b/freebsd/applications/games/tdepacman/pkg-plist
new file mode 100644
index 000000000..6fcfd89ed
--- /dev/null
+++ b/freebsd/applications/games/tdepacman/pkg-plist
@@ -0,0 +1,110 @@
+bin/tdepacman
+share/applications/tde/tdepacman.desktop
+share/apps/tdepacman/fonts/font-small.pbm
+share/apps/tdepacman/fonts/font-smooth.pbm
+share/apps/tdepacman/fonts/font.pbm
+share/apps/tdepacman/maps/mspacman/map01
+share/apps/tdepacman/maps/mspacman/map02
+share/apps/tdepacman/maps/mspacman/map03
+share/apps/tdepacman/maps/mspacman/map04
+share/apps/tdepacman/pics/down.xpm
+share/apps/tdepacman/pics/dying.xpm
+share/apps/tdepacman/pics/eyes.xpm
+share/apps/tdepacman/pics/fruit.xpm
+share/apps/tdepacman/pics/left.xpm
+share/apps/tdepacman/pics/lifes.xpm
+share/apps/tdepacman/pics/monster.xpm
+share/apps/tdepacman/pics/mspacman-tiny/dying.xpm
+share/apps/tdepacman/pics/mspacman-tiny/fruit.xpm
+share/apps/tdepacman/pics/mspacman-tiny/fruitscore.xpm
+share/apps/tdepacman/pics/mspacman-tiny/lifes.xpm
+share/apps/tdepacman/pics/mspacman-tiny/pacman.xpm
+share/apps/tdepacman/pics/mspacman-tiny/point.xpm
+share/apps/tdepacman/pics/mspacman-tiny/point02.xpm
+share/apps/tdepacman/pics/mspacman-tiny/point03.xpm
+share/apps/tdepacman/pics/mspacman-tiny/prison.xpm
+share/apps/tdepacman/pics/mspacman-tiny/prison02.xpm
+share/apps/tdepacman/pics/mspacman-tiny/prison03.xpm
+share/apps/tdepacman/pics/mspacman-tiny/prison04.xpm
+share/apps/tdepacman/pics/mspacman-tiny/prison05.xpm
+share/apps/tdepacman/pics/mspacman-tiny/prison06.xpm
+share/apps/tdepacman/pics/mspacman-tiny/switch.xpm
+share/apps/tdepacman/pics/mspacman-tiny/switch02.xpm
+share/apps/tdepacman/pics/mspacman-tiny/switch03.xpm
+share/apps/tdepacman/pics/mspacman-tiny/wall.xpm
+share/apps/tdepacman/pics/mspacman-tiny/wall02.xpm
+share/apps/tdepacman/pics/mspacman-tiny/wall03.xpm
+share/apps/tdepacman/pics/mspacman-tiny/wall04.xpm
+share/apps/tdepacman/pics/mspacman-tiny/wall05.xpm
+share/apps/tdepacman/pics/mspacman-tiny/wall06.xpm
+share/apps/tdepacman/pics/mspacman/dying.xpm
+share/apps/tdepacman/pics/mspacman/fruit.xpm
+share/apps/tdepacman/pics/mspacman/fruitscore.xpm
+share/apps/tdepacman/pics/mspacman/lifes.xpm
+share/apps/tdepacman/pics/mspacman/pacman.xpm
+share/apps/tdepacman/pics/mspacman/point.xpm
+share/apps/tdepacman/pics/mspacman/point02.xpm
+share/apps/tdepacman/pics/mspacman/point03.xpm
+share/apps/tdepacman/pics/mspacman/prison.xpm
+share/apps/tdepacman/pics/mspacman/prison02.xpm
+share/apps/tdepacman/pics/mspacman/prison03.xpm
+share/apps/tdepacman/pics/mspacman/prison04.xpm
+share/apps/tdepacman/pics/mspacman/prison05.xpm
+share/apps/tdepacman/pics/mspacman/prison06.xpm
+share/apps/tdepacman/pics/mspacman/switch.xpm
+share/apps/tdepacman/pics/mspacman/switch02.xpm
+share/apps/tdepacman/pics/mspacman/switch03.xpm
+share/apps/tdepacman/pics/mspacman/wall.xpm
+share/apps/tdepacman/pics/mspacman/wall02.xpm
+share/apps/tdepacman/pics/mspacman/wall03.xpm
+share/apps/tdepacman/pics/mspacman/wall04.xpm
+share/apps/tdepacman/pics/mspacman/wall05.xpm
+share/apps/tdepacman/pics/mspacman/wall06.xpm
+share/apps/tdepacman/pics/pacman.xpm
+share/apps/tdepacman/pics/point.xpm
+share/apps/tdepacman/pics/prison.xpm
+share/apps/tdepacman/pics/right.xpm
+share/apps/tdepacman/pics/switch.xpm
+share/apps/tdepacman/pics/tiny/dying.xpm
+share/apps/tdepacman/pics/tiny/eyes.xpm
+share/apps/tdepacman/pics/tiny/fruit.xpm
+share/apps/tdepacman/pics/tiny/lifes.xpm
+share/apps/tdepacman/pics/tiny/monster.xpm
+share/apps/tdepacman/pics/tiny/pacman.xpm
+share/apps/tdepacman/pics/tiny/point.xpm
+share/apps/tdepacman/pics/tiny/prison.xpm
+share/apps/tdepacman/pics/tiny/switch.xpm
+share/apps/tdepacman/pics/tiny/wall.xpm
+share/apps/tdepacman/pics/up.xpm
+share/apps/tdepacman/pics/wall.xpm
+share/apps/tdepacman/pics/zacman/dying.xpm
+share/apps/tdepacman/pics/zacman/eyes.xpm
+share/apps/tdepacman/pics/zacman/lifes.xpm
+share/apps/tdepacman/pics/zacman/monster.xpm
+share/apps/tdepacman/pics/zacman/pacman.xpm
+share/apps/tdepacman/pics/zacman/point.xpm
+share/apps/tdepacman/pics/zacman/switch.xpm
+share/apps/tdepacman/pics/zacman/wall.xpm
+share/apps/tdepacman/tdepacmanui.rc
+share/config/tdepacmanrc
+share/doc/tde/HTML/de/tdepacman/tdepacman-1.html
+share/doc/tde/HTML/de/tdepacman/tdepacman-2.html
+share/doc/tde/HTML/de/tdepacman/tdepacman-3.html
+share/doc/tde/HTML/de/tdepacman/tdepacman-4.html
+share/doc/tde/HTML/de/tdepacman/tdepacman-index.html
+share/doc/tde/HTML/de/tdepacman/tdepacman.gif
+share/doc/tde/HTML/en/tdepacman/common
+share/doc/tde/HTML/en/tdepacman/index.cache.bz2
+share/doc/tde/HTML/en/tdepacman/index.docbook
+share/doc/tde/HTML/en/tdepacman/screenshot.png
+share/doc/tde/HTML/en/tdepacman/tdepacman.gif
+share/icons/hicolor/16x16/apps/tdepacman.png
+share/icons/hicolor/32x32/apps/tdepacman.png
+share/icons/locolor/16x16/apps/tdepacman.png
+share/icons/locolor/32x32/apps/tdepacman.png
+share/locale/de/LC_MESSAGES/tdepacman.mo
+share/locale/es/LC_MESSAGES/tdepacman.mo
+share/locale/he/LC_MESSAGES/tdepacman.mo
+share/locale/pt/LC_MESSAGES/tdepacman.mo
+share/locale/sv/LC_MESSAGES/tdepacman.mo
+share/man/man1/tdepacman.1.gz
diff --git a/freebsd/applications/graphics/Makefile b/freebsd/applications/graphics/Makefile
new file mode 100644
index 000000000..56dcb47bf
--- /dev/null
+++ b/freebsd/applications/graphics/Makefile
@@ -0,0 +1,8 @@
+
+    SUBDIR =
+    SUBDIR += digikam
+    SUBDIR += gwenview
+    SUBDIR += gwenview-i18n
+    SUBDIR += ksquirrel
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/graphics/digikam/Makefile b/freebsd/applications/graphics/digikam/Makefile
new file mode 100644
index 000000000..763a60997
--- /dev/null
+++ b/freebsd/applications/graphics/digikam/Makefile
@@ -0,0 +1,48 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		digikam-trinity
+COMMENT=		Digital photo management application for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	d/${PORTNAME}
+PORTREVISION=		1
+CATEGORIES=		graphics x11
+DIST_SUBDIR=		TDE/applications/graphics
+
+
+# Use gmake for automake build
+USES=		gmake
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libkdcraw.so:${PORTSDIR}/x11/trinity/libraries/libkdcraw \
+		${TDE_PREFIX}/lib/libkexiv2.so:${PORTSDIR}/x11/trinity/libraries/libkexiv2 \
+		${TDE_PREFIX}/lib/libkipi.so:${PORTSDIR}/x11/trinity/libraries/libkipi
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
+		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \
+		libjasper.so:${PORTSDIR}/graphics/jasper \
+		liblcms.so:${PORTSDIR}/graphics/lcms \
+		libpng.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+
+USE_SQLITE=		yes
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-autotools-prepare
+	${TDE_AUTOTOOLS_CONFIGURE} \
+	--disable-final
+
+do-build: tde-autotools-build
+
+do-install: tde-autotools-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/graphics/digikam/distinfo b/freebsd/applications/graphics/digikam/distinfo
new file mode 100644
index 000000000..cd4a8aabb
--- /dev/null
+++ b/freebsd/applications/graphics/digikam/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666911504
+SHA256 (TDE/applications/graphics/digikam-trinity_14.0.13.orig.tar.xz) = 49187e92c46cc7f3b7eac8a5d965b986252de4e5e11fcceb4fe6676dd72d5ae1
+SIZE (TDE/applications/graphics/digikam-trinity_14.0.13.orig.tar.xz) = 54246224
diff --git a/freebsd/applications/digikam/pkg-descr b/freebsd/applications/graphics/digikam/pkg-descr
index 8305de61c..8305de61c 100644
--- a/freebsd/applications/digikam/pkg-descr
+++ b/freebsd/applications/graphics/digikam/pkg-descr
diff --git a/freebsd/applications/digikam/pkg-plist b/freebsd/applications/graphics/digikam/pkg-plist
index eabaa7607..eabaa7607 100644
--- a/freebsd/applications/digikam/pkg-plist
+++ b/freebsd/applications/graphics/digikam/pkg-plist
diff --git a/freebsd/applications/graphics/gwenview-i18n/Makefile b/freebsd/applications/graphics/gwenview-i18n/Makefile
new file mode 100644
index 000000000..8cd0392b1
--- /dev/null
+++ b/freebsd/applications/graphics/gwenview-i18n/Makefile
@@ -0,0 +1,32 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		gwenview-i18n-trinity
+COMMENT=		Internationalization (i18n) for Gwenview, an image viewer for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	g/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		graphics x11
+DIST_SUBDIR=		TDE/applications/graphics
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/graphics/gwenview-i18n/distinfo b/freebsd/applications/graphics/gwenview-i18n/distinfo
new file mode 100644
index 000000000..5c3b88f85
--- /dev/null
+++ b/freebsd/applications/graphics/gwenview-i18n/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666912638
+SHA256 (TDE/applications/graphics/gwenview-i18n-trinity_14.0.13.orig.tar.xz) = b6629749b7332553b55a30d4d8de76208967560319f4656900b8f49b2cfd521f
+SIZE (TDE/applications/graphics/gwenview-i18n-trinity_14.0.13.orig.tar.xz) = 1636048
diff --git a/freebsd/applications/gwenview-i18n/pkg-descr b/freebsd/applications/graphics/gwenview-i18n/pkg-descr
index a5bfe357c..a5bfe357c 100644
--- a/freebsd/applications/gwenview-i18n/pkg-descr
+++ b/freebsd/applications/graphics/gwenview-i18n/pkg-descr
diff --git a/freebsd/applications/gwenview-i18n/pkg-plist b/freebsd/applications/graphics/gwenview-i18n/pkg-plist
index 6912aaa74..6912aaa74 100644
--- a/freebsd/applications/gwenview-i18n/pkg-plist
+++ b/freebsd/applications/graphics/gwenview-i18n/pkg-plist
diff --git a/freebsd/applications/graphics/gwenview/Makefile b/freebsd/applications/graphics/gwenview/Makefile
new file mode 100644
index 000000000..4ded2c5d7
--- /dev/null
+++ b/freebsd/applications/graphics/gwenview/Makefile
@@ -0,0 +1,40 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		gwenview-trinity
+COMMENT=		Image viewer for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	g/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		graphics x11
+DIST_SUBDIR=		TDE/applications/graphics
+
+
+# Use gmake for automake build
+USES=		gmake
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libkipi.so:${PORTSDIR}/x11/trinity/libraries/libkipi
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
+		libmng.so:${PORTSDIR}/graphics/libmng \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-autotools-prepare
+	${TDE_AUTOTOOLS_CONFIGURE} \
+	--enable-kipi
+
+do-build: tde-autotools-build
+
+do-install: tde-autotools-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/graphics/gwenview/distinfo b/freebsd/applications/graphics/gwenview/distinfo
new file mode 100644
index 000000000..0a3a22db2
--- /dev/null
+++ b/freebsd/applications/graphics/gwenview/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666617762
+SHA256 (TDE/applications/graphics/gwenview-trinity_14.0.13.orig.tar.xz) = d4a84d342fcd4f6b2359bb703fc23df19d7602859dac10c75cdd066bd41b22cc
+SIZE (TDE/applications/graphics/gwenview-trinity_14.0.13.orig.tar.xz) = 732976
diff --git a/freebsd/applications/gwenview/pkg-descr b/freebsd/applications/graphics/gwenview/pkg-descr
index d4335caf7..d4335caf7 100644
--- a/freebsd/applications/gwenview/pkg-descr
+++ b/freebsd/applications/graphics/gwenview/pkg-descr
diff --git a/freebsd/applications/gwenview/pkg-plist b/freebsd/applications/graphics/gwenview/pkg-plist
index 42a1e3998..42a1e3998 100644
--- a/freebsd/applications/gwenview/pkg-plist
+++ b/freebsd/applications/graphics/gwenview/pkg-plist
diff --git a/freebsd/applications/graphics/ksquirrel/Makefile b/freebsd/applications/graphics/ksquirrel/Makefile
new file mode 100644
index 000000000..1c6b003b4
--- /dev/null
+++ b/freebsd/applications/graphics/ksquirrel/Makefile
@@ -0,0 +1,40 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		ksquirrel-trinity
+COMMENT=		Powerful Trinity image viewer
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		graphics x11
+DIST_SUBDIR=		TDE/applications/graphics
+TDE_BUILD_SUBDIR=	# build-in-source
+
+
+# Use gmake for automake build
+USES=		gmake
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libkonq.so:${PORTSDIR}/x11/trinity/core/tdebase \
+		${TDE_PREFIX}/lib/libkipi.so:${PORTSDIR}/x11/trinity/libraries/libkipi \
+		${TDE_PREFIX}/lib/libkipiplugins.so:${PORTSDIR}/x11/trinity/libraries/kipi-plugins \
+		${TDE_PREFIX}/lib/libksquirrel-libs.so:${PORTSDIR}/x11/trinity/libraries/libksquirrel \
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-autotools-prepare
+	${TDE_AUTOTOOLS_CONFIGURE} \
+	--disable-final
+
+do-build: tde-autotools-build
+
+do-install: tde-autotools-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/graphics/ksquirrel/distinfo b/freebsd/applications/graphics/ksquirrel/distinfo
new file mode 100644
index 000000000..f9fc38c5a
--- /dev/null
+++ b/freebsd/applications/graphics/ksquirrel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666617938
+SHA256 (TDE/applications/graphics/ksquirrel-trinity_14.0.13.orig.tar.xz) = 3065f06c51c50cbef5623f7cc27b005ddbf70055651de4c4b6939edde418c241
+SIZE (TDE/applications/graphics/ksquirrel-trinity_14.0.13.orig.tar.xz) = 783128
diff --git a/freebsd/applications/ksquirrel/pkg-descr b/freebsd/applications/graphics/ksquirrel/pkg-descr
index c497ddeee..c497ddeee 100644
--- a/freebsd/applications/ksquirrel/pkg-descr
+++ b/freebsd/applications/graphics/ksquirrel/pkg-descr
diff --git a/freebsd/applications/ksquirrel/pkg-plist b/freebsd/applications/graphics/ksquirrel/pkg-plist
index 3013c4a77..3013c4a77 100644
--- a/freebsd/applications/ksquirrel/pkg-plist
+++ b/freebsd/applications/graphics/ksquirrel/pkg-plist
diff --git a/freebsd/applications/gtk-qt-engine/Makefile b/freebsd/applications/gtk-qt-engine/Makefile
deleted file mode 100644
index 6cd6750da..000000000
--- a/freebsd/applications/gtk-qt-engine/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		gtk-qt-engine-trinity
-COMMENT=		Theme engine using TQt for GTK+ 2.x and Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	g/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11-themes
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE}
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/gtk-qt-engine/distinfo b/freebsd/applications/gtk-qt-engine/distinfo
deleted file mode 100644
index 06ef3c9cb..000000000
--- a/freebsd/applications/gtk-qt-engine/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619441312
-SHA256 (TDE/applications/gtk-qt-engine-trinity_14.0.10.orig.tar.xz) = a742566938f15b7bf951d0d088acd35825aae23998f165a89fa9d9c7557f5163
-SIZE (TDE/applications/gtk-qt-engine-trinity_14.0.10.orig.tar.xz) = 317708
diff --git a/freebsd/applications/gtk-qt-engine/pkg-plist b/freebsd/applications/gtk-qt-engine/pkg-plist
deleted file mode 100644
index 388fa91b3..000000000
--- a/freebsd/applications/gtk-qt-engine/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-lib/trinity/kcm_kcmgtk.la
-lib/trinity/kcm_kcmgtk.so
-share/applications/kcmgtk.desktop
-share/doc/tde/HTML/en/kcmgtk/common
-share/doc/tde/HTML/en/kcmgtk/index.cache.bz2
-share/doc/tde/HTML/en/kcmgtk/index.docbook
-share/locale/bg/LC_MESSAGES/gtkqtengine.mo
-share/locale/de/LC_MESSAGES/gtkqtengine.mo
-share/locale/es/LC_MESSAGES/gtkqtengine.mo
-share/locale/fr/LC_MESSAGES/gtkqtengine.mo
-share/locale/it/LC_MESSAGES/gtkqtengine.mo
-share/locale/nl/LC_MESSAGES/gtkqtengine.mo
-share/locale/nn/LC_MESSAGES/gtkqtengine.mo
-share/locale/pl/LC_MESSAGES/gtkqtengine.mo
-share/locale/ru/LC_MESSAGES/gtkqtengine.mo
-share/locale/sv/LC_MESSAGES/gtkqtengine.mo
-share/locale/tr/LC_MESSAGES/gtkqtengine.mo
-/usr/local/lib/gtk-2.0/2.10.0/engines/libqtengine.la
-/usr/local/lib/gtk-2.0/2.10.0/engines/libqtengine.so
-/usr/local/share/themes/Qt/gtk-2.0/gtkrc
-@dir /usr/local/lib/gtk-2.0/2.10.0/engines
-@dir /usr/local/lib/gtk-2.0/2.10.0
-@dir /usr/local/lib/gtk-2.0
-@dir /usr/local/share/themes/Qt/gtk-2.0
-@dir /usr/local/share/themes/Qt
-@dir /usr/local/share/themes
diff --git a/freebsd/applications/gtk3-tqt-engine/Makefile b/freebsd/applications/gtk3-tqt-engine/Makefile
deleted file mode 100644
index 4f6d30e66..000000000
--- a/freebsd/applications/gtk3-tqt-engine/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		gtk3-tqt-engine-trinity
-COMMENT=		GTK3 theme engine for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	g/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11-themes
-DIST_SUBDIR=		TDE/applications
-
-
-# Use gmake for automake build
-USES=		gmake
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libgdk-3.so:${PORTSDIR}/x11-toolkits/gtk30 \
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-autotools-prepare
-	${TDE_AUTOTOOLS_CONFIGURE}
-
-do-build: tde-autotools-build
-
-do-install: tde-autotools-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/gtk3-tqt-engine/distinfo b/freebsd/applications/gtk3-tqt-engine/distinfo
deleted file mode 100644
index ec4d742bc..000000000
--- a/freebsd/applications/gtk3-tqt-engine/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619441332
-SHA256 (TDE/applications/gtk3-tqt-engine-trinity_14.0.10.orig.tar.xz) = 6e25c0ea7cd98fdfa40862a4fe96b19c193988c0f0008d87793e05377ac5f827
-SIZE (TDE/applications/gtk3-tqt-engine-trinity_14.0.10.orig.tar.xz) = 358236
diff --git a/freebsd/applications/gwenview-i18n/Makefile b/freebsd/applications/gwenview-i18n/Makefile
deleted file mode 100644
index ea39eff40..000000000
--- a/freebsd/applications/gwenview-i18n/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		gwenview-i18n-trinity
-COMMENT=		Internationalization (i18n) for Gwenview, an image viewer for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	g/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		graphics x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/gwenview-i18n/distinfo b/freebsd/applications/gwenview-i18n/distinfo
deleted file mode 100644
index be84c9354..000000000
--- a/freebsd/applications/gwenview-i18n/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619683322
-SHA256 (TDE/applications/gwenview-i18n-trinity_14.0.10.orig.tar.xz) = 43dbdf6fdf315cd0619f0f3d7aff0c2da4124c6477a5caa500771ec33fd4a727
-SIZE (TDE/applications/gwenview-i18n-trinity_14.0.10.orig.tar.xz) = 1665688
diff --git a/freebsd/applications/gwenview/Makefile b/freebsd/applications/gwenview/Makefile
deleted file mode 100644
index 84f97f973..000000000
--- a/freebsd/applications/gwenview/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		gwenview-trinity
-COMMENT=		Image viewer for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	g/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		graphics x11
-DIST_SUBDIR=		TDE/applications
-
-
-# Use gmake for automake build
-USES=		gmake
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libkipi.so:${PORTSDIR}/x11/trinity/libraries/libkipi
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libmng.so:${PORTSDIR}/graphics/libmng \
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-autotools-prepare
-	${TDE_AUTOTOOLS_CONFIGURE} \
-	--enable-kipi
-
-do-build: tde-autotools-build
-
-do-install: tde-autotools-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/gwenview/distinfo b/freebsd/applications/gwenview/distinfo
deleted file mode 100644
index acfe86bba..000000000
--- a/freebsd/applications/gwenview/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619441415
-SHA256 (TDE/applications/gwenview-trinity_14.0.10.orig.tar.xz) = abfb2fa8eca0035f6036698476f4e6eab4b1cca93ab9517fb48011ef2950e950
-SIZE (TDE/applications/gwenview-trinity_14.0.10.orig.tar.xz) = 762736
diff --git a/freebsd/applications/internet/Makefile b/freebsd/applications/internet/Makefile
new file mode 100644
index 000000000..30c058adb
--- /dev/null
+++ b/freebsd/applications/internet/Makefile
@@ -0,0 +1,14 @@
+
+    SUBDIR =
+    SUBDIR += kasablanca
+    SUBDIR += kbiff
+    SUBDIR += kftpgrabber
+    SUBDIR += knmap
+    SUBDIR += konversation
+    SUBDIR += kopete-otr
+    SUBDIR += kshowmail
+    SUBDIR += kstreamripper
+    SUBDIR += ktorrent
+    SUBDIR += tork
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/internet/kasablanca/Makefile b/freebsd/applications/internet/kasablanca/Makefile
new file mode 100644
index 000000000..15fb65c47
--- /dev/null
+++ b/freebsd/applications/internet/kasablanca/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kasablanca-trinity
+COMMENT=		Fast and free ftp client for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libssl.so:${PORTSDIR}/security/openssl
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/kasablanca/distinfo b/freebsd/applications/internet/kasablanca/distinfo
new file mode 100644
index 000000000..54079ef15
--- /dev/null
+++ b/freebsd/applications/internet/kasablanca/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666618317
+SHA256 (TDE/applications/internet/kasablanca-trinity_14.0.13.orig.tar.xz) = 10f11b674cbc1f5d0911615701f614df3d604bc6595e246c0f20a17afb3dd5c4
+SIZE (TDE/applications/internet/kasablanca-trinity_14.0.13.orig.tar.xz) = 130444
diff --git a/freebsd/applications/kasablanca/pkg-descr b/freebsd/applications/internet/kasablanca/pkg-descr
index 484f645b6..484f645b6 100644
--- a/freebsd/applications/kasablanca/pkg-descr
+++ b/freebsd/applications/internet/kasablanca/pkg-descr
diff --git a/freebsd/applications/kasablanca/pkg-plist b/freebsd/applications/internet/kasablanca/pkg-plist
index 68a56e058..68a56e058 100644
--- a/freebsd/applications/kasablanca/pkg-plist
+++ b/freebsd/applications/internet/kasablanca/pkg-plist
diff --git a/freebsd/applications/internet/kbiff/Makefile b/freebsd/applications/internet/kbiff/Makefile
new file mode 100644
index 000000000..44ab6f271
--- /dev/null
+++ b/freebsd/applications/internet/kbiff/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kbiff-trinity
+COMMENT=		TDE mail notification utility
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/kbiff/distinfo b/freebsd/applications/internet/kbiff/distinfo
new file mode 100644
index 000000000..5943849c8
--- /dev/null
+++ b/freebsd/applications/internet/kbiff/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666618655
+SHA256 (TDE/applications/internet/kbiff-trinity_14.0.13.orig.tar.xz) = 64c31d57a1055ca988c3e11246d99b74e292ad970df76da6b79a234540a3a941
+SIZE (TDE/applications/internet/kbiff-trinity_14.0.13.orig.tar.xz) = 139192
diff --git a/freebsd/applications/kbiff/pkg-descr b/freebsd/applications/internet/kbiff/pkg-descr
index 458125bde..458125bde 100644
--- a/freebsd/applications/kbiff/pkg-descr
+++ b/freebsd/applications/internet/kbiff/pkg-descr
diff --git a/freebsd/applications/kbiff/pkg-plist b/freebsd/applications/internet/kbiff/pkg-plist
index 09bf178be..09bf178be 100644
--- a/freebsd/applications/kbiff/pkg-plist
+++ b/freebsd/applications/internet/kbiff/pkg-plist
diff --git a/freebsd/applications/internet/kftpgrabber/Makefile b/freebsd/applications/internet/kftpgrabber/Makefile
new file mode 100644
index 000000000..34ba5a6a8
--- /dev/null
+++ b/freebsd/applications/internet/kftpgrabber/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kftpgrabber-trinity
+COMMENT=		FTP client for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/kftpgrabber/distinfo b/freebsd/applications/internet/kftpgrabber/distinfo
new file mode 100644
index 000000000..797c99645
--- /dev/null
+++ b/freebsd/applications/internet/kftpgrabber/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666618699
+SHA256 (TDE/applications/internet/kftpgrabber-trinity_14.0.13.orig.tar.xz) = 901a6754571c6b5be2780cdc9da9fd4181ff662f213ce339088c3b9a7f79bea7
+SIZE (TDE/applications/internet/kftpgrabber-trinity_14.0.13.orig.tar.xz) = 756716
diff --git a/freebsd/applications/internet/kftpgrabber/pkg-descr b/freebsd/applications/internet/kftpgrabber/pkg-descr
new file mode 100644
index 000000000..6727b81ae
--- /dev/null
+++ b/freebsd/applications/internet/kftpgrabber/pkg-descr
@@ -0,0 +1,24 @@
+FTP client for TDE
+
+KFTPgrabber is a graphical FTP client for the Trinity Desktop Environment. It
+implements many features required for usable FTP interaction.
+
+Feature list:
+ - Multiple simultaneous FTP sessions in separate tabs
+ - A tree-oriented transfer queue
+ - TLS/SSL support for the control connection and the data channel
+ - X509 certificate support for authentication
+ - FXP site-to-site transfer support
+ - One-time password (OTP) support using S/KEY, MD5, RMD160 or SHA1
+ - Site bookmarks with many options configurable per-site
+ - Distributed FTP daemon support (implementing the PRET command)
+ - Can use Zeroconf for local site discovery
+ - Bookmark import plugins from other FTP clients
+ - Support for the SFTP protocol
+ - A nice traffic graph
+ - Ability to limit upload and download speed
+ - Priority and skip lists
+ - Integrated SFV checksum verifier
+ - Direct viewing/editing of remote files
+ - Advanced default "on file exists" action configuration
+ - Filter displayed files/directories as you type
diff --git a/freebsd/applications/internet/kftpgrabber/pkg-plist b/freebsd/applications/internet/kftpgrabber/pkg-plist
new file mode 100644
index 000000000..21212b03b
--- /dev/null
+++ b/freebsd/applications/internet/kftpgrabber/pkg-plist
@@ -0,0 +1,63 @@
+bin/kftpgrabber
+include/kftpgrabber/kftpbookmarkimportplugin.h
+lib/libkftpinterfaces.la
+lib/libkftpinterfaces.so
+lib/libkftpinterfaces.so.0
+lib/libkftpinterfaces.so.0.0.0
+lib/trinity/kftpimportplugin_filezilla3.la
+lib/trinity/kftpimportplugin_filezilla3.so
+lib/trinity/kftpimportplugin_gftp.la
+lib/trinity/kftpimportplugin_gftp.so
+lib/trinity/kftpimportplugin_kftp.la
+lib/trinity/kftpimportplugin_kftp.so
+lib/trinity/kftpimportplugin_ncftp.la
+lib/trinity/kftpimportplugin_ncftp.so
+share/applications/tde/kftpgrabber.desktop
+share/apps/kftpgrabber/commands.xml
+share/apps/kftpgrabber/kftpgrabber-bi-wizard.png
+share/apps/kftpgrabber/kftpgrabber-logo.png
+share/apps/kftpgrabber/kftpgrabberui.rc
+share/config.kcfg/kftpgrabber.kcfg
+share/doc/tde/HTML/en/kftpgrabber/common
+share/doc/tde/HTML/en/kftpgrabber/index.cache.bz2
+share/doc/tde/HTML/en/kftpgrabber/index.docbook
+share/icons/hicolor/16x16/apps/kftpgrabber.png
+share/icons/hicolor/22x22/apps/kftpgrabber.png
+share/icons/hicolor/32x32/apps/kftpgrabber.png
+share/icons/hicolor/48x48/apps/kftpgrabber.png
+share/icons/hicolor/64x64/apps/kftpgrabber.png
+share/locale/ar/LC_MESSAGES/kftpgrabber.mo
+share/locale/bg/LC_MESSAGES/kftpgrabber.mo
+share/locale/br/LC_MESSAGES/kftpgrabber.mo
+share/locale/cs/LC_MESSAGES/kftpgrabber.mo
+share/locale/cy/LC_MESSAGES/kftpgrabber.mo
+share/locale/da/LC_MESSAGES/kftpgrabber.mo
+share/locale/de/LC_MESSAGES/kftpgrabber.mo
+share/locale/el/LC_MESSAGES/kftpgrabber.mo
+share/locale/en_GB/LC_MESSAGES/kftpgrabber.mo
+share/locale/es/LC_MESSAGES/kftpgrabber.mo
+share/locale/et/LC_MESSAGES/kftpgrabber.mo
+share/locale/fr/LC_MESSAGES/kftpgrabber.mo
+share/locale/ga/LC_MESSAGES/kftpgrabber.mo
+share/locale/gl/LC_MESSAGES/kftpgrabber.mo
+share/locale/hu/LC_MESSAGES/kftpgrabber.mo
+share/locale/it/LC_MESSAGES/kftpgrabber.mo
+share/locale/ja/LC_MESSAGES/kftpgrabber.mo
+share/locale/ka/LC_MESSAGES/kftpgrabber.mo
+share/locale/lt/LC_MESSAGES/kftpgrabber.mo
+share/locale/nl/LC_MESSAGES/kftpgrabber.mo
+share/locale/pl/LC_MESSAGES/kftpgrabber.mo
+share/locale/pt/LC_MESSAGES/kftpgrabber.mo
+share/locale/rw/LC_MESSAGES/kftpgrabber.mo
+share/locale/sk/LC_MESSAGES/kftpgrabber.mo
+share/locale/sr/LC_MESSAGES/kftpgrabber.mo
+share/locale/sr@Latn/LC_MESSAGES/kftpgrabber.mo
+share/locale/sv/LC_MESSAGES/kftpgrabber.mo
+share/locale/tr/LC_MESSAGES/kftpgrabber.mo
+share/locale/zh_CN/LC_MESSAGES/kftpgrabber.mo
+share/man/man1/kftpgrabber.1.gz
+share/services/kftpimportplugin_filezilla3.desktop
+share/services/kftpimportplugin_gftp.desktop
+share/services/kftpimportplugin_kftp.desktop
+share/services/kftpimportplugin_ncftp.desktop
+share/servicetypes/kftpbookmarkimportplugin.desktop
diff --git a/freebsd/applications/internet/knmap/Makefile b/freebsd/applications/internet/knmap/Makefile
new file mode 100644
index 000000000..00d971925
--- /dev/null
+++ b/freebsd/applications/internet/knmap/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		knmap-trinity
+COMMENT=		KNMap - nmap graphical interface
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		security x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libkonq.so:${PORTSDIR}/x11/trinity/core/tdebase \
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+RUN_DEPENDS+=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE}
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/knmap/distinfo b/freebsd/applications/internet/knmap/distinfo
new file mode 100644
index 000000000..0516766e2
--- /dev/null
+++ b/freebsd/applications/internet/knmap/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666618807
+SHA256 (TDE/applications/internet/knmap-trinity_14.0.13.orig.tar.xz) = 3a17641c4a0da57bfb10376002f9ad7bf8c62de541e0738f5ce473df73047b05
+SIZE (TDE/applications/internet/knmap-trinity_14.0.13.orig.tar.xz) = 980948
diff --git a/freebsd/applications/knmap/pkg-descr b/freebsd/applications/internet/knmap/pkg-descr
index 68f8a6e11..68f8a6e11 100644
--- a/freebsd/applications/knmap/pkg-descr
+++ b/freebsd/applications/internet/knmap/pkg-descr
diff --git a/freebsd/applications/knmap/pkg-plist b/freebsd/applications/internet/knmap/pkg-plist
index 616c8777b..616c8777b 100644
--- a/freebsd/applications/knmap/pkg-plist
+++ b/freebsd/applications/internet/knmap/pkg-plist
diff --git a/freebsd/applications/internet/konversation/Makefile b/freebsd/applications/internet/konversation/Makefile
new file mode 100644
index 000000000..47b88565a
--- /dev/null
+++ b/freebsd/applications/internet/konversation/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		konversation-trinity
+COMMENT=		User friendly Internet Relay Chat (IRC) client for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libXi.so:${PORTSDIR}/x11/libXi
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/konversation/distinfo b/freebsd/applications/internet/konversation/distinfo
new file mode 100644
index 000000000..b59485a13
--- /dev/null
+++ b/freebsd/applications/internet/konversation/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666619471
+SHA256 (TDE/applications/internet/konversation-trinity_14.0.13.orig.tar.xz) = 791cbada3deb3c801805a254b4be4a6b26fe9cad4330b7126995830c6a71a914
+SIZE (TDE/applications/internet/konversation-trinity_14.0.13.orig.tar.xz) = 4400320
diff --git a/freebsd/applications/konversation/pkg-descr b/freebsd/applications/internet/konversation/pkg-descr
index e8b995d14..e8b995d14 100644
--- a/freebsd/applications/konversation/pkg-descr
+++ b/freebsd/applications/internet/konversation/pkg-descr
diff --git a/freebsd/applications/konversation/pkg-plist b/freebsd/applications/internet/konversation/pkg-plist
index ab370501e..ab370501e 100644
--- a/freebsd/applications/konversation/pkg-plist
+++ b/freebsd/applications/internet/konversation/pkg-plist
diff --git a/freebsd/applications/internet/kopete-otr/Makefile b/freebsd/applications/internet/kopete-otr/Makefile
new file mode 100644
index 000000000..5d4daadb4
--- /dev/null
+++ b/freebsd/applications/internet/kopete-otr/Makefile
@@ -0,0 +1,36 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kopete-otr-trinity
+COMMENT=		Off-The-Record encryption for Kopete [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libkopete.so:${PORTSDIR}/x11/trinity/core/tdenetwork
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libotr.so:${PORTSDIR}/security/libotr
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/kopete-otr/distinfo b/freebsd/applications/internet/kopete-otr/distinfo
new file mode 100644
index 000000000..c8c7d7772
--- /dev/null
+++ b/freebsd/applications/internet/kopete-otr/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666619586
+SHA256 (TDE/applications/internet/kopete-otr-trinity_14.0.13.orig.tar.xz) = 8394add8c1fa9edbd275690edaa1d92283f433971fc03e94835634f02b802649
+SIZE (TDE/applications/internet/kopete-otr-trinity_14.0.13.orig.tar.xz) = 70828
diff --git a/freebsd/applications/internet/kopete-otr/pkg-descr b/freebsd/applications/internet/kopete-otr/pkg-descr
new file mode 100644
index 000000000..3003f1ae1
--- /dev/null
+++ b/freebsd/applications/internet/kopete-otr/pkg-descr
@@ -0,0 +1,5 @@
+Off-The-Record encryption for Kopete [Trinity]
+
+This plugin enables Off-The-Record encryption for the TDE instant
+messenger Kopete. Using this plugin you can encrypt chatsessions to other
+users with IM-Cients supporting the OTR encryption method.
diff --git a/freebsd/applications/internet/kopete-otr/pkg-plist b/freebsd/applications/internet/kopete-otr/pkg-plist
new file mode 100644
index 000000000..d09314025
--- /dev/null
+++ b/freebsd/applications/internet/kopete-otr/pkg-plist
@@ -0,0 +1,32 @@
+lib/libkotr.la
+lib/libkotr.so
+lib/libkotr.so.0
+lib/libkotr.so.0.0.0
+lib/trinity/kcm_kopete_otr.la
+lib/trinity/kcm_kopete_otr.so
+lib/trinity/kopete_otr.la
+lib/trinity/kopete_otr.so
+share/apps/kopete_otr/icons/crystalsvg/16x16/actions/otr_disabled.png
+share/apps/kopete_otr/icons/crystalsvg/16x16/actions/otr_finished.png
+share/apps/kopete_otr/icons/crystalsvg/16x16/actions/otr_private.png
+share/apps/kopete_otr/icons/crystalsvg/16x16/actions/otr_unverified.png
+share/apps/kopete_otr/icons/crystalsvg/16x16/apps/kopete_otr.png
+share/apps/kopete_otr/icons/crystalsvg/16x16/apps/otr.png
+share/apps/kopete_otr/icons/crystalsvg/22x22/actions/otr_disabled.png
+share/apps/kopete_otr/icons/crystalsvg/22x22/actions/otr_finished.png
+share/apps/kopete_otr/icons/crystalsvg/22x22/actions/otr_private.png
+share/apps/kopete_otr/icons/crystalsvg/22x22/actions/otr_unverified.png
+share/apps/kopete_otr/icons/crystalsvg/32x32/actions/otr_disabled.png
+share/apps/kopete_otr/icons/crystalsvg/32x32/actions/otr_finished.png
+share/apps/kopete_otr/icons/crystalsvg/32x32/actions/otr_private.png
+share/apps/kopete_otr/icons/crystalsvg/32x32/actions/otr_unverified.png
+share/apps/kopete_otr/otrchatui.rc
+share/apps/kopete_otr/otrui.rc
+share/config.kcfg/kopete_otr.kcfg
+share/doc/tde/HTML/en/kopete_otr/common
+share/doc/tde/HTML/en/kopete_otr/index.cache.bz2
+share/doc/tde/HTML/en/kopete_otr/index.docbook
+share/icons/crystalsvg/16x16/apps/kopete_otr.png
+share/locale/de/LC_MESSAGES/kopete_otr.mo
+share/services/kopete_otr.desktop
+share/services/tdeconfiguredialog/kopete_otr_config.desktop
diff --git a/freebsd/applications/internet/kshowmail/Makefile b/freebsd/applications/internet/kshowmail/Makefile
new file mode 100644
index 000000000..3d58a1211
--- /dev/null
+++ b/freebsd/applications/internet/kshowmail/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kshowmail-trinity
+COMMENT=		Show mails on a POP3 server without actually downloading them
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libmimelib.so:${PORTSDIR}/x11/trinity/core/tdepim
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/kshowmail/distinfo b/freebsd/applications/internet/kshowmail/distinfo
new file mode 100644
index 000000000..fd6b06098
--- /dev/null
+++ b/freebsd/applications/internet/kshowmail/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666619636
+SHA256 (TDE/applications/internet/kshowmail-trinity_14.0.13.orig.tar.xz) = 16c5d0c5b113398e0ff33999b68fec3de715c1659cbebab38cb18e06a84bbc68
+SIZE (TDE/applications/internet/kshowmail-trinity_14.0.13.orig.tar.xz) = 578532
diff --git a/freebsd/applications/kshowmail/pkg-descr b/freebsd/applications/internet/kshowmail/pkg-descr
index 4291891db..4291891db 100644
--- a/freebsd/applications/kshowmail/pkg-descr
+++ b/freebsd/applications/internet/kshowmail/pkg-descr
diff --git a/freebsd/applications/kshowmail/pkg-plist b/freebsd/applications/internet/kshowmail/pkg-plist
index d118e08c6..d118e08c6 100644
--- a/freebsd/applications/kshowmail/pkg-plist
+++ b/freebsd/applications/internet/kshowmail/pkg-plist
diff --git a/freebsd/applications/internet/kstreamripper/Makefile b/freebsd/applications/internet/kstreamripper/Makefile
new file mode 100644
index 000000000..e16f507fe
--- /dev/null
+++ b/freebsd/applications/internet/kstreamripper/Makefile
@@ -0,0 +1,36 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kstreamripper-trinity
+COMMENT=		TDE frontend for streamripper
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+RUN_DEPENDS=	streamripper:${PORTSDIR}/audio/streamripper
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/kstreamripper/distinfo b/freebsd/applications/internet/kstreamripper/distinfo
new file mode 100644
index 000000000..39ccb995d
--- /dev/null
+++ b/freebsd/applications/internet/kstreamripper/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666619699
+SHA256 (TDE/applications/internet/kstreamripper-trinity_14.0.13.orig.tar.xz) = 42545d8ba6d1f03b4613ee800008efb0b6266692ac63f5c43d3d3ff064e7fad1
+SIZE (TDE/applications/internet/kstreamripper-trinity_14.0.13.orig.tar.xz) = 29076
diff --git a/freebsd/applications/kstreamripper/pkg-descr b/freebsd/applications/internet/kstreamripper/pkg-descr
index 5c3c6f361..5c3c6f361 100644
--- a/freebsd/applications/kstreamripper/pkg-descr
+++ b/freebsd/applications/internet/kstreamripper/pkg-descr
diff --git a/freebsd/applications/kstreamripper/pkg-plist b/freebsd/applications/internet/kstreamripper/pkg-plist
index d52391d35..d52391d35 100644
--- a/freebsd/applications/kstreamripper/pkg-plist
+++ b/freebsd/applications/internet/kstreamripper/pkg-plist
diff --git a/freebsd/applications/internet/ktorrent/Makefile b/freebsd/applications/internet/ktorrent/Makefile
new file mode 100644
index 000000000..6ab9b483b
--- /dev/null
+++ b/freebsd/applications/internet/ktorrent/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		ktorrent-trinity
+COMMENT=		BitTorrent client for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		misc x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+# Use gmake for automake build
+USES=	gmake
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libavahi-tqt.so:${PORTSDIR}/x11/trinity/dependencies/avahi-tqt \
+
+LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-autotools-prepare
+	${TDE_AUTOTOOLS_CONFIGURE}
+
+do-build: tde-autotools-build
+
+do-install: tde-autotools-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/ktorrent/distinfo b/freebsd/applications/internet/ktorrent/distinfo
new file mode 100644
index 000000000..4cea1727e
--- /dev/null
+++ b/freebsd/applications/internet/ktorrent/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666619753
+SHA256 (TDE/applications/internet/ktorrent-trinity_14.0.13.orig.tar.xz) = 7ea3a93d039b29319161117419aca640581767a8a8aa3c05b7fff8c4e5832b1d
+SIZE (TDE/applications/internet/ktorrent-trinity_14.0.13.orig.tar.xz) = 2087768
diff --git a/freebsd/applications/internet/ktorrent/pkg-descr b/freebsd/applications/internet/ktorrent/pkg-descr
new file mode 100644
index 000000000..4ff1f8dce
--- /dev/null
+++ b/freebsd/applications/internet/ktorrent/pkg-descr
@@ -0,0 +1,6 @@
+BitTorrent client for Trinity
+
+KTorrent is a BitTorrent program for Trinity. Its features include speed capping
+(both down and up), integrated searching, UDP tracker support, preview of
+certain file types (video and audio) and integration into the TDE Panel
+enabling background downloading.
diff --git a/freebsd/applications/internet/ktorrent/pkg-plist b/freebsd/applications/internet/ktorrent/pkg-plist
new file mode 100644
index 000000000..641500461
--- /dev/null
+++ b/freebsd/applications/internet/ktorrent/pkg-plist
@@ -0,0 +1,454 @@
+bin/ktcachecheck
+bin/ktorrent
+bin/ktshell
+bin/kttorinfo
+bin/ktupnptest
+lib/libktorrent-2.2.8.so
+lib/libktorrent.la
+lib/libktorrent.so
+lib/trinity/ktinfowidgetplugin.la
+lib/trinity/ktinfowidgetplugin.so
+lib/trinity/ktipfilterplugin.la
+lib/trinity/ktipfilterplugin.so
+lib/trinity/ktlogviewerplugin.la
+lib/trinity/ktlogviewerplugin.so
+lib/trinity/ktpartfileimportplugin.la
+lib/trinity/ktpartfileimportplugin.so
+lib/trinity/ktrssfeedplugin.la
+lib/trinity/ktrssfeedplugin.so
+lib/trinity/ktscanfolderplugin.la
+lib/trinity/ktscanfolderplugin.so
+lib/trinity/ktschedulerplugin.la
+lib/trinity/ktschedulerplugin.so
+lib/trinity/ktsearchplugin.la
+lib/trinity/ktsearchplugin.so
+lib/trinity/ktstatsplugin.la
+lib/trinity/ktstatsplugin.so
+lib/trinity/ktupnpplugin.la
+lib/trinity/ktupnpplugin.so
+lib/trinity/ktwebinterfaceplugin.la
+lib/trinity/ktwebinterfaceplugin.so
+lib/trinity/ktzeroconfplugin.la
+lib/trinity/ktzeroconfplugin.so
+share/applications/tde/ktorrent.desktop
+share/apps/ktorrent/geoip/FLAGS_LICENCE
+share/apps/ktorrent/geoip/GeoIP-LICENSE.txt
+share/apps/ktorrent/geoip/ad.png
+share/apps/ktorrent/geoip/ae.png
+share/apps/ktorrent/geoip/af.png
+share/apps/ktorrent/geoip/ag.png
+share/apps/ktorrent/geoip/ai.png
+share/apps/ktorrent/geoip/al.png
+share/apps/ktorrent/geoip/am.png
+share/apps/ktorrent/geoip/an.png
+share/apps/ktorrent/geoip/ao.png
+share/apps/ktorrent/geoip/aq.png
+share/apps/ktorrent/geoip/ar.png
+share/apps/ktorrent/geoip/as.png
+share/apps/ktorrent/geoip/at.png
+share/apps/ktorrent/geoip/au.png
+share/apps/ktorrent/geoip/aw.png
+share/apps/ktorrent/geoip/az.png
+share/apps/ktorrent/geoip/ba.png
+share/apps/ktorrent/geoip/bb.png
+share/apps/ktorrent/geoip/bd.png
+share/apps/ktorrent/geoip/be.png
+share/apps/ktorrent/geoip/bf.png
+share/apps/ktorrent/geoip/bg.png
+share/apps/ktorrent/geoip/bh.png
+share/apps/ktorrent/geoip/bi.png
+share/apps/ktorrent/geoip/bj.png
+share/apps/ktorrent/geoip/bm.png
+share/apps/ktorrent/geoip/bn.png
+share/apps/ktorrent/geoip/bo.png
+share/apps/ktorrent/geoip/br.png
+share/apps/ktorrent/geoip/bs.png
+share/apps/ktorrent/geoip/bt.png
+share/apps/ktorrent/geoip/bv.png
+share/apps/ktorrent/geoip/bw.png
+share/apps/ktorrent/geoip/by.png
+share/apps/ktorrent/geoip/bz.png
+share/apps/ktorrent/geoip/ca.png
+share/apps/ktorrent/geoip/cc.png
+share/apps/ktorrent/geoip/cd.png
+share/apps/ktorrent/geoip/cf.png
+share/apps/ktorrent/geoip/cg.png
+share/apps/ktorrent/geoip/ch.png
+share/apps/ktorrent/geoip/ci.png
+share/apps/ktorrent/geoip/ck.png
+share/apps/ktorrent/geoip/cl.png
+share/apps/ktorrent/geoip/cm.png
+share/apps/ktorrent/geoip/cn.png
+share/apps/ktorrent/geoip/co.png
+share/apps/ktorrent/geoip/cr.png
+share/apps/ktorrent/geoip/cs.png
+share/apps/ktorrent/geoip/cu.png
+share/apps/ktorrent/geoip/cv.png
+share/apps/ktorrent/geoip/cx.png
+share/apps/ktorrent/geoip/cy.png
+share/apps/ktorrent/geoip/cz.png
+share/apps/ktorrent/geoip/de.png
+share/apps/ktorrent/geoip/dj.png
+share/apps/ktorrent/geoip/dk.png
+share/apps/ktorrent/geoip/dm.png
+share/apps/ktorrent/geoip/do.png
+share/apps/ktorrent/geoip/dz.png
+share/apps/ktorrent/geoip/ec.png
+share/apps/ktorrent/geoip/ee.png
+share/apps/ktorrent/geoip/eg.png
+share/apps/ktorrent/geoip/eh.png
+share/apps/ktorrent/geoip/er.png
+share/apps/ktorrent/geoip/es.png
+share/apps/ktorrent/geoip/et.png
+share/apps/ktorrent/geoip/eu.png
+share/apps/ktorrent/geoip/fi.png
+share/apps/ktorrent/geoip/fj.png
+share/apps/ktorrent/geoip/fk.png
+share/apps/ktorrent/geoip/fm.png
+share/apps/ktorrent/geoip/fo.png
+share/apps/ktorrent/geoip/fr.png
+share/apps/ktorrent/geoip/ga.png
+share/apps/ktorrent/geoip/gb.png
+share/apps/ktorrent/geoip/gd.png
+share/apps/ktorrent/geoip/ge.png
+share/apps/ktorrent/geoip/geoip.dat
+share/apps/ktorrent/geoip/gf.png
+share/apps/ktorrent/geoip/gh.png
+share/apps/ktorrent/geoip/gi.png
+share/apps/ktorrent/geoip/gl.png
+share/apps/ktorrent/geoip/gm.png
+share/apps/ktorrent/geoip/gn.png
+share/apps/ktorrent/geoip/gp.png
+share/apps/ktorrent/geoip/gq.png
+share/apps/ktorrent/geoip/gr.png
+share/apps/ktorrent/geoip/gs.png
+share/apps/ktorrent/geoip/gt.png
+share/apps/ktorrent/geoip/gu.png
+share/apps/ktorrent/geoip/gw.png
+share/apps/ktorrent/geoip/gy.png
+share/apps/ktorrent/geoip/hk.png
+share/apps/ktorrent/geoip/hm.png
+share/apps/ktorrent/geoip/hn.png
+share/apps/ktorrent/geoip/hr.png
+share/apps/ktorrent/geoip/ht.png
+share/apps/ktorrent/geoip/hu.png
+share/apps/ktorrent/geoip/id.png
+share/apps/ktorrent/geoip/ie.png
+share/apps/ktorrent/geoip/il.png
+share/apps/ktorrent/geoip/in.png
+share/apps/ktorrent/geoip/io.png
+share/apps/ktorrent/geoip/iq.png
+share/apps/ktorrent/geoip/ir.png
+share/apps/ktorrent/geoip/is.png
+share/apps/ktorrent/geoip/it.png
+share/apps/ktorrent/geoip/jm.png
+share/apps/ktorrent/geoip/jo.png
+share/apps/ktorrent/geoip/jp.png
+share/apps/ktorrent/geoip/ke.png
+share/apps/ktorrent/geoip/kg.png
+share/apps/ktorrent/geoip/kh.png
+share/apps/ktorrent/geoip/ki.png
+share/apps/ktorrent/geoip/km.png
+share/apps/ktorrent/geoip/kn.png
+share/apps/ktorrent/geoip/kp.png
+share/apps/ktorrent/geoip/kr.png
+share/apps/ktorrent/geoip/kw.png
+share/apps/ktorrent/geoip/ky.png
+share/apps/ktorrent/geoip/kz.png
+share/apps/ktorrent/geoip/la.png
+share/apps/ktorrent/geoip/lb.png
+share/apps/ktorrent/geoip/lc.png
+share/apps/ktorrent/geoip/li.png
+share/apps/ktorrent/geoip/lk.png
+share/apps/ktorrent/geoip/lr.png
+share/apps/ktorrent/geoip/ls.png
+share/apps/ktorrent/geoip/lt.png
+share/apps/ktorrent/geoip/lu.png
+share/apps/ktorrent/geoip/lv.png
+share/apps/ktorrent/geoip/ly.png
+share/apps/ktorrent/geoip/ma.png
+share/apps/ktorrent/geoip/mc.png
+share/apps/ktorrent/geoip/md.png
+share/apps/ktorrent/geoip/mg.png
+share/apps/ktorrent/geoip/mh.png
+share/apps/ktorrent/geoip/mk.png
+share/apps/ktorrent/geoip/ml.png
+share/apps/ktorrent/geoip/mm.png
+share/apps/ktorrent/geoip/mn.png
+share/apps/ktorrent/geoip/mo.png
+share/apps/ktorrent/geoip/mp.png
+share/apps/ktorrent/geoip/mq.png
+share/apps/ktorrent/geoip/mr.png
+share/apps/ktorrent/geoip/ms.png
+share/apps/ktorrent/geoip/mt.png
+share/apps/ktorrent/geoip/mu.png
+share/apps/ktorrent/geoip/mv.png
+share/apps/ktorrent/geoip/mw.png
+share/apps/ktorrent/geoip/mx.png
+share/apps/ktorrent/geoip/my.png
+share/apps/ktorrent/geoip/mz.png
+share/apps/ktorrent/geoip/na.png
+share/apps/ktorrent/geoip/nc.png
+share/apps/ktorrent/geoip/ne.png
+share/apps/ktorrent/geoip/nf.png
+share/apps/ktorrent/geoip/ng.png
+share/apps/ktorrent/geoip/ni.png
+share/apps/ktorrent/geoip/nl.png
+share/apps/ktorrent/geoip/no.png
+share/apps/ktorrent/geoip/np.png
+share/apps/ktorrent/geoip/nr.png
+share/apps/ktorrent/geoip/nu.png
+share/apps/ktorrent/geoip/nz.png
+share/apps/ktorrent/geoip/om.png
+share/apps/ktorrent/geoip/pa.png
+share/apps/ktorrent/geoip/pe.png
+share/apps/ktorrent/geoip/pf.png
+share/apps/ktorrent/geoip/pg.png
+share/apps/ktorrent/geoip/ph.png
+share/apps/ktorrent/geoip/pk.png
+share/apps/ktorrent/geoip/pl.png
+share/apps/ktorrent/geoip/pm.png
+share/apps/ktorrent/geoip/pn.png
+share/apps/ktorrent/geoip/pr.png
+share/apps/ktorrent/geoip/ps.png
+share/apps/ktorrent/geoip/pt.png
+share/apps/ktorrent/geoip/pw.png
+share/apps/ktorrent/geoip/py.png
+share/apps/ktorrent/geoip/qa.png
+share/apps/ktorrent/geoip/re.png
+share/apps/ktorrent/geoip/ro.png
+share/apps/ktorrent/geoip/ru.png
+share/apps/ktorrent/geoip/rw.png
+share/apps/ktorrent/geoip/sa.png
+share/apps/ktorrent/geoip/sb.png
+share/apps/ktorrent/geoip/sc.png
+share/apps/ktorrent/geoip/sd.png
+share/apps/ktorrent/geoip/se.png
+share/apps/ktorrent/geoip/sg.png
+share/apps/ktorrent/geoip/sh.png
+share/apps/ktorrent/geoip/si.png
+share/apps/ktorrent/geoip/sj.png
+share/apps/ktorrent/geoip/sk.png
+share/apps/ktorrent/geoip/sl.png
+share/apps/ktorrent/geoip/sm.png
+share/apps/ktorrent/geoip/sn.png
+share/apps/ktorrent/geoip/so.png
+share/apps/ktorrent/geoip/sr.png
+share/apps/ktorrent/geoip/st.png
+share/apps/ktorrent/geoip/sv.png
+share/apps/ktorrent/geoip/sy.png
+share/apps/ktorrent/geoip/sz.png
+share/apps/ktorrent/geoip/tc.png
+share/apps/ktorrent/geoip/td.png
+share/apps/ktorrent/geoip/tf.png
+share/apps/ktorrent/geoip/tg.png
+share/apps/ktorrent/geoip/th.png
+share/apps/ktorrent/geoip/tj.png
+share/apps/ktorrent/geoip/tk.png
+share/apps/ktorrent/geoip/tl.png
+share/apps/ktorrent/geoip/tm.png
+share/apps/ktorrent/geoip/tn.png
+share/apps/ktorrent/geoip/to.png
+share/apps/ktorrent/geoip/tp.png
+share/apps/ktorrent/geoip/tr.png
+share/apps/ktorrent/geoip/tt.png
+share/apps/ktorrent/geoip/tv.png
+share/apps/ktorrent/geoip/tw.png
+share/apps/ktorrent/geoip/tz.png
+share/apps/ktorrent/geoip/ua.png
+share/apps/ktorrent/geoip/ug.png
+share/apps/ktorrent/geoip/um.png
+share/apps/ktorrent/geoip/us.png
+share/apps/ktorrent/geoip/uy.png
+share/apps/ktorrent/geoip/uz.png
+share/apps/ktorrent/geoip/va.png
+share/apps/ktorrent/geoip/vc.png
+share/apps/ktorrent/geoip/ve.png
+share/apps/ktorrent/geoip/vg.png
+share/apps/ktorrent/geoip/vi.png
+share/apps/ktorrent/geoip/vn.png
+share/apps/ktorrent/geoip/vu.png
+share/apps/ktorrent/geoip/wf.png
+share/apps/ktorrent/geoip/ws.png
+share/apps/ktorrent/geoip/ye.png
+share/apps/ktorrent/geoip/yt.png
+share/apps/ktorrent/geoip/yu.png
+share/apps/ktorrent/geoip/za.png
+share/apps/ktorrent/geoip/zm.png
+share/apps/ktorrent/geoip/zw.png
+share/apps/ktorrent/icons/cell-a-0000.png
+share/apps/ktorrent/icons/cell-a-0001.png
+share/apps/ktorrent/icons/cell-a-0002.png
+share/apps/ktorrent/icons/cell-a-0003.png
+share/apps/ktorrent/icons/cell-a-0004.png
+share/apps/ktorrent/icons/cell-b-0000.png
+share/apps/ktorrent/icons/cell-b-0001.png
+share/apps/ktorrent/icons/cell-b-0002.png
+share/apps/ktorrent/icons/cell-b-0003.png
+share/apps/ktorrent/icons/cell-b-0004.png
+share/apps/ktorrent/icons/hicolor/22x22/actions/ktencrypted.png
+share/apps/ktorrent/icons/hicolor/22x22/actions/ktremove.png
+share/apps/ktorrent/icons/hicolor/22x22/actions/ktstart.png
+share/apps/ktorrent/icons/hicolor/22x22/actions/ktstart_all.png
+share/apps/ktorrent/icons/hicolor/22x22/actions/ktstop.png
+share/apps/ktorrent/icons/hicolor/22x22/actions/ktstop_all.png
+share/apps/ktorrent/icons/hicolor/48x48/actions/ktplugins.png
+share/apps/ktorrent/icons/hicolor/64x64/actions/ktinfowidget.png
+share/apps/ktorrent/icons/hicolor/64x64/actions/ktqueuemanager.png
+share/apps/ktorrent/icons/hicolor/64x64/actions/ktupnp.png
+share/apps/ktorrent/icons/hicolor/64x64/places/ktprefdownloads.png
+share/apps/ktorrent/ktorrentui.rc
+share/apps/ktorrent/ktpartfileimportpluginui.rc
+share/apps/ktorrent/ktschedulerpluginui.rc
+share/apps/ktorrent/www/coldmilk/favicon.ico
+share/apps/ktorrent/www/coldmilk/icon.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/edit_user.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/high_priority.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/low_priority.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/normal_priority.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/only_seed.png
+share/apps/ktorrent/www/coldmilk/icons/22x22/exit.png
+share/apps/ktorrent/www/coldmilk/icons/22x22/ktstart_all.png
+share/apps/ktorrent/www/coldmilk/icons/22x22/ktstop_all.png
+share/apps/ktorrent/www/coldmilk/icons/22x22/remove.png
+share/apps/ktorrent/www/coldmilk/icons/22x22/start.png
+share/apps/ktorrent/www/coldmilk/icons/22x22/stop.png
+share/apps/ktorrent/www/coldmilk/icons/32x32/configure.png
+share/apps/ktorrent/www/coldmilk/icons/32x32/extender_opened.png
+share/apps/ktorrent/www/coldmilk/icons/32x32/fileopen.png
+share/apps/ktorrent/www/coldmilk/icons/32x32/folder1.png
+share/apps/ktorrent/www/coldmilk/icons/48x48/exit.png
+share/apps/ktorrent/www/coldmilk/icons/48x48/switchuser.png
+share/apps/ktorrent/www/coldmilk/icons/64x64/down.png
+share/apps/ktorrent/www/coldmilk/icons/64x64/folder1_man.png
+share/apps/ktorrent/www/coldmilk/icons/64x64/looknfeel.png
+share/apps/ktorrent/www/coldmilk/interface.js
+share/apps/ktorrent/www/coldmilk/interface.php
+share/apps/ktorrent/www/coldmilk/login.html
+share/apps/ktorrent/www/coldmilk/page_update.js
+share/apps/ktorrent/www/coldmilk/rest.php
+share/apps/ktorrent/www/coldmilk/shutdown.php
+share/apps/ktorrent/www/coldmilk/style.css
+share/apps/ktorrent/www/default/details.php
+share/apps/ktorrent/www/default/favicon.ico
+share/apps/ktorrent/www/default/grad1.jpg
+share/apps/ktorrent/www/default/grad2.jpg
+share/apps/ktorrent/www/default/header_tile.png
+share/apps/ktorrent/www/default/high_priority.png
+share/apps/ktorrent/www/default/icon.png
+share/apps/ktorrent/www/default/interface.php
+share/apps/ktorrent/www/default/ktorrentwebinterfacelogo.png
+share/apps/ktorrent/www/default/login.html
+share/apps/ktorrent/www/default/low_priority.png
+share/apps/ktorrent/www/default/menu_bg.png
+share/apps/ktorrent/www/default/normal_priority.png
+share/apps/ktorrent/www/default/only_seed.png
+share/apps/ktorrent/www/default/remove.png
+share/apps/ktorrent/www/default/shutdown.php
+share/apps/ktorrent/www/default/start.png
+share/apps/ktorrent/www/default/stop.png
+share/apps/ktorrent/www/default/style.css
+share/apps/ktorrent/www/default/stylen.css
+share/apps/ktorrent/www/default/wz_tooltip.js
+share/apps/ktorrent/www/mobile/favicon.ico
+share/apps/ktorrent/www/mobile/interface.php
+share/apps/ktorrent/www/mobile/ktorrentwebinterfacelogo.png
+share/apps/ktorrent/www/mobile/login.html
+share/apps/ktorrent/www/mobile/remove.png
+share/apps/ktorrent/www/mobile/settings.php
+share/apps/ktorrent/www/mobile/start.png
+share/apps/ktorrent/www/mobile/stop.png
+share/apps/ktorrent/www/mobile/torrent.php
+share/config.kcfg/ktinfowidgetplugin.kcfg
+share/config.kcfg/ktipfilterplugin.kcfg
+share/config.kcfg/ktlogviewerplugin.kcfg
+share/config.kcfg/ktorrent.kcfg
+share/config.kcfg/ktrssfeedplugin.kcfg
+share/config.kcfg/ktscanfolderplugin.kcfg
+share/config.kcfg/ktschedulerplugin.kcfg
+share/config.kcfg/ktsearchplugin.kcfg
+share/config.kcfg/ktstatsplugin.kcfg
+share/config.kcfg/ktupnpplugin.kcfg
+share/config.kcfg/ktwebinterfaceplugin.kcfg
+share/doc/tde/HTML/en/ktorrent/advanced-config.png
+share/doc/tde/HTML/en/ktorrent/bittorrent-config.png
+share/doc/tde/HTML/en/ktorrent/commands.docbook
+share/doc/tde/HTML/en/ktorrent/common
+share/doc/tde/HTML/en/ktorrent/configure.docbook
+share/doc/tde/HTML/en/ktorrent/credits.docbook
+share/doc/tde/HTML/en/ktorrent/downloads-config.png
+share/doc/tde/HTML/en/ktorrent/faq.docbook
+share/doc/tde/HTML/en/ktorrent/general-config.png
+share/doc/tde/HTML/en/ktorrent/index.cache.bz2
+share/doc/tde/HTML/en/ktorrent/index.docbook
+share/doc/tde/HTML/en/ktorrent/introduction.docbook
+share/doc/tde/HTML/en/ktorrent/introduction.png
+share/doc/tde/HTML/en/ktorrent/plugins-config.png
+share/doc/tde/HTML/en/ktorrent/systemtray-popup.png
+share/doc/tde/HTML/en/ktorrent/using.docbook
+share/icons/hicolor/128x128/apps/ktorrent.png
+share/icons/hicolor/128x128/mimetypes/torrent.png
+share/icons/hicolor/16x16/apps/ktorrent.png
+share/icons/hicolor/16x16/mimetypes/torrent.png
+share/icons/hicolor/22x22/apps/ktorrent.png
+share/icons/hicolor/22x22/mimetypes/torrent.png
+share/icons/hicolor/32x32/apps/ktorrent.png
+share/icons/hicolor/32x32/mimetypes/torrent.png
+share/icons/hicolor/48x48/apps/ktorrent.png
+share/icons/hicolor/48x48/mimetypes/torrent.png
+share/icons/hicolor/64x64/apps/ktorrent.png
+share/icons/hicolor/64x64/mimetypes/torrent.png
+share/icons/hicolor/scalable/apps/ktorrent.svgz
+share/icons/hicolor/scalable/mimetypes/torrent.svgz
+share/locale/ar/LC_MESSAGES/ktorrent.mo
+share/locale/bg/LC_MESSAGES/ktorrent.mo
+share/locale/br/LC_MESSAGES/ktorrent.mo
+share/locale/ca/LC_MESSAGES/ktorrent.mo
+share/locale/cs/LC_MESSAGES/ktorrent.mo
+share/locale/cy/LC_MESSAGES/ktorrent.mo
+share/locale/da/LC_MESSAGES/ktorrent.mo
+share/locale/de/LC_MESSAGES/ktorrent.mo
+share/locale/el/LC_MESSAGES/ktorrent.mo
+share/locale/en_GB/LC_MESSAGES/ktorrent.mo
+share/locale/es/LC_MESSAGES/ktorrent.mo
+share/locale/et/LC_MESSAGES/ktorrent.mo
+share/locale/fa/LC_MESSAGES/ktorrent.mo
+share/locale/fr/LC_MESSAGES/ktorrent.mo
+share/locale/gl/LC_MESSAGES/ktorrent.mo
+share/locale/hu/LC_MESSAGES/ktorrent.mo
+share/locale/it/LC_MESSAGES/ktorrent.mo
+share/locale/ja/LC_MESSAGES/ktorrent.mo
+share/locale/ka/LC_MESSAGES/ktorrent.mo
+share/locale/lt/LC_MESSAGES/ktorrent.mo
+share/locale/ms/LC_MESSAGES/ktorrent.mo
+share/locale/nb/LC_MESSAGES/ktorrent.mo
+share/locale/nds/LC_MESSAGES/ktorrent.mo
+share/locale/nl/LC_MESSAGES/ktorrent.mo
+share/locale/pa/LC_MESSAGES/ktorrent.mo
+share/locale/pl/LC_MESSAGES/ktorrent.mo
+share/locale/pt/LC_MESSAGES/ktorrent.mo
+share/locale/pt_BR/LC_MESSAGES/ktorrent.mo
+share/locale/ru/LC_MESSAGES/ktorrent.mo
+share/locale/rw/LC_MESSAGES/ktorrent.mo
+share/locale/sk/LC_MESSAGES/ktorrent.mo
+share/locale/sr/LC_MESSAGES/ktorrent.mo
+share/locale/sr@Latn/LC_MESSAGES/ktorrent.mo
+share/locale/sv/LC_MESSAGES/ktorrent.mo
+share/locale/tr/LC_MESSAGES/ktorrent.mo
+share/locale/uk/LC_MESSAGES/ktorrent.mo
+share/locale/zh_CN/LC_MESSAGES/ktorrent.mo
+share/locale/zh_TW/LC_MESSAGES/ktorrent.mo
+share/man/man1/ktorrent.1.gz
+share/services/ktinfowidgetplugin.desktop
+share/services/ktipfilterplugin.desktop
+share/services/ktlogviewerplugin.desktop
+share/services/ktpartfileimportplugin.desktop
+share/services/ktrssfeedplugin.desktop
+share/services/ktscanfolderplugin.desktop
+share/services/ktschedulerplugin.desktop
+share/services/ktsearchplugin.desktop
+share/services/ktstatsplugin.desktop
+share/services/ktupnpplugin.desktop
+share/services/ktwebinterfaceplugin.desktop
+share/services/ktzeroconfplugin.desktop
+share/servicetypes/ktorrentplugin.desktop
diff --git a/freebsd/applications/internet/tork/Makefile b/freebsd/applications/internet/tork/Makefile
new file mode 100644
index 000000000..8a468908c
--- /dev/null
+++ b/freebsd/applications/internet/tork/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tork-trinity
+COMMENT=		anonymity manager for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/internet
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${LOCALBASE}/lib/torsocks/libtorsocks.so:${PORTSDIR}/net/torsocks \
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libssl.so:${PORTSDIR}/security/openssl \
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON" \
+	-DWITH_EMBEDDED_GEOIP="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/internet/tork/distinfo b/freebsd/applications/internet/tork/distinfo
new file mode 100644
index 000000000..bbfe5d090
--- /dev/null
+++ b/freebsd/applications/internet/tork/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666620037
+SHA256 (TDE/applications/internet/tork-trinity_14.0.13.orig.tar.xz) = 9511b2a5dc4f853f18e9449851b048912f55ee04d773bfb3ac384aa7dafcd9d6
+SIZE (TDE/applications/internet/tork-trinity_14.0.13.orig.tar.xz) = 1974840
diff --git a/freebsd/applications/internet/tork/pkg-descr b/freebsd/applications/internet/tork/pkg-descr
new file mode 100644
index 000000000..fad5f9dc9
--- /dev/null
+++ b/freebsd/applications/internet/tork/pkg-descr
@@ -0,0 +1,8 @@
+anonymity manager for TDE
+
+TorK is an anonymity manager for the Trinity desktop.
+Browse anonymously on Konqueror, Iceweasel or Opera.
+Send anonymous email via the MixMinion network.
+Use ssh, IRC and IM anonymously. Control and monitor
+your anonymous traffic and non-anonymous traffic on
+the Tor network.
diff --git a/freebsd/applications/internet/tork/pkg-plist b/freebsd/applications/internet/tork/pkg-plist
new file mode 100644
index 000000000..4cc80b510
--- /dev/null
+++ b/freebsd/applications/internet/tork/pkg-plist
@@ -0,0 +1,410 @@
+bin/tork
+bin/torkarkollon
+bin/usewithtor
+lib/trinity/kickermenu_tork.la
+lib/trinity/kickermenu_tork.so
+lib/trinity/tdehtml_tork.la
+lib/trinity/tdehtml_tork.so
+lib/trinity/tdeio_torioslave.la
+lib/trinity/tdeio_torioslave.so
+share/applications/tde/tork.desktop
+share/applications/tde/tork_plug_in.desktop
+share/apps/kicker/menuext/torkmenu.desktop
+share/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop
+share/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop
+share/apps/konqueror/servicemenus/tork_downloadwithopera.desktop
+share/apps/tdehtml/kpartplugins/tork_plug_in.rc
+share/apps/tork/eventsrc
+share/apps/tork/geoip/GeoIP-LICENSE.txt
+share/apps/tork/geoip/GeoIP.dat
+share/apps/tork/icons/crystalsvg/16x16/actions/likeback_bug_tork.png
+share/apps/tork/icons/crystalsvg/16x16/actions/likeback_configure_tork.png
+share/apps/tork/icons/crystalsvg/16x16/actions/likeback_dislike_tork.png
+share/apps/tork/icons/crystalsvg/16x16/actions/likeback_feature_tork.png
+share/apps/tork/icons/crystalsvg/16x16/actions/likeback_like_tork.png
+share/apps/tork/icons/hicolor/16x16/actions/tork_torsmall.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_19.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_33.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_FAILED.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ad.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ae.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_af.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ag.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ai.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_aim_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_al.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_am.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_an.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ao.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_aq.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ar.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_as.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_at.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_au.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_aw.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ax.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_az.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ba.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bb.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bd.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_be.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bf.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bh.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bi.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bj.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bo.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_br.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bs.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bt.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bv.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bw.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_by.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_bz.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ca.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cc.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cd.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cf.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ch.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ci.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ck.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cl.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_co.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cs.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cu.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cv.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cx.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cy.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_cz.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_de.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_dj.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_dk.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_dm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_do.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_dz.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ec.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ee.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_eg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_eh.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_er.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_es.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_et.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_eu.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_fi.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_fj.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_fk.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_fm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_fo.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_fr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ga.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gadu_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gb.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gd.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ge.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gf.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gh.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gi.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gl.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gp.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gq.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_groupwise_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gs.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gt.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gu.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gw.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_gy.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_hk.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_hm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_hn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_hr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ht.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_hu.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_icq_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_id.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ie.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_il.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_in.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_io.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_iq.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ir.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_irc_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_is.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_it.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_jabber_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_je.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_jm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_jo.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_jp.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ke.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_kg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_kh.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ki.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_km.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_kn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_konqueroroff.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_konqueroron.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_kp.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_kr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_kw.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ky.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_kz.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_la.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_lb.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_lc.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_li.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_lk.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_lr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ls.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_lt.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_lu.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_lv.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ly.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ma.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mc.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_md.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_me.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mh.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mk.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ml.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mo.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mp.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mq.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ms.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_msn_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mt.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mu.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mv.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mw.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mx.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_my.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_mz.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_na.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_nc.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ne.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_nf.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ng.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ni.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_nl.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_no.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_np.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_nr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_nu.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_nz.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_om.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pa.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pe.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pf.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ph.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pk.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pl.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ps.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pt.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_pw.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_py.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_qa.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_re.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ro.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_rs.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_rs.woa.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ru.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_rw.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sa.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sb.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sc.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sd.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_se.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sh.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_si.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sj.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sk.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sl.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sms_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_so.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_st.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sv.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sy.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_sz.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tc.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_td.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_testbed_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tf.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_th.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tj.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tk.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tl.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_to.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tp.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tr.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tt.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tv.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tw.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_tz.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ua.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ug.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_um.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_us.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_uy.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_uz.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_va.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_vc.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ve.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_vg.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_vi.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_vn.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_vu.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_wf.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ws.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_yahoo_protocol.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_ye.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_yt.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_yu.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_za.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_zm.png
+share/apps/tork/icons/hicolor/16x16/apps/tork_zw.png
+share/apps/tork/icons/hicolor/22x22/actions/tokr_green.png
+share/apps/tork/icons/hicolor/22x22/actions/tork.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_green.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_green_exit.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_guard_detached.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_guard_down.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_guard_little.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_guard_red.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_guard_unlisted.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_guard_unusable.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_guard_up.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_konqueror_https.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_konsole_https.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_little.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_little_exit.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_none.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_orange.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_orange_exit.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_play.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_red.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_red_exit.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_server.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_stop.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_tor.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_torsmall.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_uncensor.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_yellow.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_yellow_exit.png
+share/apps/tork/icons/hicolor/22x22/apps/tork_konqueroroff.png
+share/apps/tork/icons/hicolor/22x22/apps/tork_konqueroron.png
+share/apps/tork/icons/hicolor/32x32/actions/tork.png
+share/apps/tork/icons/hicolor/32x32/actions/tork_Apply_Settings.png
+share/apps/tork/icons/hicolor/32x32/actions/tork_DNS_Leak_Warnings.png
+share/apps/tork/icons/hicolor/32x32/actions/tork_Usage_Warnings.png
+share/apps/tork/icons/hicolor/32x32/actions/tork_green.png
+share/apps/tork/icons/hicolor/32x32/actions/tork_none.png
+share/apps/tork/icons/hicolor/32x32/actions/tork_orange.png
+share/apps/tork/icons/hicolor/32x32/actions/tork_red.png
+share/apps/tork/icons/hicolor/32x32/actions/tork_yellow.png
+share/apps/tork/icons/hicolor/32x32/apps/tork_FAILED.png
+share/apps/tork/icons/hicolor/32x32/apps/tork_General_Warnings.png
+share/apps/tork/icons/hicolor/32x32/apps/tork_Security_Warnings.png
+share/apps/tork/icons/hicolor/32x32/apps/tork_TorK_Feedback.png
+share/apps/tork/icons/hicolor/32x32/apps/tork_green.png
+share/apps/tork/icons/hicolor/48x48/apps/tork.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_FAILED.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_a1.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_a2.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_agent.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_alert.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_firefox.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_green.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_help.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_identity.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_info.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_internet.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_kgpg.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_konqueror_play.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_konqueror_stop.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_konsole.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_konsolessh.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_mail.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_opera.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_penguin.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_play.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_pressplay.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_privoxy.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_remotetor.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_stop.png
+share/apps/tork/icons/hicolor/48x48/apps/tork_torserver.png
+share/apps/tork/privoxy/templates/blocked
+share/apps/tork/privoxy/templates/cgi-error-404
+share/apps/tork/privoxy/templates/cgi-error-bad-param
+share/apps/tork/privoxy/templates/cgi-error-disabled
+share/apps/tork/privoxy/templates/cgi-error-file
+share/apps/tork/privoxy/templates/cgi-error-modified
+share/apps/tork/privoxy/templates/cgi-error-parse
+share/apps/tork/privoxy/templates/cgi-style.css
+share/apps/tork/privoxy/templates/connect-failed
+share/apps/tork/privoxy/templates/default
+share/apps/tork/privoxy/templates/edit-actions-add-url-form
+share/apps/tork/privoxy/templates/edit-actions-for-url
+share/apps/tork/privoxy/templates/edit-actions-for-url-filter
+share/apps/tork/privoxy/templates/edit-actions-list
+share/apps/tork/privoxy/templates/edit-actions-list-section
+share/apps/tork/privoxy/templates/edit-actions-list-url
+share/apps/tork/privoxy/templates/edit-actions-remove-url-form
+share/apps/tork/privoxy/templates/edit-actions-url-form
+share/apps/tork/privoxy/templates/mod-local-help
+share/apps/tork/privoxy/templates/mod-support-and-service
+share/apps/tork/privoxy/templates/mod-title
+share/apps/tork/privoxy/templates/mod-unstable-warning
+share/apps/tork/privoxy/templates/no-such-domain
+share/apps/tork/privoxy/templates/show-request
+share/apps/tork/privoxy/templates/show-status
+share/apps/tork/privoxy/templates/show-status-file
+share/apps/tork/privoxy/templates/show-url-info
+share/apps/tork/privoxy/templates/show-version
+share/apps/tork/privoxy/templates/toggle
+share/apps/tork/privoxy/templates/toggle-mini
+share/apps/tork/privoxy/templates/untrusted
+share/apps/tork/tips
+share/apps/tork/torkui.rc
+share/config.kcfg/torkconfig.kcfg
+share/doc/tde/HTML/en/tork/common
+share/doc/tde/HTML/en/tork/index.cache.bz2
+share/doc/tde/HTML/en/tork/index.docbook
+share/icons/hicolor/48x48/apps/tork.png
+share/locale/cs/LC_MESSAGES/tork.mo
+share/locale/de/LC_MESSAGES/tork.mo
+share/locale/el/LC_MESSAGES/tork.mo
+share/locale/es/LC_MESSAGES/tork.mo
+share/locale/fr/LC_MESSAGES/tork.mo
+share/locale/it/LC_MESSAGES/tork.mo
+share/locale/nl/LC_MESSAGES/tork.mo
+share/locale/tr/LC_MESSAGES/tork.mo
+share/locale/zh_CN/LC_MESSAGES/tork.mo
+share/man/man1/tork.1.gz
+share/man/man1/torkarkollon.1.gz
+share/menu/tork
+share/pixmaps/tork.xpm
+share/services/torioslave.protocol
diff --git a/freebsd/applications/kaffeine/Makefile b/freebsd/applications/kaffeine/Makefile
deleted file mode 100644
index 7d3fa4dc9..000000000
--- a/freebsd/applications/kaffeine/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kaffeine-trinity
-COMMENT=		Versatile media player for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia \
-		libgstaudio-1.0.so:${PORTSDIR}/multimedia/gstreamer1-plugins \
-		libmp3lame.so:${PORTSDIR}/audio/lame \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libxcb.so:${PORTSDIR}/x11/libxcb \
-		libxine.so:${PORTSDIR}/multimedia/libxine \
-		libXtst.so:${PORTSDIR}/x11/libXtst \
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON" \
-	-DWITH_DVB="OFF"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kaffeine/distinfo b/freebsd/applications/kaffeine/distinfo
deleted file mode 100644
index 10592bf81..000000000
--- a/freebsd/applications/kaffeine/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619469785
-SHA256 (TDE/applications/kaffeine-trinity_14.0.10.orig.tar.xz) = 110cf01a936746cf14eb8959dc07a9a779f932b25349f6bb7c1351e053159f24
-SIZE (TDE/applications/kaffeine-trinity_14.0.10.orig.tar.xz) = 2391000
diff --git a/freebsd/applications/kasablanca/Makefile b/freebsd/applications/kasablanca/Makefile
deleted file mode 100644
index 41bb0369c..000000000
--- a/freebsd/applications/kasablanca/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kasablanca-trinity
-COMMENT=		Fast and free ftp client for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
-		libssl.so:${PORTSDIR}/security/openssl
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kasablanca/distinfo b/freebsd/applications/kasablanca/distinfo
deleted file mode 100644
index 146f5cf64..000000000
--- a/freebsd/applications/kasablanca/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619469838
-SHA256 (TDE/applications/kasablanca-trinity_14.0.10.orig.tar.xz) = c9f57b7d4473e3b6fc13a3cc1d79fc1d64d4bc191682bf0437b20296628a0af5
-SIZE (TDE/applications/kasablanca-trinity_14.0.10.orig.tar.xz) = 162996
diff --git a/freebsd/applications/katapult/Makefile b/freebsd/applications/katapult/Makefile
deleted file mode 100644
index b8abaac1f..000000000
--- a/freebsd/applications/katapult/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		katapult-trinity
-COMMENT=		Item launcher for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libXi.so:${PORTSDIR}/x11/libXi
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/katapult/distinfo b/freebsd/applications/katapult/distinfo
deleted file mode 100644
index 9a2d5f53b..000000000
--- a/freebsd/applications/katapult/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619469894
-SHA256 (TDE/applications/katapult-trinity_14.0.10.orig.tar.xz) = 5ae36f6549437c3385009fe692ca6c838d717acb2fbcb5ee2a8f24c7aa14e642
-SIZE (TDE/applications/katapult-trinity_14.0.10.orig.tar.xz) = 285680
diff --git a/freebsd/applications/kbarcode/Makefile b/freebsd/applications/kbarcode/Makefile
deleted file mode 100644
index dc5b33466..000000000
--- a/freebsd/applications/kbarcode/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kbarcode-trinity
-COMMENT=		Barcode and label printing application for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kbarcode/distinfo b/freebsd/applications/kbarcode/distinfo
deleted file mode 100644
index 9f8a9b7a3..000000000
--- a/freebsd/applications/kbarcode/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619469962
-SHA256 (TDE/applications/kbarcode-trinity_14.0.10.orig.tar.xz) = 2f84d2f2558748a8be48862987c7c2db70aea491963c13482751e85da2e4fab3
-SIZE (TDE/applications/kbarcode-trinity_14.0.10.orig.tar.xz) = 305140
diff --git a/freebsd/applications/kbfx/Makefile b/freebsd/applications/kbfx/Makefile
deleted file mode 100644
index 357b7f234..000000000
--- a/freebsd/applications/kbfx/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kbfx-trinity
-COMMENT=		An alternative to T-Menu for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kbfx/distinfo b/freebsd/applications/kbfx/distinfo
deleted file mode 100644
index a56f0c12a..000000000
--- a/freebsd/applications/kbfx/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470025
-SHA256 (TDE/applications/kbfx-trinity_14.0.10.orig.tar.xz) = e1432d22e681e640625bcfe791ea9e7efd3b494f8631463411291baea2d6c5bb
-SIZE (TDE/applications/kbfx-trinity_14.0.10.orig.tar.xz) = 2641012
diff --git a/freebsd/applications/kbibtex/Makefile b/freebsd/applications/kbibtex/Makefile
deleted file mode 100644
index a5b2dfa6b..000000000
--- a/freebsd/applications/kbibtex/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kbibtex-trinity
-COMMENT=		BibTeX editor for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libyaz.so:${PORTSDIR}/net/yaz \
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kbibtex/distinfo b/freebsd/applications/kbibtex/distinfo
deleted file mode 100644
index d44ee2ed1..000000000
--- a/freebsd/applications/kbibtex/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470142
-SHA256 (TDE/applications/kbibtex-trinity_14.0.10.orig.tar.xz) = de77a505ce83f51f9da3ebf8de42bea5985c3b327ca61d815cd09b2961626f85
-SIZE (TDE/applications/kbibtex-trinity_14.0.10.orig.tar.xz) = 317772
diff --git a/freebsd/applications/kbiff/Makefile b/freebsd/applications/kbiff/Makefile
deleted file mode 100644
index e5735e760..000000000
--- a/freebsd/applications/kbiff/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kbiff-trinity
-COMMENT=		TDE mail notification utility
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kbiff/distinfo b/freebsd/applications/kbiff/distinfo
deleted file mode 100644
index 1f68f62ce..000000000
--- a/freebsd/applications/kbiff/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470239
-SHA256 (TDE/applications/kbiff-trinity_14.0.10.orig.tar.xz) = 0fdca20fad4b193ca7dfdf996fcda1b44268e1cba141ac25754a8c91d32c2487
-SIZE (TDE/applications/kbiff-trinity_14.0.10.orig.tar.xz) = 171944
diff --git a/freebsd/applications/kbookreader/Makefile b/freebsd/applications/kbookreader/Makefile
deleted file mode 100644
index aa647301b..000000000
--- a/freebsd/applications/kbookreader/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kbookreader-trinity
-COMMENT=		eBook reader for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kbookreader/distinfo b/freebsd/applications/kbookreader/distinfo
deleted file mode 100644
index ec7cc1b0c..000000000
--- a/freebsd/applications/kbookreader/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470288
-SHA256 (TDE/applications/kbookreader-trinity_14.0.10.orig.tar.xz) = b99e14e6f63cc2ef90c5718787f6e1708107b99cd71e3ba3f15e8da87dce527c
-SIZE (TDE/applications/kbookreader-trinity_14.0.10.orig.tar.xz) = 154140
diff --git a/freebsd/applications/kbookreader/pkg-plist b/freebsd/applications/kbookreader/pkg-plist
deleted file mode 100644
index 0b5866a8f..000000000
--- a/freebsd/applications/kbookreader/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-bin/bookreader
-bin/bookreader_client
-share/applications/tde/bookreader.desktop
-share/apps/bookreader/bookreaderui.rc
-share/apps/bookreader/themes/default/bg.png
-share/apps/bookreader/themes/default/bookmark.png
-share/apps/bookreader/themes/default/splash.png
-share/config.kcfg/bookreader.kcfg
-share/doc/tde/HTML/en/bookreader/common
-share/doc/tde/HTML/en/bookreader/index.cache.bz2
-share/doc/tde/HTML/en/bookreader/index.docbook
-share/icons/hicolor/16x16/apps/bookreader.png
-share/icons/hicolor/32x32/apps/bookreader.png
-share/locale/cs/LC_MESSAGES/kbookreader.mo
-share/locale/de/LC_MESSAGES/kbookreader.mo
-share/locale/nl/LC_MESSAGES/kbookreader.mo
diff --git a/freebsd/applications/kchmviewer/Makefile b/freebsd/applications/kchmviewer/Makefile
deleted file mode 100644
index 0d1513f6a..000000000
--- a/freebsd/applications/kchmviewer/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kchmviewer-trinity
-COMMENT=		CHM viewer for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
-		libchm.so:${PORTSDIR}/misc/chmlib
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kchmviewer/distinfo b/freebsd/applications/kchmviewer/distinfo
deleted file mode 100644
index 80cceb439..000000000
--- a/freebsd/applications/kchmviewer/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470318
-SHA256 (TDE/applications/kchmviewer-trinity_14.0.10.orig.tar.xz) = ed017da89efd698af1ee1ebf7e14583a87f639e86fb183b2d57d77b1623214c8
-SIZE (TDE/applications/kchmviewer-trinity_14.0.10.orig.tar.xz) = 270020
diff --git a/freebsd/applications/kcmautostart/Makefile b/freebsd/applications/kcmautostart/Makefile
deleted file mode 100644
index 27ffaa2e2..000000000
--- a/freebsd/applications/kcmautostart/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kcontrol-autostart-trinity
-COMMENT=		autostart module for the Trinity control center
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-DISTSRC=		kcmautostart-trinity-${TDE_VERSION}${TDE_PREVERSION}
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kcmautostart/distinfo b/freebsd/applications/kcmautostart/distinfo
deleted file mode 100644
index af1e4f9c6..000000000
--- a/freebsd/applications/kcmautostart/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470356
-SHA256 (TDE/applications/kcontrol-autostart-trinity_14.0.10.orig.tar.xz) = dd46472bb1d4baf55262f9f2af0577a400c03de1e4863701c10b1a6927ee7074
-SIZE (TDE/applications/kcontrol-autostart-trinity_14.0.10.orig.tar.xz) = 50736
diff --git a/freebsd/applications/kcmldap/Makefile b/freebsd/applications/kcmldap/Makefile
deleted file mode 100644
index 805e7634f..000000000
--- a/freebsd/applications/kcmldap/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kcontrol-ldap-bonding-trinity
-COMMENT=		Kerberos control module for the Trinity control center
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-DISTSRC=		kcmldap-trinity-${TDE_VERSION}${TDE_PREVERSION}
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libtdeldap.so:${PORTSDIR}/x11/trinity/libraries/libtdeldap
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kcmldap/distinfo b/freebsd/applications/kcmldap/distinfo
deleted file mode 100644
index deddbcb52..000000000
--- a/freebsd/applications/kcmldap/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470395
-SHA256 (TDE/applications/kcontrol-ldap-bonding-trinity_14.0.10.orig.tar.xz) = 65cbdc5b1722be6a87dd21b44e2f944839ca73097a19eeee33245968dd923d04
-SIZE (TDE/applications/kcontrol-ldap-bonding-trinity_14.0.10.orig.tar.xz) = 186764
diff --git a/freebsd/applications/kcmldapmanager/Makefile b/freebsd/applications/kcmldapmanager/Makefile
deleted file mode 100644
index 6bfed33c8..000000000
--- a/freebsd/applications/kcmldapmanager/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kcontrol-ldap-manager-trinity
-COMMENT=		Kerberos realm management module for the Trinity control center
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-DISTSRC=		kcmldapmanager-trinity-${TDE_VERSION}${TDE_PREVERSION}
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libtdeldap.so:${PORTSDIR}/x11/trinity/libraries/libtdeldap
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kcmldapmanager/distinfo b/freebsd/applications/kcmldapmanager/distinfo
deleted file mode 100644
index 26d9933f2..000000000
--- a/freebsd/applications/kcmldapmanager/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470439
-SHA256 (TDE/applications/kcontrol-ldap-manager-trinity_14.0.10.orig.tar.xz) = 634c3c3894c78800d2a63512ace2a056c41fc833872abe65f735e0fe9bf9ad33
-SIZE (TDE/applications/kcontrol-ldap-manager-trinity_14.0.10.orig.tar.xz) = 57584
diff --git a/freebsd/applications/kcpuload/Makefile b/freebsd/applications/kcpuload/Makefile
deleted file mode 100644
index e07afe0c9..000000000
--- a/freebsd/applications/kcpuload/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kcpuload-trinity
-COMMENT=		A CPU meter for Kicker [Trinity]
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kcpuload/distinfo b/freebsd/applications/kcpuload/distinfo
deleted file mode 100644
index a2c727580..000000000
--- a/freebsd/applications/kcpuload/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470475
-SHA256 (TDE/applications/kcpuload-trinity_14.0.10.orig.tar.xz) = 5d550ba8fc251e7f406566755dbd27f46d01f6dfd48b728a6935a2353f0119ae
-SIZE (TDE/applications/kcpuload-trinity_14.0.10.orig.tar.xz) = 67020
diff --git a/freebsd/applications/kdbg/Makefile b/freebsd/applications/kdbg/Makefile
deleted file mode 100644
index bfeaad321..000000000
--- a/freebsd/applications/kdbg/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kdbg-trinity
-COMMENT=		Graphical debugger interface [Trinity]
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kdbg/distinfo b/freebsd/applications/kdbg/distinfo
deleted file mode 100644
index da596adb5..000000000
--- a/freebsd/applications/kdbg/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470510
-SHA256 (TDE/applications/kdbg-trinity_14.0.10.orig.tar.xz) = 9300d2e27438202fe86fbf8b672824c204df8ac814aea1a7399e19e99a78f462
-SIZE (TDE/applications/kdbg-trinity_14.0.10.orig.tar.xz) = 499972
diff --git a/freebsd/applications/kdbusnotification/Makefile b/freebsd/applications/kdbusnotification/Makefile
deleted file mode 100644
index 1b9927804..000000000
--- a/freebsd/applications/kdbusnotification/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kdbusnotification-trinity
-COMMENT=		DBUS notification service for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kdbusnotification/distinfo b/freebsd/applications/kdbusnotification/distinfo
deleted file mode 100644
index b52322fe2..000000000
--- a/freebsd/applications/kdbusnotification/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470563
-SHA256 (TDE/applications/kdbusnotification-trinity_14.0.10.orig.tar.xz) = c99b4be3a941e411c4796c30dfe696cb466b1ca646c1c75dd3ee86b7279ebf23
-SIZE (TDE/applications/kdbusnotification-trinity_14.0.10.orig.tar.xz) = 40808
diff --git a/freebsd/applications/kdiff3/Makefile b/freebsd/applications/kdiff3/Makefile
deleted file mode 100644
index 957cc701a..000000000
--- a/freebsd/applications/kdiff3/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kdiff3-trinity
-COMMENT=		Compares and merges 2 or 3 files or directories
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kdiff3/distinfo b/freebsd/applications/kdiff3/distinfo
deleted file mode 100644
index 65d83803f..000000000
--- a/freebsd/applications/kdiff3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470588
-SHA256 (TDE/applications/kdiff3-trinity_14.0.10.orig.tar.xz) = 6a43362943e748af1d85037fab90c940d3096ab3a20a834f3703804a44be1fcb
-SIZE (TDE/applications/kdiff3-trinity_14.0.10.orig.tar.xz) = 821228
diff --git a/freebsd/applications/kdiff3/pkg-plist b/freebsd/applications/kdiff3/pkg-plist
deleted file mode 100644
index 0361ec6bd..000000000
--- a/freebsd/applications/kdiff3/pkg-plist
+++ /dev/null
@@ -1,251 +0,0 @@
-bin/kdiff3
-lib/trinity/libkdiff3part.la
-lib/trinity/libkdiff3part.so
-lib/trinity/libkdiff3plugin.la
-lib/trinity/libkdiff3plugin.so
-share/applications/tde/kdiff3.desktop
-share/applnk/.hidden/kdiff3plugin.desktop
-share/apps/kdiff3/kdiff3_shell.rc
-share/apps/kdiff3part/kdiff3_part.rc
-share/doc/kdiff3/html/compilation.html
-share/doc/kdiff3/html/credits.html
-share/doc/kdiff3/html/dirbrowser.png
-share/doc/kdiff3/html/dirmerge.html
-share/doc/kdiff3/html/dirmergebig.png
-share/doc/kdiff3/html/dirmergeoptions.html
-share/doc/kdiff3/html/dirmergevisible.html
-share/doc/kdiff3/html/documentation.html
-share/doc/kdiff3/html/dothemerge.html
-share/doc/kdiff3/html/faq.html
-share/doc/kdiff3/html/features.html
-share/doc/kdiff3/html/find.html
-share/doc/kdiff3/html/index.html
-share/doc/kdiff3/html/installation.html
-share/doc/kdiff3/html/interpretinginformation.html
-share/doc/kdiff3/html/introduction.html
-share/doc/kdiff3/html/iteminfo.png
-share/doc/kdiff3/html/kpart.html
-share/doc/kdiff3/html/letter_by_letter.png
-share/doc/kdiff3/html/merge_current.png
-share/doc/kdiff3/html/merging.html
-share/doc/kdiff3/html/misc.html
-share/doc/kdiff3/html/navigation.html
-share/doc/kdiff3/html/new.png
-share/doc/kdiff3/html/open_dialog.png
-share/doc/kdiff3/html/opendialog.html
-share/doc/kdiff3/html/options.html
-share/doc/kdiff3/html/other.html
-share/doc/kdiff3/html/pasteinput.html
-share/doc/kdiff3/html/preprocessors.html
-share/doc/kdiff3/html/printing.html
-share/doc/kdiff3/html/requirements.html
-share/doc/kdiff3/html/saving.html
-share/doc/kdiff3/html/screenshot_diff.png
-share/doc/kdiff3/html/screenshot_merge.png
-share/doc/kdiff3/html/screenshots.html
-share/doc/kdiff3/html/selections.html
-share/doc/kdiff3/html/startingdirmerge.html
-share/doc/kdiff3/html/triple_diff.png
-share/doc/kdiff3/html/white_space.png
-share/doc/tde/HTML/da/kdiff3/common
-share/doc/tde/HTML/da/kdiff3/dirbrowser.png
-share/doc/tde/HTML/da/kdiff3/dirmergebig.png
-share/doc/tde/HTML/da/kdiff3/index.cache.bz2
-share/doc/tde/HTML/da/kdiff3/index.docbook
-share/doc/tde/HTML/da/kdiff3/iteminfo.png
-share/doc/tde/HTML/da/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/da/kdiff3/merge_current.png
-share/doc/tde/HTML/da/kdiff3/new.png
-share/doc/tde/HTML/da/kdiff3/open_dialog.png
-share/doc/tde/HTML/da/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/da/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/da/kdiff3/triple_diff.png
-share/doc/tde/HTML/da/kdiff3/white_space.png
-share/doc/tde/HTML/de/kdiff3/common
-share/doc/tde/HTML/de/kdiff3/dirbrowser.png
-share/doc/tde/HTML/de/kdiff3/dirmergebig.png
-share/doc/tde/HTML/de/kdiff3/index.cache.bz2
-share/doc/tde/HTML/de/kdiff3/index.docbook
-share/doc/tde/HTML/de/kdiff3/iteminfo.png
-share/doc/tde/HTML/de/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/de/kdiff3/merge_current.png
-share/doc/tde/HTML/de/kdiff3/new.png
-share/doc/tde/HTML/de/kdiff3/open_dialog.png
-share/doc/tde/HTML/de/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/de/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/de/kdiff3/triple_diff.png
-share/doc/tde/HTML/de/kdiff3/white_space.png
-share/doc/tde/HTML/en/kdiff3/common
-share/doc/tde/HTML/en/kdiff3/dirbrowser.png
-share/doc/tde/HTML/en/kdiff3/dirmergebig.png
-share/doc/tde/HTML/en/kdiff3/index.cache.bz2
-share/doc/tde/HTML/en/kdiff3/index.docbook
-share/doc/tde/HTML/en/kdiff3/iteminfo.png
-share/doc/tde/HTML/en/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/en/kdiff3/merge_current.png
-share/doc/tde/HTML/en/kdiff3/new.png
-share/doc/tde/HTML/en/kdiff3/open_dialog.png
-share/doc/tde/HTML/en/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/en/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/en/kdiff3/triple_diff.png
-share/doc/tde/HTML/en/kdiff3/white_space.png
-share/doc/tde/HTML/es/kdiff3/common
-share/doc/tde/HTML/es/kdiff3/dirbrowser.png
-share/doc/tde/HTML/es/kdiff3/dirmergebig.png
-share/doc/tde/HTML/es/kdiff3/index.cache.bz2
-share/doc/tde/HTML/es/kdiff3/index.docbook
-share/doc/tde/HTML/es/kdiff3/iteminfo.png
-share/doc/tde/HTML/es/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/es/kdiff3/merge_current.png
-share/doc/tde/HTML/es/kdiff3/new.png
-share/doc/tde/HTML/es/kdiff3/open_dialog.png
-share/doc/tde/HTML/es/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/es/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/es/kdiff3/triple_diff.png
-share/doc/tde/HTML/es/kdiff3/white_space.png
-share/doc/tde/HTML/et/kdiff3/common
-share/doc/tde/HTML/et/kdiff3/dirbrowser.png
-share/doc/tde/HTML/et/kdiff3/dirmergebig.png
-share/doc/tde/HTML/et/kdiff3/index.cache.bz2
-share/doc/tde/HTML/et/kdiff3/index.docbook
-share/doc/tde/HTML/et/kdiff3/iteminfo.png
-share/doc/tde/HTML/et/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/et/kdiff3/merge_current.png
-share/doc/tde/HTML/et/kdiff3/new.png
-share/doc/tde/HTML/et/kdiff3/open_dialog.png
-share/doc/tde/HTML/et/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/et/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/et/kdiff3/triple_diff.png
-share/doc/tde/HTML/et/kdiff3/white_space.png
-share/doc/tde/HTML/fr/kdiff3/common
-share/doc/tde/HTML/fr/kdiff3/dirbrowser.png
-share/doc/tde/HTML/fr/kdiff3/dirmergebig.png
-share/doc/tde/HTML/fr/kdiff3/index.cache.bz2
-share/doc/tde/HTML/fr/kdiff3/index.docbook
-share/doc/tde/HTML/fr/kdiff3/iteminfo.png
-share/doc/tde/HTML/fr/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/fr/kdiff3/merge_current.png
-share/doc/tde/HTML/fr/kdiff3/new.png
-share/doc/tde/HTML/fr/kdiff3/open_dialog.png
-share/doc/tde/HTML/fr/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/fr/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/fr/kdiff3/triple_diff.png
-share/doc/tde/HTML/fr/kdiff3/white_space.png
-share/doc/tde/HTML/it/kdiff3/common
-share/doc/tde/HTML/it/kdiff3/dirbrowser.png
-share/doc/tde/HTML/it/kdiff3/dirmergebig.png
-share/doc/tde/HTML/it/kdiff3/index.cache.bz2
-share/doc/tde/HTML/it/kdiff3/index.docbook
-share/doc/tde/HTML/it/kdiff3/iteminfo.png
-share/doc/tde/HTML/it/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/it/kdiff3/merge_current.png
-share/doc/tde/HTML/it/kdiff3/new.png
-share/doc/tde/HTML/it/kdiff3/open_dialog.png
-share/doc/tde/HTML/it/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/it/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/it/kdiff3/triple_diff.png
-share/doc/tde/HTML/it/kdiff3/white_space.png
-share/doc/tde/HTML/nl/kdiff3/common
-share/doc/tde/HTML/nl/kdiff3/dirbrowser.png
-share/doc/tde/HTML/nl/kdiff3/dirmergebig.png
-share/doc/tde/HTML/nl/kdiff3/index.cache.bz2
-share/doc/tde/HTML/nl/kdiff3/index.docbook
-share/doc/tde/HTML/nl/kdiff3/iteminfo.png
-share/doc/tde/HTML/nl/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/nl/kdiff3/merge_current.png
-share/doc/tde/HTML/nl/kdiff3/new.png
-share/doc/tde/HTML/nl/kdiff3/open_dialog.png
-share/doc/tde/HTML/nl/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/nl/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/nl/kdiff3/triple_diff.png
-share/doc/tde/HTML/nl/kdiff3/white_space.png
-share/doc/tde/HTML/pt/kdiff3/common
-share/doc/tde/HTML/pt/kdiff3/dirbrowser.png
-share/doc/tde/HTML/pt/kdiff3/dirmergebig.png
-share/doc/tde/HTML/pt/kdiff3/index.cache.bz2
-share/doc/tde/HTML/pt/kdiff3/index.docbook
-share/doc/tde/HTML/pt/kdiff3/iteminfo.png
-share/doc/tde/HTML/pt/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/pt/kdiff3/merge_current.png
-share/doc/tde/HTML/pt/kdiff3/new.png
-share/doc/tde/HTML/pt/kdiff3/open_dialog.png
-share/doc/tde/HTML/pt/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/pt/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/pt/kdiff3/triple_diff.png
-share/doc/tde/HTML/pt/kdiff3/white_space.png
-share/doc/tde/HTML/sv/kdiff3/common
-share/doc/tde/HTML/sv/kdiff3/dirbrowser.png
-share/doc/tde/HTML/sv/kdiff3/dirmergebig.png
-share/doc/tde/HTML/sv/kdiff3/index.cache.bz2
-share/doc/tde/HTML/sv/kdiff3/index.docbook
-share/doc/tde/HTML/sv/kdiff3/iteminfo.png
-share/doc/tde/HTML/sv/kdiff3/letter_by_letter.png
-share/doc/tde/HTML/sv/kdiff3/merge_current.png
-share/doc/tde/HTML/sv/kdiff3/new.png
-share/doc/tde/HTML/sv/kdiff3/open_dialog.png
-share/doc/tde/HTML/sv/kdiff3/screenshot_diff.png
-share/doc/tde/HTML/sv/kdiff3/screenshot_merge.png
-share/doc/tde/HTML/sv/kdiff3/triple_diff.png
-share/doc/tde/HTML/sv/kdiff3/white_space.png
-share/icons/hicolor/16x16/apps/kdiff3.png
-share/icons/hicolor/32x32/apps/kdiff3.png
-share/icons/locolor/16x16/apps/kdiff3.png
-share/icons/locolor/32x32/apps/kdiff3.png
-share/locale/ar/LC_MESSAGES/kdiff3.mo
-share/locale/az/LC_MESSAGES/kdiff3.mo
-share/locale/bg/LC_MESSAGES/kdiff3.mo
-share/locale/bg/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/br/LC_MESSAGES/kdiff3.mo
-share/locale/br/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/ca/LC_MESSAGES/kdiff3.mo
-share/locale/cs/LC_MESSAGES/kdiff3.mo
-share/locale/cs/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/cy/LC_MESSAGES/kdiff3.mo
-share/locale/da/LC_MESSAGES/kdiff3.mo
-share/locale/da/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/de/LC_MESSAGES/kdiff3.mo
-share/locale/de/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/el/LC_MESSAGES/kdiff3.mo
-share/locale/el/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/en_GB/LC_MESSAGES/kdiff3.mo
-share/locale/es/LC_MESSAGES/kdiff3.mo
-share/locale/et/LC_MESSAGES/kdiff3.mo
-share/locale/et/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/fr/LC_MESSAGES/kdiff3.mo
-share/locale/ga/LC_MESSAGES/kdiff3.mo
-share/locale/ga/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/gl/LC_MESSAGES/kdiff3.mo
-share/locale/hi/LC_MESSAGES/kdiff3.mo
-share/locale/hu/LC_MESSAGES/kdiff3.mo
-share/locale/is/LC_MESSAGES/kdiff3.mo
-share/locale/it/LC_MESSAGES/kdiff3.mo
-share/locale/it/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/ja/LC_MESSAGES/kdiff3.mo
-share/locale/ka/LC_MESSAGES/kdiff3.mo
-share/locale/lt/LC_MESSAGES/kdiff3.mo
-share/locale/nb/LC_MESSAGES/kdiff3.mo
-share/locale/nl/LC_MESSAGES/kdiff3.mo
-share/locale/nl/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/pl/LC_MESSAGES/kdiff3.mo
-share/locale/pt/LC_MESSAGES/kdiff3.mo
-share/locale/pt/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/pt_BR/LC_MESSAGES/kdiff3.mo
-share/locale/pt_BR/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/ro/LC_MESSAGES/kdiff3.mo
-share/locale/ru/LC_MESSAGES/kdiff3.mo
-share/locale/rw/LC_MESSAGES/kdiff3.mo
-share/locale/sk/LC_MESSAGES/kdiff3.mo
-share/locale/sk/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/sr/LC_MESSAGES/kdiff3.mo
-share/locale/sr@Latn/LC_MESSAGES/kdiff3.mo
-share/locale/sv/LC_MESSAGES/kdiff3.mo
-share/locale/sv/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/ta/LC_MESSAGES/kdiff3.mo
-share/locale/tg/LC_MESSAGES/kdiff3.mo
-share/locale/tr/LC_MESSAGES/kdiff3.mo
-share/locale/tr/LC_MESSAGES/kdiff3_plugin.mo
-share/locale/uk/LC_MESSAGES/kdiff3.mo
-share/locale/zh_CN/LC_MESSAGES/kdiff3.mo
-share/man/man1/kdiff3.1.gz
-share/services/kdiff3_plugin.desktop
-share/services/kdiff3part.desktop
diff --git a/freebsd/applications/kdirstat/Makefile b/freebsd/applications/kdirstat/Makefile
deleted file mode 100644
index 2d2b976c8..000000000
--- a/freebsd/applications/kdirstat/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kdirstat-trinity
-COMMENT=		Graphical disk usage display with cleanup facilities [Trinity]
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kdirstat/distinfo b/freebsd/applications/kdirstat/distinfo
deleted file mode 100644
index 4b0667daa..000000000
--- a/freebsd/applications/kdirstat/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470635
-SHA256 (TDE/applications/kdirstat-trinity_14.0.10.orig.tar.xz) = 4fc71560b10cc64153d69989de20b187d900da11936d556d5b05ae3e99cc402c
-SIZE (TDE/applications/kdirstat-trinity_14.0.10.orig.tar.xz) = 236176
diff --git a/freebsd/applications/keep/Makefile b/freebsd/applications/keep/Makefile
deleted file mode 100644
index 1895ddc3c..000000000
--- a/freebsd/applications/keep/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		keep-trinity
-COMMENT=		Backup system for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-RUN_DEPENDS+=	rdiff-backup:${PORTSDIR}/sysutils/py-rdiff-backup
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/keep/distinfo b/freebsd/applications/keep/distinfo
deleted file mode 100644
index 34acce55b..000000000
--- a/freebsd/applications/keep/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470671
-SHA256 (TDE/applications/keep-trinity_14.0.10.orig.tar.xz) = 694aacd50e1a3693b62ee078d6e30b414d876aa4d8e4aff0b0331ff33578243b
-SIZE (TDE/applications/keep-trinity_14.0.10.orig.tar.xz) = 197180
diff --git a/freebsd/applications/kiosktool/Makefile b/freebsd/applications/kiosktool/Makefile
deleted file mode 100644
index f81838667..000000000
--- a/freebsd/applications/kiosktool/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kiosktool-trinity
-COMMENT=		Tool to configure the TDE kiosk framework
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kiosktool/distinfo b/freebsd/applications/kiosktool/distinfo
deleted file mode 100644
index 226c8f6d2..000000000
--- a/freebsd/applications/kiosktool/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470726
-SHA256 (TDE/applications/kiosktool-trinity_14.0.10.orig.tar.xz) = 892b526ac36c0b74db56dad02e3d7f8142159a4c45770924b02a89db8ead6bca
-SIZE (TDE/applications/kiosktool-trinity_14.0.10.orig.tar.xz) = 302840
diff --git a/freebsd/applications/kkbswitch/Makefile b/freebsd/applications/kkbswitch/Makefile
deleted file mode 100644
index 926932533..000000000
--- a/freebsd/applications/kkbswitch/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kkbswitch-trinity
-COMMENT=		KKBSwitch – keyboard layout indicator
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		sysutils x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libkonq.so:${PORTSDIR}/x11/trinity/core/tdebase \
-		${TDE_PREFIX}/lib/libartsc.so:${PORTSDIR}/x11/trinity/dependencies/arts \
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL=ON
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kkbswitch/distinfo b/freebsd/applications/kkbswitch/distinfo
deleted file mode 100644
index 8a14959dc..000000000
--- a/freebsd/applications/kkbswitch/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470789
-SHA256 (TDE/applications/kkbswitch-trinity_14.0.10.orig.tar.xz) = 7f7f1766fbd732a7e34780b597b3d54377d497d08021e74ac802c31b3486b9c0
-SIZE (TDE/applications/kkbswitch-trinity_14.0.10.orig.tar.xz) = 111192
diff --git a/freebsd/applications/klamav/Makefile b/freebsd/applications/klamav/Makefile
deleted file mode 100644
index 176037c89..000000000
--- a/freebsd/applications/klamav/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		klamav-trinity
-COMMENT=		TDE frontend for ClamAV [Trinity]
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
-		libclamav.so:${PORTSDIR}/security/clamav
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/klamav/distinfo b/freebsd/applications/klamav/distinfo
deleted file mode 100644
index bdf752774..000000000
--- a/freebsd/applications/klamav/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619470827
-SHA256 (TDE/applications/klamav-trinity_14.0.10.orig.tar.xz) = 2b6546d2de6c7e217651b4c4d56d94b98c948d7297486f7e1b105399464ef812
-SIZE (TDE/applications/klamav-trinity_14.0.10.orig.tar.xz) = 669628
diff --git a/freebsd/applications/klamav/pkg-plist b/freebsd/applications/klamav/pkg-plist
deleted file mode 100644
index 6076e1020..000000000
--- a/freebsd/applications/klamav/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-bin/ScanWithKlamAV
-bin/klamav
-bin/klammail
-share/applications/tde/klamav.desktop
-share/apps/klamav/about/aboutklamav.html
-share/apps/klamav/about/klam.png
-share/apps/klamav/about/klamav.css
-share/apps/klamav/about/main.html
-share/apps/klamav/about/nodb.html
-share/apps/klamav/about/top-right-klamav.png
-share/apps/klamav/about/wait.html
-share/apps/klamav/eventsrc
-share/apps/klamav/icons/hicolor/32x32/actions/klamav_scan_found.png
-share/apps/klamav/icons/hicolor/32x32/actions/klamav_scan_safe.png
-share/apps/klamav/icons/hicolor/32x32/actions/klamav_scanning.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamav.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamav_error.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamav_on_acc_disabled.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamav_on_acc_enabled.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamav_quarantining.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamav_update_required.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamav_virus.png
-share/apps/klamav/icons/hicolor/48x48/apps/klamav.png
-share/apps/klamav/klamavui.rc
-share/apps/konqueror/servicemenus/klamav-dropdown.desktop
-share/doc/tde/HTML/en/klamav/common
-share/doc/tde/HTML/en/klamav/index.cache.bz2
-share/doc/tde/HTML/en/klamav/index.docbook
-share/doc/tde/HTML/en/klamav/klamav.png
-share/doc/tde/HTML/en/klamav/klamav_error.png
-share/doc/tde/HTML/en/klamav/klamav_on_acc_disabled.png
-share/doc/tde/HTML/en/klamav/klamav_on_acc_enabled.png
-share/doc/tde/HTML/en/klamav/klamav_quarantining.png
-share/doc/tde/HTML/en/klamav/klamav_scan_found.png
-share/doc/tde/HTML/en/klamav/klamav_scan_safe.png
-share/doc/tde/HTML/en/klamav/klamav_scanning.png
-share/doc/tde/HTML/en/klamav/klamav_update_required.png
-share/doc/tde/HTML/en/klamav/klamav_virus.png
-share/icons/hicolor/32x32/apps/klamav.png
-share/icons/hicolor/48x48/apps/klamav.png
-share/locale/el/LC_MESSAGES/klamav.mo
-share/locale/eo/LC_MESSAGES/klamav.mo
-share/locale/it/LC_MESSAGES/klamav.mo
-share/locale/pt/LC_MESSAGES/klamav.mo
-share/locale/ru/LC_MESSAGES/klamav.mo
diff --git a/freebsd/applications/knights/Makefile b/freebsd/applications/knights/Makefile
deleted file mode 100644
index 99ce700bb..000000000
--- a/freebsd/applications/knights/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		knights-trinity
-COMMENT=		A chess interface for the Trinity Desktop Environment
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/knights/distinfo b/freebsd/applications/knights/distinfo
deleted file mode 100644
index 08a0262a5..000000000
--- a/freebsd/applications/knights/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619522140
-SHA256 (TDE/applications/knights-trinity_14.0.10.orig.tar.xz) = bb65b0fd1aa7aac3dc2feb6c3980cfdd32530cf4befcde8be6b4a5e0980358c5
-SIZE (TDE/applications/knights-trinity_14.0.10.orig.tar.xz) = 619972
diff --git a/freebsd/applications/knmap/Makefile b/freebsd/applications/knmap/Makefile
deleted file mode 100644
index e7cafef68..000000000
--- a/freebsd/applications/knmap/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		knmap-trinity
-COMMENT=		KNMap - nmap graphical interface
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		security x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libkonq.so:${PORTSDIR}/x11/trinity/core/tdebase \
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-RUN_DEPENDS+=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE}
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/knmap/distinfo b/freebsd/applications/knmap/distinfo
deleted file mode 100644
index 9c48ff0c5..000000000
--- a/freebsd/applications/knmap/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619522342
-SHA256 (TDE/applications/knmap-trinity_14.0.10.orig.tar.xz) = bac1f38e2ba4283fd789cd8a0ab3944d523b8b32b28348d87665609dfae5cc6d
-SIZE (TDE/applications/knmap-trinity_14.0.10.orig.tar.xz) = 1013692
diff --git a/freebsd/applications/knowit/Makefile b/freebsd/applications/knowit/Makefile
deleted file mode 100644
index 09e431fa6..000000000
--- a/freebsd/applications/knowit/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		knowit-trinity
-COMMENT=		Tool for managing notes [Trinity]
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/knowit/distinfo b/freebsd/applications/knowit/distinfo
deleted file mode 100644
index 6b0db65ca..000000000
--- a/freebsd/applications/knowit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619522770
-SHA256 (TDE/applications/knowit-trinity_14.0.10.orig.tar.xz) = 1cdde00ab351b1d0c17c879f3b5f6d34342cd88fde25631bbf557da28562e945
-SIZE (TDE/applications/knowit-trinity_14.0.10.orig.tar.xz) = 130144
diff --git a/freebsd/applications/knutclient/Makefile b/freebsd/applications/knutclient/Makefile
deleted file mode 100644
index e48b7af6f..000000000
--- a/freebsd/applications/knutclient/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		knutclient-trinity
-COMMENT=		A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/knutclient/distinfo b/freebsd/applications/knutclient/distinfo
deleted file mode 100644
index fea3c8d34..000000000
--- a/freebsd/applications/knutclient/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619522790
-SHA256 (TDE/applications/knutclient-trinity_14.0.10.orig.tar.xz) = b5c67b6067bed51162c95da227084899ecbaa6d7301ccd4d385578ac0537aeb9
-SIZE (TDE/applications/knutclient-trinity_14.0.10.orig.tar.xz) = 564488
diff --git a/freebsd/applications/kompose/Makefile b/freebsd/applications/kompose/Makefile
deleted file mode 100644
index 39505bc83..000000000
--- a/freebsd/applications/kompose/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kompose-trinity
-COMMENT=		Full screen task manager for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2 \
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kompose/distinfo b/freebsd/applications/kompose/distinfo
deleted file mode 100644
index a2d86b5de..000000000
--- a/freebsd/applications/kompose/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619522816
-SHA256 (TDE/applications/kompose-trinity_14.0.10.orig.tar.xz) = ae52fdd0d6afe06d616c482f3bc67a929574c4d0f88ab0cfc9a5ec021854977e
-SIZE (TDE/applications/kompose-trinity_14.0.10.orig.tar.xz) = 109052
diff --git a/freebsd/applications/konversation/Makefile b/freebsd/applications/konversation/Makefile
deleted file mode 100644
index e768b36ce..000000000
--- a/freebsd/applications/konversation/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		konversation-trinity
-COMMENT=		User friendly Internet Relay Chat (IRC) client for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-LIB_DEPENDS+=\
-		libXi.so:${PORTSDIR}/x11/libXi
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/konversation/distinfo b/freebsd/applications/konversation/distinfo
deleted file mode 100644
index fc4d069e7..000000000
--- a/freebsd/applications/konversation/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619522841
-SHA256 (TDE/applications/konversation-trinity_14.0.10.orig.tar.xz) = 7a65ccc78ac11ee26398920937334a38579eed4ecc18ab5b2bf8f0e3de8bca1f
-SIZE (TDE/applications/konversation-trinity_14.0.10.orig.tar.xz) = 4430232
diff --git a/freebsd/applications/kooldock/Makefile b/freebsd/applications/kooldock/Makefile
deleted file mode 100644
index a86e9beaf..000000000
--- a/freebsd/applications/kooldock/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kooldock-trinity
-COMMENT=		Dock for TDE with cool visual enhancements
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kooldock/distinfo b/freebsd/applications/kooldock/distinfo
deleted file mode 100644
index 4dcb4823e..000000000
--- a/freebsd/applications/kooldock/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619522923
-SHA256 (TDE/applications/kooldock-trinity_14.0.10.orig.tar.xz) = 252f3153e409664974c6a4112bda6009c9ae25bd90cdc7d62e00c174a64fe9ac
-SIZE (TDE/applications/kooldock-trinity_14.0.10.orig.tar.xz) = 366560
diff --git a/freebsd/applications/krename/Makefile b/freebsd/applications/krename/Makefile
deleted file mode 100644
index ef5af4301..000000000
--- a/freebsd/applications/krename/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		krename-trinity
-COMMENT=		Powerful batch renamer for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/krename/distinfo b/freebsd/applications/krename/distinfo
deleted file mode 100644
index e3398ee96..000000000
--- a/freebsd/applications/krename/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619522949
-SHA256 (TDE/applications/krename-trinity_14.0.10.orig.tar.xz) = a1a9062f7dd60f96b90e237475d2817f1b07fc12e24591df8f639e339f36168d
-SIZE (TDE/applications/krename-trinity_14.0.10.orig.tar.xz) = 220240
diff --git a/freebsd/applications/krename/pkg-plist b/freebsd/applications/krename/pkg-plist
deleted file mode 100644
index a2abd87d9..000000000
--- a/freebsd/applications/krename/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-bin/krename
-share/applications/tde/krename.desktop
-share/apps/konqueror/servicemenus/krename_dir.desktop
-share/apps/konqueror/servicemenus/krenameservicemenu.desktop
-share/apps/krename/krename_system_default_tabbed.xml
-share/apps/krename/krename_system_default_wizard.xml
-share/apps/krename/logo.png
-share/doc/tde/HTML/en/krename/index.html
-share/icons/hicolor/32x32/apps/krename.png
-share/icons/hicolor/48x48/apps/krename.png
-share/icons/locolor/16x16/apps/krename.png
-share/icons/locolor/32x32/apps/krename.png
-share/locale/bs/LC_MESSAGES/krename.mo
-share/locale/de/LC_MESSAGES/krename.mo
-share/locale/es/LC_MESSAGES/krename.mo
-share/locale/fr/LC_MESSAGES/krename.mo
-share/locale/hu/LC_MESSAGES/krename.mo
-share/locale/it/LC_MESSAGES/krename.mo
-share/locale/ja/LC_MESSAGES/krename.mo
-share/locale/nl/LC_MESSAGES/krename.mo
-share/locale/pl/LC_MESSAGES/krename.mo
-share/locale/pt_BR/LC_MESSAGES/krename.mo
-share/locale/ru/LC_MESSAGES/krename.mo
-share/locale/sl/LC_MESSAGES/krename.mo
-share/locale/sv/LC_MESSAGES/krename.mo
-share/locale/tr/LC_MESSAGES/krename.mo
-share/locale/zh_CN/LC_MESSAGES/krename.mo
-share/locale/zh_TW/LC_MESSAGES/krename.mo
-share/man/man1/krename.1.gz
diff --git a/freebsd/applications/kscope/Makefile b/freebsd/applications/kscope/Makefile
deleted file mode 100644
index b8bbc5a3d..000000000
--- a/freebsd/applications/kscope/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kscope-trinity
-COMMENT=		Source editing environment for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/share/cmake/kate.cmake:${PORTSDIR}/x11/trinity/core/tdebase
-
-BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kscope/distinfo b/freebsd/applications/kscope/distinfo
deleted file mode 100644
index bf17adbf9..000000000
--- a/freebsd/applications/kscope/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619522980
-SHA256 (TDE/applications/kscope-trinity_14.0.10.orig.tar.xz) = f0ec45a694a4415f5f1ed521a7a04175cc9980194e771f9ce4a1cf61577f3192
-SIZE (TDE/applications/kscope-trinity_14.0.10.orig.tar.xz) = 1341560
diff --git a/freebsd/applications/kscope/pkg-plist b/freebsd/applications/kscope/pkg-plist
deleted file mode 100644
index d00005ac3..000000000
--- a/freebsd/applications/kscope/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-bin/kscope
-share/applications/tde/kscope.desktop
-share/apps/kscope/kscope_config
-share/apps/kscope/kscopeui.rc
-share/apps/kscope/pics/bookmark.png
-share/apps/kscope/pics/call_graph.png
-share/apps/kscope/pics/called_tree.png
-share/apps/kscope/pics/calling_tree.png
-share/apps/kscope/pics/file_ro.png
-share/apps/kscope/pics/file_rw.png
-share/apps/kscope/pics/file_save.png
-share/apps/kscope/pics/query_locked.png
-share/apps/kscope/pics/query_unlocked.png
-share/apps/kscope/pics/tab_list.png
-share/doc/tde/HTML/en/kscope/about.docbook
-share/doc/tde/HTML/en/kscope/autocomp_dlg.png
-share/doc/tde/HTML/en/kscope/bookmarks.docbook
-share/doc/tde/HTML/en/kscope/bookmarks.png
-share/doc/tde/HTML/en/kscope/call_graph.png
-share/doc/tde/HTML/en/kscope/call_tree.png
-share/doc/tde/HTML/en/kscope/common
-share/doc/tde/HTML/en/kscope/config_dlg.docbook
-share/doc/tde/HTML/en/kscope/editing.docbook
-share/doc/tde/HTML/en/kscope/index.cache.bz2
-share/doc/tde/HTML/en/kscope/index.docbook
-share/doc/tde/HTML/en/kscope/main_menu.docbook
-share/doc/tde/HTML/en/kscope/main_window.docbook
-share/doc/tde/HTML/en/kscope/main_window.png
-share/doc/tde/HTML/en/kscope/pos_history.docbook
-share/doc/tde/HTML/en/kscope/pref_clrs.png
-share/doc/tde/HTML/en/kscope/pref_fonts.png
-share/doc/tde/HTML/en/kscope/pref_opts.png
-share/doc/tde/HTML/en/kscope/pref_progs.png
-share/doc/tde/HTML/en/kscope/project_details.png
-share/doc/tde/HTML/en/kscope/project_files.png
-share/doc/tde/HTML/en/kscope/project_make.png
-share/doc/tde/HTML/en/kscope/project_open.png
-share/doc/tde/HTML/en/kscope/project_opts.png
-share/doc/tde/HTML/en/kscope/project_types.png
-share/doc/tde/HTML/en/kscope/projects.docbook
-share/doc/tde/HTML/en/kscope/query_dlg.png
-share/doc/tde/HTML/en/kscope/query_filter.png
-share/doc/tde/HTML/en/kscope/query_system.docbook
-share/doc/tde/HTML/en/kscope/quick_start.docbook
-share/icons/hicolor/16x16/apps/kscope.png
-share/icons/hicolor/32x32/apps/kscope.png
-share/icons/locolor/16x16/apps/kscope.png
-share/icons/locolor/32x32/apps/kscope.png
-share/locale/de/LC_MESSAGES/kscope.mo
-share/locale/zh_CN/LC_MESSAGES/kscope.mo
-share/man/man1/kscope.1.gz
diff --git a/freebsd/applications/kshowmail/Makefile b/freebsd/applications/kshowmail/Makefile
deleted file mode 100644
index 46ca27a21..000000000
--- a/freebsd/applications/kshowmail/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kshowmail-trinity
-COMMENT=		Show mails on a POP3 server without actually downloading them
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libmimelib.so:${PORTSDIR}/x11/trinity/core/tdepim
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kshowmail/distinfo b/freebsd/applications/kshowmail/distinfo
deleted file mode 100644
index 80eec3bf0..000000000
--- a/freebsd/applications/kshowmail/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619524031
-SHA256 (TDE/applications/kshowmail-trinity_14.0.10.orig.tar.xz) = dee5bf8875891a9b2403de31029c2648acc4a0ba0ef4d32b95a91e4bf4ccada8
-SIZE (TDE/applications/kshowmail-trinity_14.0.10.orig.tar.xz) = 612136
diff --git a/freebsd/applications/kshutdown/Makefile b/freebsd/applications/kshutdown/Makefile
deleted file mode 100644
index e6a190001..000000000
--- a/freebsd/applications/kshutdown/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kshutdown-trinity
-COMMENT=		An advanced shut down utility for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kshutdown/distinfo b/freebsd/applications/kshutdown/distinfo
deleted file mode 100644
index ab43cd1da..000000000
--- a/freebsd/applications/kshutdown/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619529686
-SHA256 (TDE/applications/kshutdown-trinity_14.0.10.orig.tar.xz) = b37f44b434ac990b4bdef8f78983e069da700c66ea0ac1c324709c6cda2efbcf
-SIZE (TDE/applications/kshutdown-trinity_14.0.10.orig.tar.xz) = 205060
diff --git a/freebsd/applications/ksplash-engine-moodin/Makefile b/freebsd/applications/ksplash-engine-moodin/Makefile
deleted file mode 100644
index d86fba911..000000000
--- a/freebsd/applications/ksplash-engine-moodin/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		ksplash-engine-moodin-trinity
-COMMENT=		Fading splash screen engine for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libksplashthemes.so:${PORTSDIR}/x11/trinity/core/tdebase
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/ksplash-engine-moodin/distinfo b/freebsd/applications/ksplash-engine-moodin/distinfo
deleted file mode 100644
index 44ac0e30a..000000000
--- a/freebsd/applications/ksplash-engine-moodin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619529709
-SHA256 (TDE/applications/ksplash-engine-moodin-trinity_14.0.10.orig.tar.xz) = fc2b0c24a9cdeb6742943cd163b63266c231aacf6b8c139ea9a88632bd8d8262
-SIZE (TDE/applications/ksplash-engine-moodin-trinity_14.0.10.orig.tar.xz) = 651368
diff --git a/freebsd/applications/ksquirrel/Makefile b/freebsd/applications/ksquirrel/Makefile
deleted file mode 100644
index ba680290e..000000000
--- a/freebsd/applications/ksquirrel/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		ksquirrel-trinity
-COMMENT=		Powerful Trinity image viewer
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		graphics x11
-DIST_SUBDIR=		TDE/applications
-TDE_BUILD_SUBDIR=	# build-in-source
-
-
-# Use gmake for automake build
-USES=		gmake
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/lib/libkonq.so:${PORTSDIR}/x11/trinity/core/tdebase \
-		${TDE_PREFIX}/lib/libkipi.so:${PORTSDIR}/x11/trinity/libraries/libkipi \
-		${TDE_PREFIX}/lib/libkipiplugins.so:${PORTSDIR}/x11/trinity/libraries/kipi-plugins \
-		${TDE_PREFIX}/lib/libksquirrel-libs.so:${PORTSDIR}/x11/trinity/libraries/libksquirrel \
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-autotools-prepare
-	${TDE_AUTOTOOLS_CONFIGURE} \
-	--disable-final
-
-do-build: tde-autotools-build
-
-do-install: tde-autotools-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/ksquirrel/distinfo b/freebsd/applications/ksquirrel/distinfo
deleted file mode 100644
index bbc06d97a..000000000
--- a/freebsd/applications/ksquirrel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619529786
-SHA256 (TDE/applications/ksquirrel-trinity_14.0.10.orig.tar.xz) = 193f6e915d18d58fb7cb8bb096b090a4a03f450f29fb9522508ffe21351f31ff
-SIZE (TDE/applications/ksquirrel-trinity_14.0.10.orig.tar.xz) = 813448
diff --git a/freebsd/applications/kstreamripper/Makefile b/freebsd/applications/kstreamripper/Makefile
deleted file mode 100644
index 4d66c8254..000000000
--- a/freebsd/applications/kstreamripper/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kstreamripper-trinity
-COMMENT=		TDE frontend for streamripper
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-RUN_DEPENDS=	streamripper:${PORTSDIR}/audio/streamripper
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kstreamripper/distinfo b/freebsd/applications/kstreamripper/distinfo
deleted file mode 100644
index 75683e8da..000000000
--- a/freebsd/applications/kstreamripper/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619530449
-SHA256 (TDE/applications/kstreamripper-trinity_14.0.10.orig.tar.xz) = 4c3af63653a406f0edbbe65931ea9485889bf2cac11d15335b2be9ecc8484d70
-SIZE (TDE/applications/kstreamripper-trinity_14.0.10.orig.tar.xz) = 61928
diff --git a/freebsd/applications/ksystemlog/Makefile b/freebsd/applications/ksystemlog/Makefile
deleted file mode 100644
index 505631537..000000000
--- a/freebsd/applications/ksystemlog/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		ksystemlog-trinity
-COMMENT=		System log viewer tool for Trinity
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/ksystemlog/distinfo b/freebsd/applications/ksystemlog/distinfo
deleted file mode 100644
index 47cdd1064..000000000
--- a/freebsd/applications/ksystemlog/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619530465
-SHA256 (TDE/applications/ksystemlog-trinity_14.0.10.orig.tar.xz) = 6351c541b0d36c15e1a103edbe5c0233532e1cfc5ee268d434973f8676a84e22
-SIZE (TDE/applications/ksystemlog-trinity_14.0.10.orig.tar.xz) = 465140
diff --git a/freebsd/applications/kvkbd/Makefile b/freebsd/applications/kvkbd/Makefile
deleted file mode 100644
index e4945801c..000000000
--- a/freebsd/applications/kvkbd/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kvkbd-trinity
-COMMENT=		Virtual keyboard for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
-		libXtst.so:${PORTSDIR}/x11/libXtst \
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kvkbd/distinfo b/freebsd/applications/kvkbd/distinfo
deleted file mode 100644
index e59a9c562..000000000
--- a/freebsd/applications/kvkbd/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619530508
-SHA256 (TDE/applications/kvkbd-trinity_14.0.10.orig.tar.xz) = 31ae3f3db66730a7f83d603e6e7987e0fe6e52d79aa3f1d0d9dfe6cac203f1e9
-SIZE (TDE/applications/kvkbd-trinity_14.0.10.orig.tar.xz) = 80064
diff --git a/freebsd/applications/kxmleditor/Makefile b/freebsd/applications/kxmleditor/Makefile
deleted file mode 100644
index b55e533ef..000000000
--- a/freebsd/applications/kxmleditor/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		kxmleditor-trinity
-COMMENT=		XML Editor for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	k/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/kxmleditor/distinfo b/freebsd/applications/kxmleditor/distinfo
deleted file mode 100644
index ab98cff35..000000000
--- a/freebsd/applications/kxmleditor/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619530526
-SHA256 (TDE/applications/kxmleditor-trinity_14.0.10.orig.tar.xz) = b40ad5865df105eebad93dcb6a785bd6cb1d874b8f99759540ae2c672316befd
-SIZE (TDE/applications/kxmleditor-trinity_14.0.10.orig.tar.xz) = 767104
diff --git a/freebsd/applications/kxmleditor/pkg-plist b/freebsd/applications/kxmleditor/pkg-plist
deleted file mode 100644
index 8cbd1a003..000000000
--- a/freebsd/applications/kxmleditor/pkg-plist
+++ /dev/null
@@ -1,106 +0,0 @@
-bin/kxmleditor
-lib/libkxmleditorpart.la
-lib/libkxmleditorpart.so
-lib/libkxmleditorpart.so.1
-lib/libkxmleditorpart.so.1.0.0
-share/applnk/Applications/kxmleditor.desktop
-share/apps/kxmleditor/icons/hicolor/16x16/actions/bookmark_next.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/bookmark_prev.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/collapse_node.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/expand_node.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_cdata.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_comment.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_delete_attribute.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_delete_contents.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_delete_element.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_delete_procins.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_edit_attribute.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_edit_contents.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_edit_element.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_edit_procins.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_insert_attribute.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_insert_contents.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_insert_element.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_insert_procins.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_move_item_down.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_move_item_up.png
-share/apps/kxmleditor/icons/hicolor/16x16/actions/xml_text.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/bookmark_next.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/bookmark_prev.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/collapse_node.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/expand_node.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_delete_attribute.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_delete_contents.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_delete_element.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_delete_procins.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_edit_attribute.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_edit_contents.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_edit_element.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_edit_procins.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_insert_attribute.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_insert_contents.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_insert_element.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_insert_procins.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_move_item_down.png
-share/apps/kxmleditor/icons/hicolor/22x22/actions/xml_move_item_up.png
-share/apps/kxmleditor/icons/hicolor/32x32/actions/bookmark_next.png
-share/apps/kxmleditor/icons/hicolor/32x32/actions/bookmark_prev.png
-share/apps/kxmleditor/icons/hicolor/32x32/actions/xml_move_item_down.png
-share/apps/kxmleditor/icons/hicolor/32x32/actions/xml_move_item_up.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/bookmark_next.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/bookmark_prev.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/collapse_node.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/expand_node.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_delete_attribute.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_delete_contents.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_delete_element.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_delete_procins.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_edit_attribute.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_edit_contents.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_edit_element.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_edit_procins.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_insert_attribute.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_insert_contents.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_insert_element.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_insert_procins.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_move_item_down.png
-share/apps/kxmleditor/icons/locolor/16x16/actions/xml_move_item_up.png
-share/apps/kxmleditor/kxedocument.rc
-share/apps/kxmleditor/kxmleditorpartBrowseUI.rc
-share/apps/kxmleditor/kxmleditorpartEditUI.rc
-share/apps/kxmleditor/kxmleditorshell.rc
-share/apps/kxmleditor/pics/xml_attribute.png
-share/apps/kxmleditor/pics/xml_cdata.png
-share/apps/kxmleditor/pics/xml_cdata_b.png
-share/apps/kxmleditor/pics/xml_comment.png
-share/apps/kxmleditor/pics/xml_comment_b.png
-share/apps/kxmleditor/pics/xml_contents.png
-share/apps/kxmleditor/pics/xml_contents_b.png
-share/apps/kxmleditor/pics/xml_element.png
-share/apps/kxmleditor/pics/xml_element_b.png
-share/apps/kxmleditor/pics/xml_procinstr.png
-share/apps/kxmleditor/pics/xml_procinstr_b.png
-share/apps/kxmleditor/pics/xml_text.png
-share/apps/kxmleditor/pics/xml_text_b.png
-share/doc/tde/HTML/en/kxmleditor/common
-share/doc/tde/HTML/en/kxmleditor/index.cache.bz2
-share/doc/tde/HTML/en/kxmleditor/index.docbook
-share/doc/tde/HTML/en/kxmleditor/screenshot.png
-share/doc/tde/HTML/en/kxmleditor/setuparchive.png
-share/doc/tde/HTML/en/kxmleditor/setupnewfiles.png
-share/doc/tde/HTML/en/kxmleditor/setupprinting.png
-share/doc/tde/HTML/en/kxmleditor/setuptextview.png
-share/doc/tde/HTML/en/kxmleditor/setuptreeview.png
-share/doc/tde/HTML/en/kxmleditor/specprocinstrdlg.png
-share/doc/tde/HTML/en/kxmleditor/tdeparts.png
-share/doc/tde/HTML/en/kxmleditor/texteditor.png
-share/doc/tde/HTML/en/kxmleditor/xml.png
-share/icons/hicolor/32x32/apps/kxmleditor.png
-share/icons/hicolor/48x48/apps/kxmleditor.png
-share/icons/locolor/16x16/apps/kxmleditor.png
-share/icons/locolor/32x32/apps/kxmleditor.png
-share/locale/de/LC_MESSAGES/kxmleditor.mo
-share/locale/fr/LC_MESSAGES/kxmleditor.mo
-share/locale/pl/LC_MESSAGES/kxmleditor.mo
-share/man/man1/kxmleditor.1.gz
-share/services/kxmleditorpart.desktop
diff --git a/freebsd/applications/mathemagics/Makefile b/freebsd/applications/mathemagics/Makefile
deleted file mode 100644
index 386a5aa8a..000000000
--- a/freebsd/applications/mathemagics/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		mathemagics-trinity
-COMMENT=		A RPN scientific calculator for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	m/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/mathemagics/distinfo b/freebsd/applications/mathemagics/distinfo
deleted file mode 100644
index 927063cf1..000000000
--- a/freebsd/applications/mathemagics/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601590
-SHA256 (TDE/applications/mathemagics-trinity_14.0.10.orig.tar.xz) = 214a4f0158ee25d529a60ad1d5b8d4549797d648960abb9d261b1e67d5364924
-SIZE (TDE/applications/mathemagics-trinity_14.0.10.orig.tar.xz) = 63704
diff --git a/freebsd/applications/mathemagics/pkg-plist b/freebsd/applications/mathemagics/pkg-plist
deleted file mode 100644
index 4623edb7a..000000000
--- a/freebsd/applications/mathemagics/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/mathemagics
-share/applications/tde/mathemagics.desktop
-share/apps/mathemagics/mathemagicsui.rc
-share/doc/tde/HTML/en/mathemagics/common
-share/doc/tde/HTML/en/mathemagics/index.cache.bz2
-share/doc/tde/HTML/en/mathemagics/index.docbook
-share/icons/hicolor/22x22/apps/mathemagics.png
-share/icons/hicolor/32x32/apps/mathemagics.png
-share/icons/hicolor/48x48/apps/mathemagics.png
-share/icons/locolor/16x16/apps/mathemagics.png
-share/icons/locolor/32x32/apps/mathemagics.png
-share/man/man1/mathemagics.1.gz
diff --git a/freebsd/applications/misc/Makefile b/freebsd/applications/misc/Makefile
new file mode 100644
index 000000000..e76ed2618
--- /dev/null
+++ b/freebsd/applications/misc/Makefile
@@ -0,0 +1,7 @@
+
+    SUBDIR =
+    SUBDIR += bibletime
+    SUBDIR += kcmldap
+    SUBDIR += kcmldapmanager
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/misc/bibletime/Makefile b/freebsd/applications/misc/bibletime/Makefile
new file mode 100644
index 000000000..76d8634e0
--- /dev/null
+++ b/freebsd/applications/misc/bibletime/Makefile
@@ -0,0 +1,40 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		bibletime-trinity
+COMMENT=		A bible study tool for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	b/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		misc x11
+DIST_SUBDIR=		TDE/applications/misc
+
+
+# Use gmake for automake build
+USES=	gmake
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/bin/xml2pot:${PORTSDIR}/x11/trinity/core/tdesdk
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libboost_system.so:${PORTSDIR}/devel/boost-libs \
+		libclucene-shared.so:${PORTSDIR}/textproc/clucene \
+		libsword.so:${PORTSDIR}/misc/sword \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-autotools-prepare
+	${TDE_AUTOTOOLS_CONFIGURE}
+
+do-build: tde-autotools-build
+
+do-install: tde-autotools-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/misc/bibletime/distinfo b/freebsd/applications/misc/bibletime/distinfo
new file mode 100644
index 000000000..cefe4042b
--- /dev/null
+++ b/freebsd/applications/misc/bibletime/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666648778
+SHA256 (TDE/applications/misc/bibletime-trinity_14.0.13.orig.tar.xz) = 2d88cc22f74c9325641e92e5ba5b41f45b5718f390fb2450793d51fa697e0f81
+SIZE (TDE/applications/misc/bibletime-trinity_14.0.13.orig.tar.xz) = 934864
diff --git a/freebsd/applications/bibletime/pkg-descr b/freebsd/applications/misc/bibletime/pkg-descr
index dbae5bde3..dbae5bde3 100644
--- a/freebsd/applications/bibletime/pkg-descr
+++ b/freebsd/applications/misc/bibletime/pkg-descr
diff --git a/freebsd/applications/bibletime/pkg-plist b/freebsd/applications/misc/bibletime/pkg-plist
index 91eb6c030..91eb6c030 100644
--- a/freebsd/applications/bibletime/pkg-plist
+++ b/freebsd/applications/misc/bibletime/pkg-plist
diff --git a/freebsd/applications/misc/kcmldap/Makefile b/freebsd/applications/misc/kcmldap/Makefile
new file mode 100644
index 000000000..6fa08b336
--- /dev/null
+++ b/freebsd/applications/misc/kcmldap/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kcontrol-ldap-bonding-trinity
+COMMENT=		Kerberos control module for the Trinity control center
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/misc
+DISTSRC=		kcmldap-trinity-${TDE_VERSION}${TDE_PREVERSION}
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libtdeldap.so:${PORTSDIR}/x11/trinity/libraries/libtdeldap
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/misc/kcmldap/distinfo b/freebsd/applications/misc/kcmldap/distinfo
new file mode 100644
index 000000000..d9c2beb86
--- /dev/null
+++ b/freebsd/applications/misc/kcmldap/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666648886
+SHA256 (TDE/applications/misc/kcontrol-ldap-bonding-trinity_14.0.13.orig.tar.xz) = 4c6054fe39a37ae85254f91114c600cb27e90a0b3181e4807910895e3cf19ed6
+SIZE (TDE/applications/misc/kcontrol-ldap-bonding-trinity_14.0.13.orig.tar.xz) = 154060
diff --git a/freebsd/applications/kcmldap/pkg-descr b/freebsd/applications/misc/kcmldap/pkg-descr
index e159fb32e..e159fb32e 100644
--- a/freebsd/applications/kcmldap/pkg-descr
+++ b/freebsd/applications/misc/kcmldap/pkg-descr
diff --git a/freebsd/applications/kcmldap/pkg-plist b/freebsd/applications/misc/kcmldap/pkg-plist
index 5c77ddc48..5c77ddc48 100644
--- a/freebsd/applications/kcmldap/pkg-plist
+++ b/freebsd/applications/misc/kcmldap/pkg-plist
diff --git a/freebsd/applications/misc/kcmldapmanager/Makefile b/freebsd/applications/misc/kcmldapmanager/Makefile
new file mode 100644
index 000000000..5bf18bf16
--- /dev/null
+++ b/freebsd/applications/misc/kcmldapmanager/Makefile
@@ -0,0 +1,36 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kcontrol-ldap-manager-trinity
+COMMENT=		Kerberos realm management module for the Trinity control center
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/misc
+DISTSRC=		kcmldapmanager-trinity-${TDE_VERSION}${TDE_PREVERSION}
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libtdeldap.so:${PORTSDIR}/x11/trinity/libraries/libtdeldap
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/misc/kcmldapmanager/distinfo b/freebsd/applications/misc/kcmldapmanager/distinfo
new file mode 100644
index 000000000..7951796ff
--- /dev/null
+++ b/freebsd/applications/misc/kcmldapmanager/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666648911
+SHA256 (TDE/applications/misc/kcontrol-ldap-manager-trinity_14.0.13.orig.tar.xz) = 04b5d286a89fe36cbaad088237497ae60920cdaf6f2eb981ec7ea8cddf7bfcb6
+SIZE (TDE/applications/misc/kcontrol-ldap-manager-trinity_14.0.13.orig.tar.xz) = 24892
diff --git a/freebsd/applications/kcmldapmanager/pkg-descr b/freebsd/applications/misc/kcmldapmanager/pkg-descr
index 89fd5b79b..89fd5b79b 100644
--- a/freebsd/applications/kcmldapmanager/pkg-descr
+++ b/freebsd/applications/misc/kcmldapmanager/pkg-descr
diff --git a/freebsd/applications/kcmldapmanager/pkg-plist b/freebsd/applications/misc/kcmldapmanager/pkg-plist
index 9a51aaa05..9a51aaa05 100644
--- a/freebsd/applications/kcmldapmanager/pkg-plist
+++ b/freebsd/applications/misc/kcmldapmanager/pkg-plist
diff --git a/freebsd/applications/multimedia/Makefile b/freebsd/applications/multimedia/Makefile
new file mode 100644
index 000000000..fc9723425
--- /dev/null
+++ b/freebsd/applications/multimedia/Makefile
@@ -0,0 +1,7 @@
+
+    SUBDIR =
+    SUBDIR += amarok
+    SUBDIR += codeine
+    SUBDIR += kaffeine
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/multimedia/amarok/Makefile b/freebsd/applications/multimedia/amarok/Makefile
new file mode 100644
index 000000000..c1dd7e88c
--- /dev/null
+++ b/freebsd/applications/multimedia/amarok/Makefile
@@ -0,0 +1,54 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		amarok-trinity
+COMMENT=		Versatile and easy to use audio player for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	a/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		audio x11
+DIST_SUBDIR=		TDE/applications/multimedia
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libartsc.so:${PORTSDIR}/x11/trinity/dependencies/arts \
+		${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/include/konqsidebarplugin.h:${PORTSDIR}/x11/trinity/core/tdebase \
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libdbus-tqt-1.so:${PORTSDIR}/x11/trinity/dependencies/dbus-tqt \
+		libakode.so:${PORTSDIR}/x11/trinity/dependencies/akode \
+
+LIB_DEPENDS+=\
+		libgpod.so:${PORTSDIR}/audio/libgpod \
+		libmp4v2.so:${PORTSDIR}/multimedia/mp4v2 \
+		libmtp.so:${PORTSDIR}/multimedia/libmtp \
+		libSDL.so:${PORTSDIR}/devel/sdl12 \
+		libtag.so:${PORTSDIR}/audio/taglib \
+		libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04 \
+		libxine.so:${PORTSDIR}/multimedia/libxine \
+
+USE_MYSQL=		yes
+USE_PGSQL=		yes
+USE_SQLITE=		yes
+
+USE_RUBY=		yes
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON" \
+	-DWITH_IFP="OFF" \
+	-DWITH_NJB="OFF" \
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/multimedia/amarok/distinfo b/freebsd/applications/multimedia/amarok/distinfo
new file mode 100644
index 000000000..335fac4f4
--- /dev/null
+++ b/freebsd/applications/multimedia/amarok/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666649479
+SHA256 (TDE/applications/multimedia/amarok-trinity_14.0.13.orig.tar.xz) = 1d05f88da18190646038417981e04ccb8b3bc3cc30bd62b195f10d4e922463fb
+SIZE (TDE/applications/multimedia/amarok-trinity_14.0.13.orig.tar.xz) = 10019600
diff --git a/freebsd/applications/amarok/pkg-descr b/freebsd/applications/multimedia/amarok/pkg-descr
index be4ebf0d1..be4ebf0d1 100644
--- a/freebsd/applications/amarok/pkg-descr
+++ b/freebsd/applications/multimedia/amarok/pkg-descr
diff --git a/freebsd/applications/multimedia/amarok/pkg-plist b/freebsd/applications/multimedia/amarok/pkg-plist
new file mode 100644
index 000000000..b90430c8c
--- /dev/null
+++ b/freebsd/applications/multimedia/amarok/pkg-plist
@@ -0,0 +1,1034 @@
+bin/amarok
+bin/amarok_daapserver.rb
+bin/amarok_libvisual
+bin/amarok_proxy.rb
+bin/amarokapp
+bin/amarokcollectionscanner
+lib/libamarok.la
+lib/libamarok.so
+lib/libamarok.so.0
+lib/libamarok.so.0.0.0
+lib/ruby_lib/http11.rb
+lib/ruby_lib/libhttp11.la
+lib/ruby_lib/libhttp11.so
+lib/ruby_lib/libhttp11.so.0
+lib/ruby_lib/libhttp11.so.0.0.0
+lib/trinity/konqsidebar_universalamarok.la
+lib/trinity/konqsidebar_universalamarok.so
+lib/trinity/libamarok_aKode-engine.la
+lib/trinity/libamarok_aKode-engine.so
+lib/trinity/libamarok_daap-mediadevice.la
+lib/trinity/libamarok_daap-mediadevice.so
+lib/trinity/libamarok_generic-mediadevice.la
+lib/trinity/libamarok_generic-mediadevice.so
+lib/trinity/libamarok_ipod-mediadevice.la
+lib/trinity/libamarok_ipod-mediadevice.so
+lib/trinity/libamarok_massstorage-device.la
+lib/trinity/libamarok_massstorage-device.so
+lib/trinity/libamarok_mtp-mediadevice.la
+lib/trinity/libamarok_mtp-mediadevice.so
+lib/trinity/libamarok_nfs-device.la
+lib/trinity/libamarok_nfs-device.so
+lib/trinity/libamarok_smb-device.la
+lib/trinity/libamarok_smb-device.so
+lib/trinity/libamarok_void-engine_plugin.la
+lib/trinity/libamarok_void-engine_plugin.so
+lib/trinity/libamarok_xine-engine.la
+lib/trinity/libamarok_xine-engine.so
+lib/trinity/libamarok_yauap-engine_plugin.la
+lib/trinity/libamarok_yauap-engine_plugin.so
+share/applications/tde/amarok.desktop
+share/apps/amarok/amarokui.rc
+share/apps/amarok/data/Amarok_1.4_Welcome.ogg
+share/apps/amarok/data/Cool-Streams.xml
+share/apps/amarok/data/ball.png
+share/apps/amarok/data/dot.png
+share/apps/amarok/data/equalizer_presets.xml
+share/apps/amarok/data/firstrun.m3u
+share/apps/amarok/data/grid.png
+share/apps/amarok/data/magnatune_logo.png
+share/apps/amarok/data/wirl1.png
+share/apps/amarok/data/wirl2.png
+share/apps/amarok/images/amarok_cut.png
+share/apps/amarok/images/amarok_rocks.jpg
+share/apps/amarok/images/b_next.png
+share/apps/amarok/images/b_pause.png
+share/apps/amarok/images/b_play.png
+share/apps/amarok/images/b_prev.png
+share/apps/amarok/images/b_stop.png
+share/apps/amarok/images/back_stars_grey.png
+share/apps/amarok/images/currenttrack_bar_left.png
+share/apps/amarok/images/currenttrack_bar_mid.png
+share/apps/amarok/images/currenttrack_bar_right.png
+share/apps/amarok/images/currenttrack_pause.png
+share/apps/amarok/images/currenttrack_play.png
+share/apps/amarok/images/currenttrack_repeat.png
+share/apps/amarok/images/currenttrack_repeat_small.png
+share/apps/amarok/images/currenttrack_stop.png
+share/apps/amarok/images/currenttrack_stop_small.png
+share/apps/amarok/images/eq_active2.png
+share/apps/amarok/images/eq_inactive2.png
+share/apps/amarok/images/lastfm.png
+share/apps/amarok/images/loading1.png
+share/apps/amarok/images/loading2.png
+share/apps/amarok/images/menu_sidepixmap.png
+share/apps/amarok/images/more_albums.png
+share/apps/amarok/images/musicbrainz.png
+share/apps/amarok/images/nocover.png
+share/apps/amarok/images/pl_active2.png
+share/apps/amarok/images/pl_inactive2.png
+share/apps/amarok/images/sbinner_stars.png
+share/apps/amarok/images/shadow_albumcover.png
+share/apps/amarok/images/smallstar.png
+share/apps/amarok/images/splash_screen.jpg
+share/apps/amarok/images/star.png
+share/apps/amarok/images/time_minus.png
+share/apps/amarok/images/time_plus.png
+share/apps/amarok/images/vol_speaker.png
+share/apps/amarok/images/volumeslider-gradient.png
+share/apps/amarok/images/volumeslider-handle.png
+share/apps/amarok/images/volumeslider-handle_glow.png
+share/apps/amarok/images/volumeslider-inset.png
+share/apps/amarok/images/wizard_compact.png
+share/apps/amarok/images/wizard_xmms.png
+share/apps/amarok/images/xine_logo.png
+share/apps/amarok/ruby_lib/codes.rb
+share/apps/amarok/ruby_lib/gem_plugin.rb
+share/apps/amarok/ruby_lib/gemconfigure.rb
+share/apps/amarok/ruby_lib/mongrel.rb
+share/apps/amarok/ruby_lib/mongrel/cgi.rb
+share/apps/amarok/ruby_lib/mongrel/command.rb
+share/apps/amarok/ruby_lib/mongrel/configurator.rb
+share/apps/amarok/ruby_lib/mongrel/debug.rb
+share/apps/amarok/ruby_lib/mongrel/handlers.rb
+share/apps/amarok/ruby_lib/mongrel/init.rb
+share/apps/amarok/ruby_lib/mongrel/mime_types.yml
+share/apps/amarok/ruby_lib/mongrel/stats.rb
+share/apps/amarok/ruby_lib/mongrel/tcphack.rb
+share/apps/amarok/ruby_lib/rbconfig/datadir.rb
+share/apps/amarok/ruby_lib/rubygems.rb
+share/apps/amarok/ruby_lib/rubygems/builder.rb
+share/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
+share/apps/amarok/ruby_lib/rubygems/command.rb
+share/apps/amarok/ruby_lib/rubygems/config_file.rb
+share/apps/amarok/ruby_lib/rubygems/custom_require.rb
+share/apps/amarok/ruby_lib/rubygems/dependency_list.rb
+share/apps/amarok/ruby_lib/rubygems/doc_manager.rb
+share/apps/amarok/ruby_lib/rubygems/format.rb
+share/apps/amarok/ruby_lib/rubygems/gem_commands.rb
+share/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
+share/apps/amarok/ruby_lib/rubygems/gem_runner.rb
+share/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
+share/apps/amarok/ruby_lib/rubygems/installer.rb
+share/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
+share/apps/amarok/ruby_lib/rubygems/old_format.rb
+share/apps/amarok/ruby_lib/rubygems/open-uri.rb
+share/apps/amarok/ruby_lib/rubygems/package.rb
+share/apps/amarok/ruby_lib/rubygems/remote_installer.rb
+share/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
+share/apps/amarok/ruby_lib/rubygems/security.rb
+share/apps/amarok/ruby_lib/rubygems/source_index.rb
+share/apps/amarok/ruby_lib/rubygems/specification.rb
+share/apps/amarok/ruby_lib/rubygems/timer.rb
+share/apps/amarok/ruby_lib/rubygems/user_interaction.rb
+share/apps/amarok/ruby_lib/rubygems/validator.rb
+share/apps/amarok/ruby_lib/rubygems/version.rb
+share/apps/amarok/scripts/common/Publisher.py
+share/apps/amarok/scripts/common/Zeroconf.py
+share/apps/amarok/scripts/lyrics_astraweb/README
+share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
+share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
+share/apps/amarok/scripts/lyrics_lyrc/README
+share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
+share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
+share/apps/amarok/scripts/playlist2html/Playlist.py
+share/apps/amarok/scripts/playlist2html/PlaylistServer.py
+share/apps/amarok/scripts/playlist2html/PlaylistServer.spec
+share/apps/amarok/scripts/playlist2html/README
+share/apps/amarok/scripts/playlist2html/playlist2html.py
+share/apps/amarok/scripts/playlist2html/playlist2html.spec
+share/apps/amarok/scripts/ruby_debug/debug.rb
+share/apps/amarok/scripts/score_default/README
+share/apps/amarok/scripts/score_default/score_default.rb
+share/apps/amarok/scripts/score_default/score_default.spec
+share/apps/amarok/scripts/score_impulsive/README
+share/apps/amarok/scripts/score_impulsive/score_impulsive.rb
+share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
+share/apps/amarok/scripts/templates/amarok.rb
+share/apps/amarok/scripts/templates/python_qt_template.py
+share/apps/amarok/scripts/templates/ruby_qt_template.rb
+share/apps/amarok/scripts/webcontrol/Globals.py
+share/apps/amarok/scripts/webcontrol/Playlist.py
+share/apps/amarok/scripts/webcontrol/README
+share/apps/amarok/scripts/webcontrol/RequestHandler.py
+share/apps/amarok/scripts/webcontrol/WebControl.py
+share/apps/amarok/scripts/webcontrol/WebControl.spec
+share/apps/amarok/scripts/webcontrol/WebPublisher.py
+share/apps/amarok/scripts/webcontrol/amarok_cut.png
+share/apps/amarok/scripts/webcontrol/controlbackground.png
+share/apps/amarok/scripts/webcontrol/main.css
+share/apps/amarok/scripts/webcontrol/main.js
+share/apps/amarok/scripts/webcontrol/player_end.png
+share/apps/amarok/scripts/webcontrol/player_pause.png
+share/apps/amarok/scripts/webcontrol/player_play.png
+share/apps/amarok/scripts/webcontrol/player_start.png
+share/apps/amarok/scripts/webcontrol/player_stop.png
+share/apps/amarok/scripts/webcontrol/smallstar.png
+share/apps/amarok/scripts/webcontrol/star.png
+share/apps/amarok/scripts/webcontrol/template.thtml
+share/apps/amarok/scripts/webcontrol/vol_speaker.png
+share/apps/amarok/themes/TDE-lineart/background.png
+share/apps/amarok/themes/TDE-lineart/head.png
+share/apps/amarok/themes/TDE-lineart/stylesheet.css
+share/apps/amarok/themes/example/stylesheet.css
+share/apps/amarok/themes/reinhardt/images/background.png
+share/apps/amarok/themes/reinhardt/images/transparency.png
+share/apps/amarok/themes/reinhardt/stylesheet.css
+share/apps/konqsidebartng/add/amarok_konquisidebar.desktop
+share/apps/konqsidebartng/entries/amarok_konquisidebar.desktop
+share/apps/konqsidebartng/kicker_entries/amarok_konquisidebar.desktop
+share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
+share/apps/konqueror/servicemenus/amarok_append.desktop
+share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
+share/apps/profiles/amarok.profile.xml
+share/config.kcfg/amarok.kcfg
+share/config.kcfg/xinecfg.kcfg
+share/config/amarokrc
+share/doc/tde/HTML/da/amarok/advanced.docbook
+share/doc/tde/HTML/da/amarok/common
+share/doc/tde/HTML/da/amarok/config.docbook
+share/doc/tde/HTML/da/amarok/faq.docbook
+share/doc/tde/HTML/da/amarok/index.cache.bz2
+share/doc/tde/HTML/da/amarok/index.docbook
+share/doc/tde/HTML/da/amarok/quick.docbook
+share/doc/tde/HTML/da/amarok/requirements.docbook
+share/doc/tde/HTML/da/amarok/using.docbook
+share/doc/tde/HTML/de/amarok/add_dynamic.png
+share/doc/tde/HTML/de/amarok/advanced.docbook
+share/doc/tde/HTML/de/amarok/amarok_playlist.png
+share/doc/tde/HTML/de/amarok/analyzer.png
+share/doc/tde/HTML/de/amarok/buttons.png
+share/doc/tde/HTML/de/amarok/collection.png
+share/doc/tde/HTML/de/amarok/common
+share/doc/tde/HTML/de/amarok/config.docbook
+share/doc/tde/HTML/de/amarok/config_appearance.png
+share/doc/tde/HTML/de/amarok/config_collection.png
+share/doc/tde/HTML/de/amarok/config_engine.png
+share/doc/tde/HTML/de/amarok/config_general.png
+share/doc/tde/HTML/de/amarok/config_osd.png
+share/doc/tde/HTML/de/amarok/config_playback.png
+share/doc/tde/HTML/de/amarok/config_scrobbler.png
+share/doc/tde/HTML/de/amarok/context.png
+share/doc/tde/HTML/de/amarok/coverman.png
+share/doc/tde/HTML/de/amarok/dynamic_bar.png
+share/doc/tde/HTML/de/amarok/dynamic_settings.png
+share/doc/tde/HTML/de/amarok/equalizer.png
+share/doc/tde/HTML/de/amarok/faq.docbook
+share/doc/tde/HTML/de/amarok/file_browser.png
+share/doc/tde/HTML/de/amarok/index.cache.bz2
+share/doc/tde/HTML/de/amarok/index.docbook
+share/doc/tde/HTML/de/amarok/logo.png
+share/doc/tde/HTML/de/amarok/media_device.png
+share/doc/tde/HTML/de/amarok/menubar.png
+share/doc/tde/HTML/de/amarok/musicbrainz.png
+share/doc/tde/HTML/de/amarok/pl_browser.png
+share/doc/tde/HTML/de/amarok/pl_tip1.png
+share/doc/tde/HTML/de/amarok/play_list.png
+share/doc/tde/HTML/de/amarok/player_window.png
+share/doc/tde/HTML/de/amarok/playlist_browser.png
+share/doc/tde/HTML/de/amarok/playlist_window.png
+share/doc/tde/HTML/de/amarok/queue_manager.png
+share/doc/tde/HTML/de/amarok/quick.docbook
+share/doc/tde/HTML/de/amarok/requirements.docbook
+share/doc/tde/HTML/de/amarok/rmb_menu.png
+share/doc/tde/HTML/de/amarok/script_manager.png
+share/doc/tde/HTML/de/amarok/status_bar.png
+share/doc/tde/HTML/de/amarok/using.docbook
+share/doc/tde/HTML/de/amarok/vis_window.png
+share/doc/tde/HTML/en/amarok/add_dynamic.png
+share/doc/tde/HTML/en/amarok/advanced.docbook
+share/doc/tde/HTML/en/amarok/amarok_playlist.png
+share/doc/tde/HTML/en/amarok/analyzer.png
+share/doc/tde/HTML/en/amarok/buttons.png
+share/doc/tde/HTML/en/amarok/collection.png
+share/doc/tde/HTML/en/amarok/common
+share/doc/tde/HTML/en/amarok/config.docbook
+share/doc/tde/HTML/en/amarok/config_appearance.png
+share/doc/tde/HTML/en/amarok/config_collection.png
+share/doc/tde/HTML/en/amarok/config_engine.png
+share/doc/tde/HTML/en/amarok/config_general.png
+share/doc/tde/HTML/en/amarok/config_osd.png
+share/doc/tde/HTML/en/amarok/config_playback.png
+share/doc/tde/HTML/en/amarok/config_scrobbler.png
+share/doc/tde/HTML/en/amarok/coverman.png
+share/doc/tde/HTML/en/amarok/dynamic_bar.png
+share/doc/tde/HTML/en/amarok/dynamic_settings.png
+share/doc/tde/HTML/en/amarok/equalizer.png
+share/doc/tde/HTML/en/amarok/faq.docbook
+share/doc/tde/HTML/en/amarok/file_browser.png
+share/doc/tde/HTML/en/amarok/index.cache.bz2
+share/doc/tde/HTML/en/amarok/index.docbook
+share/doc/tde/HTML/en/amarok/logo.png
+share/doc/tde/HTML/en/amarok/media_device.png
+share/doc/tde/HTML/en/amarok/menubar.png
+share/doc/tde/HTML/en/amarok/musicbrainz.png
+share/doc/tde/HTML/en/amarok/pl_tip1.png
+share/doc/tde/HTML/en/amarok/play_list.png
+share/doc/tde/HTML/en/amarok/player_window.png
+share/doc/tde/HTML/en/amarok/playlist_browser.png
+share/doc/tde/HTML/en/amarok/playlist_window.png
+share/doc/tde/HTML/en/amarok/queue_manager.png
+share/doc/tde/HTML/en/amarok/quick.docbook
+share/doc/tde/HTML/en/amarok/requirements.docbook
+share/doc/tde/HTML/en/amarok/rmb_menu.png
+share/doc/tde/HTML/en/amarok/script_manager.png
+share/doc/tde/HTML/en/amarok/status_bar.png
+share/doc/tde/HTML/en/amarok/tab_lyrics.png
+share/doc/tde/HTML/en/amarok/tab_music.png
+share/doc/tde/HTML/en/amarok/tab_wiki.png
+share/doc/tde/HTML/en/amarok/using.docbook
+share/doc/tde/HTML/en/amarok/vis_window.png
+share/doc/tde/HTML/es/amarok/add_dynamic.png
+share/doc/tde/HTML/es/amarok/advanced.docbook
+share/doc/tde/HTML/es/amarok/amarok_playlist.png
+share/doc/tde/HTML/es/amarok/analyzer.png
+share/doc/tde/HTML/es/amarok/browser_choice.png
+share/doc/tde/HTML/es/amarok/buttons.png
+share/doc/tde/HTML/es/amarok/collection.png
+share/doc/tde/HTML/es/amarok/common
+share/doc/tde/HTML/es/amarok/config.docbook
+share/doc/tde/HTML/es/amarok/config_appearance.png
+share/doc/tde/HTML/es/amarok/config_collection.png
+share/doc/tde/HTML/es/amarok/config_engine.png
+share/doc/tde/HTML/es/amarok/config_general.png
+share/doc/tde/HTML/es/amarok/config_osd.png
+share/doc/tde/HTML/es/amarok/config_playback.png
+share/doc/tde/HTML/es/amarok/config_scrobbler.png
+share/doc/tde/HTML/es/amarok/context.png
+share/doc/tde/HTML/es/amarok/coverman.png
+share/doc/tde/HTML/es/amarok/dynamic_bar.png
+share/doc/tde/HTML/es/amarok/dynamic_mode1.png
+share/doc/tde/HTML/es/amarok/dynamic_mode2.png
+share/doc/tde/HTML/es/amarok/dynamic_settings.png
+share/doc/tde/HTML/es/amarok/equalizer.png
+share/doc/tde/HTML/es/amarok/faq.docbook
+share/doc/tde/HTML/es/amarok/file_browser.png
+share/doc/tde/HTML/es/amarok/index.cache.bz2
+share/doc/tde/HTML/es/amarok/index.docbook
+share/doc/tde/HTML/es/amarok/logo.png
+share/doc/tde/HTML/es/amarok/media_device.png
+share/doc/tde/HTML/es/amarok/menubar.png
+share/doc/tde/HTML/es/amarok/musicbrainz.png
+share/doc/tde/HTML/es/amarok/pl_browser.png
+share/doc/tde/HTML/es/amarok/pl_tip1.png
+share/doc/tde/HTML/es/amarok/play_list.png
+share/doc/tde/HTML/es/amarok/player_window.png
+share/doc/tde/HTML/es/amarok/playlist_browser.png
+share/doc/tde/HTML/es/amarok/playlist_window.png
+share/doc/tde/HTML/es/amarok/queue_manager.png
+share/doc/tde/HTML/es/amarok/quick.docbook
+share/doc/tde/HTML/es/amarok/requirements.docbook
+share/doc/tde/HTML/es/amarok/rmb_menu.png
+share/doc/tde/HTML/es/amarok/script_manager.png
+share/doc/tde/HTML/es/amarok/status_bar.png
+share/doc/tde/HTML/es/amarok/tab_lyrics.png
+share/doc/tde/HTML/es/amarok/tab_music.png
+share/doc/tde/HTML/es/amarok/tab_wiki.png
+share/doc/tde/HTML/es/amarok/using.docbook
+share/doc/tde/HTML/es/amarok/vis_window.png
+share/doc/tde/HTML/et/amarok/advanced.docbook
+share/doc/tde/HTML/et/amarok/common
+share/doc/tde/HTML/et/amarok/config.docbook
+share/doc/tde/HTML/et/amarok/develop.docbook
+share/doc/tde/HTML/et/amarok/faq.docbook
+share/doc/tde/HTML/et/amarok/feature_guide.docbook
+share/doc/tde/HTML/et/amarok/hidden.docbook
+share/doc/tde/HTML/et/amarok/howto.docbook
+share/doc/tde/HTML/et/amarok/index.cache.bz2
+share/doc/tde/HTML/et/amarok/index.docbook
+share/doc/tde/HTML/et/amarok/plugin.docbook
+share/doc/tde/HTML/et/amarok/quick.docbook
+share/doc/tde/HTML/et/amarok/requirements.docbook
+share/doc/tde/HTML/et/amarok/using.docbook
+share/doc/tde/HTML/fr/amarok/advanced.docbook
+share/doc/tde/HTML/fr/amarok/common
+share/doc/tde/HTML/fr/amarok/config.docbook
+share/doc/tde/HTML/fr/amarok/faq.docbook
+share/doc/tde/HTML/fr/amarok/feature_guide.docbook
+share/doc/tde/HTML/fr/amarok/index.cache.bz2
+share/doc/tde/HTML/fr/amarok/index.docbook
+share/doc/tde/HTML/fr/amarok/quick.docbook
+share/doc/tde/HTML/fr/amarok/requirements.docbook
+share/doc/tde/HTML/fr/amarok/using.docbook
+share/doc/tde/HTML/it/amarok/add_dynamic.png
+share/doc/tde/HTML/it/amarok/advanced.docbook
+share/doc/tde/HTML/it/amarok/amarok_playlist.png
+share/doc/tde/HTML/it/amarok/analyzer.png
+share/doc/tde/HTML/it/amarok/buttons.png
+share/doc/tde/HTML/it/amarok/collection.png
+share/doc/tde/HTML/it/amarok/common
+share/doc/tde/HTML/it/amarok/completo.png
+share/doc/tde/HTML/it/amarok/config.docbook
+share/doc/tde/HTML/it/amarok/config_appearance.png
+share/doc/tde/HTML/it/amarok/config_collection.png
+share/doc/tde/HTML/it/amarok/config_engine.png
+share/doc/tde/HTML/it/amarok/config_general.png
+share/doc/tde/HTML/it/amarok/config_osd.png
+share/doc/tde/HTML/it/amarok/config_playback.png
+share/doc/tde/HTML/it/amarok/config_scrobbler.png
+share/doc/tde/HTML/it/amarok/context.png
+share/doc/tde/HTML/it/amarok/coverman.png
+share/doc/tde/HTML/it/amarok/develop.docbook
+share/doc/tde/HTML/it/amarok/dynamic_bar.png
+share/doc/tde/HTML/it/amarok/dynamic_settings.png
+share/doc/tde/HTML/it/amarok/equalizer.png
+share/doc/tde/HTML/it/amarok/faq.docbook
+share/doc/tde/HTML/it/amarok/feature_guide.docbook
+share/doc/tde/HTML/it/amarok/file_browser.png
+share/doc/tde/HTML/it/amarok/hidden.docbook
+share/doc/tde/HTML/it/amarok/index.cache.bz2
+share/doc/tde/HTML/it/amarok/index.docbook
+share/doc/tde/HTML/it/amarok/media_device.png
+share/doc/tde/HTML/it/amarok/menubar.png
+share/doc/tde/HTML/it/amarok/pl_browser.png
+share/doc/tde/HTML/it/amarok/pl_tip1.png
+share/doc/tde/HTML/it/amarok/play_list.png
+share/doc/tde/HTML/it/amarok/player_window.png
+share/doc/tde/HTML/it/amarok/playlist_browser.png
+share/doc/tde/HTML/it/amarok/playlist_window.png
+share/doc/tde/HTML/it/amarok/plugin.docbook
+share/doc/tde/HTML/it/amarok/queue_manager.png
+share/doc/tde/HTML/it/amarok/quick.docbook
+share/doc/tde/HTML/it/amarok/requirements.docbook
+share/doc/tde/HTML/it/amarok/rmb_menu.png
+share/doc/tde/HTML/it/amarok/script_manager.png
+share/doc/tde/HTML/it/amarok/status_bar.png
+share/doc/tde/HTML/it/amarok/tab_lyrics.png
+share/doc/tde/HTML/it/amarok/tab_music.png
+share/doc/tde/HTML/it/amarok/tab_wiki.png
+share/doc/tde/HTML/it/amarok/using.docbook
+share/doc/tde/HTML/it/amarok/vis_window.png
+share/doc/tde/HTML/nl/amarok/add_dynamic.png
+share/doc/tde/HTML/nl/amarok/advanced.docbook
+share/doc/tde/HTML/nl/amarok/amarok_playlist.png
+share/doc/tde/HTML/nl/amarok/analyzer.png
+share/doc/tde/HTML/nl/amarok/buttons.png
+share/doc/tde/HTML/nl/amarok/collection.png
+share/doc/tde/HTML/nl/amarok/common
+share/doc/tde/HTML/nl/amarok/config.docbook
+share/doc/tde/HTML/nl/amarok/config_appearance.png
+share/doc/tde/HTML/nl/amarok/config_collection.png
+share/doc/tde/HTML/nl/amarok/config_engine.png
+share/doc/tde/HTML/nl/amarok/config_general.png
+share/doc/tde/HTML/nl/amarok/config_osd.png
+share/doc/tde/HTML/nl/amarok/config_playback.png
+share/doc/tde/HTML/nl/amarok/config_scrobbler.png
+share/doc/tde/HTML/nl/amarok/context.png
+share/doc/tde/HTML/nl/amarok/coverman.png
+share/doc/tde/HTML/nl/amarok/develop.docbook
+share/doc/tde/HTML/nl/amarok/dynamic_bar.png
+share/doc/tde/HTML/nl/amarok/dynamic_settings.png
+share/doc/tde/HTML/nl/amarok/equalizer.png
+share/doc/tde/HTML/nl/amarok/faq.docbook
+share/doc/tde/HTML/nl/amarok/feature_guide.docbook
+share/doc/tde/HTML/nl/amarok/file_browser.png
+share/doc/tde/HTML/nl/amarok/hidden.docbook
+share/doc/tde/HTML/nl/amarok/index.cache.bz2
+share/doc/tde/HTML/nl/amarok/index.docbook
+share/doc/tde/HTML/nl/amarok/logo.png
+share/doc/tde/HTML/nl/amarok/media_device.png
+share/doc/tde/HTML/nl/amarok/menubar.png
+share/doc/tde/HTML/nl/amarok/musicbrainz.png
+share/doc/tde/HTML/nl/amarok/pl_browser.png
+share/doc/tde/HTML/nl/amarok/pl_tip1.png
+share/doc/tde/HTML/nl/amarok/play_list.png
+share/doc/tde/HTML/nl/amarok/player_window.png
+share/doc/tde/HTML/nl/amarok/playlist_browser.png
+share/doc/tde/HTML/nl/amarok/playlist_window.png
+share/doc/tde/HTML/nl/amarok/plugin.docbook
+share/doc/tde/HTML/nl/amarok/queue_manager.png
+share/doc/tde/HTML/nl/amarok/quick.docbook
+share/doc/tde/HTML/nl/amarok/requirements.docbook
+share/doc/tde/HTML/nl/amarok/rmb_menu.png
+share/doc/tde/HTML/nl/amarok/script_manager.png
+share/doc/tde/HTML/nl/amarok/status_bar.png
+share/doc/tde/HTML/nl/amarok/tab_lyrics.png
+share/doc/tde/HTML/nl/amarok/tab_lyrics1.png
+share/doc/tde/HTML/nl/amarok/tab_music.png
+share/doc/tde/HTML/nl/amarok/tab_wiki.png
+share/doc/tde/HTML/nl/amarok/using.docbook
+share/doc/tde/HTML/nl/amarok/vis_window.png
+share/doc/tde/HTML/pl/amarok/advanced.docbook
+share/doc/tde/HTML/pl/amarok/common
+share/doc/tde/HTML/pl/amarok/config.docbook
+share/doc/tde/HTML/pl/amarok/faq.docbook
+share/doc/tde/HTML/pl/amarok/index.cache.bz2
+share/doc/tde/HTML/pl/amarok/index.docbook
+share/doc/tde/HTML/pl/amarok/quick.docbook
+share/doc/tde/HTML/pl/amarok/requirements.docbook
+share/doc/tde/HTML/pl/amarok/using.docbook
+share/doc/tde/HTML/pt/amarok/add_dynamic.png
+share/doc/tde/HTML/pt/amarok/advanced.docbook
+share/doc/tde/HTML/pt/amarok/amarok_playlist.png
+share/doc/tde/HTML/pt/amarok/analyzer.png
+share/doc/tde/HTML/pt/amarok/buttons.png
+share/doc/tde/HTML/pt/amarok/collection.png
+share/doc/tde/HTML/pt/amarok/common
+share/doc/tde/HTML/pt/amarok/config.docbook
+share/doc/tde/HTML/pt/amarok/config_appearance.png
+share/doc/tde/HTML/pt/amarok/config_collection.png
+share/doc/tde/HTML/pt/amarok/config_engine.png
+share/doc/tde/HTML/pt/amarok/config_general.png
+share/doc/tde/HTML/pt/amarok/config_osd.png
+share/doc/tde/HTML/pt/amarok/config_playback.png
+share/doc/tde/HTML/pt/amarok/config_scrobbler.png
+share/doc/tde/HTML/pt/amarok/coverman.png
+share/doc/tde/HTML/pt/amarok/develop.docbook
+share/doc/tde/HTML/pt/amarok/dynamic_bar.png
+share/doc/tde/HTML/pt/amarok/dynamic_settings.png
+share/doc/tde/HTML/pt/amarok/equalizer.png
+share/doc/tde/HTML/pt/amarok/faq.docbook
+share/doc/tde/HTML/pt/amarok/feature_guide.docbook
+share/doc/tde/HTML/pt/amarok/file_browser.png
+share/doc/tde/HTML/pt/amarok/hidden.docbook
+share/doc/tde/HTML/pt/amarok/index.cache.bz2
+share/doc/tde/HTML/pt/amarok/index.docbook
+share/doc/tde/HTML/pt/amarok/logo.png
+share/doc/tde/HTML/pt/amarok/media_device.png
+share/doc/tde/HTML/pt/amarok/menubar.png
+share/doc/tde/HTML/pt/amarok/musicbrainz.png
+share/doc/tde/HTML/pt/amarok/pl_tip1.png
+share/doc/tde/HTML/pt/amarok/play_list.png
+share/doc/tde/HTML/pt/amarok/player_window.png
+share/doc/tde/HTML/pt/amarok/playlist_browser.png
+share/doc/tde/HTML/pt/amarok/playlist_window.png
+share/doc/tde/HTML/pt/amarok/plugin.docbook
+share/doc/tde/HTML/pt/amarok/queue_manager.png
+share/doc/tde/HTML/pt/amarok/quick.docbook
+share/doc/tde/HTML/pt/amarok/requirements.docbook
+share/doc/tde/HTML/pt/amarok/rmb_menu.png
+share/doc/tde/HTML/pt/amarok/script_manager.png
+share/doc/tde/HTML/pt/amarok/status_bar.png
+share/doc/tde/HTML/pt/amarok/using.docbook
+share/doc/tde/HTML/pt/amarok/vis_window.png
+share/doc/tde/HTML/pt_BR/amarok/advanced.docbook
+share/doc/tde/HTML/pt_BR/amarok/common
+share/doc/tde/HTML/pt_BR/amarok/config.docbook
+share/doc/tde/HTML/pt_BR/amarok/faq.docbook
+share/doc/tde/HTML/pt_BR/amarok/feature_guide.docbook
+share/doc/tde/HTML/pt_BR/amarok/index.cache.bz2
+share/doc/tde/HTML/pt_BR/amarok/index.docbook
+share/doc/tde/HTML/pt_BR/amarok/quick.docbook
+share/doc/tde/HTML/pt_BR/amarok/requirements.docbook
+share/doc/tde/HTML/pt_BR/amarok/using.docbook
+share/doc/tde/HTML/ru/amarok/requirements.docbook
+share/doc/tde/HTML/sv/amarok/add_dynamic.png
+share/doc/tde/HTML/sv/amarok/advanced.docbook
+share/doc/tde/HTML/sv/amarok/amarok_playlist.png
+share/doc/tde/HTML/sv/amarok/analyzer.png
+share/doc/tde/HTML/sv/amarok/browser_choice.png
+share/doc/tde/HTML/sv/amarok/buttons.png
+share/doc/tde/HTML/sv/amarok/collection.png
+share/doc/tde/HTML/sv/amarok/common
+share/doc/tde/HTML/sv/amarok/config.docbook
+share/doc/tde/HTML/sv/amarok/config_appearance.png
+share/doc/tde/HTML/sv/amarok/config_collection.png
+share/doc/tde/HTML/sv/amarok/config_colors.png
+share/doc/tde/HTML/sv/amarok/config_engine.png
+share/doc/tde/HTML/sv/amarok/config_fonts.png
+share/doc/tde/HTML/sv/amarok/config_general.png
+share/doc/tde/HTML/sv/amarok/config_mysql.png
+share/doc/tde/HTML/sv/amarok/config_osd.png
+share/doc/tde/HTML/sv/amarok/config_playback.png
+share/doc/tde/HTML/sv/amarok/config_scrobbler.png
+share/doc/tde/HTML/sv/amarok/context.png
+share/doc/tde/HTML/sv/amarok/coverman.png
+share/doc/tde/HTML/sv/amarok/develop.docbook
+share/doc/tde/HTML/sv/amarok/dynamic_bar.png
+share/doc/tde/HTML/sv/amarok/dynamic_settings.png
+share/doc/tde/HTML/sv/amarok/equalizer.png
+share/doc/tde/HTML/sv/amarok/faq.docbook
+share/doc/tde/HTML/sv/amarok/feature_guide.docbook
+share/doc/tde/HTML/sv/amarok/file_browser.png
+share/doc/tde/HTML/sv/amarok/hidden.docbook
+share/doc/tde/HTML/sv/amarok/index.cache.bz2
+share/doc/tde/HTML/sv/amarok/index.docbook
+share/doc/tde/HTML/sv/amarok/media_device.png
+share/doc/tde/HTML/sv/amarok/menubar.png
+share/doc/tde/HTML/sv/amarok/pl_browser.png
+share/doc/tde/HTML/sv/amarok/pl_tip1.png
+share/doc/tde/HTML/sv/amarok/play_list.png
+share/doc/tde/HTML/sv/amarok/player_window.png
+share/doc/tde/HTML/sv/amarok/playlist_browser.png
+share/doc/tde/HTML/sv/amarok/playlist_window.png
+share/doc/tde/HTML/sv/amarok/plugin.docbook
+share/doc/tde/HTML/sv/amarok/queue_manager.png
+share/doc/tde/HTML/sv/amarok/quick.docbook
+share/doc/tde/HTML/sv/amarok/requirements.docbook
+share/doc/tde/HTML/sv/amarok/rmb_menu.png
+share/doc/tde/HTML/sv/amarok/script_manager.png
+share/doc/tde/HTML/sv/amarok/scripts_window.png
+share/doc/tde/HTML/sv/amarok/search.png
+share/doc/tde/HTML/sv/amarok/status_bar.png
+share/doc/tde/HTML/sv/amarok/streams.png
+share/doc/tde/HTML/sv/amarok/using.docbook
+share/doc/tde/HTML/sv/amarok/vis_window.png
+share/doc/tde/HTML/sv/amarok/welcome.png
+share/icons/crystalsvg/16x16/actions/covermanager.png
+share/icons/crystalsvg/16x16/actions/dynamic.png
+share/icons/crystalsvg/16x16/actions/equalizer.png
+share/icons/crystalsvg/16x16/actions/mini_dock.png
+share/icons/crystalsvg/16x16/actions/player_playlist_2.png
+share/icons/crystalsvg/16x16/actions/podcast.png
+share/icons/crystalsvg/16x16/actions/podcast_new.png
+share/icons/crystalsvg/16x16/actions/random.png
+share/icons/crystalsvg/16x16/actions/repeat_playlist.png
+share/icons/crystalsvg/16x16/actions/repeat_track.png
+share/icons/crystalsvg/16x16/actions/visualizations.png
+share/icons/crystalsvg/16x16/actions/wiki.png
+share/icons/crystalsvg/22x22/actions/amarok_podcast.png
+share/icons/crystalsvg/22x22/actions/amarok_podcast_new.png
+share/icons/crystalsvg/22x22/actions/amazon_locale.png
+share/icons/crystalsvg/22x22/actions/dynamic.png
+share/icons/crystalsvg/22x22/actions/player_playlist_2.png
+share/icons/crystalsvg/22x22/actions/random.png
+share/icons/crystalsvg/22x22/actions/repeat_playlist.png
+share/icons/crystalsvg/22x22/actions/visualizations.png
+share/icons/crystalsvg/64x64/actions/dynamic.png
+share/icons/crystalsvg/64x64/actions/podcast.png
+share/icons/crystalsvg/64x64/actions/podcast_new.png
+share/icons/crystalsvg/64x64/actions/random.png
+share/icons/crystalsvg/64x64/actions/repeat_playlist.png
+share/icons/hicolor/128x128/apps/amarok.png
+share/icons/hicolor/16x16/actions/amarok_add_lyrics.png
+share/icons/hicolor/16x16/actions/amarok_add_playlist.png
+share/icons/hicolor/16x16/actions/amarok_album.png
+share/icons/hicolor/16x16/actions/amarok_artist.png
+share/icons/hicolor/16x16/actions/amarok_audioscrobbler.png
+share/icons/hicolor/16x16/actions/amarok_back.png
+share/icons/hicolor/16x16/actions/amarok_burn.png
+share/icons/hicolor/16x16/actions/amarok_change_language.png
+share/icons/hicolor/16x16/actions/amarok_circle.png
+share/icons/hicolor/16x16/actions/amarok_clock.png
+share/icons/hicolor/16x16/actions/amarok_collection.png
+share/icons/hicolor/16x16/actions/amarok_configure.png
+share/icons/hicolor/16x16/actions/amarok_covermanager.png
+share/icons/hicolor/16x16/actions/amarok_device.png
+share/icons/hicolor/16x16/actions/amarok_download.png
+share/icons/hicolor/16x16/actions/amarok_dynamic.png
+share/icons/hicolor/16x16/actions/amarok_edit-copy.png
+share/icons/hicolor/16x16/actions/amarok_edit.png
+share/icons/hicolor/16x16/actions/amarok_equalizer.png
+share/icons/hicolor/16x16/actions/amarok_external.png
+share/icons/hicolor/16x16/actions/amarok_fastforward.png
+share/icons/hicolor/16x16/actions/amarok_favourite_genres.png
+share/icons/hicolor/16x16/actions/amarok_files.png
+share/icons/hicolor/16x16/actions/amarok_files2.png
+share/icons/hicolor/16x16/actions/amarok_info.png
+share/icons/hicolor/16x16/actions/amarok_lastfm.png
+share/icons/hicolor/16x16/actions/amarok_love.png
+share/icons/hicolor/16x16/actions/amarok_lyrics.png
+share/icons/hicolor/16x16/actions/amarok_magnatune.png
+share/icons/hicolor/16x16/actions/amarok_mostplayed.png
+share/icons/hicolor/16x16/actions/amarok_music.png
+share/icons/hicolor/16x16/actions/amarok_next.png
+share/icons/hicolor/16x16/actions/amarok_pause.png
+share/icons/hicolor/16x16/actions/amarok_play.png
+share/icons/hicolor/16x16/actions/amarok_playlist.png
+share/icons/hicolor/16x16/actions/amarok_playlist_clear.png
+share/icons/hicolor/16x16/actions/amarok_playlist_refresh.png
+share/icons/hicolor/16x16/actions/amarok_podcast.png
+share/icons/hicolor/16x16/actions/amarok_podcast2.png
+share/icons/hicolor/16x16/actions/amarok_queue.png
+share/icons/hicolor/16x16/actions/amarok_random.png
+share/icons/hicolor/16x16/actions/amarok_random_album.png
+share/icons/hicolor/16x16/actions/amarok_random_no.png
+share/icons/hicolor/16x16/actions/amarok_random_track.png
+share/icons/hicolor/16x16/actions/amarok_redo.png
+share/icons/hicolor/16x16/actions/amarok_refresh.png
+share/icons/hicolor/16x16/actions/amarok_remove.png
+share/icons/hicolor/16x16/actions/amarok_remove_from_playlist.png
+share/icons/hicolor/16x16/actions/amarok_repeat_album.png
+share/icons/hicolor/16x16/actions/amarok_repeat_no.png
+share/icons/hicolor/16x16/actions/amarok_repeat_playlist.png
+share/icons/hicolor/16x16/actions/amarok_repeat_track.png
+share/icons/hicolor/16x16/actions/amarok_rescan.png
+share/icons/hicolor/16x16/actions/amarok_rewind.png
+share/icons/hicolor/16x16/actions/amarok_save.png
+share/icons/hicolor/16x16/actions/amarok_scripts.png
+share/icons/hicolor/16x16/actions/amarok_search.png
+share/icons/hicolor/16x16/actions/amarok_settings_engine.png
+share/icons/hicolor/16x16/actions/amarok_settings_general.png
+share/icons/hicolor/16x16/actions/amarok_settings_indicator.png
+share/icons/hicolor/16x16/actions/amarok_settings_playback.png
+share/icons/hicolor/16x16/actions/amarok_settings_view.png
+share/icons/hicolor/16x16/actions/amarok_stop.png
+share/icons/hicolor/16x16/actions/amarok_track.png
+share/icons/hicolor/16x16/actions/amarok_undo.png
+share/icons/hicolor/16x16/actions/amarok_visualizations.png
+share/icons/hicolor/16x16/actions/amarok_zoom.png
+share/icons/hicolor/16x16/actions/collection.png
+share/icons/hicolor/16x16/apps/amarok.png
+share/icons/hicolor/22x22/actions/amarok_add_lyrics.png
+share/icons/hicolor/22x22/actions/amarok_add_playlist.png
+share/icons/hicolor/22x22/actions/amarok_album.png
+share/icons/hicolor/22x22/actions/amarok_artist.png
+share/icons/hicolor/22x22/actions/amarok_audioscrobbler.png
+share/icons/hicolor/22x22/actions/amarok_back.png
+share/icons/hicolor/22x22/actions/amarok_burn.png
+share/icons/hicolor/22x22/actions/amarok_change_language.png
+share/icons/hicolor/22x22/actions/amarok_circle.png
+share/icons/hicolor/22x22/actions/amarok_clock.png
+share/icons/hicolor/22x22/actions/amarok_collection.png
+share/icons/hicolor/22x22/actions/amarok_configure.png
+share/icons/hicolor/22x22/actions/amarok_covermanager.png
+share/icons/hicolor/22x22/actions/amarok_device.png
+share/icons/hicolor/22x22/actions/amarok_download.png
+share/icons/hicolor/22x22/actions/amarok_dynamic.png
+share/icons/hicolor/22x22/actions/amarok_edit-copy.png
+share/icons/hicolor/22x22/actions/amarok_edit.png
+share/icons/hicolor/22x22/actions/amarok_equalizer.png
+share/icons/hicolor/22x22/actions/amarok_external.png
+share/icons/hicolor/22x22/actions/amarok_fastforward.png
+share/icons/hicolor/22x22/actions/amarok_favourite_genres.png
+share/icons/hicolor/22x22/actions/amarok_files.png
+share/icons/hicolor/22x22/actions/amarok_files2.png
+share/icons/hicolor/22x22/actions/amarok_info.png
+share/icons/hicolor/22x22/actions/amarok_lastfm.png
+share/icons/hicolor/22x22/actions/amarok_love.png
+share/icons/hicolor/22x22/actions/amarok_lyrics.png
+share/icons/hicolor/22x22/actions/amarok_magnatune.png
+share/icons/hicolor/22x22/actions/amarok_mostplayed.png
+share/icons/hicolor/22x22/actions/amarok_music.png
+share/icons/hicolor/22x22/actions/amarok_next.png
+share/icons/hicolor/22x22/actions/amarok_pause.png
+share/icons/hicolor/22x22/actions/amarok_play.png
+share/icons/hicolor/22x22/actions/amarok_playlist.png
+share/icons/hicolor/22x22/actions/amarok_playlist_clear.png
+share/icons/hicolor/22x22/actions/amarok_playlist_refresh.png
+share/icons/hicolor/22x22/actions/amarok_podcast.png
+share/icons/hicolor/22x22/actions/amarok_podcast2.png
+share/icons/hicolor/22x22/actions/amarok_queue.png
+share/icons/hicolor/22x22/actions/amarok_random.png
+share/icons/hicolor/22x22/actions/amarok_random_album.png
+share/icons/hicolor/22x22/actions/amarok_random_no.png
+share/icons/hicolor/22x22/actions/amarok_random_track.png
+share/icons/hicolor/22x22/actions/amarok_redo.png
+share/icons/hicolor/22x22/actions/amarok_refresh.png
+share/icons/hicolor/22x22/actions/amarok_remove.png
+share/icons/hicolor/22x22/actions/amarok_remove_from_playlist.png
+share/icons/hicolor/22x22/actions/amarok_repeat_album.png
+share/icons/hicolor/22x22/actions/amarok_repeat_no.png
+share/icons/hicolor/22x22/actions/amarok_repeat_playlist.png
+share/icons/hicolor/22x22/actions/amarok_repeat_track.png
+share/icons/hicolor/22x22/actions/amarok_rescan.png
+share/icons/hicolor/22x22/actions/amarok_rewind.png
+share/icons/hicolor/22x22/actions/amarok_save.png
+share/icons/hicolor/22x22/actions/amarok_scripts.png
+share/icons/hicolor/22x22/actions/amarok_search.png
+share/icons/hicolor/22x22/actions/amarok_settings_engine.png
+share/icons/hicolor/22x22/actions/amarok_settings_general.png
+share/icons/hicolor/22x22/actions/amarok_settings_indicator.png
+share/icons/hicolor/22x22/actions/amarok_settings_playback.png
+share/icons/hicolor/22x22/actions/amarok_settings_view.png
+share/icons/hicolor/22x22/actions/amarok_stop.png
+share/icons/hicolor/22x22/actions/amarok_track.png
+share/icons/hicolor/22x22/actions/amarok_undo.png
+share/icons/hicolor/22x22/actions/amarok_visualizations.png
+share/icons/hicolor/22x22/actions/amarok_zoom.png
+share/icons/hicolor/22x22/actions/collection.png
+share/icons/hicolor/22x22/apps/amarok.png
+share/icons/hicolor/32x32/actions/amarok_add_lyrics.png
+share/icons/hicolor/32x32/actions/amarok_add_playlist.png
+share/icons/hicolor/32x32/actions/amarok_album.png
+share/icons/hicolor/32x32/actions/amarok_artist.png
+share/icons/hicolor/32x32/actions/amarok_audioscrobbler.png
+share/icons/hicolor/32x32/actions/amarok_back.png
+share/icons/hicolor/32x32/actions/amarok_burn.png
+share/icons/hicolor/32x32/actions/amarok_change_language.png
+share/icons/hicolor/32x32/actions/amarok_circle.png
+share/icons/hicolor/32x32/actions/amarok_clock.png
+share/icons/hicolor/32x32/actions/amarok_collection.png
+share/icons/hicolor/32x32/actions/amarok_configure.png
+share/icons/hicolor/32x32/actions/amarok_covermanager.png
+share/icons/hicolor/32x32/actions/amarok_device.png
+share/icons/hicolor/32x32/actions/amarok_download.png
+share/icons/hicolor/32x32/actions/amarok_dynamic.png
+share/icons/hicolor/32x32/actions/amarok_edit-copy.png
+share/icons/hicolor/32x32/actions/amarok_edit.png
+share/icons/hicolor/32x32/actions/amarok_equalizer.png
+share/icons/hicolor/32x32/actions/amarok_external.png
+share/icons/hicolor/32x32/actions/amarok_fastforward.png
+share/icons/hicolor/32x32/actions/amarok_favourite_genres.png
+share/icons/hicolor/32x32/actions/amarok_files.png
+share/icons/hicolor/32x32/actions/amarok_files2.png
+share/icons/hicolor/32x32/actions/amarok_info.png
+share/icons/hicolor/32x32/actions/amarok_lastfm.png
+share/icons/hicolor/32x32/actions/amarok_love.png
+share/icons/hicolor/32x32/actions/amarok_lyrics.png
+share/icons/hicolor/32x32/actions/amarok_magnatune.png
+share/icons/hicolor/32x32/actions/amarok_mostplayed.png
+share/icons/hicolor/32x32/actions/amarok_music.png
+share/icons/hicolor/32x32/actions/amarok_next.png
+share/icons/hicolor/32x32/actions/amarok_pause.png
+share/icons/hicolor/32x32/actions/amarok_play.png
+share/icons/hicolor/32x32/actions/amarok_playlist.png
+share/icons/hicolor/32x32/actions/amarok_playlist_clear.png
+share/icons/hicolor/32x32/actions/amarok_playlist_refresh.png
+share/icons/hicolor/32x32/actions/amarok_podcast.png
+share/icons/hicolor/32x32/actions/amarok_podcast2.png
+share/icons/hicolor/32x32/actions/amarok_queue.png
+share/icons/hicolor/32x32/actions/amarok_random.png
+share/icons/hicolor/32x32/actions/amarok_random_album.png
+share/icons/hicolor/32x32/actions/amarok_random_no.png
+share/icons/hicolor/32x32/actions/amarok_random_track.png
+share/icons/hicolor/32x32/actions/amarok_redo.png
+share/icons/hicolor/32x32/actions/amarok_refresh.png
+share/icons/hicolor/32x32/actions/amarok_remove.png
+share/icons/hicolor/32x32/actions/amarok_remove_from_playlist.png
+share/icons/hicolor/32x32/actions/amarok_repeat_album.png
+share/icons/hicolor/32x32/actions/amarok_repeat_no.png
+share/icons/hicolor/32x32/actions/amarok_repeat_playlist.png
+share/icons/hicolor/32x32/actions/amarok_repeat_track.png
+share/icons/hicolor/32x32/actions/amarok_rescan.png
+share/icons/hicolor/32x32/actions/amarok_rewind.png
+share/icons/hicolor/32x32/actions/amarok_save.png
+share/icons/hicolor/32x32/actions/amarok_scripts.png
+share/icons/hicolor/32x32/actions/amarok_search.png
+share/icons/hicolor/32x32/actions/amarok_settings_engine.png
+share/icons/hicolor/32x32/actions/amarok_settings_general.png
+share/icons/hicolor/32x32/actions/amarok_settings_indicator.png
+share/icons/hicolor/32x32/actions/amarok_settings_playback.png
+share/icons/hicolor/32x32/actions/amarok_settings_view.png
+share/icons/hicolor/32x32/actions/amarok_stop.png
+share/icons/hicolor/32x32/actions/amarok_track.png
+share/icons/hicolor/32x32/actions/amarok_undo.png
+share/icons/hicolor/32x32/actions/amarok_visualizations.png
+share/icons/hicolor/32x32/actions/amarok_zoom.png
+share/icons/hicolor/32x32/actions/audioscrobbler.png
+share/icons/hicolor/32x32/actions/collection.png
+share/icons/hicolor/32x32/apps/amarok.png
+share/icons/hicolor/48x48/actions/amarok_add_lyrics.png
+share/icons/hicolor/48x48/actions/amarok_add_playlist.png
+share/icons/hicolor/48x48/actions/amarok_album.png
+share/icons/hicolor/48x48/actions/amarok_artist.png
+share/icons/hicolor/48x48/actions/amarok_audioscrobbler.png
+share/icons/hicolor/48x48/actions/amarok_back.png
+share/icons/hicolor/48x48/actions/amarok_burn.png
+share/icons/hicolor/48x48/actions/amarok_change_language.png
+share/icons/hicolor/48x48/actions/amarok_circle.png
+share/icons/hicolor/48x48/actions/amarok_clock.png
+share/icons/hicolor/48x48/actions/amarok_collection.png
+share/icons/hicolor/48x48/actions/amarok_configure.png
+share/icons/hicolor/48x48/actions/amarok_covermanager.png
+share/icons/hicolor/48x48/actions/amarok_device.png
+share/icons/hicolor/48x48/actions/amarok_download.png
+share/icons/hicolor/48x48/actions/amarok_dynamic.png
+share/icons/hicolor/48x48/actions/amarok_edit-copy.png
+share/icons/hicolor/48x48/actions/amarok_edit.png
+share/icons/hicolor/48x48/actions/amarok_equalizer.png
+share/icons/hicolor/48x48/actions/amarok_external.png
+share/icons/hicolor/48x48/actions/amarok_fastforward.png
+share/icons/hicolor/48x48/actions/amarok_favourite_genres.png
+share/icons/hicolor/48x48/actions/amarok_files.png
+share/icons/hicolor/48x48/actions/amarok_files2.png
+share/icons/hicolor/48x48/actions/amarok_info.png
+share/icons/hicolor/48x48/actions/amarok_lastfm.png
+share/icons/hicolor/48x48/actions/amarok_love.png
+share/icons/hicolor/48x48/actions/amarok_lyrics.png
+share/icons/hicolor/48x48/actions/amarok_magnatune.png
+share/icons/hicolor/48x48/actions/amarok_mostplayed.png
+share/icons/hicolor/48x48/actions/amarok_music.png
+share/icons/hicolor/48x48/actions/amarok_next.png
+share/icons/hicolor/48x48/actions/amarok_pause.png
+share/icons/hicolor/48x48/actions/amarok_play.png
+share/icons/hicolor/48x48/actions/amarok_playlist.png
+share/icons/hicolor/48x48/actions/amarok_playlist_clear.png
+share/icons/hicolor/48x48/actions/amarok_playlist_refresh.png
+share/icons/hicolor/48x48/actions/amarok_podcast.png
+share/icons/hicolor/48x48/actions/amarok_podcast2.png
+share/icons/hicolor/48x48/actions/amarok_queue.png
+share/icons/hicolor/48x48/actions/amarok_random.png
+share/icons/hicolor/48x48/actions/amarok_random_album.png
+share/icons/hicolor/48x48/actions/amarok_random_no.png
+share/icons/hicolor/48x48/actions/amarok_random_track.png
+share/icons/hicolor/48x48/actions/amarok_redo.png
+share/icons/hicolor/48x48/actions/amarok_refresh.png
+share/icons/hicolor/48x48/actions/amarok_remove.png
+share/icons/hicolor/48x48/actions/amarok_remove_from_playlist.png
+share/icons/hicolor/48x48/actions/amarok_repeat_album.png
+share/icons/hicolor/48x48/actions/amarok_repeat_no.png
+share/icons/hicolor/48x48/actions/amarok_repeat_playlist.png
+share/icons/hicolor/48x48/actions/amarok_repeat_track.png
+share/icons/hicolor/48x48/actions/amarok_rescan.png
+share/icons/hicolor/48x48/actions/amarok_rewind.png
+share/icons/hicolor/48x48/actions/amarok_save.png
+share/icons/hicolor/48x48/actions/amarok_scripts.png
+share/icons/hicolor/48x48/actions/amarok_search.png
+share/icons/hicolor/48x48/actions/amarok_settings_engine.png
+share/icons/hicolor/48x48/actions/amarok_settings_general.png
+share/icons/hicolor/48x48/actions/amarok_settings_indicator.png
+share/icons/hicolor/48x48/actions/amarok_settings_playback.png
+share/icons/hicolor/48x48/actions/amarok_settings_view.png
+share/icons/hicolor/48x48/actions/amarok_stop.png
+share/icons/hicolor/48x48/actions/amarok_track.png
+share/icons/hicolor/48x48/actions/amarok_undo.png
+share/icons/hicolor/48x48/actions/amarok_visualizations.png
+share/icons/hicolor/48x48/actions/amarok_zoom.png
+share/icons/hicolor/48x48/actions/collection.png
+share/icons/hicolor/48x48/apps/amarok.png
+share/icons/hicolor/64x64/actions/amarok_add_lyrics.png
+share/icons/hicolor/64x64/actions/amarok_add_playlist.png
+share/icons/hicolor/64x64/actions/amarok_album.png
+share/icons/hicolor/64x64/actions/amarok_artist.png
+share/icons/hicolor/64x64/actions/amarok_audioscrobbler.png
+share/icons/hicolor/64x64/actions/amarok_back.png
+share/icons/hicolor/64x64/actions/amarok_burn.png
+share/icons/hicolor/64x64/actions/amarok_change_language.png
+share/icons/hicolor/64x64/actions/amarok_circle.png
+share/icons/hicolor/64x64/actions/amarok_clock.png
+share/icons/hicolor/64x64/actions/amarok_collection.png
+share/icons/hicolor/64x64/actions/amarok_configure.png
+share/icons/hicolor/64x64/actions/amarok_covermanager.png
+share/icons/hicolor/64x64/actions/amarok_device.png
+share/icons/hicolor/64x64/actions/amarok_download.png
+share/icons/hicolor/64x64/actions/amarok_dynamic.png
+share/icons/hicolor/64x64/actions/amarok_edit-copy.png
+share/icons/hicolor/64x64/actions/amarok_edit.png
+share/icons/hicolor/64x64/actions/amarok_equalizer.png
+share/icons/hicolor/64x64/actions/amarok_external.png
+share/icons/hicolor/64x64/actions/amarok_fastforward.png
+share/icons/hicolor/64x64/actions/amarok_favourite_genres.png
+share/icons/hicolor/64x64/actions/amarok_files.png
+share/icons/hicolor/64x64/actions/amarok_files2.png
+share/icons/hicolor/64x64/actions/amarok_info.png
+share/icons/hicolor/64x64/actions/amarok_love.png
+share/icons/hicolor/64x64/actions/amarok_lyrics.png
+share/icons/hicolor/64x64/actions/amarok_magnatune.png
+share/icons/hicolor/64x64/actions/amarok_mostplayed.png
+share/icons/hicolor/64x64/actions/amarok_music.png
+share/icons/hicolor/64x64/actions/amarok_next.png
+share/icons/hicolor/64x64/actions/amarok_pause.png
+share/icons/hicolor/64x64/actions/amarok_play.png
+share/icons/hicolor/64x64/actions/amarok_playlist.png
+share/icons/hicolor/64x64/actions/amarok_playlist_clear.png
+share/icons/hicolor/64x64/actions/amarok_playlist_refresh.png
+share/icons/hicolor/64x64/actions/amarok_podcast.png
+share/icons/hicolor/64x64/actions/amarok_podcast2.png
+share/icons/hicolor/64x64/actions/amarok_queue.png
+share/icons/hicolor/64x64/actions/amarok_random.png
+share/icons/hicolor/64x64/actions/amarok_random_album.png
+share/icons/hicolor/64x64/actions/amarok_random_no.png
+share/icons/hicolor/64x64/actions/amarok_random_track.png
+share/icons/hicolor/64x64/actions/amarok_redo.png
+share/icons/hicolor/64x64/actions/amarok_refresh.png
+share/icons/hicolor/64x64/actions/amarok_remove.png
+share/icons/hicolor/64x64/actions/amarok_remove_from_playlist.png
+share/icons/hicolor/64x64/actions/amarok_repeat_album.png
+share/icons/hicolor/64x64/actions/amarok_repeat_no.png
+share/icons/hicolor/64x64/actions/amarok_repeat_playlist.png
+share/icons/hicolor/64x64/actions/amarok_repeat_track.png
+share/icons/hicolor/64x64/actions/amarok_rescan.png
+share/icons/hicolor/64x64/actions/amarok_rewind.png
+share/icons/hicolor/64x64/actions/amarok_save.png
+share/icons/hicolor/64x64/actions/amarok_scripts.png
+share/icons/hicolor/64x64/actions/amarok_search.png
+share/icons/hicolor/64x64/actions/amarok_settings_engine.png
+share/icons/hicolor/64x64/actions/amarok_settings_general.png
+share/icons/hicolor/64x64/actions/amarok_settings_indicator.png
+share/icons/hicolor/64x64/actions/amarok_settings_playback.png
+share/icons/hicolor/64x64/actions/amarok_settings_view.png
+share/icons/hicolor/64x64/actions/amarok_stop.png
+share/icons/hicolor/64x64/actions/amarok_track.png
+share/icons/hicolor/64x64/actions/amarok_undo.png
+share/icons/hicolor/64x64/actions/amarok_visualizations.png
+share/icons/hicolor/64x64/actions/amarok_zoom.png
+share/icons/hicolor/64x64/actions/collection.png
+share/icons/hicolor/64x64/apps/amarok.png
+share/locale/af/LC_MESSAGES/amarok.mo
+share/locale/ar/LC_MESSAGES/amarok.mo
+share/locale/az/LC_MESSAGES/amarok.mo
+share/locale/be/LC_MESSAGES/amarok.mo
+share/locale/bg/LC_MESSAGES/amarok.mo
+share/locale/bn/LC_MESSAGES/amarok.mo
+share/locale/br/LC_MESSAGES/amarok.mo
+share/locale/ca/LC_MESSAGES/amarok.mo
+share/locale/cs/LC_MESSAGES/amarok.mo
+share/locale/cy/LC_MESSAGES/amarok.mo
+share/locale/da/LC_MESSAGES/amarok.mo
+share/locale/de/LC_MESSAGES/amarok.mo
+share/locale/el/LC_MESSAGES/amarok.mo
+share/locale/en_GB/LC_MESSAGES/amarok.mo
+share/locale/eo/LC_MESSAGES/amarok.mo
+share/locale/es/LC_MESSAGES/amarok.mo
+share/locale/et/LC_MESSAGES/amarok.mo
+share/locale/eu/LC_MESSAGES/amarok.mo
+share/locale/fa/LC_MESSAGES/amarok.mo
+share/locale/fi/LC_MESSAGES/amarok.mo
+share/locale/fr/LC_MESSAGES/amarok.mo
+share/locale/ga/LC_MESSAGES/amarok.mo
+share/locale/gl/LC_MESSAGES/amarok.mo
+share/locale/he/LC_MESSAGES/amarok.mo
+share/locale/hi/LC_MESSAGES/amarok.mo
+share/locale/hu/LC_MESSAGES/amarok.mo
+share/locale/id/LC_MESSAGES/amarok.mo
+share/locale/is/LC_MESSAGES/amarok.mo
+share/locale/it/LC_MESSAGES/amarok.mo
+share/locale/ja/LC_MESSAGES/amarok.mo
+share/locale/ka/LC_MESSAGES/amarok.mo
+share/locale/km/LC_MESSAGES/amarok.mo
+share/locale/ko/LC_MESSAGES/amarok.mo
+share/locale/ku/LC_MESSAGES/amarok.mo
+share/locale/lo/LC_MESSAGES/amarok.mo
+share/locale/lt/LC_MESSAGES/amarok.mo
+share/locale/mk/LC_MESSAGES/amarok.mo
+share/locale/ms/LC_MESSAGES/amarok.mo
+share/locale/nb/LC_MESSAGES/amarok.mo
+share/locale/nds/LC_MESSAGES/amarok.mo
+share/locale/ne/LC_MESSAGES/amarok.mo
+share/locale/nl/LC_MESSAGES/amarok.mo
+share/locale/nn/LC_MESSAGES/amarok.mo
+share/locale/pa/LC_MESSAGES/amarok.mo
+share/locale/pl/LC_MESSAGES/amarok.mo
+share/locale/pt/LC_MESSAGES/amarok.mo
+share/locale/pt_BR/LC_MESSAGES/amarok.mo
+share/locale/ro/LC_MESSAGES/amarok.mo
+share/locale/ru/LC_MESSAGES/amarok.mo
+share/locale/rw/LC_MESSAGES/amarok.mo
+share/locale/se/LC_MESSAGES/amarok.mo
+share/locale/sk/LC_MESSAGES/amarok.mo
+share/locale/sl/LC_MESSAGES/amarok.mo
+share/locale/sq/LC_MESSAGES/amarok.mo
+share/locale/sr/LC_MESSAGES/amarok.mo
+share/locale/sr@Latn/LC_MESSAGES/amarok.mo
+share/locale/ss/LC_MESSAGES/amarok.mo
+share/locale/sv/LC_MESSAGES/amarok.mo
+share/locale/ta/LC_MESSAGES/amarok.mo
+share/locale/tg/LC_MESSAGES/amarok.mo
+share/locale/th/LC_MESSAGES/amarok.mo
+share/locale/tr/LC_MESSAGES/amarok.mo
+share/locale/uk/LC_MESSAGES/amarok.mo
+share/locale/uz/LC_MESSAGES/amarok.mo
+share/locale/uz@cyrillic/LC_MESSAGES/amarok.mo
+share/locale/zh_CN/LC_MESSAGES/amarok.mo
+share/locale/zh_TW/LC_MESSAGES/amarok.mo
+share/man/man1/amarok.1.gz
+share/man/man1/amarok_libvisual.1.gz
+share/man/man1/amarokapp.1.gz
+share/man/man1/amarokcollectionscanner.1.gz
+share/services/amarok_aKode-engine.desktop
+share/services/amarok_daap-mediadevice.desktop
+share/services/amarok_generic-mediadevice.desktop
+share/services/amarok_ipod-mediadevice.desktop
+share/services/amarok_massstorage-device.desktop
+share/services/amarok_mtp-mediadevice.desktop
+share/services/amarok_nfs-device.desktop
+share/services/amarok_smb-device.desktop
+share/services/amarok_void-engine_plugin.desktop
+share/services/amarok_xine-engine.desktop
+share/services/amarok_yauap-engine_plugin.desktop
+share/services/amarokitpc.protocol
+share/services/amaroklastfm.protocol
+share/services/amarokpcast.protocol
+share/servicetypes/amarok_codecinstall.desktop
+share/servicetypes/amarok_plugin.desktop
diff --git a/freebsd/applications/multimedia/codeine/Makefile b/freebsd/applications/multimedia/codeine/Makefile
new file mode 100644
index 000000000..58951bc7b
--- /dev/null
+++ b/freebsd/applications/multimedia/codeine/Makefile
@@ -0,0 +1,36 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		codeine-trinity
+COMMENT=		Simple TDE video player
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	c/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/multimedia
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+
+LIB_DEPENDS+=	libxine.so:${PORTSDIR}/multimedia/libxine \
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/multimedia/codeine/distinfo b/freebsd/applications/multimedia/codeine/distinfo
new file mode 100644
index 000000000..a5370cd87
--- /dev/null
+++ b/freebsd/applications/multimedia/codeine/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666649738
+SHA256 (TDE/applications/multimedia/codeine-trinity_14.0.13.orig.tar.xz) = d710b86c6d238605119c9bc8a8e57b8e5a8bf66b246274630402ce0a27a89840
+SIZE (TDE/applications/multimedia/codeine-trinity_14.0.13.orig.tar.xz) = 89972
diff --git a/freebsd/applications/codeine/pkg-descr b/freebsd/applications/multimedia/codeine/pkg-descr
index e1659b27b..e1659b27b 100644
--- a/freebsd/applications/codeine/pkg-descr
+++ b/freebsd/applications/multimedia/codeine/pkg-descr
diff --git a/freebsd/applications/codeine/pkg-plist b/freebsd/applications/multimedia/codeine/pkg-plist
index dd29fe120..dd29fe120 100644
--- a/freebsd/applications/codeine/pkg-plist
+++ b/freebsd/applications/multimedia/codeine/pkg-plist
diff --git a/freebsd/applications/multimedia/kaffeine/Makefile b/freebsd/applications/multimedia/kaffeine/Makefile
new file mode 100644
index 000000000..bb330ed0f
--- /dev/null
+++ b/freebsd/applications/multimedia/kaffeine/Makefile
@@ -0,0 +1,46 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kaffeine-trinity
+COMMENT=		Versatile media player for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/multimedia
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia \
+		libgstaudio-1.0.so:${PORTSDIR}/multimedia/gstreamer1-plugins \
+		libmp3lame.so:${PORTSDIR}/audio/lame \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libtheora.so:${PORTSDIR}/multimedia/libtheora \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libxcb.so:${PORTSDIR}/x11/libxcb \
+		libxine.so:${PORTSDIR}/multimedia/libxine \
+		libXtst.so:${PORTSDIR}/x11/libXtst \
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON" \
+	-DWITH_DVB="OFF"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/multimedia/kaffeine/distinfo b/freebsd/applications/multimedia/kaffeine/distinfo
new file mode 100644
index 000000000..c779ce7d4
--- /dev/null
+++ b/freebsd/applications/multimedia/kaffeine/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666649793
+SHA256 (TDE/applications/multimedia/kaffeine-trinity_14.0.13.orig.tar.xz) = be446752c65f4c382874db5304504f30c2395d16848b5ab9e6a57c4239eba1a9
+SIZE (TDE/applications/multimedia/kaffeine-trinity_14.0.13.orig.tar.xz) = 2363372
diff --git a/freebsd/applications/kaffeine/pkg-descr b/freebsd/applications/multimedia/kaffeine/pkg-descr
index 4fe3ceabb..4fe3ceabb 100644
--- a/freebsd/applications/kaffeine/pkg-descr
+++ b/freebsd/applications/multimedia/kaffeine/pkg-descr
diff --git a/freebsd/applications/kaffeine/pkg-plist b/freebsd/applications/multimedia/kaffeine/pkg-plist
index 99896a3f8..99896a3f8 100644
--- a/freebsd/applications/kaffeine/pkg-plist
+++ b/freebsd/applications/multimedia/kaffeine/pkg-plist
diff --git a/freebsd/applications/office/Makefile b/freebsd/applications/office/Makefile
new file mode 100644
index 000000000..d17ee3b3b
--- /dev/null
+++ b/freebsd/applications/office/Makefile
@@ -0,0 +1,11 @@
+
+    SUBDIR =
+    SUBDIR += basket
+    SUBDIR += kbibtex
+    SUBDIR += kbookreader
+    SUBDIR += kile
+    SUBDIR += kmymoney2
+    SUBDIR += knowit
+    SUBDIR += tellico
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/office/basket/Makefile b/freebsd/applications/office/basket/Makefile
new file mode 100644
index 000000000..ed373eb9d
--- /dev/null
+++ b/freebsd/applications/office/basket/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		basket-trinity
+COMMENT=		Multi-purpose note-taking application for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	b/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		deskutils x11
+DIST_SUBDIR=		TDE/applications/office
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libkontact.so:${PORTSDIR}/x11/trinity/core/tdepim
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libgpgme.so:${PORTSDIR}/security/gpgme \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/office/basket/distinfo b/freebsd/applications/office/basket/distinfo
new file mode 100644
index 000000000..17f963992
--- /dev/null
+++ b/freebsd/applications/office/basket/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666649869
+SHA256 (TDE/applications/office/basket-trinity_14.0.13.orig.tar.xz) = a14f60c52b9d76360c9a64d99a12619b1c6639281acff93c4827a700ce5bfd1e
+SIZE (TDE/applications/office/basket-trinity_14.0.13.orig.tar.xz) = 3616860
diff --git a/freebsd/applications/basket/pkg-descr b/freebsd/applications/office/basket/pkg-descr
index 65566a566..65566a566 100644
--- a/freebsd/applications/basket/pkg-descr
+++ b/freebsd/applications/office/basket/pkg-descr
diff --git a/freebsd/applications/office/basket/pkg-plist b/freebsd/applications/office/basket/pkg-plist
new file mode 100644
index 000000000..c1833598b
--- /dev/null
+++ b/freebsd/applications/office/basket/pkg-plist
@@ -0,0 +1,126 @@
+bin/basket
+lib/libbasketcommon.la
+lib/libbasketcommon.so
+lib/trinity/basketthumbcreator.la
+lib/trinity/basketthumbcreator.so
+lib/trinity/kcm_basket.la
+lib/trinity/kcm_basket.so
+lib/trinity/libbasketpart.la
+lib/trinity/libbasketpart.so
+lib/trinity/libkontact_basket.la
+lib/trinity/libkontact_basket.so
+share/applications/tde/basket.desktop
+share/apps/basket/backgrounds/abstract.png
+share/apps/basket/backgrounds/alien-artifact.png
+share/apps/basket/backgrounds/alien-artifact.png.config
+share/apps/basket/backgrounds/basket-title.png
+share/apps/basket/backgrounds/green-curves.png
+share/apps/basket/backgrounds/light.png
+share/apps/basket/backgrounds/painting.png
+share/apps/basket/backgrounds/pens.png
+share/apps/basket/backgrounds/pins.png
+share/apps/basket/backgrounds/previews/abstract.png
+share/apps/basket/backgrounds/previews/alien-artifact.png
+share/apps/basket/backgrounds/previews/basket-title.png
+share/apps/basket/backgrounds/previews/green-curves.png
+share/apps/basket/backgrounds/previews/light.png
+share/apps/basket/backgrounds/previews/painting.png
+share/apps/basket/backgrounds/previews/pens.png
+share/apps/basket/backgrounds/previews/pins.png
+share/apps/basket/backgrounds/previews/rainbow-balls.png
+share/apps/basket/backgrounds/previews/rounds-line.png
+share/apps/basket/backgrounds/previews/strings.png
+share/apps/basket/backgrounds/previews/todo.png
+share/apps/basket/backgrounds/previews/working.png
+share/apps/basket/backgrounds/rainbow-balls.png
+share/apps/basket/backgrounds/rounds-line.png
+share/apps/basket/backgrounds/strings.png
+share/apps/basket/backgrounds/todo.png
+share/apps/basket/backgrounds/working.png
+share/apps/basket/basket_part.rc
+share/apps/basket/basketui.rc
+share/apps/basket/images/insertion_help.png
+share/apps/basket/images/tag_export_help.png
+share/apps/basket/images/tag_export_on_every_lines_help.png
+share/apps/basket/welcome/Welcome_de.baskets
+share/apps/basket/welcome/Welcome_en_US.baskets
+share/apps/basket/welcome/Welcome_fr.baskets
+share/apps/basket/welcome/Welcome_it.baskets
+share/apps/basket/welcome/Welcome_ja.baskets
+share/apps/basket/welcome/Welcome_nn.baskets
+share/apps/basket/welcome/Welcome_pt.baskets
+share/apps/basket/welcome/Welcome_ru.baskets
+share/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
+share/config/magic/basket.magic
+share/config/magic/basket.magic.mgc
+share/doc/tde/HTML/en/basket/common
+share/doc/tde/HTML/en/basket/index.cache.bz2
+share/doc/tde/HTML/en/basket/index.docbook
+share/icons/crystalsvg/128x128/apps/basket.png
+share/icons/crystalsvg/128x128/mimetypes/baskets.png
+share/icons/crystalsvg/128x128/mimetypes/baskett.png
+share/icons/crystalsvg/16x16/actions/likeback_bug.png
+share/icons/crystalsvg/16x16/actions/likeback_dislike.png
+share/icons/crystalsvg/16x16/actions/likeback_feature.png
+share/icons/crystalsvg/16x16/actions/likeback_like.png
+share/icons/crystalsvg/16x16/actions/tag_checkbox.png
+share/icons/crystalsvg/16x16/actions/tag_checkbox_checked.png
+share/icons/crystalsvg/16x16/actions/tag_for_later.png
+share/icons/crystalsvg/16x16/actions/tag_fun.png
+share/icons/crystalsvg/16x16/actions/tag_important.png
+share/icons/crystalsvg/16x16/actions/tag_preference_bad.png
+share/icons/crystalsvg/16x16/actions/tag_preference_excelent.png
+share/icons/crystalsvg/16x16/actions/tag_preference_good.png
+share/icons/crystalsvg/16x16/actions/tag_priority_high.png
+share/icons/crystalsvg/16x16/actions/tag_priority_low.png
+share/icons/crystalsvg/16x16/actions/tag_priority_medium.png
+share/icons/crystalsvg/16x16/actions/tag_progress_000.png
+share/icons/crystalsvg/16x16/actions/tag_progress_025.png
+share/icons/crystalsvg/16x16/actions/tag_progress_050.png
+share/icons/crystalsvg/16x16/actions/tag_progress_075.png
+share/icons/crystalsvg/16x16/actions/tag_progress_100.png
+share/icons/crystalsvg/16x16/apps/basket.png
+share/icons/crystalsvg/16x16/mimetypes/baskets.png
+share/icons/crystalsvg/16x16/mimetypes/baskett.png
+share/icons/crystalsvg/22x22/apps/basket.png
+share/icons/crystalsvg/22x22/mimetypes/baskets.png
+share/icons/crystalsvg/22x22/mimetypes/baskett.png
+share/icons/crystalsvg/32x32/apps/basket.png
+share/icons/crystalsvg/32x32/mimetypes/baskets.png
+share/icons/crystalsvg/32x32/mimetypes/baskett.png
+share/icons/crystalsvg/48x48/apps/basket.png
+share/icons/crystalsvg/48x48/mimetypes/baskets.png
+share/icons/crystalsvg/48x48/mimetypes/baskett.png
+share/icons/crystalsvg/64x64/apps/basket.png
+share/icons/crystalsvg/64x64/mimetypes/baskets.png
+share/icons/crystalsvg/64x64/mimetypes/baskett.png
+share/icons/crystalsvg/scalable/apps/basket.svg
+share/locale/cs/LC_MESSAGES/basket.mo
+share/locale/da/LC_MESSAGES/basket.mo
+share/locale/de/LC_MESSAGES/basket.mo
+share/locale/el/LC_MESSAGES/basket.mo
+share/locale/es/LC_MESSAGES/basket.mo
+share/locale/fr/LC_MESSAGES/basket.mo
+share/locale/it/LC_MESSAGES/basket.mo
+share/locale/ja/LC_MESSAGES/basket.mo
+share/locale/nl/LC_MESSAGES/basket.mo
+share/locale/nn/LC_MESSAGES/basket.mo
+share/locale/pl_PL/LC_MESSAGES/basket.mo
+share/locale/pt/LC_MESSAGES/basket.mo
+share/locale/ru/LC_MESSAGES/basket.mo
+share/locale/sk/LC_MESSAGES/basket.mo
+share/locale/tr/LC_MESSAGES/basket.mo
+share/locale/uk/LC_MESSAGES/basket.mo
+share/locale/zh_CN/LC_MESSAGES/basket.mo
+share/locale/zh_TW/LC_MESSAGES/basket.mo
+share/man/man1/basket.1.gz
+share/mimelnk/application/x-basket-archive.desktop
+share/mimelnk/application/x-basket-template.desktop
+share/services/basket_config_apps.desktop
+share/services/basket_config_baskets.desktop
+share/services/basket_config_general.desktop
+share/services/basket_config_new_notes.desktop
+share/services/basket_config_notes_appearance.desktop
+share/services/basket_part.desktop
+share/services/basketthumbcreator.desktop
+share/services/kontact/basket.desktop
diff --git a/freebsd/applications/office/kbibtex/Makefile b/freebsd/applications/office/kbibtex/Makefile
new file mode 100644
index 000000000..b7c51762d
--- /dev/null
+++ b/freebsd/applications/office/kbibtex/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kbibtex-trinity
+COMMENT=		BibTeX editor for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/office
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libyaz.so:${PORTSDIR}/net/yaz \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/office/kbibtex/distinfo b/freebsd/applications/office/kbibtex/distinfo
new file mode 100644
index 000000000..1d90eb2a6
--- /dev/null
+++ b/freebsd/applications/office/kbibtex/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666649973
+SHA256 (TDE/applications/office/kbibtex-trinity_14.0.13.orig.tar.xz) = 3ed351bc550027fefb192b2fdc3c5c3723f8ae17d4a4ec424598a0340bebb8a1
+SIZE (TDE/applications/office/kbibtex-trinity_14.0.13.orig.tar.xz) = 285576
diff --git a/freebsd/applications/kbibtex/pkg-descr b/freebsd/applications/office/kbibtex/pkg-descr
index a7600726c..a7600726c 100644
--- a/freebsd/applications/kbibtex/pkg-descr
+++ b/freebsd/applications/office/kbibtex/pkg-descr
diff --git a/freebsd/applications/kbibtex/pkg-plist b/freebsd/applications/office/kbibtex/pkg-plist
index 069f863bf..069f863bf 100644
--- a/freebsd/applications/kbibtex/pkg-plist
+++ b/freebsd/applications/office/kbibtex/pkg-plist
diff --git a/freebsd/applications/office/kbookreader/Makefile b/freebsd/applications/office/kbookreader/Makefile
new file mode 100644
index 000000000..6b6fea85c
--- /dev/null
+++ b/freebsd/applications/office/kbookreader/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kbookreader-trinity
+COMMENT=		eBook reader for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/office
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/office/kbookreader/distinfo b/freebsd/applications/office/kbookreader/distinfo
new file mode 100644
index 000000000..07abc9614
--- /dev/null
+++ b/freebsd/applications/office/kbookreader/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666650042
+SHA256 (TDE/applications/office/kbookreader-trinity_14.0.13.orig.tar.xz) = 217a6fb9c85674467343747dd5d7f0705948bd026d7ad2955123f487c79f728e
+SIZE (TDE/applications/office/kbookreader-trinity_14.0.13.orig.tar.xz) = 121924
diff --git a/freebsd/applications/kbookreader/pkg-descr b/freebsd/applications/office/kbookreader/pkg-descr
index a0e08ae4b..a0e08ae4b 100644
--- a/freebsd/applications/kbookreader/pkg-descr
+++ b/freebsd/applications/office/kbookreader/pkg-descr
diff --git a/freebsd/applications/office/kbookreader/pkg-plist b/freebsd/applications/office/kbookreader/pkg-plist
new file mode 100644
index 000000000..02d0c4a52
--- /dev/null
+++ b/freebsd/applications/office/kbookreader/pkg-plist
@@ -0,0 +1,16 @@
+bin/kbookreader
+bin/kbookreader_client
+share/applications/tde/kbookreader.desktop
+share/apps/kbookreader/kbookreaderui.rc
+share/apps/kbookreader/themes/default/bg.png
+share/apps/kbookreader/themes/default/bookmark.png
+share/apps/kbookreader/themes/default/splash.png
+share/config.kcfg/kbookreader.kcfg
+share/doc/tde/HTML/en/kbookreader/common
+share/doc/tde/HTML/en/kbookreader/index.cache.bz2
+share/doc/tde/HTML/en/kbookreader/index.docbook
+share/icons/hicolor/16x16/apps/kbookreader.png
+share/icons/hicolor/32x32/apps/kbookreader.png
+share/locale/cs/LC_MESSAGES/kbookreader.mo
+share/locale/de/LC_MESSAGES/kbookreader.mo
+share/locale/nl/LC_MESSAGES/kbookreader.mo
diff --git a/freebsd/applications/office/kile/Makefile b/freebsd/applications/office/kile/Makefile
new file mode 100644
index 000000000..b03cdfda1
--- /dev/null
+++ b/freebsd/applications/office/kile/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kile-trinity
+COMMENT=		TDE Integrated LaTeX Environment
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/office
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/office/kile/distinfo b/freebsd/applications/office/kile/distinfo
new file mode 100644
index 000000000..3b49712d5
--- /dev/null
+++ b/freebsd/applications/office/kile/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666650126
+SHA256 (TDE/applications/office/kile-trinity_14.0.13.orig.tar.xz) = 4f6b655f64ffbbee6d3a612bded6870708f510c5d82bb1c85b57c96dbf496ae7
+SIZE (TDE/applications/office/kile-trinity_14.0.13.orig.tar.xz) = 3683504
diff --git a/freebsd/applications/office/kile/pkg-descr b/freebsd/applications/office/kile/pkg-descr
new file mode 100644
index 000000000..f7b110c2f
--- /dev/null
+++ b/freebsd/applications/office/kile/pkg-descr
@@ -0,0 +1,14 @@
+TDE Integrated LaTeX Environment
+
+Kile is a user-friendly LaTeX source editor and TeX shell for TDE.
+
+The source editor is a multi-document editor designed for .tex and .bib
+files.  Menus, wizards and auto-completion are provided to assist with
+tag insertion and code generation.  A structural view of the document
+assists with navigation within source files.
+
+The TeX shell integrates the various tools required for TeX processing.
+It assists with LaTeX compilation, DVI and postscript document viewing,
+generation of bibliographies and indices and other common tasks.
+
+Kile can support large projects consisting of several smaller files.
diff --git a/freebsd/applications/office/kile/pkg-plist b/freebsd/applications/office/kile/pkg-plist
new file mode 100644
index 000000000..8ed11df03
--- /dev/null
+++ b/freebsd/applications/office/kile/pkg-plist
@@ -0,0 +1,1550 @@
+bin/kile
+share/applications/tde/kile.desktop
+share/apps/kile/complete/abbreviation/example.cwl
+share/apps/kile/complete/abbreviation/fastex.cwl
+share/apps/kile/complete/dictionary/example.cwl
+share/apps/kile/complete/dictionary/metapost.cwl
+share/apps/kile/complete/tex/acronym.cwl
+share/apps/kile/complete/tex/afterpage.cwl
+share/apps/kile/complete/tex/allrunes.cwl
+share/apps/kile/complete/tex/amsbsy.cwl
+share/apps/kile/complete/tex/amsfonts.cwl
+share/apps/kile/complete/tex/amsmath.cwl
+share/apps/kile/complete/tex/amsopn.cwl
+share/apps/kile/complete/tex/amssymb.cwl
+share/apps/kile/complete/tex/amsthm.cwl
+share/apps/kile/complete/tex/array.cwl
+share/apps/kile/complete/tex/attachfile.cwl
+share/apps/kile/complete/tex/babel.cwl
+share/apps/kile/complete/tex/beamerfoils.cwl
+share/apps/kile/complete/tex/beamerprosper.cwl
+share/apps/kile/complete/tex/beamerseminar.cwl
+share/apps/kile/complete/tex/beamertexpower.cwl
+share/apps/kile/complete/tex/bm.cwl
+share/apps/kile/complete/tex/booktabs.cwl
+share/apps/kile/complete/tex/braket.cwl
+share/apps/kile/complete/tex/calc.cwl
+share/apps/kile/complete/tex/class-beamer.cwl
+share/apps/kile/complete/tex/class-letter.cwl
+share/apps/kile/complete/tex/class-scrartcl,scrreprt,scrbook.cwl
+share/apps/kile/complete/tex/class-scrlttr2.cwl
+share/apps/kile/complete/tex/color.cwl
+share/apps/kile/complete/tex/colortbl.cwl
+share/apps/kile/complete/tex/coordsys.cwl
+share/apps/kile/complete/tex/currvita.cwl
+share/apps/kile/complete/tex/cyrillic.cwl
+share/apps/kile/complete/tex/diagxy.cwl
+share/apps/kile/complete/tex/doi.cwl
+share/apps/kile/complete/tex/enumerate.cwl
+share/apps/kile/complete/tex/fancybox.cwl
+share/apps/kile/complete/tex/fancyhdr.cwl
+share/apps/kile/complete/tex/fancyunits-base.cwl
+share/apps/kile/complete/tex/fancyunits-np.cwl
+share/apps/kile/complete/tex/fancyunits-per.cwl
+share/apps/kile/complete/tex/fancyunits_big-fractions.cwl
+share/apps/kile/complete/tex/fancyunits_medium-fractions.cwl
+share/apps/kile/complete/tex/fancyunits_small-fractions.cwl
+share/apps/kile/complete/tex/fancyvrb.cwl
+share/apps/kile/complete/tex/float.cwl
+share/apps/kile/complete/tex/fontspec.cwl
+share/apps/kile/complete/tex/glosstex.cwl
+share/apps/kile/complete/tex/graphicx.cwl
+share/apps/kile/complete/tex/hyperref.cwl
+share/apps/kile/complete/tex/ifthen.cwl
+share/apps/kile/complete/tex/import.cwl
+share/apps/kile/complete/tex/jurabib.cwl
+share/apps/kile/complete/tex/latex-209.cwl
+share/apps/kile/complete/tex/latex-dev.cwl
+share/apps/kile/complete/tex/latex-document.cwl
+share/apps/kile/complete/tex/latex-l2tabu.cwl
+share/apps/kile/complete/tex/latex-mathsymbols.cwl
+share/apps/kile/complete/tex/layout.cwl
+share/apps/kile/complete/tex/listings.cwl
+share/apps/kile/complete/tex/logsys.cwl
+share/apps/kile/complete/tex/longtable.cwl
+share/apps/kile/complete/tex/lscape.cwl
+share/apps/kile/complete/tex/manyfoot.cwl
+share/apps/kile/complete/tex/mdwlist.cwl
+share/apps/kile/complete/tex/multicol.cwl
+share/apps/kile/complete/tex/multido.cwl
+share/apps/kile/complete/tex/nicefrac.cwl
+share/apps/kile/complete/tex/pdfpages.cwl
+share/apps/kile/complete/tex/psfrag.cwl
+share/apps/kile/complete/tex/pst-3d.cwl
+share/apps/kile/complete/tex/pst-blur.cwl
+share/apps/kile/complete/tex/pst-char.cwl
+share/apps/kile/complete/tex/pst-coil.cwl
+share/apps/kile/complete/tex/pst-eps.cwl
+share/apps/kile/complete/tex/pst-fill.cwl
+share/apps/kile/complete/tex/pst-node.cwl
+share/apps/kile/complete/tex/pst-plot.cwl
+share/apps/kile/complete/tex/pst-text.cwl
+share/apps/kile/complete/tex/pst-tree.cwl
+share/apps/kile/complete/tex/pstricks.cwl
+share/apps/kile/complete/tex/rotating.cwl
+share/apps/kile/complete/tex/scraddr.cwl
+share/apps/kile/complete/tex/scrdate.cwl
+share/apps/kile/complete/tex/scrlfile.cwl
+share/apps/kile/complete/tex/scrpage2.cwl
+share/apps/kile/complete/tex/scrtime.cwl
+share/apps/kile/complete/tex/setspace.cwl
+share/apps/kile/complete/tex/siunitx-special.cwl
+share/apps/kile/complete/tex/siunitx.cwl
+share/apps/kile/complete/tex/subfig.cwl
+share/apps/kile/complete/tex/supertabular.cwl
+share/apps/kile/complete/tex/svn-multi.cwl
+share/apps/kile/complete/tex/svninfo.cwl
+share/apps/kile/complete/tex/tabularx.cwl
+share/apps/kile/complete/tex/tex.cwl
+share/apps/kile/complete/tex/textcomp.cwl
+share/apps/kile/complete/tex/todonotes.cwl
+share/apps/kile/complete/tex/url.cwl
+share/apps/kile/complete/tex/varioref.cwl
+share/apps/kile/complete/tex/verse.cwl
+share/apps/kile/complete/tex/virginialake.cwl
+share/apps/kile/complete/tex/xifthen.cwl
+share/apps/kile/complete/tex/xltxtra.cwl
+share/apps/kile/complete/tex/xtab.cwl
+share/apps/kile/complete/tex/yfonts.cwl
+share/apps/kile/docpartui.rc
+share/apps/kile/encodings/cp1250.enc
+share/apps/kile/encodings/cp1252.enc
+share/apps/kile/encodings/latin1.enc
+share/apps/kile/encodings/latin2.enc
+share/apps/kile/encodings/latin3.enc
+share/apps/kile/encodings/latin4.enc
+share/apps/kile/encodings/latin5.enc
+share/apps/kile/encodings/latin9.enc
+share/apps/kile/help/latex-kile.lst
+share/apps/kile/help/latex-tetex.lst
+share/apps/kile/help/latex-tetex3.lst
+share/apps/kile/help/latex-texlive-3.9.lst
+share/apps/kile/icons/hicolor/16x16/actions/acute.png
+share/apps/kile/icons/hicolor/16x16/actions/bar.png
+share/apps/kile/icons/hicolor/16x16/actions/beamerblock.png
+share/apps/kile/icons/hicolor/16x16/actions/beamerframe.png
+share/apps/kile/icons/hicolor/16x16/actions/binom.png
+share/apps/kile/icons/hicolor/16x16/actions/breve.png
+share/apps/kile/icons/hicolor/16x16/actions/chapter.png
+share/apps/kile/icons/hicolor/16x16/actions/check.png
+share/apps/kile/icons/hicolor/16x16/actions/closeallenv.png
+share/apps/kile/icons/hicolor/16x16/actions/closeenv.png
+share/apps/kile/icons/hicolor/16x16/actions/closegroup.png
+share/apps/kile/icons/hicolor/16x16/actions/complete1.png
+share/apps/kile/icons/hicolor/16x16/actions/complete2.png
+share/apps/kile/icons/hicolor/16x16/actions/complete3.png
+share/apps/kile/icons/hicolor/16x16/actions/configure_kile.png
+share/apps/kile/icons/hicolor/16x16/actions/configure_project.png
+share/apps/kile/icons/hicolor/16x16/actions/ddot.png
+share/apps/kile/icons/hicolor/16x16/actions/delenv_i.png
+share/apps/kile/icons/hicolor/16x16/actions/delenv_o.png
+share/apps/kile/icons/hicolor/16x16/actions/deleol.png
+share/apps/kile/icons/hicolor/16x16/actions/delete.png
+share/apps/kile/icons/hicolor/16x16/actions/delgroup_i.png
+share/apps/kile/icons/hicolor/16x16/actions/delgroup_o.png
+share/apps/kile/icons/hicolor/16x16/actions/delline.png
+share/apps/kile/icons/hicolor/16x16/actions/delmath.png
+share/apps/kile/icons/hicolor/16x16/actions/delpar.png
+share/apps/kile/icons/hicolor/16x16/actions/delword.png
+share/apps/kile/icons/hicolor/16x16/actions/description.png
+share/apps/kile/icons/hicolor/16x16/actions/dot.png
+share/apps/kile/icons/hicolor/16x16/actions/enumerate.png
+share/apps/kile/icons/hicolor/16x16/actions/eqnarray.png
+share/apps/kile/icons/hicolor/16x16/actions/equation.png
+share/apps/kile/icons/hicolor/16x16/actions/file.png
+share/apps/kile/icons/hicolor/16x16/actions/gotobeginenv.png
+share/apps/kile/icons/hicolor/16x16/actions/gotobegingroup.png
+share/apps/kile/icons/hicolor/16x16/actions/gotoendenv.png
+share/apps/kile/icons/hicolor/16x16/actions/gotoendgroup.png
+share/apps/kile/icons/hicolor/16x16/actions/graphics.png
+share/apps/kile/icons/hicolor/16x16/actions/grave.png
+share/apps/kile/icons/hicolor/16x16/actions/hat.png
+share/apps/kile/icons/hicolor/16x16/actions/include.png
+share/apps/kile/icons/hicolor/16x16/actions/item.png
+share/apps/kile/icons/hicolor/16x16/actions/itemize.png
+share/apps/kile/icons/hicolor/16x16/actions/js.png
+share/apps/kile/icons/hicolor/16x16/actions/label.png
+share/apps/kile/icons/hicolor/16x16/actions/masteritem.png
+share/apps/kile/icons/hicolor/16x16/actions/matchenv.png
+share/apps/kile/icons/hicolor/16x16/actions/matchgroup.png
+share/apps/kile/icons/hicolor/16x16/actions/math0.png
+share/apps/kile/icons/hicolor/16x16/actions/math1.png
+share/apps/kile/icons/hicolor/16x16/actions/math10.png
+share/apps/kile/icons/hicolor/16x16/actions/math2.png
+share/apps/kile/icons/hicolor/16x16/actions/math3.png
+share/apps/kile/icons/hicolor/16x16/actions/math4.png
+share/apps/kile/icons/hicolor/16x16/actions/math5.png
+share/apps/kile/icons/hicolor/16x16/actions/math6.png
+share/apps/kile/icons/hicolor/16x16/actions/math7.png
+share/apps/kile/icons/hicolor/16x16/actions/math8.png
+share/apps/kile/icons/hicolor/16x16/actions/math9.png
+share/apps/kile/icons/hicolor/16x16/actions/mathmode.png
+share/apps/kile/icons/hicolor/16x16/actions/minipage.png
+share/apps/kile/icons/hicolor/16x16/actions/nextbullet.png
+share/apps/kile/icons/hicolor/16x16/actions/nextparagraph.png
+share/apps/kile/icons/hicolor/16x16/actions/nextsection.png
+share/apps/kile/icons/hicolor/16x16/actions/nroot.png
+share/apps/kile/icons/hicolor/16x16/actions/part.png
+share/apps/kile/icons/hicolor/16x16/actions/prevbullet.png
+share/apps/kile/icons/hicolor/16x16/actions/prevparagraph.png
+share/apps/kile/icons/hicolor/16x16/actions/prevsection.png
+share/apps/kile/icons/hicolor/16x16/actions/projectitem.png
+share/apps/kile/icons/hicolor/16x16/actions/refreshstructure.png
+share/apps/kile/icons/hicolor/16x16/actions/relation.png
+share/apps/kile/icons/hicolor/16x16/actions/scriptnew.png
+share/apps/kile/icons/hicolor/16x16/actions/scriptopen.png
+share/apps/kile/icons/hicolor/16x16/actions/section.png
+share/apps/kile/icons/hicolor/16x16/actions/selenv_i.png
+share/apps/kile/icons/hicolor/16x16/actions/selenv_o.png
+share/apps/kile/icons/hicolor/16x16/actions/selgroup_i.png
+share/apps/kile/icons/hicolor/16x16/actions/selgroup_o.png
+share/apps/kile/icons/hicolor/16x16/actions/selline.png
+share/apps/kile/icons/hicolor/16x16/actions/selmath.png
+share/apps/kile/icons/hicolor/16x16/actions/selpar.png
+share/apps/kile/icons/hicolor/16x16/actions/selword.png
+share/apps/kile/icons/hicolor/16x16/actions/smallfrac.png
+share/apps/kile/icons/hicolor/16x16/actions/structure.png
+share/apps/kile/icons/hicolor/16x16/actions/subsection.png
+share/apps/kile/icons/hicolor/16x16/actions/subsubsection.png
+share/apps/kile/icons/hicolor/16x16/actions/tilde.png
+share/apps/kile/icons/hicolor/16x16/actions/vec.png
+share/apps/kile/icons/hicolor/16x16/actions/verb.png
+share/apps/kile/icons/hicolor/16x16/actions/verbatim.png
+share/apps/kile/icons/hicolor/16x16/actions/viewdvi.png
+share/apps/kile/icons/hicolor/16x16/actions/viewhtml.png
+share/apps/kile/icons/hicolor/16x16/actions/viewpdf.png
+share/apps/kile/icons/hicolor/16x16/actions/viewps.png
+share/apps/kile/icons/hicolor/22x22/actions/array.png
+share/apps/kile/icons/hicolor/22x22/actions/bboxnext.png
+share/apps/kile/icons/hicolor/22x22/actions/bboxprev.png
+share/apps/kile/icons/hicolor/22x22/actions/binom.png
+share/apps/kile/icons/hicolor/22x22/actions/cline.png
+share/apps/kile/icons/hicolor/22x22/actions/complete1.png
+share/apps/kile/icons/hicolor/22x22/actions/complete2.png
+share/apps/kile/icons/hicolor/22x22/actions/complete3.png
+share/apps/kile/icons/hicolor/22x22/actions/configure_kile.png
+share/apps/kile/icons/hicolor/22x22/actions/configure_project.png
+share/apps/kile/icons/hicolor/22x22/actions/convert.png
+share/apps/kile/icons/hicolor/22x22/actions/description.png
+share/apps/kile/icons/hicolor/22x22/actions/dfrac.png
+share/apps/kile/icons/hicolor/22x22/actions/displaymathmode.png
+share/apps/kile/icons/hicolor/22x22/actions/emph.png
+share/apps/kile/icons/hicolor/22x22/actions/enumerate.png
+share/apps/kile/icons/hicolor/22x22/actions/eqnarray.png
+share/apps/kile/icons/hicolor/22x22/actions/equation.png
+share/apps/kile/icons/hicolor/22x22/actions/errornext.png
+share/apps/kile/icons/hicolor/22x22/actions/errorprev.png
+share/apps/kile/icons/hicolor/22x22/actions/filegrep.png
+share/apps/kile/icons/hicolor/22x22/actions/hline.png
+share/apps/kile/icons/hicolor/22x22/actions/item.png
+share/apps/kile/icons/hicolor/22x22/actions/itemize.png
+share/apps/kile/icons/hicolor/22x22/actions/js.png
+share/apps/kile/icons/hicolor/22x22/actions/jspage.png
+share/apps/kile/icons/hicolor/22x22/actions/label.png
+share/apps/kile/icons/hicolor/22x22/actions/master.png
+share/apps/kile/icons/hicolor/22x22/actions/minipage.png
+share/apps/kile/icons/hicolor/22x22/actions/multicolumn.png
+share/apps/kile/icons/hicolor/22x22/actions/newline.png
+share/apps/kile/icons/hicolor/22x22/actions/nroot.png
+share/apps/kile/icons/hicolor/22x22/actions/output_win.png
+share/apps/kile/icons/hicolor/22x22/actions/preview_env.png
+share/apps/kile/icons/hicolor/22x22/actions/preview_sel.png
+share/apps/kile/icons/hicolor/22x22/actions/preview_subdoc.png
+share/apps/kile/icons/hicolor/22x22/actions/project_add.png
+share/apps/kile/icons/hicolor/22x22/actions/project_remove.png
+share/apps/kile/icons/hicolor/22x22/actions/project_show.png
+share/apps/kile/icons/hicolor/22x22/actions/projectgrep.png
+share/apps/kile/icons/hicolor/22x22/actions/quick.png
+share/apps/kile/icons/hicolor/22x22/actions/quickwizard.png
+share/apps/kile/icons/hicolor/22x22/actions/refreshstructure.png
+share/apps/kile/icons/hicolor/22x22/actions/scriptnew.png
+share/apps/kile/icons/hicolor/22x22/actions/scriptopen.png
+share/apps/kile/icons/hicolor/22x22/actions/slanted.png
+share/apps/kile/icons/hicolor/22x22/actions/strong.png
+share/apps/kile/icons/hicolor/22x22/actions/tabbing.png
+share/apps/kile/icons/hicolor/22x22/actions/tabular.png
+share/apps/kile/icons/hicolor/22x22/actions/typewriter.png
+share/apps/kile/icons/hicolor/22x22/actions/verb.png
+share/apps/kile/icons/hicolor/22x22/actions/verbatim.png
+share/apps/kile/icons/hicolor/22x22/actions/viewdvi.png
+share/apps/kile/icons/hicolor/22x22/actions/viewhtml.png
+share/apps/kile/icons/hicolor/22x22/actions/viewlog.png
+share/apps/kile/icons/hicolor/22x22/actions/viewpdf.png
+share/apps/kile/icons/hicolor/22x22/actions/viewps.png
+share/apps/kile/icons/hicolor/22x22/actions/vline.png
+share/apps/kile/icons/hicolor/22x22/actions/warnnext.png
+share/apps/kile/icons/hicolor/22x22/actions/warnprev.png
+share/apps/kile/icons/hicolor/22x22/actions/watchfile.png
+share/apps/kile/icons/hicolor/22x22/actions/wizard_array.png
+share/apps/kile/icons/hicolor/22x22/actions/wizard_float.png
+share/apps/kile/icons/hicolor/22x22/actions/wizard_math.png
+share/apps/kile/icons/hicolor/22x22/actions/wizard_pstools.png
+share/apps/kile/icons/hicolor/22x22/actions/wizard_tabbing.png
+share/apps/kile/icons/hicolor/22x22/actions/wizard_tabular.png
+share/apps/kile/icons/hicolor/32x32/actions/bibtex.png
+share/apps/kile/icons/hicolor/32x32/actions/dblatex.png
+share/apps/kile/icons/hicolor/32x32/actions/dvipdf.png
+share/apps/kile/icons/hicolor/32x32/actions/dvipng.png
+share/apps/kile/icons/hicolor/32x32/actions/dvips.png
+share/apps/kile/icons/hicolor/32x32/actions/dvisearch.png
+share/apps/kile/icons/hicolor/32x32/actions/environment.png
+share/apps/kile/icons/hicolor/32x32/actions/js.png
+share/apps/kile/icons/hicolor/32x32/actions/l2h.png
+share/apps/kile/icons/hicolor/32x32/actions/latex.png
+share/apps/kile/icons/hicolor/32x32/actions/lilypond.png
+share/apps/kile/icons/hicolor/32x32/actions/makeidx.png
+share/apps/kile/icons/hicolor/32x32/actions/mpost.png
+share/apps/kile/icons/hicolor/32x32/actions/pdflatex.png
+share/apps/kile/icons/hicolor/32x32/actions/pdftex.png
+share/apps/kile/icons/hicolor/32x32/actions/ps2pdf.png
+share/apps/kile/icons/hicolor/32x32/actions/scriptnew.png
+share/apps/kile/icons/hicolor/32x32/actions/scriptopen.png
+share/apps/kile/icons/hicolor/32x32/actions/texcompiler.png
+share/apps/kile/icons/hicolor/32x32/actions/viewbib.png
+share/apps/kile/icons/hicolor/32x32/actions/viewdvi.png
+share/apps/kile/icons/hicolor/32x32/actions/viewhtml.png
+share/apps/kile/icons/hicolor/32x32/actions/viewpdf.png
+share/apps/kile/icons/hicolor/32x32/actions/viewps.png
+share/apps/kile/icons/hicolor/48x48/actions/graphicspage.png
+share/apps/kile/icons/hicolor/64x64/actions/preview.png
+share/apps/kile/kilestdtools.rc
+share/apps/kile/kileui.rc
+share/apps/kile/mathsymbols/arrows/img001arrows.png
+share/apps/kile/mathsymbols/arrows/img002arrows.png
+share/apps/kile/mathsymbols/arrows/img003arrows.png
+share/apps/kile/mathsymbols/arrows/img004arrows.png
+share/apps/kile/mathsymbols/arrows/img005arrows.png
+share/apps/kile/mathsymbols/arrows/img006arrows.png
+share/apps/kile/mathsymbols/arrows/img007arrows.png
+share/apps/kile/mathsymbols/arrows/img008arrows.png
+share/apps/kile/mathsymbols/arrows/img009arrows.png
+share/apps/kile/mathsymbols/arrows/img010arrows.png
+share/apps/kile/mathsymbols/arrows/img011arrows.png
+share/apps/kile/mathsymbols/arrows/img012arrows.png
+share/apps/kile/mathsymbols/arrows/img013arrows.png
+share/apps/kile/mathsymbols/arrows/img014arrows.png
+share/apps/kile/mathsymbols/arrows/img015arrows.png
+share/apps/kile/mathsymbols/arrows/img016arrows.png
+share/apps/kile/mathsymbols/arrows/img017arrows.png
+share/apps/kile/mathsymbols/arrows/img018arrows.png
+share/apps/kile/mathsymbols/arrows/img019arrows.png
+share/apps/kile/mathsymbols/arrows/img020arrows.png
+share/apps/kile/mathsymbols/arrows/img021arrows.png
+share/apps/kile/mathsymbols/arrows/img022arrows.png
+share/apps/kile/mathsymbols/arrows/img023arrows.png
+share/apps/kile/mathsymbols/arrows/img024arrows.png
+share/apps/kile/mathsymbols/arrows/img025arrows.png
+share/apps/kile/mathsymbols/arrows/img026arrows.png
+share/apps/kile/mathsymbols/arrows/img027arrows.png
+share/apps/kile/mathsymbols/arrows/img028arrows.png
+share/apps/kile/mathsymbols/arrows/img029arrows.png
+share/apps/kile/mathsymbols/arrows/img030arrows.png
+share/apps/kile/mathsymbols/arrows/img031arrows.png
+share/apps/kile/mathsymbols/arrows/img032arrows.png
+share/apps/kile/mathsymbols/arrows/img033arrows.png
+share/apps/kile/mathsymbols/arrows/img034arrows.png
+share/apps/kile/mathsymbols/arrows/img035arrows.png
+share/apps/kile/mathsymbols/arrows/img036arrows.png
+share/apps/kile/mathsymbols/arrows/img037arrows.png
+share/apps/kile/mathsymbols/arrows/img038arrows.png
+share/apps/kile/mathsymbols/arrows/img039arrows.png
+share/apps/kile/mathsymbols/arrows/img040arrows.png
+share/apps/kile/mathsymbols/arrows/img041arrows.png
+share/apps/kile/mathsymbols/arrows/img042arrows.png
+share/apps/kile/mathsymbols/arrows/img043arrows.png
+share/apps/kile/mathsymbols/arrows/img044arrows.png
+share/apps/kile/mathsymbols/arrows/img045arrows.png
+share/apps/kile/mathsymbols/arrows/img046arrows.png
+share/apps/kile/mathsymbols/arrows/img047arrows.png
+share/apps/kile/mathsymbols/arrows/img048arrows.png
+share/apps/kile/mathsymbols/arrows/img049arrows.png
+share/apps/kile/mathsymbols/arrows/img050arrows.png
+share/apps/kile/mathsymbols/arrows/img051arrows.png
+share/apps/kile/mathsymbols/arrows/img052arrows.png
+share/apps/kile/mathsymbols/arrows/img053arrows.png
+share/apps/kile/mathsymbols/arrows/img054arrows.png
+share/apps/kile/mathsymbols/arrows/img055arrows.png
+share/apps/kile/mathsymbols/arrows/img056arrows.png
+share/apps/kile/mathsymbols/arrows/img057arrows.png
+share/apps/kile/mathsymbols/arrows/img058arrows.png
+share/apps/kile/mathsymbols/arrows/img059arrows.png
+share/apps/kile/mathsymbols/arrows/img060arrows.png
+share/apps/kile/mathsymbols/arrows/img061arrows.png
+share/apps/kile/mathsymbols/arrows/img062arrows.png
+share/apps/kile/mathsymbols/arrows/img063arrows.png
+share/apps/kile/mathsymbols/arrows/img064arrows.png
+share/apps/kile/mathsymbols/arrows/img065arrows.png
+share/apps/kile/mathsymbols/arrows/img066arrows.png
+share/apps/kile/mathsymbols/arrows/img067arrows.png
+share/apps/kile/mathsymbols/arrows/img068arrows.png
+share/apps/kile/mathsymbols/arrows/img069arrows.png
+share/apps/kile/mathsymbols/cyrillic/img001cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img002cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img003cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img004cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img005cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img006cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img007cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img008cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img009cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img010cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img011cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img012cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img013cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img014cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img015cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img016cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img017cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img018cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img019cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img020cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img021cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img022cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img023cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img024cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img025cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img026cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img027cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img028cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img029cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img030cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img031cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img032cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img033cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img034cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img035cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img036cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img037cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img038cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img039cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img040cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img041cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img042cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img043cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img044cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img045cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img046cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img047cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img048cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img049cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img050cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img051cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img052cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img053cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img054cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img055cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img056cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img057cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img058cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img059cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img060cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img061cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img062cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img063cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img064cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img065cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img066cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img067cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img068cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img069cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img070cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img071cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img072cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img073cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img074cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img075cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img076cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img077cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img078cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img079cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img080cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img081cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img082cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img083cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img084cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img085cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img086cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img087cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img088cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img089cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img090cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img091cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img092cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img093cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img094cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img095cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img096cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img097cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img098cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img099cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img100cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img101cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img102cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img103cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img104cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img105cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img106cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img107cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img108cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img109cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img110cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img111cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img112cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img113cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img114cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img115cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img116cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img117cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img118cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img119cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img120cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img121cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img122cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img123cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img124cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img125cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img126cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img127cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img128cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img129cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img130cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img131cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img132cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img133cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img134cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img135cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img136cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img137cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img138cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img139cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img140cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img141cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img142cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img143cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img144cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img145cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img146cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img147cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img148cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img149cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img150cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img151cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img152cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img153cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img154cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img155cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img156cyrillic.png
+share/apps/kile/mathsymbols/cyrillic/img157cyrillic.png
+share/apps/kile/mathsymbols/delimiters/img001delimiters.png
+share/apps/kile/mathsymbols/delimiters/img002delimiters.png
+share/apps/kile/mathsymbols/delimiters/img003delimiters.png
+share/apps/kile/mathsymbols/delimiters/img004delimiters.png
+share/apps/kile/mathsymbols/delimiters/img005delimiters.png
+share/apps/kile/mathsymbols/delimiters/img006delimiters.png
+share/apps/kile/mathsymbols/delimiters/img007delimiters.png
+share/apps/kile/mathsymbols/delimiters/img008delimiters.png
+share/apps/kile/mathsymbols/delimiters/img009delimiters.png
+share/apps/kile/mathsymbols/delimiters/img010delimiters.png
+share/apps/kile/mathsymbols/delimiters/img011delimiters.png
+share/apps/kile/mathsymbols/delimiters/img012delimiters.png
+share/apps/kile/mathsymbols/delimiters/img013delimiters.png
+share/apps/kile/mathsymbols/delimiters/img014delimiters.png
+share/apps/kile/mathsymbols/delimiters/img015delimiters.png
+share/apps/kile/mathsymbols/delimiters/img016delimiters.png
+share/apps/kile/mathsymbols/delimiters/img017delimiters.png
+share/apps/kile/mathsymbols/delimiters/img018delimiters.png
+share/apps/kile/mathsymbols/delimiters/img019delimiters.png
+share/apps/kile/mathsymbols/delimiters/img020delimiters.png
+share/apps/kile/mathsymbols/delimiters/img021delimiters.png
+share/apps/kile/mathsymbols/delimiters/img022delimiters.png
+share/apps/kile/mathsymbols/delimiters/img023delimiters.png
+share/apps/kile/mathsymbols/delimiters/img024delimiters.png
+share/apps/kile/mathsymbols/delimiters/img025delimiters.png
+share/apps/kile/mathsymbols/delimiters/img026delimiters.png
+share/apps/kile/mathsymbols/delimiters/img027delimiters.png
+share/apps/kile/mathsymbols/delimiters/img028delimiters.png
+share/apps/kile/mathsymbols/delimiters/img029delimiters.png
+share/apps/kile/mathsymbols/delimiters/img030delimiters.png
+share/apps/kile/mathsymbols/delimiters/img031delimiters.png
+share/apps/kile/mathsymbols/delimiters/img032delimiters.png
+share/apps/kile/mathsymbols/delimiters/img033delimiters.png
+share/apps/kile/mathsymbols/delimiters/img034delimiters.png
+share/apps/kile/mathsymbols/delimiters/img035delimiters.png
+share/apps/kile/mathsymbols/delimiters/img036delimiters.png
+share/apps/kile/mathsymbols/delimiters/img037delimiters.png
+share/apps/kile/mathsymbols/greek/img001greek.png
+share/apps/kile/mathsymbols/greek/img002greek.png
+share/apps/kile/mathsymbols/greek/img003greek.png
+share/apps/kile/mathsymbols/greek/img004greek.png
+share/apps/kile/mathsymbols/greek/img005greek.png
+share/apps/kile/mathsymbols/greek/img006greek.png
+share/apps/kile/mathsymbols/greek/img007greek.png
+share/apps/kile/mathsymbols/greek/img008greek.png
+share/apps/kile/mathsymbols/greek/img009greek.png
+share/apps/kile/mathsymbols/greek/img010greek.png
+share/apps/kile/mathsymbols/greek/img011greek.png
+share/apps/kile/mathsymbols/greek/img012greek.png
+share/apps/kile/mathsymbols/greek/img013greek.png
+share/apps/kile/mathsymbols/greek/img014greek.png
+share/apps/kile/mathsymbols/greek/img015greek.png
+share/apps/kile/mathsymbols/greek/img016greek.png
+share/apps/kile/mathsymbols/greek/img017greek.png
+share/apps/kile/mathsymbols/greek/img018greek.png
+share/apps/kile/mathsymbols/greek/img019greek.png
+share/apps/kile/mathsymbols/greek/img020greek.png
+share/apps/kile/mathsymbols/greek/img021greek.png
+share/apps/kile/mathsymbols/greek/img022greek.png
+share/apps/kile/mathsymbols/greek/img023greek.png
+share/apps/kile/mathsymbols/greek/img024greek.png
+share/apps/kile/mathsymbols/greek/img025greek.png
+share/apps/kile/mathsymbols/greek/img026greek.png
+share/apps/kile/mathsymbols/greek/img027greek.png
+share/apps/kile/mathsymbols/greek/img028greek.png
+share/apps/kile/mathsymbols/greek/img029greek.png
+share/apps/kile/mathsymbols/greek/img030greek.png
+share/apps/kile/mathsymbols/greek/img031greek.png
+share/apps/kile/mathsymbols/greek/img032greek.png
+share/apps/kile/mathsymbols/greek/img033greek.png
+share/apps/kile/mathsymbols/greek/img034greek.png
+share/apps/kile/mathsymbols/greek/img035greek.png
+share/apps/kile/mathsymbols/greek/img036greek.png
+share/apps/kile/mathsymbols/greek/img037greek.png
+share/apps/kile/mathsymbols/greek/img038greek.png
+share/apps/kile/mathsymbols/greek/img039greek.png
+share/apps/kile/mathsymbols/greek/img040greek.png
+share/apps/kile/mathsymbols/greek/img041greek.png
+share/apps/kile/mathsymbols/greek/img042greek.png
+share/apps/kile/mathsymbols/greek/img043greek.png
+share/apps/kile/mathsymbols/greek/img044greek.png
+share/apps/kile/mathsymbols/greek/img045greek.png
+share/apps/kile/mathsymbols/greek/img046greek.png
+share/apps/kile/mathsymbols/greek/img047greek.png
+share/apps/kile/mathsymbols/greek/img048greek.png
+share/apps/kile/mathsymbols/greek/img049greek.png
+share/apps/kile/mathsymbols/greek/img050greek.png
+share/apps/kile/mathsymbols/greek/img051greek.png
+share/apps/kile/mathsymbols/greek/img052greek.png
+share/apps/kile/mathsymbols/greek/img053greek.png
+share/apps/kile/mathsymbols/greek/img054greek.png
+share/apps/kile/mathsymbols/greek/img055greek.png
+share/apps/kile/mathsymbols/greek/img056greek.png
+share/apps/kile/mathsymbols/greek/img057greek.png
+share/apps/kile/mathsymbols/greek/img058greek.png
+share/apps/kile/mathsymbols/greek/img059greek.png
+share/apps/kile/mathsymbols/greek/img060greek.png
+share/apps/kile/mathsymbols/greek/img061greek.png
+share/apps/kile/mathsymbols/greek/img062greek.png
+share/apps/kile/mathsymbols/greek/img063greek.png
+share/apps/kile/mathsymbols/greek/img064greek.png
+share/apps/kile/mathsymbols/greek/img065greek.png
+share/apps/kile/mathsymbols/misc-math/img001misc-math.png
+share/apps/kile/mathsymbols/misc-math/img002misc-math.png
+share/apps/kile/mathsymbols/misc-math/img003misc-math.png
+share/apps/kile/mathsymbols/misc-math/img004misc-math.png
+share/apps/kile/mathsymbols/misc-math/img005misc-math.png
+share/apps/kile/mathsymbols/misc-math/img006misc-math.png
+share/apps/kile/mathsymbols/misc-math/img007misc-math.png
+share/apps/kile/mathsymbols/misc-math/img008misc-math.png
+share/apps/kile/mathsymbols/misc-math/img009misc-math.png
+share/apps/kile/mathsymbols/misc-math/img010misc-math.png
+share/apps/kile/mathsymbols/misc-math/img011misc-math.png
+share/apps/kile/mathsymbols/misc-math/img012misc-math.png
+share/apps/kile/mathsymbols/misc-math/img013misc-math.png
+share/apps/kile/mathsymbols/misc-math/img014misc-math.png
+share/apps/kile/mathsymbols/misc-math/img015misc-math.png
+share/apps/kile/mathsymbols/misc-math/img016misc-math.png
+share/apps/kile/mathsymbols/misc-math/img017misc-math.png
+share/apps/kile/mathsymbols/misc-math/img018misc-math.png
+share/apps/kile/mathsymbols/misc-math/img019misc-math.png
+share/apps/kile/mathsymbols/misc-math/img020misc-math.png
+share/apps/kile/mathsymbols/misc-math/img021misc-math.png
+share/apps/kile/mathsymbols/misc-math/img022misc-math.png
+share/apps/kile/mathsymbols/misc-math/img023misc-math.png
+share/apps/kile/mathsymbols/misc-math/img024misc-math.png
+share/apps/kile/mathsymbols/misc-math/img025misc-math.png
+share/apps/kile/mathsymbols/misc-math/img026misc-math.png
+share/apps/kile/mathsymbols/misc-math/img027misc-math.png
+share/apps/kile/mathsymbols/misc-math/img028misc-math.png
+share/apps/kile/mathsymbols/misc-math/img029misc-math.png
+share/apps/kile/mathsymbols/misc-math/img030misc-math.png
+share/apps/kile/mathsymbols/misc-math/img031misc-math.png
+share/apps/kile/mathsymbols/misc-math/img032misc-math.png
+share/apps/kile/mathsymbols/misc-math/img033misc-math.png
+share/apps/kile/mathsymbols/misc-math/img034misc-math.png
+share/apps/kile/mathsymbols/misc-math/img035misc-math.png
+share/apps/kile/mathsymbols/misc-math/img036misc-math.png
+share/apps/kile/mathsymbols/misc-math/img037misc-math.png
+share/apps/kile/mathsymbols/misc-math/img038misc-math.png
+share/apps/kile/mathsymbols/misc-math/img039misc-math.png
+share/apps/kile/mathsymbols/misc-math/img040misc-math.png
+share/apps/kile/mathsymbols/misc-math/img041misc-math.png
+share/apps/kile/mathsymbols/misc-math/img042misc-math.png
+share/apps/kile/mathsymbols/misc-math/img043misc-math.png
+share/apps/kile/mathsymbols/misc-math/img044misc-math.png
+share/apps/kile/mathsymbols/misc-math/img045misc-math.png
+share/apps/kile/mathsymbols/misc-math/img046misc-math.png
+share/apps/kile/mathsymbols/misc-math/img047misc-math.png
+share/apps/kile/mathsymbols/misc-math/img048misc-math.png
+share/apps/kile/mathsymbols/misc-math/img049misc-math.png
+share/apps/kile/mathsymbols/misc-math/img050misc-math.png
+share/apps/kile/mathsymbols/misc-math/img051misc-math.png
+share/apps/kile/mathsymbols/misc-math/img052misc-math.png
+share/apps/kile/mathsymbols/misc-math/img053misc-math.png
+share/apps/kile/mathsymbols/misc-math/img054misc-math.png
+share/apps/kile/mathsymbols/misc-math/img055misc-math.png
+share/apps/kile/mathsymbols/misc-math/img056misc-math.png
+share/apps/kile/mathsymbols/misc-math/img057misc-math.png
+share/apps/kile/mathsymbols/misc-math/img058misc-math.png
+share/apps/kile/mathsymbols/misc-math/img059misc-math.png
+share/apps/kile/mathsymbols/misc-math/img060misc-math.png
+share/apps/kile/mathsymbols/misc-math/img061misc-math.png
+share/apps/kile/mathsymbols/misc-math/img062misc-math.png
+share/apps/kile/mathsymbols/misc-math/img063misc-math.png
+share/apps/kile/mathsymbols/misc-math/img064misc-math.png
+share/apps/kile/mathsymbols/misc-math/img065misc-math.png
+share/apps/kile/mathsymbols/misc-math/img066misc-math.png
+share/apps/kile/mathsymbols/misc-math/img067misc-math.png
+share/apps/kile/mathsymbols/misc-math/img068misc-math.png
+share/apps/kile/mathsymbols/misc-math/img069misc-math.png
+share/apps/kile/mathsymbols/misc-math/img070misc-math.png
+share/apps/kile/mathsymbols/misc-math/img071misc-math.png
+share/apps/kile/mathsymbols/misc-math/img072misc-math.png
+share/apps/kile/mathsymbols/misc-math/img073misc-math.png
+share/apps/kile/mathsymbols/misc-math/img074misc-math.png
+share/apps/kile/mathsymbols/misc-math/img075misc-math.png
+share/apps/kile/mathsymbols/misc-math/img076misc-math.png
+share/apps/kile/mathsymbols/misc-math/img077misc-math.png
+share/apps/kile/mathsymbols/misc-math/img078misc-math.png
+share/apps/kile/mathsymbols/misc-math/img079misc-math.png
+share/apps/kile/mathsymbols/misc-math/img080misc-math.png
+share/apps/kile/mathsymbols/misc-math/img081misc-math.png
+share/apps/kile/mathsymbols/misc-math/img082misc-math.png
+share/apps/kile/mathsymbols/misc-math/img083misc-math.png
+share/apps/kile/mathsymbols/misc-math/img084misc-math.png
+share/apps/kile/mathsymbols/misc-math/img085misc-math.png
+share/apps/kile/mathsymbols/misc-math/img086misc-math.png
+share/apps/kile/mathsymbols/misc-math/img087misc-math.png
+share/apps/kile/mathsymbols/misc-math/img088misc-math.png
+share/apps/kile/mathsymbols/misc-math/img089misc-math.png
+share/apps/kile/mathsymbols/misc-math/img090misc-math.png
+share/apps/kile/mathsymbols/misc-math/img091misc-math.png
+share/apps/kile/mathsymbols/misc-math/img092misc-math.png
+share/apps/kile/mathsymbols/misc-math/img093misc-math.png
+share/apps/kile/mathsymbols/misc-math/img094misc-math.png
+share/apps/kile/mathsymbols/misc-math/img095misc-math.png
+share/apps/kile/mathsymbols/misc-math/img096misc-math.png
+share/apps/kile/mathsymbols/misc-math/img097misc-math.png
+share/apps/kile/mathsymbols/misc-text/img001misc-text.png
+share/apps/kile/mathsymbols/misc-text/img002misc-text.png
+share/apps/kile/mathsymbols/misc-text/img003misc-text.png
+share/apps/kile/mathsymbols/misc-text/img004misc-text.png
+share/apps/kile/mathsymbols/misc-text/img005misc-text.png
+share/apps/kile/mathsymbols/misc-text/img006misc-text.png
+share/apps/kile/mathsymbols/misc-text/img007misc-text.png
+share/apps/kile/mathsymbols/misc-text/img008misc-text.png
+share/apps/kile/mathsymbols/misc-text/img009misc-text.png
+share/apps/kile/mathsymbols/misc-text/img010misc-text.png
+share/apps/kile/mathsymbols/misc-text/img011misc-text.png
+share/apps/kile/mathsymbols/misc-text/img012misc-text.png
+share/apps/kile/mathsymbols/misc-text/img013misc-text.png
+share/apps/kile/mathsymbols/misc-text/img014misc-text.png
+share/apps/kile/mathsymbols/misc-text/img015misc-text.png
+share/apps/kile/mathsymbols/misc-text/img016misc-text.png
+share/apps/kile/mathsymbols/misc-text/img017misc-text.png
+share/apps/kile/mathsymbols/misc-text/img018misc-text.png
+share/apps/kile/mathsymbols/misc-text/img019misc-text.png
+share/apps/kile/mathsymbols/misc-text/img020misc-text.png
+share/apps/kile/mathsymbols/misc-text/img021misc-text.png
+share/apps/kile/mathsymbols/misc-text/img022misc-text.png
+share/apps/kile/mathsymbols/misc-text/img023misc-text.png
+share/apps/kile/mathsymbols/misc-text/img024misc-text.png
+share/apps/kile/mathsymbols/misc-text/img025misc-text.png
+share/apps/kile/mathsymbols/misc-text/img026misc-text.png
+share/apps/kile/mathsymbols/misc-text/img027misc-text.png
+share/apps/kile/mathsymbols/misc-text/img028misc-text.png
+share/apps/kile/mathsymbols/misc-text/img029misc-text.png
+share/apps/kile/mathsymbols/misc-text/img030misc-text.png
+share/apps/kile/mathsymbols/misc-text/img031misc-text.png
+share/apps/kile/mathsymbols/misc-text/img032misc-text.png
+share/apps/kile/mathsymbols/misc-text/img033misc-text.png
+share/apps/kile/mathsymbols/misc-text/img034misc-text.png
+share/apps/kile/mathsymbols/misc-text/img035misc-text.png
+share/apps/kile/mathsymbols/misc-text/img036misc-text.png
+share/apps/kile/mathsymbols/misc-text/img037misc-text.png
+share/apps/kile/mathsymbols/misc-text/img038misc-text.png
+share/apps/kile/mathsymbols/misc-text/img039misc-text.png
+share/apps/kile/mathsymbols/misc-text/img040misc-text.png
+share/apps/kile/mathsymbols/misc-text/img041misc-text.png
+share/apps/kile/mathsymbols/misc-text/img042misc-text.png
+share/apps/kile/mathsymbols/misc-text/img043misc-text.png
+share/apps/kile/mathsymbols/misc-text/img044misc-text.png
+share/apps/kile/mathsymbols/misc-text/img045misc-text.png
+share/apps/kile/mathsymbols/misc-text/img046misc-text.png
+share/apps/kile/mathsymbols/misc-text/img047misc-text.png
+share/apps/kile/mathsymbols/misc-text/img048misc-text.png
+share/apps/kile/mathsymbols/misc-text/img049misc-text.png
+share/apps/kile/mathsymbols/misc-text/img050misc-text.png
+share/apps/kile/mathsymbols/misc-text/img051misc-text.png
+share/apps/kile/mathsymbols/misc-text/img052misc-text.png
+share/apps/kile/mathsymbols/misc-text/img053misc-text.png
+share/apps/kile/mathsymbols/misc-text/img054misc-text.png
+share/apps/kile/mathsymbols/misc-text/img055misc-text.png
+share/apps/kile/mathsymbols/misc-text/img056misc-text.png
+share/apps/kile/mathsymbols/misc-text/img057misc-text.png
+share/apps/kile/mathsymbols/misc-text/img058misc-text.png
+share/apps/kile/mathsymbols/misc-text/img059misc-text.png
+share/apps/kile/mathsymbols/misc-text/img060misc-text.png
+share/apps/kile/mathsymbols/misc-text/img061misc-text.png
+share/apps/kile/mathsymbols/misc-text/img062misc-text.png
+share/apps/kile/mathsymbols/misc-text/img063misc-text.png
+share/apps/kile/mathsymbols/misc-text/img064misc-text.png
+share/apps/kile/mathsymbols/misc-text/img065misc-text.png
+share/apps/kile/mathsymbols/misc-text/img066misc-text.png
+share/apps/kile/mathsymbols/misc-text/img067misc-text.png
+share/apps/kile/mathsymbols/misc-text/img068misc-text.png
+share/apps/kile/mathsymbols/misc-text/img069misc-text.png
+share/apps/kile/mathsymbols/misc-text/img070misc-text.png
+share/apps/kile/mathsymbols/misc-text/img071misc-text.png
+share/apps/kile/mathsymbols/misc-text/img072misc-text.png
+share/apps/kile/mathsymbols/misc-text/img073misc-text.png
+share/apps/kile/mathsymbols/misc-text/img074misc-text.png
+share/apps/kile/mathsymbols/misc-text/img075misc-text.png
+share/apps/kile/mathsymbols/misc-text/img076misc-text.png
+share/apps/kile/mathsymbols/misc-text/img077misc-text.png
+share/apps/kile/mathsymbols/misc-text/img078misc-text.png
+share/apps/kile/mathsymbols/misc-text/img079misc-text.png
+share/apps/kile/mathsymbols/misc-text/img080misc-text.png
+share/apps/kile/mathsymbols/misc-text/img081misc-text.png
+share/apps/kile/mathsymbols/misc-text/img082misc-text.png
+share/apps/kile/mathsymbols/misc-text/img083misc-text.png
+share/apps/kile/mathsymbols/misc-text/img084misc-text.png
+share/apps/kile/mathsymbols/misc-text/img085misc-text.png
+share/apps/kile/mathsymbols/misc-text/img086misc-text.png
+share/apps/kile/mathsymbols/misc-text/img087misc-text.png
+share/apps/kile/mathsymbols/misc-text/img088misc-text.png
+share/apps/kile/mathsymbols/misc-text/img089misc-text.png
+share/apps/kile/mathsymbols/misc-text/img090misc-text.png
+share/apps/kile/mathsymbols/misc-text/img091misc-text.png
+share/apps/kile/mathsymbols/misc-text/img092misc-text.png
+share/apps/kile/mathsymbols/misc-text/img093misc-text.png
+share/apps/kile/mathsymbols/misc-text/img094misc-text.png
+share/apps/kile/mathsymbols/misc-text/img095misc-text.png
+share/apps/kile/mathsymbols/misc-text/img096misc-text.png
+share/apps/kile/mathsymbols/misc-text/img097misc-text.png
+share/apps/kile/mathsymbols/misc-text/img098misc-text.png
+share/apps/kile/mathsymbols/misc-text/img099misc-text.png
+share/apps/kile/mathsymbols/misc-text/img100misc-text.png
+share/apps/kile/mathsymbols/misc-text/img101misc-text.png
+share/apps/kile/mathsymbols/misc-text/img102misc-text.png
+share/apps/kile/mathsymbols/misc-text/img103misc-text.png
+share/apps/kile/mathsymbols/misc-text/img104misc-text.png
+share/apps/kile/mathsymbols/misc-text/img105misc-text.png
+share/apps/kile/mathsymbols/misc-text/img106misc-text.png
+share/apps/kile/mathsymbols/misc-text/img107misc-text.png
+share/apps/kile/mathsymbols/misc-text/img108misc-text.png
+share/apps/kile/mathsymbols/misc-text/img109misc-text.png
+share/apps/kile/mathsymbols/misc-text/img110misc-text.png
+share/apps/kile/mathsymbols/misc-text/img111misc-text.png
+share/apps/kile/mathsymbols/misc-text/img112misc-text.png
+share/apps/kile/mathsymbols/misc-text/img113misc-text.png
+share/apps/kile/mathsymbols/misc-text/img114misc-text.png
+share/apps/kile/mathsymbols/misc-text/img115misc-text.png
+share/apps/kile/mathsymbols/misc-text/img116misc-text.png
+share/apps/kile/mathsymbols/misc-text/img117misc-text.png
+share/apps/kile/mathsymbols/misc-text/img118misc-text.png
+share/apps/kile/mathsymbols/misc-text/img119misc-text.png
+share/apps/kile/mathsymbols/misc-text/img120misc-text.png
+share/apps/kile/mathsymbols/misc-text/img121misc-text.png
+share/apps/kile/mathsymbols/misc-text/img122misc-text.png
+share/apps/kile/mathsymbols/misc-text/img123misc-text.png
+share/apps/kile/mathsymbols/misc-text/img124misc-text.png
+share/apps/kile/mathsymbols/misc-text/img125misc-text.png
+share/apps/kile/mathsymbols/misc-text/img126misc-text.png
+share/apps/kile/mathsymbols/misc-text/img127misc-text.png
+share/apps/kile/mathsymbols/misc-text/img128misc-text.png
+share/apps/kile/mathsymbols/misc-text/img129misc-text.png
+share/apps/kile/mathsymbols/misc-text/img130misc-text.png
+share/apps/kile/mathsymbols/misc-text/img131misc-text.png
+share/apps/kile/mathsymbols/misc-text/img132misc-text.png
+share/apps/kile/mathsymbols/misc-text/img133misc-text.png
+share/apps/kile/mathsymbols/misc-text/img134misc-text.png
+share/apps/kile/mathsymbols/misc-text/img135misc-text.png
+share/apps/kile/mathsymbols/operators/img001operators.png
+share/apps/kile/mathsymbols/operators/img002operators.png
+share/apps/kile/mathsymbols/operators/img003operators.png
+share/apps/kile/mathsymbols/operators/img004operators.png
+share/apps/kile/mathsymbols/operators/img005operators.png
+share/apps/kile/mathsymbols/operators/img006operators.png
+share/apps/kile/mathsymbols/operators/img007operators.png
+share/apps/kile/mathsymbols/operators/img008operators.png
+share/apps/kile/mathsymbols/operators/img009operators.png
+share/apps/kile/mathsymbols/operators/img010operators.png
+share/apps/kile/mathsymbols/operators/img011operators.png
+share/apps/kile/mathsymbols/operators/img012operators.png
+share/apps/kile/mathsymbols/operators/img013operators.png
+share/apps/kile/mathsymbols/operators/img014operators.png
+share/apps/kile/mathsymbols/operators/img015operators.png
+share/apps/kile/mathsymbols/operators/img016operators.png
+share/apps/kile/mathsymbols/operators/img017operators.png
+share/apps/kile/mathsymbols/operators/img018operators.png
+share/apps/kile/mathsymbols/operators/img019operators.png
+share/apps/kile/mathsymbols/operators/img020operators.png
+share/apps/kile/mathsymbols/operators/img021operators.png
+share/apps/kile/mathsymbols/operators/img022operators.png
+share/apps/kile/mathsymbols/operators/img023operators.png
+share/apps/kile/mathsymbols/operators/img024operators.png
+share/apps/kile/mathsymbols/operators/img025operators.png
+share/apps/kile/mathsymbols/operators/img026operators.png
+share/apps/kile/mathsymbols/operators/img027operators.png
+share/apps/kile/mathsymbols/operators/img028operators.png
+share/apps/kile/mathsymbols/operators/img029operators.png
+share/apps/kile/mathsymbols/operators/img030operators.png
+share/apps/kile/mathsymbols/operators/img031operators.png
+share/apps/kile/mathsymbols/operators/img032operators.png
+share/apps/kile/mathsymbols/operators/img033operators.png
+share/apps/kile/mathsymbols/operators/img034operators.png
+share/apps/kile/mathsymbols/operators/img035operators.png
+share/apps/kile/mathsymbols/operators/img036operators.png
+share/apps/kile/mathsymbols/operators/img037operators.png
+share/apps/kile/mathsymbols/operators/img038operators.png
+share/apps/kile/mathsymbols/operators/img039operators.png
+share/apps/kile/mathsymbols/operators/img040operators.png
+share/apps/kile/mathsymbols/operators/img041operators.png
+share/apps/kile/mathsymbols/operators/img042operators.png
+share/apps/kile/mathsymbols/operators/img043operators.png
+share/apps/kile/mathsymbols/operators/img044operators.png
+share/apps/kile/mathsymbols/operators/img045operators.png
+share/apps/kile/mathsymbols/operators/img046operators.png
+share/apps/kile/mathsymbols/operators/img047operators.png
+share/apps/kile/mathsymbols/operators/img048operators.png
+share/apps/kile/mathsymbols/operators/img049operators.png
+share/apps/kile/mathsymbols/operators/img050operators.png
+share/apps/kile/mathsymbols/operators/img051operators.png
+share/apps/kile/mathsymbols/operators/img052operators.png
+share/apps/kile/mathsymbols/operators/img053operators.png
+share/apps/kile/mathsymbols/operators/img054operators.png
+share/apps/kile/mathsymbols/operators/img055operators.png
+share/apps/kile/mathsymbols/operators/img056operators.png
+share/apps/kile/mathsymbols/operators/img057operators.png
+share/apps/kile/mathsymbols/operators/img058operators.png
+share/apps/kile/mathsymbols/operators/img059operators.png
+share/apps/kile/mathsymbols/operators/img060operators.png
+share/apps/kile/mathsymbols/operators/img061operators.png
+share/apps/kile/mathsymbols/operators/img062operators.png
+share/apps/kile/mathsymbols/operators/img063operators.png
+share/apps/kile/mathsymbols/operators/img064operators.png
+share/apps/kile/mathsymbols/operators/img065operators.png
+share/apps/kile/mathsymbols/operators/img066operators.png
+share/apps/kile/mathsymbols/operators/img067operators.png
+share/apps/kile/mathsymbols/operators/img068operators.png
+share/apps/kile/mathsymbols/operators/img069operators.png
+share/apps/kile/mathsymbols/operators/img070operators.png
+share/apps/kile/mathsymbols/operators/img071operators.png
+share/apps/kile/mathsymbols/operators/img072operators.png
+share/apps/kile/mathsymbols/operators/img073operators.png
+share/apps/kile/mathsymbols/operators/img074operators.png
+share/apps/kile/mathsymbols/operators/img075operators.png
+share/apps/kile/mathsymbols/operators/img076operators.png
+share/apps/kile/mathsymbols/operators/img077operators.png
+share/apps/kile/mathsymbols/operators/img078operators.png
+share/apps/kile/mathsymbols/operators/img079operators.png
+share/apps/kile/mathsymbols/operators/img080operators.png
+share/apps/kile/mathsymbols/operators/img081operators.png
+share/apps/kile/mathsymbols/operators/img082operators.png
+share/apps/kile/mathsymbols/operators/img083operators.png
+share/apps/kile/mathsymbols/operators/img084operators.png
+share/apps/kile/mathsymbols/operators/img085operators.png
+share/apps/kile/mathsymbols/operators/img086operators.png
+share/apps/kile/mathsymbols/operators/img087operators.png
+share/apps/kile/mathsymbols/operators/img088operators.png
+share/apps/kile/mathsymbols/operators/img089operators.png
+share/apps/kile/mathsymbols/operators/img090operators.png
+share/apps/kile/mathsymbols/operators/img091operators.png
+share/apps/kile/mathsymbols/operators/img092operators.png
+share/apps/kile/mathsymbols/operators/img093operators.png
+share/apps/kile/mathsymbols/operators/img094operators.png
+share/apps/kile/mathsymbols/operators/img095operators.png
+share/apps/kile/mathsymbols/operators/img096operators.png
+share/apps/kile/mathsymbols/operators/img097operators.png
+share/apps/kile/mathsymbols/operators/img098operators.png
+share/apps/kile/mathsymbols/operators/img099operators.png
+share/apps/kile/mathsymbols/operators/img100operators.png
+share/apps/kile/mathsymbols/operators/img101operators.png
+share/apps/kile/mathsymbols/operators/img102operators.png
+share/apps/kile/mathsymbols/operators/img103operators.png
+share/apps/kile/mathsymbols/operators/img104operators.png
+share/apps/kile/mathsymbols/operators/img105operators.png
+share/apps/kile/mathsymbols/operators/img106operators.png
+share/apps/kile/mathsymbols/operators/img107operators.png
+share/apps/kile/mathsymbols/operators/img108operators.png
+share/apps/kile/mathsymbols/operators/img109operators.png
+share/apps/kile/mathsymbols/operators/img110operators.png
+share/apps/kile/mathsymbols/operators/img111operators.png
+share/apps/kile/mathsymbols/operators/img112operators.png
+share/apps/kile/mathsymbols/operators/img113operators.png
+share/apps/kile/mathsymbols/relation/img001relation.png
+share/apps/kile/mathsymbols/relation/img002relation.png
+share/apps/kile/mathsymbols/relation/img003relation.png
+share/apps/kile/mathsymbols/relation/img004relation.png
+share/apps/kile/mathsymbols/relation/img005relation.png
+share/apps/kile/mathsymbols/relation/img006relation.png
+share/apps/kile/mathsymbols/relation/img007relation.png
+share/apps/kile/mathsymbols/relation/img008relation.png
+share/apps/kile/mathsymbols/relation/img009relation.png
+share/apps/kile/mathsymbols/relation/img010relation.png
+share/apps/kile/mathsymbols/relation/img011relation.png
+share/apps/kile/mathsymbols/relation/img012relation.png
+share/apps/kile/mathsymbols/relation/img013relation.png
+share/apps/kile/mathsymbols/relation/img014relation.png
+share/apps/kile/mathsymbols/relation/img015relation.png
+share/apps/kile/mathsymbols/relation/img016relation.png
+share/apps/kile/mathsymbols/relation/img017relation.png
+share/apps/kile/mathsymbols/relation/img018relation.png
+share/apps/kile/mathsymbols/relation/img019relation.png
+share/apps/kile/mathsymbols/relation/img020relation.png
+share/apps/kile/mathsymbols/relation/img021relation.png
+share/apps/kile/mathsymbols/relation/img022relation.png
+share/apps/kile/mathsymbols/relation/img023relation.png
+share/apps/kile/mathsymbols/relation/img024relation.png
+share/apps/kile/mathsymbols/relation/img025relation.png
+share/apps/kile/mathsymbols/relation/img026relation.png
+share/apps/kile/mathsymbols/relation/img027relation.png
+share/apps/kile/mathsymbols/relation/img028relation.png
+share/apps/kile/mathsymbols/relation/img029relation.png
+share/apps/kile/mathsymbols/relation/img030relation.png
+share/apps/kile/mathsymbols/relation/img031relation.png
+share/apps/kile/mathsymbols/relation/img032relation.png
+share/apps/kile/mathsymbols/relation/img033relation.png
+share/apps/kile/mathsymbols/relation/img034relation.png
+share/apps/kile/mathsymbols/relation/img035relation.png
+share/apps/kile/mathsymbols/relation/img036relation.png
+share/apps/kile/mathsymbols/relation/img037relation.png
+share/apps/kile/mathsymbols/relation/img038relation.png
+share/apps/kile/mathsymbols/relation/img039relation.png
+share/apps/kile/mathsymbols/relation/img040relation.png
+share/apps/kile/mathsymbols/relation/img041relation.png
+share/apps/kile/mathsymbols/relation/img042relation.png
+share/apps/kile/mathsymbols/relation/img043relation.png
+share/apps/kile/mathsymbols/relation/img044relation.png
+share/apps/kile/mathsymbols/relation/img045relation.png
+share/apps/kile/mathsymbols/relation/img046relation.png
+share/apps/kile/mathsymbols/relation/img047relation.png
+share/apps/kile/mathsymbols/relation/img048relation.png
+share/apps/kile/mathsymbols/relation/img049relation.png
+share/apps/kile/mathsymbols/relation/img050relation.png
+share/apps/kile/mathsymbols/relation/img051relation.png
+share/apps/kile/mathsymbols/relation/img052relation.png
+share/apps/kile/mathsymbols/relation/img053relation.png
+share/apps/kile/mathsymbols/relation/img054relation.png
+share/apps/kile/mathsymbols/relation/img055relation.png
+share/apps/kile/mathsymbols/relation/img056relation.png
+share/apps/kile/mathsymbols/relation/img057relation.png
+share/apps/kile/mathsymbols/relation/img058relation.png
+share/apps/kile/mathsymbols/relation/img059relation.png
+share/apps/kile/mathsymbols/relation/img060relation.png
+share/apps/kile/mathsymbols/relation/img061relation.png
+share/apps/kile/mathsymbols/relation/img062relation.png
+share/apps/kile/mathsymbols/relation/img063relation.png
+share/apps/kile/mathsymbols/relation/img064relation.png
+share/apps/kile/mathsymbols/relation/img065relation.png
+share/apps/kile/mathsymbols/relation/img066relation.png
+share/apps/kile/mathsymbols/relation/img067relation.png
+share/apps/kile/mathsymbols/relation/img068relation.png
+share/apps/kile/mathsymbols/relation/img069relation.png
+share/apps/kile/mathsymbols/relation/img070relation.png
+share/apps/kile/mathsymbols/relation/img071relation.png
+share/apps/kile/mathsymbols/relation/img072relation.png
+share/apps/kile/mathsymbols/relation/img073relation.png
+share/apps/kile/mathsymbols/relation/img074relation.png
+share/apps/kile/mathsymbols/relation/img075relation.png
+share/apps/kile/mathsymbols/relation/img076relation.png
+share/apps/kile/mathsymbols/relation/img077relation.png
+share/apps/kile/mathsymbols/relation/img078relation.png
+share/apps/kile/mathsymbols/relation/img079relation.png
+share/apps/kile/mathsymbols/relation/img080relation.png
+share/apps/kile/mathsymbols/relation/img081relation.png
+share/apps/kile/mathsymbols/relation/img082relation.png
+share/apps/kile/mathsymbols/relation/img083relation.png
+share/apps/kile/mathsymbols/relation/img084relation.png
+share/apps/kile/mathsymbols/relation/img085relation.png
+share/apps/kile/mathsymbols/relation/img086relation.png
+share/apps/kile/mathsymbols/relation/img087relation.png
+share/apps/kile/mathsymbols/relation/img088relation.png
+share/apps/kile/mathsymbols/relation/img089relation.png
+share/apps/kile/mathsymbols/relation/img090relation.png
+share/apps/kile/mathsymbols/relation/img091relation.png
+share/apps/kile/mathsymbols/relation/img092relation.png
+share/apps/kile/mathsymbols/relation/img093relation.png
+share/apps/kile/mathsymbols/relation/img094relation.png
+share/apps/kile/mathsymbols/relation/img095relation.png
+share/apps/kile/mathsymbols/relation/img096relation.png
+share/apps/kile/mathsymbols/relation/img097relation.png
+share/apps/kile/mathsymbols/relation/img098relation.png
+share/apps/kile/mathsymbols/relation/img099relation.png
+share/apps/kile/mathsymbols/relation/img100relation.png
+share/apps/kile/mathsymbols/relation/img101relation.png
+share/apps/kile/mathsymbols/relation/img102relation.png
+share/apps/kile/mathsymbols/relation/img103relation.png
+share/apps/kile/mathsymbols/relation/img104relation.png
+share/apps/kile/mathsymbols/relation/img105relation.png
+share/apps/kile/mathsymbols/relation/img106relation.png
+share/apps/kile/mathsymbols/relation/img107relation.png
+share/apps/kile/mathsymbols/relation/img108relation.png
+share/apps/kile/mathsymbols/relation/img109relation.png
+share/apps/kile/mathsymbols/relation/img110relation.png
+share/apps/kile/mathsymbols/relation/img111relation.png
+share/apps/kile/mathsymbols/relation/img112relation.png
+share/apps/kile/mathsymbols/relation/img113relation.png
+share/apps/kile/mathsymbols/relation/img114relation.png
+share/apps/kile/mathsymbols/relation/img115relation.png
+share/apps/kile/mathsymbols/relation/img116relation.png
+share/apps/kile/mathsymbols/relation/img117relation.png
+share/apps/kile/mathsymbols/relation/img118relation.png
+share/apps/kile/mathsymbols/relation/img119relation.png
+share/apps/kile/mathsymbols/relation/img120relation.png
+share/apps/kile/mathsymbols/relation/img121relation.png
+share/apps/kile/mathsymbols/relation/img122relation.png
+share/apps/kile/mathsymbols/relation/img123relation.png
+share/apps/kile/mathsymbols/relation/img124relation.png
+share/apps/kile/mathsymbols/relation/img125relation.png
+share/apps/kile/mathsymbols/relation/img126relation.png
+share/apps/kile/mathsymbols/relation/img127relation.png
+share/apps/kile/mathsymbols/relation/img128relation.png
+share/apps/kile/mathsymbols/relation/img129relation.png
+share/apps/kile/mathsymbols/relation/img130relation.png
+share/apps/kile/mathsymbols/relation/img131relation.png
+share/apps/kile/mathsymbols/relation/img132relation.png
+share/apps/kile/mathsymbols/relation/img133relation.png
+share/apps/kile/mathsymbols/relation/img134relation.png
+share/apps/kile/mathsymbols/relation/img135relation.png
+share/apps/kile/mathsymbols/relation/img136relation.png
+share/apps/kile/mathsymbols/relation/img137relation.png
+share/apps/kile/mathsymbols/relation/img138relation.png
+share/apps/kile/mathsymbols/relation/img139relation.png
+share/apps/kile/mathsymbols/special/img001special.png
+share/apps/kile/mathsymbols/special/img002special.png
+share/apps/kile/mathsymbols/special/img003special.png
+share/apps/kile/mathsymbols/special/img004special.png
+share/apps/kile/mathsymbols/special/img005special.png
+share/apps/kile/mathsymbols/special/img006special.png
+share/apps/kile/mathsymbols/special/img007special.png
+share/apps/kile/mathsymbols/special/img008special.png
+share/apps/kile/mathsymbols/special/img009special.png
+share/apps/kile/mathsymbols/special/img010special.png
+share/apps/kile/mathsymbols/special/img011special.png
+share/apps/kile/mathsymbols/special/img012special.png
+share/apps/kile/mathsymbols/special/img013special.png
+share/apps/kile/mathsymbols/special/img014special.png
+share/apps/kile/mathsymbols/special/img015special.png
+share/apps/kile/mathsymbols/special/img016special.png
+share/apps/kile/mathsymbols/special/img017special.png
+share/apps/kile/mathsymbols/special/img018special.png
+share/apps/kile/mathsymbols/special/img019special.png
+share/apps/kile/mathsymbols/special/img020special.png
+share/apps/kile/mathsymbols/special/img021special.png
+share/apps/kile/mathsymbols/special/img022special.png
+share/apps/kile/mathsymbols/special/img023special.png
+share/apps/kile/mathsymbols/special/img024special.png
+share/apps/kile/mathsymbols/special/img025special.png
+share/apps/kile/mathsymbols/special/img026special.png
+share/apps/kile/mathsymbols/special/img027special.png
+share/apps/kile/mathsymbols/special/img028special.png
+share/apps/kile/mathsymbols/special/img029special.png
+share/apps/kile/mathsymbols/special/img030special.png
+share/apps/kile/mathsymbols/special/img031special.png
+share/apps/kile/mathsymbols/special/img032special.png
+share/apps/kile/mathsymbols/special/img033special.png
+share/apps/kile/mathsymbols/special/img034special.png
+share/apps/kile/mathsymbols/special/img035special.png
+share/apps/kile/mathsymbols/special/img036special.png
+share/apps/kile/mathsymbols/special/img037special.png
+share/apps/kile/mathsymbols/special/img038special.png
+share/apps/kile/mathsymbols/special/img039special.png
+share/apps/kile/mathsymbols/special/img040special.png
+share/apps/kile/mathsymbols/special/img041special.png
+share/apps/kile/mathsymbols/special/img042special.png
+share/apps/kile/mathsymbols/special/img043special.png
+share/apps/kile/mathsymbols/special/img044special.png
+share/apps/kile/mathsymbols/special/img045special.png
+share/apps/kile/mathsymbols/special/img046special.png
+share/apps/kile/mathsymbols/special/img047special.png
+share/apps/kile/mathsymbols/special/img048special.png
+share/apps/kile/mathsymbols/special/img049special.png
+share/apps/kile/mathsymbols/special/img050special.png
+share/apps/kile/mathsymbols/special/img051special.png
+share/apps/kile/mathsymbols/special/img052special.png
+share/apps/kile/mathsymbols/special/img053special.png
+share/apps/kile/mathsymbols/special/img054special.png
+share/apps/kile/mathsymbols/special/img055special.png
+share/apps/kile/mathsymbols/special/img056special.png
+share/apps/kile/mathsymbols/special/img057special.png
+share/apps/kile/mathsymbols/special/img058special.png
+share/apps/kile/mathsymbols/special/img059special.png
+share/apps/kile/mathsymbols/special/img060special.png
+share/apps/kile/mathsymbols/special/img061special.png
+share/apps/kile/mathsymbols/special/img062special.png
+share/apps/kile/mathsymbols/special/img063special.png
+share/apps/kile/mathsymbols/special/img064special.png
+share/apps/kile/mathsymbols/special/img065special.png
+share/apps/kile/mathsymbols/special/img066special.png
+share/apps/kile/mathsymbols/special/img067special.png
+share/apps/kile/mathsymbols/special/img068special.png
+share/apps/kile/mathsymbols/special/img069special.png
+share/apps/kile/mathsymbols/special/img070special.png
+share/apps/kile/mathsymbols/special/img071special.png
+share/apps/kile/mathsymbols/special/img072special.png
+share/apps/kile/mathsymbols/special/img073special.png
+share/apps/kile/mathsymbols/special/img074special.png
+share/apps/kile/mathsymbols/special/img075special.png
+share/apps/kile/mathsymbols/special/img076special.png
+share/apps/kile/mathsymbols/special/img077special.png
+share/apps/kile/mathsymbols/special/img078special.png
+share/apps/kile/mathsymbols/special/img079special.png
+share/apps/kile/mathsymbols/special/img080special.png
+share/apps/kile/mathsymbols/special/img081special.png
+share/apps/kile/mathsymbols/special/img082special.png
+share/apps/kile/mathsymbols/special/img083special.png
+share/apps/kile/mathsymbols/special/img084special.png
+share/apps/kile/mathsymbols/special/img085special.png
+share/apps/kile/mathsymbols/special/img086special.png
+share/apps/kile/mathsymbols/special/img087special.png
+share/apps/kile/mathsymbols/special/img088special.png
+share/apps/kile/mathsymbols/special/img089special.png
+share/apps/kile/mathsymbols/special/img090special.png
+share/apps/kile/mathsymbols/special/img091special.png
+share/apps/kile/mathsymbols/special/img092special.png
+share/apps/kile/mathsymbols/special/img093special.png
+share/apps/kile/mathsymbols/special/img094special.png
+share/apps/kile/mathsymbols/special/img095special.png
+share/apps/kile/mathsymbols/special/img096special.png
+share/apps/kile/mathsymbols/special/img097special.png
+share/apps/kile/mathsymbols/special/img098special.png
+share/apps/kile/mathsymbols/special/img099special.png
+share/apps/kile/mathsymbols/special/img100special.png
+share/apps/kile/mathsymbols/special/img101special.png
+share/apps/kile/mathsymbols/special/img102special.png
+share/apps/kile/mathsymbols/special/img103special.png
+share/apps/kile/mathsymbols/special/img104special.png
+share/apps/kile/mathsymbols/special/img105special.png
+share/apps/kile/mathsymbols/special/img106special.png
+share/apps/kile/mathsymbols/special/img107special.png
+share/apps/kile/mathsymbols/special/img108special.png
+share/apps/kile/mathsymbols/special/img109special.png
+share/apps/kile/mathsymbols/special/img110special.png
+share/apps/kile/mathsymbols/special/img111special.png
+share/apps/kile/mathsymbols/special/img112special.png
+share/apps/kile/mathsymbols/special/img113special.png
+share/apps/kile/mathsymbols/special/img114special.png
+share/apps/kile/mathsymbols/special/img115special.png
+share/apps/kile/mathsymbols/special/img116special.png
+share/apps/kile/mathsymbols/special/img117special.png
+share/apps/kile/mathsymbols/special/img118special.png
+share/apps/kile/mathsymbols/special/img119special.png
+share/apps/kile/mathsymbols/special/img120special.png
+share/apps/kile/mathsymbols/special/img121special.png
+share/apps/kile/mathsymbols/special/img122special.png
+share/apps/kile/mathsymbols/special/img123special.png
+share/apps/kile/mathsymbols/special/img124special.png
+share/apps/kile/mathsymbols/special/img125special.png
+share/apps/kile/mathsymbols/special/img126special.png
+share/apps/kile/mathsymbols/special/img127special.png
+share/apps/kile/mathsymbols/special/img128special.png
+share/apps/kile/mathsymbols/special/img129special.png
+share/apps/kile/mathsymbols/special/img130special.png
+share/apps/kile/mathsymbols/special/img131special.png
+share/apps/kile/mathsymbols/special/img132special.png
+share/apps/kile/mathsymbols/special/img133special.png
+share/apps/kile/mathsymbols/special/img134special.png
+share/apps/kile/mathsymbols/special/img135special.png
+share/apps/kile/mathsymbols/special/img136special.png
+share/apps/kile/mathsymbols/special/img137special.png
+share/apps/kile/mathsymbols/special/img138special.png
+share/apps/kile/mathsymbols/special/img139special.png
+share/apps/kile/mathsymbols/special/img140special.png
+share/apps/kile/mathsymbols/special/img141special.png
+share/apps/kile/mathsymbols/special/img142special.png
+share/apps/kile/mathsymbols/special/img143special.png
+share/apps/kile/mathsymbols/special/img144special.png
+share/apps/kile/mathsymbols/special/img145special.png
+share/apps/kile/mathsymbols/special/img146special.png
+share/apps/kile/mathsymbols/special/img147special.png
+share/apps/kile/mathsymbols/special/img148special.png
+share/apps/kile/mathsymbols/special/img149special.png
+share/apps/kile/mathsymbols/special/img150special.png
+share/apps/kile/mathsymbols/special/img151special.png
+share/apps/kile/mathsymbols/special/img152special.png
+share/apps/kile/mathsymbols/special/img153special.png
+share/apps/kile/mathsymbols/special/img154special.png
+share/apps/kile/mathsymbols/special/img155special.png
+share/apps/kile/mathsymbols/special/img156special.png
+share/apps/kile/mathsymbols/special/img157special.png
+share/apps/kile/mathsymbols/special/img158special.png
+share/apps/kile/mathsymbols/special/img159special.png
+share/apps/kile/mathsymbols/special/img160special.png
+share/apps/kile/mathsymbols/special/img161special.png
+share/apps/kile/mathsymbols/special/img162special.png
+share/apps/kile/mathsymbols/special/img163special.png
+share/apps/kile/mathsymbols/special/img164special.png
+share/apps/kile/mathsymbols/special/img165special.png
+share/apps/kile/mathsymbols/special/img166special.png
+share/apps/kile/mathsymbols/special/img167special.png
+share/apps/kile/mathsymbols/special/img168special.png
+share/apps/kile/mathsymbols/special/img169special.png
+share/apps/kile/mathsymbols/special/img170special.png
+share/apps/kile/mathsymbols/special/img171special.png
+share/apps/kile/mathsymbols/special/img172special.png
+share/apps/kile/mathsymbols/special/img173special.png
+share/apps/kile/mathsymbols/special/img174special.png
+share/apps/kile/mathsymbols/special/img175special.png
+share/apps/kile/mathsymbols/special/img176special.png
+share/apps/kile/mathsymbols/special/img177special.png
+share/apps/kile/mathsymbols/special/img178special.png
+share/apps/kile/pics/kile_splash.png
+share/apps/kile/pics/type_Article.tex.kileicon
+share/apps/kile/pics/type_Beamer.tex.kileicon
+share/apps/kile/pics/type_Book.tex.kileicon
+share/apps/kile/pics/type_Default.png
+share/apps/kile/pics/type_Empty.png
+share/apps/kile/pics/type_HA-prosper.tex.kileicon
+share/apps/kile/pics/type_Letter.tex.kileicon
+share/apps/kile/pics/type_Project.png
+share/apps/kile/pics/type_Prosper.tex.kileicon
+share/apps/kile/pics/type_Report.tex.kileicon
+share/apps/kile/pics/type_Scrartcl.tex.kileicon
+share/apps/kile/pics/type_Scrbook.tex.kileicon
+share/apps/kile/pics/type_Scrlttr2.tex.kileicon
+share/apps/kile/pics/type_Scrreprt.tex.kileicon
+share/apps/kile/templates/template_Article.tex
+share/apps/kile/templates/template_Beamer.tex
+share/apps/kile/templates/template_Book.tex
+share/apps/kile/templates/template_HA-prosper.tex
+share/apps/kile/templates/template_Letter.tex
+share/apps/kile/templates/template_Prosper.tex
+share/apps/kile/templates/template_Report.tex
+share/apps/kile/templates/template_Scrartcl.tex
+share/apps/kile/templates/template_Scrbook.tex
+share/apps/kile/templates/template_Scrlttr2.tex
+share/apps/kile/templates/template_Scrreprt.tex
+share/apps/kile/test/runTests.sh
+share/apps/kile/test/test.bib
+share/apps/kile/test/test.tex
+share/apps/kile/test/test_bib.tex
+share/apps/kile/test/test_index.tex
+share/apps/kile/test/test_plain.tex
+share/apps/kile/tips
+share/apps/tdeconf_update/kile.upd
+share/apps/tdeconf_update/kile1.6_upd.pl
+share/apps/tdeconf_update/kile1.7_upd.pl
+share/apps/tdeconf_update/kile1.9-1_upd.pl
+share/apps/tdeconf_update/kile1.9_upd.pl
+share/apps/tdeconf_update/kile2.0-1_upd.pl
+share/apps/tdeconf_update/kile2.0-2_upd.pl
+share/apps/tdeconf_update/kile2.0-3_upd.pl
+share/apps/tdeconf_update/kile2.0-4_upd.pl
+share/apps/tdeconf_update/kile2.0-5_upd.pl
+share/config.kcfg/kile.kcfg
+share/doc/tde/HTML/da/kile/common
+share/doc/tde/HTML/da/kile/index.cache.bz2
+share/doc/tde/HTML/da/kile/index.docbook
+share/doc/tde/HTML/en/kile/bullets.png
+share/doc/tde/HTML/en/kile/common
+share/doc/tde/HTML/en/kile/complete_cmd1.png
+share/doc/tde/HTML/en/kile/complete_cmd2.png
+share/doc/tde/HTML/en/kile/complete_env1.png
+share/doc/tde/HTML/en/kile/complete_env2.png
+share/doc/tde/HTML/en/kile/config-complete.png
+share/doc/tde/HTML/en/kile/config-dblquotes.png
+share/doc/tde/HTML/en/kile/config-encoding.png
+share/doc/tde/HTML/en/kile/config-quickpreview.png
+share/doc/tde/HTML/en/kile/config-userhelp.png
+share/doc/tde/HTML/en/kile/delete.png
+share/doc/tde/HTML/en/kile/dialog-addhelp.png
+share/doc/tde/HTML/en/kile/dialog-docbrowser1.png
+share/doc/tde/HTML/en/kile/dialog-docbrowser2.png
+share/doc/tde/HTML/en/kile/dialog-pstools.png
+share/doc/tde/HTML/en/kile/dialog-tabular.png
+share/doc/tde/HTML/en/kile/environment.png
+share/doc/tde/HTML/en/kile/includegraphics.png
+share/doc/tde/HTML/en/kile/index.cache.bz2
+share/doc/tde/HTML/en/kile/index.docbook
+share/doc/tde/HTML/en/kile/latex_example.png
+share/doc/tde/HTML/en/kile/psutils1.png
+share/doc/tde/HTML/en/kile/psutils15.png
+share/doc/tde/HTML/en/kile/psutils16.png
+share/doc/tde/HTML/en/kile/psutils2.png
+share/doc/tde/HTML/en/kile/psutils3.png
+share/doc/tde/HTML/en/kile/psutils5.png
+share/doc/tde/HTML/en/kile/psutils6.png
+share/doc/tde/HTML/en/kile/psutils7.png
+share/doc/tde/HTML/en/kile/psutils8.png
+share/doc/tde/HTML/en/kile/quickpreview.png
+share/doc/tde/HTML/en/kile/select.png
+share/doc/tde/HTML/en/kile/snap_autocomplete.png
+share/doc/tde/HTML/en/kile/snap_compile_error.png
+share/doc/tde/HTML/en/kile/snap_editusertag.png
+share/doc/tde/HTML/en/kile/snap_encoding.png
+share/doc/tde/HTML/en/kile/snap_kdvi_settings.png
+share/doc/tde/HTML/en/kile/snap_projectview.png
+share/doc/tde/HTML/en/kile/snap_projectview_add.png
+share/doc/tde/HTML/en/kile/snap_ref_choose.png
+share/doc/tde/HTML/en/kile/snap_ref_select.png
+share/doc/tde/HTML/en/kile/snap_sidebarmenu.png
+share/doc/tde/HTML/en/kile/snap_structview_label.png
+share/doc/tde/HTML/en/kile/snap_usertag.png
+share/doc/tde/HTML/en/kile/texgroup.png
+share/doc/tde/HTML/es/kile/bullets.png
+share/doc/tde/HTML/es/kile/common
+share/doc/tde/HTML/es/kile/complete_cmd1.png
+share/doc/tde/HTML/es/kile/complete_cmd2.png
+share/doc/tde/HTML/es/kile/complete_env1.png
+share/doc/tde/HTML/es/kile/complete_env2.png
+share/doc/tde/HTML/es/kile/config-complete.png
+share/doc/tde/HTML/es/kile/config-quickpreview.png
+share/doc/tde/HTML/es/kile/config-userhelp.png
+share/doc/tde/HTML/es/kile/delete.png
+share/doc/tde/HTML/es/kile/dialog-addhelp.png
+share/doc/tde/HTML/es/kile/dialog-docbrowser1.png
+share/doc/tde/HTML/es/kile/dialog-docbrowser2.png
+share/doc/tde/HTML/es/kile/dialog-pstools.png
+share/doc/tde/HTML/es/kile/dialog-tabular.png
+share/doc/tde/HTML/es/kile/environment.png
+share/doc/tde/HTML/es/kile/ico.png
+share/doc/tde/HTML/es/kile/includegraphics.png
+share/doc/tde/HTML/es/kile/index.cache.bz2
+share/doc/tde/HTML/es/kile/index.docbook
+share/doc/tde/HTML/es/kile/psutils1.png
+share/doc/tde/HTML/es/kile/psutils15.png
+share/doc/tde/HTML/es/kile/psutils16.png
+share/doc/tde/HTML/es/kile/psutils2.png
+share/doc/tde/HTML/es/kile/psutils3.png
+share/doc/tde/HTML/es/kile/psutils5.png
+share/doc/tde/HTML/es/kile/psutils6.png
+share/doc/tde/HTML/es/kile/psutils7.png
+share/doc/tde/HTML/es/kile/psutils8.png
+share/doc/tde/HTML/es/kile/quickpreview.png
+share/doc/tde/HTML/es/kile/select.png
+share/doc/tde/HTML/es/kile/snap_autocomplete.png
+share/doc/tde/HTML/es/kile/snap_compile_error.png
+share/doc/tde/HTML/es/kile/snap_editusertag.png
+share/doc/tde/HTML/es/kile/snap_encoding.png
+share/doc/tde/HTML/es/kile/snap_kdvi_settings.png
+share/doc/tde/HTML/es/kile/snap_projectview.png
+share/doc/tde/HTML/es/kile/snap_projectview_add.png
+share/doc/tde/HTML/es/kile/snap_ref_choose.png
+share/doc/tde/HTML/es/kile/snap_ref_select.png
+share/doc/tde/HTML/es/kile/snap_sidebarmenu.png
+share/doc/tde/HTML/es/kile/snap_structview_label.png
+share/doc/tde/HTML/es/kile/snap_usertag.png
+share/doc/tde/HTML/es/kile/texgroup.png
+share/doc/tde/HTML/et/kile/common
+share/doc/tde/HTML/et/kile/index.cache.bz2
+share/doc/tde/HTML/et/kile/index.docbook
+share/doc/tde/HTML/it/kile/common
+share/doc/tde/HTML/it/kile/index.cache.bz2
+share/doc/tde/HTML/it/kile/index.docbook
+share/doc/tde/HTML/it/kile/snap_autocomplete.png
+share/doc/tde/HTML/it/kile/snap_compile_error.png
+share/doc/tde/HTML/it/kile/snap_editusertag.png
+share/doc/tde/HTML/it/kile/snap_encoding.png
+share/doc/tde/HTML/it/kile/snap_kdvi_settings.png
+share/doc/tde/HTML/it/kile/snap_projectview.png
+share/doc/tde/HTML/it/kile/snap_projectview_add.png
+share/doc/tde/HTML/it/kile/snap_ref_choose.png
+share/doc/tde/HTML/it/kile/snap_ref_select.png
+share/doc/tde/HTML/it/kile/snap_sidebarmenu.png
+share/doc/tde/HTML/it/kile/snap_structview_label.png
+share/doc/tde/HTML/it/kile/snap_usertag.png
+share/doc/tde/HTML/it/kile/snap_wizardry.png
+share/doc/tde/HTML/nl/kile/common
+share/doc/tde/HTML/nl/kile/index.cache.bz2
+share/doc/tde/HTML/nl/kile/index.docbook
+share/doc/tde/HTML/pt/kile/common
+share/doc/tde/HTML/pt/kile/index.cache.bz2
+share/doc/tde/HTML/pt/kile/index.docbook
+share/doc/tde/HTML/sv/kile/bullets.png
+share/doc/tde/HTML/sv/kile/common
+share/doc/tde/HTML/sv/kile/config-complete.png
+share/doc/tde/HTML/sv/kile/config-dblquotes.png
+share/doc/tde/HTML/sv/kile/config-encoding.png
+share/doc/tde/HTML/sv/kile/config-quickpreview.png
+share/doc/tde/HTML/sv/kile/config-userhelp.png
+share/doc/tde/HTML/sv/kile/delete.png
+share/doc/tde/HTML/sv/kile/dialog-addhelp.png
+share/doc/tde/HTML/sv/kile/dialog-docbrowser1.png
+share/doc/tde/HTML/sv/kile/dialog-docbrowser2.png
+share/doc/tde/HTML/sv/kile/dialog-pstools.png
+share/doc/tde/HTML/sv/kile/dialog-tabular.png
+share/doc/tde/HTML/sv/kile/environment.png
+share/doc/tde/HTML/sv/kile/includegraphics.png
+share/doc/tde/HTML/sv/kile/index.cache.bz2
+share/doc/tde/HTML/sv/kile/index.docbook
+share/doc/tde/HTML/sv/kile/latex_example.png
+share/doc/tde/HTML/sv/kile/quickpreview.png
+share/doc/tde/HTML/sv/kile/select.png
+share/doc/tde/HTML/sv/kile/snap_autocomplete.png
+share/doc/tde/HTML/sv/kile/snap_compile_error.png
+share/doc/tde/HTML/sv/kile/snap_editusertag.png
+share/doc/tde/HTML/sv/kile/snap_encoding.png
+share/doc/tde/HTML/sv/kile/snap_kdvi_settings.png
+share/doc/tde/HTML/sv/kile/snap_projectview.png
+share/doc/tde/HTML/sv/kile/snap_projectview_add.png
+share/doc/tde/HTML/sv/kile/snap_ref_choose.png
+share/doc/tde/HTML/sv/kile/snap_ref_select.png
+share/doc/tde/HTML/sv/kile/snap_sidebarmenu.png
+share/doc/tde/HTML/sv/kile/snap_structview_label.png
+share/doc/tde/HTML/sv/kile/snap_usertag.png
+share/doc/tde/HTML/sv/kile/texgroup.png
+share/icons/hicolor/128x128/apps/kile.png
+share/icons/hicolor/16x16/apps/kile.png
+share/icons/hicolor/22x22/apps/kile.png
+share/icons/hicolor/32x32/apps/kile.png
+share/icons/hicolor/48x48/apps/kile.png
+share/icons/hicolor/64x64/apps/kile.png
+share/icons/hicolor/scalable/apps/kile.svgz
+share/locale/ar/LC_MESSAGES/kile.mo
+share/locale/bg/LC_MESSAGES/kile.mo
+share/locale/br/LC_MESSAGES/kile.mo
+share/locale/ca/LC_MESSAGES/kile.mo
+share/locale/cs/LC_MESSAGES/kile.mo
+share/locale/cy/LC_MESSAGES/kile.mo
+share/locale/da/LC_MESSAGES/kile.mo
+share/locale/de/LC_MESSAGES/kile.mo
+share/locale/el/LC_MESSAGES/kile.mo
+share/locale/en_GB/LC_MESSAGES/kile.mo
+share/locale/es/LC_MESSAGES/kile.mo
+share/locale/et/LC_MESSAGES/kile.mo
+share/locale/eu/LC_MESSAGES/kile.mo
+share/locale/fi/LC_MESSAGES/kile.mo
+share/locale/fr/LC_MESSAGES/kile.mo
+share/locale/ga/LC_MESSAGES/kile.mo
+share/locale/gl/LC_MESSAGES/kile.mo
+share/locale/hi/LC_MESSAGES/kile.mo
+share/locale/hu/LC_MESSAGES/kile.mo
+share/locale/is/LC_MESSAGES/kile.mo
+share/locale/it/LC_MESSAGES/kile.mo
+share/locale/ja/LC_MESSAGES/kile.mo
+share/locale/lt/LC_MESSAGES/kile.mo
+share/locale/ms/LC_MESSAGES/kile.mo
+share/locale/mt/LC_MESSAGES/kile.mo
+share/locale/nb/LC_MESSAGES/kile.mo
+share/locale/nds/LC_MESSAGES/kile.mo
+share/locale/nl/LC_MESSAGES/kile.mo
+share/locale/nn/LC_MESSAGES/kile.mo
+share/locale/pa/LC_MESSAGES/kile.mo
+share/locale/pl/LC_MESSAGES/kile.mo
+share/locale/pt/LC_MESSAGES/kile.mo
+share/locale/pt_BR/LC_MESSAGES/kile.mo
+share/locale/ro/LC_MESSAGES/kile.mo
+share/locale/ru/LC_MESSAGES/kile.mo
+share/locale/rw/LC_MESSAGES/kile.mo
+share/locale/sk/LC_MESSAGES/kile.mo
+share/locale/sr/LC_MESSAGES/kile.mo
+share/locale/sr@Latn/LC_MESSAGES/kile.mo
+share/locale/sv/LC_MESSAGES/kile.mo
+share/locale/ta/LC_MESSAGES/kile.mo
+share/locale/th/LC_MESSAGES/kile.mo
+share/locale/tr/LC_MESSAGES/kile.mo
+share/locale/uk/LC_MESSAGES/kile.mo
+share/locale/zh_CN/LC_MESSAGES/kile.mo
+share/man/man1/kile.1.gz
+share/mimelnk/text/x-kilepr.desktop
diff --git a/freebsd/applications/office/kmymoney2/Makefile b/freebsd/applications/office/kmymoney2/Makefile
new file mode 100644
index 000000000..43d2d1f88
--- /dev/null
+++ b/freebsd/applications/office/kmymoney2/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kmymoney2-trinity
+COMMENT=		Personal finance manager for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/office
+DISTSRC=		kmymoney-trinity-${TDE_VERSION}${TDE_PREVERSION}
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libofx.so:${PORTSDIR}/finance/libofx \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON" \
+	-DBUILD_DEVELOPER_DOCS="OFF" \
+	-DBUILD_DESIGNER_PLUGIN="OFF"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/office/kmymoney2/distinfo b/freebsd/applications/office/kmymoney2/distinfo
new file mode 100644
index 000000000..0899604cd
--- /dev/null
+++ b/freebsd/applications/office/kmymoney2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666650209
+SHA256 (TDE/applications/office/kmymoney2-trinity_14.0.13.orig.tar.xz) = a1bee5e229b4739c59bc89f8358311612be39d3c6b0416aa6db2dfd897257708
+SIZE (TDE/applications/office/kmymoney2-trinity_14.0.13.orig.tar.xz) = 8901288
diff --git a/freebsd/applications/office/kmymoney2/pkg-descr b/freebsd/applications/office/kmymoney2/pkg-descr
new file mode 100644
index 000000000..7743920ee
--- /dev/null
+++ b/freebsd/applications/office/kmymoney2/pkg-descr
@@ -0,0 +1,6 @@
+Personal finance manager for TDE
+
+KMyMoney is the Personal Finance Manager for TDE. It operates similar to
+MS-Money and Quicken, supports different account types, categorisation of
+expenses, QIF import/export, multiple currencies and initial online banking
+support.
diff --git a/freebsd/applications/office/kmymoney2/pkg-plist b/freebsd/applications/office/kmymoney2/pkg-plist
new file mode 100644
index 000000000..0dfc272f1
--- /dev/null
+++ b/freebsd/applications/office/kmymoney2/pkg-plist
@@ -0,0 +1,1130 @@
+bin/kmymoney
+bin/kmymoney2
+include/kmymoney/export.h
+include/kmymoney/importinterface.h
+include/kmymoney/imymoneyserialize.h
+include/kmymoney/imymoneystorage.h
+include/kmymoney/imymoneystorageformat.h
+include/kmymoney/investtransactioneditor.h
+include/kmymoney/kaccounttemplateselector.h
+include/kmymoney/kbudgetvalues.h
+include/kmymoney/kbudgetvaluesdecl.h
+include/kmymoney/kcurrencycalculator.h
+include/kmymoney/kcurrencycalculatordecl.h
+include/kmymoney/kgpgfile.h
+include/kmymoney/kguiutils.h
+include/kmymoney/kmymoneyaccountcombo.h
+include/kmymoney/kmymoneyaccountcompletion.h
+include/kmymoney/kmymoneyaccountselector.h
+include/kmymoney/kmymoneyaccounttree.h
+include/kmymoney/kmymoneyaccounttreebase.h
+include/kmymoney/kmymoneyaccounttreebudget.h
+include/kmymoney/kmymoneyaccounttreeforecast.h
+include/kmymoney/kmymoneycategory.h
+include/kmymoney/kmymoneychecklistitem.h
+include/kmymoney/kmymoneycombo.h
+include/kmymoney/kmymoneycompletion.h
+include/kmymoney/kmymoneycurrencyselector.h
+include/kmymoney/kmymoneydateinput.h
+include/kmymoney/kmymoneyedit.h
+include/kmymoney/kmymoneyforecastlistviewitem.h
+include/kmymoney/kmymoneyglobalsettings.h
+include/kmymoney/kmymoneylineedit.h
+include/kmymoney/kmymoneylistviewitem.h
+include/kmymoney/kmymoneyplugin.h
+include/kmymoney/kmymoneyselector.h
+include/kmymoney/kmymoneysettings.h
+include/kmymoney/kmymoneytitlelabel.h
+include/kmymoney/kmymoneyutils.h
+include/kmymoney/kmymoneyview.h
+include/kmymoney/kmymoneywizard.h
+include/kmymoney/mymoneyaccount.h
+include/kmymoney/mymoneybudget.h
+include/kmymoney/mymoneycategory.h
+include/kmymoney/mymoneyexception.h
+include/kmymoney/mymoneyfile.h
+include/kmymoney/mymoneyfinancialcalculator.h
+include/kmymoney/mymoneyforecast.h
+include/kmymoney/mymoneyinstitution.h
+include/kmymoney/mymoneyinvesttransaction.h
+include/kmymoney/mymoneykeyvaluecontainer.h
+include/kmymoney/mymoneymoney.h
+include/kmymoney/mymoneyobject.h
+include/kmymoney/mymoneyobjectcontainer.h
+include/kmymoney/mymoneyobserver.h
+include/kmymoney/mymoneypayee.h
+include/kmymoney/mymoneyprice.h
+include/kmymoney/mymoneyreport.h
+include/kmymoney/mymoneyscheduled.h
+include/kmymoney/mymoneysecurity.h
+include/kmymoney/mymoneysplit.h
+include/kmymoney/mymoneystatement.h
+include/kmymoney/mymoneystoragesql.h
+include/kmymoney/mymoneysubject.h
+include/kmymoney/mymoneytemplate.h
+include/kmymoney/mymoneytransaction.h
+include/kmymoney/mymoneytransactionfilter.h
+include/kmymoney/mymoneyutils.h
+include/kmymoney/pluginloader.h
+include/kmymoney/register.h
+include/kmymoney/registeritem.h
+include/kmymoney/scheduledtransaction.h
+include/kmymoney/selectedtransaction.h
+include/kmymoney/statementinterface.h
+include/kmymoney/stdtransactiondownloaded.h
+include/kmymoney/stdtransactionmatched.h
+include/kmymoney/transaction.h
+include/kmymoney/transactioneditor.h
+include/kmymoney/transactioneditorcontainer.h
+include/kmymoney/transactionform.h
+include/kmymoney/transactionsortoption.h
+include/kmymoney/viewinterface.h
+lib/libkmm_kdchart.la
+lib/libkmm_kdchart.so
+lib/libkmm_kdchart.so.0
+lib/libkmm_kdchart.so.0.0.0
+lib/libkmm_mymoney.la
+lib/libkmm_mymoney.so
+lib/libkmm_mymoney.so.5
+lib/libkmm_mymoney.so.5.0.0
+lib/libkmm_plugin.la
+lib/libkmm_plugin.so
+lib/libkmm_plugin.so.0
+lib/libkmm_plugin.so.0.0.0
+lib/trinity/kmm_ofximport.la
+lib/trinity/kmm_ofximport.so
+share/applications/tde/kmymoney2.desktop
+share/apps/kmm_ofximport/kmm_ofximport.rc
+share/apps/kmymoney2/html/home.html
+share/apps/kmymoney2/html/home_de.html
+share/apps/kmymoney2/html/home_es.html
+share/apps/kmymoney2/html/home_fr.html
+share/apps/kmymoney2/html/home_gl.html
+share/apps/kmymoney2/html/home_it.html
+share/apps/kmymoney2/html/home_nl.html
+share/apps/kmymoney2/html/home_pt.html
+share/apps/kmymoney2/html/home_pt_BR.html
+share/apps/kmymoney2/html/home_ro.html
+share/apps/kmymoney2/html/home_ru.html
+share/apps/kmymoney2/html/home_tr.html
+share/apps/kmymoney2/html/images/about_kde.png
+share/apps/kmymoney2/html/images/arrow.png
+share/apps/kmymoney2/html/images/backarrow.png
+share/apps/kmymoney2/html/images/background.png
+share/apps/kmymoney2/html/images/bc.png
+share/apps/kmymoney2/html/images/bg-texture.png
+share/apps/kmymoney2/html/images/bl.png
+share/apps/kmymoney2/html/images/bottomleft.png
+share/apps/kmymoney2/html/images/bottomright.png
+share/apps/kmymoney2/html/images/br.png
+share/apps/kmymoney2/html/images/center.png
+share/apps/kmymoney2/html/images/currencyflourish.png
+share/apps/kmymoney2/html/images/filenew.png
+share/apps/kmymoney2/html/images/kmymoneydata.png
+share/apps/kmymoney2/html/images/konqueror.png
+share/apps/kmymoney2/html/images/lc.png
+share/apps/kmymoney2/html/images/manual.png
+share/apps/kmymoney2/html/images/messagebox_info.png
+share/apps/kmymoney2/html/images/original-trans_logo.png
+share/apps/kmymoney2/html/images/rc.png
+share/apps/kmymoney2/html/images/rightborder.png
+share/apps/kmymoney2/html/images/shadow.png
+share/apps/kmymoney2/html/images/spacer.gif
+share/apps/kmymoney2/html/images/spacer.png
+share/apps/kmymoney2/html/images/tc.png
+share/apps/kmymoney2/html/images/title-center.png
+share/apps/kmymoney2/html/images/title-left.png
+share/apps/kmymoney2/html/images/title-right.png
+share/apps/kmymoney2/html/images/tl.png
+share/apps/kmymoney2/html/images/top-shadow.png
+share/apps/kmymoney2/html/images/topleft.png
+share/apps/kmymoney2/html/images/topright.png
+share/apps/kmymoney2/html/images/tr.png
+share/apps/kmymoney2/html/images/trans_logo.png
+share/apps/kmymoney2/html/kmymoney2.css
+share/apps/kmymoney2/html/welcome.css
+share/apps/kmymoney2/html/whats_new.html
+share/apps/kmymoney2/html/whats_new_de.html
+share/apps/kmymoney2/html/whats_new_es.html
+share/apps/kmymoney2/html/whats_new_fr.html
+share/apps/kmymoney2/html/whats_new_gl.html
+share/apps/kmymoney2/html/whats_new_it.html
+share/apps/kmymoney2/html/whats_new_nl.html
+share/apps/kmymoney2/html/whats_new_pt_BR.html
+share/apps/kmymoney2/html/whats_new_ro.html
+share/apps/kmymoney2/html/whats_new_ru.html
+share/apps/kmymoney2/html/whats_new_tr.html
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_asset.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_cash.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_checking.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_closed.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_credit-card.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_expense.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_income.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_investments.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_liability.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_loan.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account-types_savings.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/account_add.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/accounts.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/budget.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/categories.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/forcast.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/institution_add.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/institutions.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/investments.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/ledger.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/onlinebanking.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/payee.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/reconcile.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/report.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/schedule.png
+share/apps/kmymoney2/icons/Tango/128x128/apps/transaction_find.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_asset.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_cash.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_checking.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_closed.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_credit-card.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_expense.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_income.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_investments.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_liability.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_loan.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account-types_savings.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/account_add.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/accounts.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/backup.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/bank.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/budget.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/categories.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/close_window.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/delete.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/forcast.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/hide_categories.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/hide_reconciled.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/institution_add.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/institutions.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/investments.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/ledger.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/onlinebanking.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/payee.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/personal_data.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/reconcile.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/report.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/schedule.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/split_transaction.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/transaction_find.png
+share/apps/kmymoney2/icons/Tango/16x16/actions/view_info.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_asset.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_cash.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_checking.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_closed.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_credit-card.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_expense.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_income.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_investments.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_liability.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_loan.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account-types_savings.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/account_add.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/accounts.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/attention.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/backup.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/bank.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/budget.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/categories.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/close_window.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/delete.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/forcast.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/hide_categories.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/hide_reconciled.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/institution_add.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/institutions.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/investments.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/ledger.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/onlinebanking.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/payee.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/personal_data.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/reconcile.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/report.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/schedule.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/transaction_find.png
+share/apps/kmymoney2/icons/Tango/22x22/actions/view_info.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_asset.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_cash.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_checking.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_closed.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_credit-card.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_expense.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_income.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_investments.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_liability.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_loan.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account-types_savings.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/account_add.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/accounts.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/budget.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/categories.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/forcast.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/institution_add.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/institutions.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/investments.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/ledger.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/onlinebanking.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/payee.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/reconcile.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/report.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/schedule.png
+share/apps/kmymoney2/icons/Tango/32x32/apps/transaction_find.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_asset.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_cash.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_checking.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_closed.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_credit-card.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_expense.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_income.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_investments.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_liability.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_loan.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account-types_savings.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/account_add.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/accounts.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/budget.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/categories.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/forcast.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/institution_add.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/institutions.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/investments.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/ledger.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/onlinebanking.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/payee.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/reconcile.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/report.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/schedule.png
+share/apps/kmymoney2/icons/Tango/48x48/apps/transaction_find.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_asset.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_cash.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_checking.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_closed.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_credit-card.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_expense.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_income.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_investments.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_liability.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_loan.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account-types_savings.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/account_add.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/accounts.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/budget.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/categories.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/forcast.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/institution_add.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/institutions.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/investments.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/ledger.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/onlinebanking.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/payee.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/reconcile.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/report.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/schedule.png
+share/apps/kmymoney2/icons/Tango/64x64/apps/transaction_find.png
+share/apps/kmymoney2/icons/Tango/scalable/account-types_asset.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_cash.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_checking.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_closed.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_credit-card.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_expense.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_income.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_investments.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_liability.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_loan.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account-types_savings.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account.svgz
+share/apps/kmymoney2/icons/Tango/scalable/account_add.svgz
+share/apps/kmymoney2/icons/Tango/scalable/accounts.svgz
+share/apps/kmymoney2/icons/Tango/scalable/backup.svgz
+share/apps/kmymoney2/icons/Tango/scalable/bank.svgz
+share/apps/kmymoney2/icons/Tango/scalable/budget.svgz
+share/apps/kmymoney2/icons/Tango/scalable/categories.svgz
+share/apps/kmymoney2/icons/Tango/scalable/forcast.svgz
+share/apps/kmymoney2/icons/Tango/scalable/hide_categories.svgz
+share/apps/kmymoney2/icons/Tango/scalable/hide_reconciled.svgz
+share/apps/kmymoney2/icons/Tango/scalable/institution_add.svgz
+share/apps/kmymoney2/icons/Tango/scalable/institutions.svgz
+share/apps/kmymoney2/icons/Tango/scalable/investments.svgz
+share/apps/kmymoney2/icons/Tango/scalable/ledger.svgz
+share/apps/kmymoney2/icons/Tango/scalable/onlinebanking.svgz
+share/apps/kmymoney2/icons/Tango/scalable/payee.svgz
+share/apps/kmymoney2/icons/Tango/scalable/personal_data.svgz
+share/apps/kmymoney2/icons/Tango/scalable/reconcile.svgz
+share/apps/kmymoney2/icons/Tango/scalable/report.svgz
+share/apps/kmymoney2/icons/Tango/scalable/schedule.svgz
+share/apps/kmymoney2/icons/Tango/scalable/transaction_find.svgz
+share/apps/kmymoney2/icons/Tango/scalable/view_info.svgz
+share/apps/kmymoney2/icons/hicolor/16x16/actions/account-type_asset.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/account-type_expense.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/account-type_income.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/account-type_liability.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/account_add.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/account_open.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/backup.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/bank.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/categories.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/close_window.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/delete.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/hide_categories.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/hide_reconciled.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/institution_add.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/ledger.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/pay_edit.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/personal_data.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/reconcile.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/split_transaction.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction_export.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction_find.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction_import.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/unreconciled.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/update_prices.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/view_info.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account-types_asset.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account-types_closed.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account-types_expense.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account-types_income.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account-types_liability.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account-types_online.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account-types_reconcile.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account_add.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account_open.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/attention.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/backup.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/bank.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/categories.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/cleared.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/close_window.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/delete.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/hide_categories.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/hide_reconciled.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/institution_add.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/ledger.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/pay_edit.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/personal_data.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/reconcile.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/report-bar.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/report-line.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/report-pie.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/report-solid.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/report-text.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/set_as.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/transaction.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/transaction_export.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/transaction_find.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/transaction_import.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/unreconciled.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/update_prices.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/view_info.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/account-types_asset.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/account-types_cash.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/account-types_checking.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/account-types_credit-card.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/account-types_investments.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/account-types_liability.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/account-types_loan.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/account-types_reconciled.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/account-types_savings.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/accounts.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/budget.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/categories.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/forcast.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/home.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/institutions.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/investments.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/ledger.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/onlinebanking.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/payee.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/report.png
+share/apps/kmymoney2/icons/hicolor/32x32/apps/schedule.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/account-types_asset.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/account-types_cash.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/account-types_checking.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/account-types_credit-card.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/account-types_investment.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/account-types_liability.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/account-types_loan.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/account-types_savings.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/accounts.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/budget.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/categories.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/forcast.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/home.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/institutions.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/investments.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/ledger.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/onlinebanking.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/payee.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/report.png
+share/apps/kmymoney2/icons/hicolor/48x48/apps/schedule.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/account-types_asset.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/account-types_cash.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/account-types_checking.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/account-types_credit-card.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/account-types_investments.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/account-types_liability.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/account-types_loan.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/account-types_savings.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/accounts.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/budget.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/categories.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/forcast.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/home.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/institutions.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/investments.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/ledger.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/onlinebanking.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/payee.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/report.png
+share/apps/kmymoney2/icons/hicolor/64x64/apps/schedule.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/account-add.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/account-types_asset.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/account-types_cash.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/account-types_checking.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/account-types_closed.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/account-types_credit-card.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/account-types_investments.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/account-types_liability.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/account-types_loan.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/accounts.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/budget.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/categories.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/forcast.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/institutions.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/investments.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/ledger.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/onlinebanking.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/payee.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/reconcile.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/report.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/schedule.png
+share/apps/kmymoney2/icons/oxygen/128x128/apps/transaction_find.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_asset.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_cash.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_checking.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_closed.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_credit-card.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_expense.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_income.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_investments.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_liability.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_loan.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/account-types_savings.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/accounts.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/budget.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/forcast.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/institutions.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/investments.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/ledger.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/onlinebanking.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/payee.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/report.png
+share/apps/kmymoney2/icons/oxygen/16x16/actions/schedule.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/account-types_cash.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/account-types_checking.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/account-types_credit-card.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/account-types_investments.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/account-types_loan.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/account-types_savings.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/accounts.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/budget.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/forcast.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/institutions.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/investments.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/ledger.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/onlinebanking.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/payee.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/report.png
+share/apps/kmymoney2/icons/oxygen/22x22/actions/schedule.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/account-types_closed.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/account-types_expense.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/account-types_income.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/account_add.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/accounts.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/budget.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/categories.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/forcast.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/institution_add.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/institutions.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/investments.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/ledger.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/onlinebanking.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/payee.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/reconcile.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/report.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/schedule.png
+share/apps/kmymoney2/icons/oxygen/32x32/apps/transaction_find.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/account-types_closed.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/account-types_expense.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/account-types_income.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/account_add.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/accounts.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/budget.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/categories.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/forcast.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/institution_add.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/institutions.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/investments.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/ledger.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/onlinebanking.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/payee.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/reconcile.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/report.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/schedule.png
+share/apps/kmymoney2/icons/oxygen/48x48/apps/transaction_find.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/account-add.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/account-types_closed.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/accounts.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/budget.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/categories.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/forcast.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/institutions.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/investments.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/ledger.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/onlinebanking.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/payee.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/reconcile.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/report.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/schedule.png
+share/apps/kmymoney2/icons/oxygen/64x64/apps/transaction_find.png
+share/apps/kmymoney2/icons/oxygen/scalable/account-add.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_asset.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_cash.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_checking.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_closed.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_credit-card.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_expense.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_income.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_investments.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_liability.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_loan.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/account-types_savings.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/accounts.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/budget.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/categories.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/forcast.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/hide_categories.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/hide_reconciled.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/institution_add.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/institutions.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/investments.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/ledger.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/onlinebanking.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/payee.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/personal_data.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/reconcile.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/report.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/schedule.svgz
+share/apps/kmymoney2/icons/oxygen/scalable/transaction_find.svgz
+share/apps/kmymoney2/kmymoney2ui.rc
+share/apps/kmymoney2/misc/financequote.pl
+share/apps/kmymoney2/pics/startlogo.png
+share/apps/kmymoney2/pics/titlelabel_background.png
+share/apps/kmymoney2/templates/C/brokerage.kmt
+share/apps/kmymoney2/templates/C/business.kmt
+share/apps/kmymoney2/templates/C/carloan.kmt
+share/apps/kmymoney2/templates/C/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/C/checkbook.kmt
+share/apps/kmymoney2/templates/C/childcare.kmt
+share/apps/kmymoney2/templates/C/common.kmt
+share/apps/kmymoney2/templates/C/default_categories-template.kmt
+share/apps/kmymoney2/templates/C/eduloan.kmt
+share/apps/kmymoney2/templates/C/fixedassets.kmt
+share/apps/kmymoney2/templates/C/full.kmt
+share/apps/kmymoney2/templates/C/homeloan.kmt
+share/apps/kmymoney2/templates/C/homeown.kmt
+share/apps/kmymoney2/templates/C/old-default_accounts.kmt
+share/apps/kmymoney2/templates/C/otherloan.kmt
+share/apps/kmymoney2/templates/C/renter.kmt
+share/apps/kmymoney2/templates/C/retiremt.kmt
+share/apps/kmymoney2/templates/C/spouseinc.kmt
+share/apps/kmymoney2/templates/C/spouseretire.kmt
+share/apps/kmymoney2/templates/de_AT/auto.kmt
+share/apps/kmymoney2/templates/de_AT/autoloan.kmt
+share/apps/kmymoney2/templates/de_AT/brokerage.kmt
+share/apps/kmymoney2/templates/de_AT/business.kmt
+share/apps/kmymoney2/templates/de_AT/common.kmt
+share/apps/kmymoney2/templates/de_AT/houseown.kmt
+share/apps/kmymoney2/templates/de_AT/investment.kmt
+share/apps/kmymoney2/templates/de_AT/kids.kmt
+share/apps/kmymoney2/templates/de_CH/brokerage.kmt
+share/apps/kmymoney2/templates/de_CH/chkmu.kmt
+share/apps/kmymoney2/templates/de_CH/common.kmt
+share/apps/kmymoney2/templates/de_CH/kids.kmt
+share/apps/kmymoney2/templates/de_CH/otherasset.kmt
+share/apps/kmymoney2/templates/de_CH/otherloan.kmt
+share/apps/kmymoney2/templates/de_DE/auto.kmt
+share/apps/kmymoney2/templates/de_DE/autoloan.kmt
+share/apps/kmymoney2/templates/de_DE/brokerage.kmt
+share/apps/kmymoney2/templates/de_DE/common.kmt
+share/apps/kmymoney2/templates/de_DE/default_accounts.kmt
+share/apps/kmymoney2/templates/de_DE/full.kmt
+share/apps/kmymoney2/templates/de_DE/houseown.kmt
+share/apps/kmymoney2/templates/de_DE/investment.kmt
+share/apps/kmymoney2/templates/de_DE/kids.kmt
+share/apps/kmymoney2/templates/de_DE/otherasset.kmt
+share/apps/kmymoney2/templates/de_DE/otherloan.kmt
+share/apps/kmymoney2/templates/de_DE/skr03.kmt
+share/apps/kmymoney2/templates/de_DE/skr04.kmt
+share/apps/kmymoney2/templates/de_DE/studium.kmt
+share/apps/kmymoney2/templates/dk/car.kmt
+share/apps/kmymoney2/templates/dk/common.kmt
+share/apps/kmymoney2/templates/dk/homeloan.kmt
+share/apps/kmymoney2/templates/dk/homeown.kmt
+share/apps/kmymoney2/templates/el_GR/brokerage.kmt
+share/apps/kmymoney2/templates/el_GR/carloan.kmt
+share/apps/kmymoney2/templates/el_GR/common.kmt
+share/apps/kmymoney2/templates/en_GB/brokerage.kmt
+share/apps/kmymoney2/templates/en_GB/business.kmt
+share/apps/kmymoney2/templates/en_GB/carloan.kmt
+share/apps/kmymoney2/templates/en_GB/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/en_GB/checkbook.kmt
+share/apps/kmymoney2/templates/en_GB/childcare.kmt
+share/apps/kmymoney2/templates/en_GB/common.kmt
+share/apps/kmymoney2/templates/en_GB/default_accounts.kmt
+share/apps/kmymoney2/templates/en_GB/eduloan.kmt
+share/apps/kmymoney2/templates/en_GB/fixedassets.kmt
+share/apps/kmymoney2/templates/en_GB/full.kmt
+share/apps/kmymoney2/templates/en_GB/homeloan.kmt
+share/apps/kmymoney2/templates/en_GB/homeown.kmt
+share/apps/kmymoney2/templates/en_GB/otherloan.kmt
+share/apps/kmymoney2/templates/en_GB/renter.kmt
+share/apps/kmymoney2/templates/en_GB/retiremt.kmt
+share/apps/kmymoney2/templates/en_GB/spouseinc.kmt
+share/apps/kmymoney2/templates/en_GB/spouseretire.kmt
+share/apps/kmymoney2/templates/en_GB/uk-vat.kmt
+share/apps/kmymoney2/templates/en_US/0.6-default_accounts.kmt
+share/apps/kmymoney2/templates/en_US/0.8-default_accounts.kmt
+share/apps/kmymoney2/templates/en_US/Base-Blank.kmt
+share/apps/kmymoney2/templates/en_US/Base-Detailed.kmt
+share/apps/kmymoney2/templates/en_US/Base-Simple.kmt
+share/apps/kmymoney2/templates/en_US/House.kmt
+share/apps/kmymoney2/templates/en_US/Pets.kmt
+share/apps/kmymoney2/templates/en_US/Retirement.kmt
+share/apps/kmymoney2/templates/en_US/ScheduleA_itemized-deductions.kmt
+share/apps/kmymoney2/templates/en_US/ScheduleBandD.kmt
+share/apps/kmymoney2/templates/en_US/ScheduleC_business.kmt
+share/apps/kmymoney2/templates/en_US/ScheduleE_rental-property.kmt
+share/apps/kmymoney2/templates/en_US/ScheduleF_farming.kmt
+share/apps/kmymoney2/templates/en_US/kids.kmt
+share/apps/kmymoney2/templates/es_AR/brokerage.kmt
+share/apps/kmymoney2/templates/es_AR/carloan.kmt
+share/apps/kmymoney2/templates/es_AR/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/es_AR/childcare.kmt
+share/apps/kmymoney2/templates/es_AR/common.kmt
+share/apps/kmymoney2/templates/es_AR/currency.kmt
+share/apps/kmymoney2/templates/es_AR/default_accounts.kmt
+share/apps/kmymoney2/templates/es_AR/eduloan.kmt
+share/apps/kmymoney2/templates/es_AR/fixedassets.kmt
+share/apps/kmymoney2/templates/es_AR/homeloan.kmt
+share/apps/kmymoney2/templates/es_AR/homeown.kmt
+share/apps/kmymoney2/templates/es_AR/otherloan.kmt
+share/apps/kmymoney2/templates/es_AR/renter.kmt
+share/apps/kmymoney2/templates/es_AR/retiremt.kmt
+share/apps/kmymoney2/templates/es_AR/spouseinc.kmt
+share/apps/kmymoney2/templates/es_AR/spouseretire.kmt
+share/apps/kmymoney2/templates/es_ES/brokerage.kmt
+share/apps/kmymoney2/templates/es_ES/carloan.kmt
+share/apps/kmymoney2/templates/es_ES/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/es_ES/childcare.kmt
+share/apps/kmymoney2/templates/es_ES/common.kmt
+share/apps/kmymoney2/templates/es_ES/currency.kmt
+share/apps/kmymoney2/templates/es_ES/default_accounts.kmt
+share/apps/kmymoney2/templates/es_ES/eduloan.kmt
+share/apps/kmymoney2/templates/es_ES/fixedassets.kmt
+share/apps/kmymoney2/templates/es_ES/homeloan.kmt
+share/apps/kmymoney2/templates/es_ES/homeown.kmt
+share/apps/kmymoney2/templates/es_ES/otherloan.kmt
+share/apps/kmymoney2/templates/es_ES/renter.kmt
+share/apps/kmymoney2/templates/es_ES/retiremt.kmt
+share/apps/kmymoney2/templates/es_ES/spouseinc.kmt
+share/apps/kmymoney2/templates/es_ES/spouseretire.kmt
+share/apps/kmymoney2/templates/es_MX/brokerage.kmt
+share/apps/kmymoney2/templates/es_MX/carloan.kmt
+share/apps/kmymoney2/templates/es_MX/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/es_MX/childcare.kmt
+share/apps/kmymoney2/templates/es_MX/common.kmt
+share/apps/kmymoney2/templates/es_MX/currency.kmt
+share/apps/kmymoney2/templates/es_MX/eduloan.kmt
+share/apps/kmymoney2/templates/es_MX/fixedassets.kmt
+share/apps/kmymoney2/templates/es_MX/homeloan.kmt
+share/apps/kmymoney2/templates/es_MX/homeown.kmt
+share/apps/kmymoney2/templates/es_MX/otherloan.kmt
+share/apps/kmymoney2/templates/es_MX/renter.kmt
+share/apps/kmymoney2/templates/es_MX/retiremt.kmt
+share/apps/kmymoney2/templates/es_MX/spouseinc.kmt
+share/apps/kmymoney2/templates/es_MX/spouseretire.kmt
+share/apps/kmymoney2/templates/fr_CA/actifsfixes.kmt
+share/apps/kmymoney2/templates/fr_CA/automobile.kmt
+share/apps/kmymoney2/templates/fr_CA/basecommune.kmt
+share/apps/kmymoney2/templates/fr_CA/cdmarchemon.kmt
+share/apps/kmymoney2/templates/fr_CA/chequier.kmt
+share/apps/kmymoney2/templates/fr_CA/conjointretraite.kmt
+share/apps/kmymoney2/templates/fr_CA/conjointrev.kmt
+share/apps/kmymoney2/templates/fr_CA/courtage.kmt
+share/apps/kmymoney2/templates/fr_CA/etudeemprunt.kmt
+share/apps/kmymoney2/templates/fr_CA/garderie.kmt
+share/apps/kmymoney2/templates/fr_CA/locataire.kmt
+share/apps/kmymoney2/templates/fr_CA/proprietaire.kmt
+share/apps/kmymoney2/templates/fr_CA/retraite.kmt
+share/apps/kmymoney2/templates/fr_CA/revenus.kmt
+share/apps/kmymoney2/templates/fr_CH/brokerage.kmt
+share/apps/kmymoney2/templates/fr_CH/business.kmt
+share/apps/kmymoney2/templates/fr_CH/carloan.kmt
+share/apps/kmymoney2/templates/fr_CH/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/fr_CH/childcare.kmt
+share/apps/kmymoney2/templates/fr_CH/common.kmt
+share/apps/kmymoney2/templates/fr_CH/currency.kmt
+share/apps/kmymoney2/templates/fr_CH/eduloan.kmt
+share/apps/kmymoney2/templates/fr_CH/fixedassets.kmt
+share/apps/kmymoney2/templates/fr_CH/homeloan.kmt
+share/apps/kmymoney2/templates/fr_CH/homeown.kmt
+share/apps/kmymoney2/templates/fr_CH/otherloan.kmt
+share/apps/kmymoney2/templates/fr_CH/renter.kmt
+share/apps/kmymoney2/templates/fr_CH/retiremt.kmt
+share/apps/kmymoney2/templates/fr_CH/spouseinc.kmt
+share/apps/kmymoney2/templates/fr_CH/spouseretire.kmt
+share/apps/kmymoney2/templates/fr_FR/brokerage.kmt
+share/apps/kmymoney2/templates/fr_FR/business.kmt
+share/apps/kmymoney2/templates/fr_FR/carloan.kmt
+share/apps/kmymoney2/templates/fr_FR/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/fr_FR/childcare.kmt
+share/apps/kmymoney2/templates/fr_FR/common.kmt
+share/apps/kmymoney2/templates/fr_FR/comptes_par_default.kmt
+share/apps/kmymoney2/templates/fr_FR/currency.kmt
+share/apps/kmymoney2/templates/fr_FR/eduloan.kmt
+share/apps/kmymoney2/templates/fr_FR/fixedassets.kmt
+share/apps/kmymoney2/templates/fr_FR/homeloan.kmt
+share/apps/kmymoney2/templates/fr_FR/homeown.kmt
+share/apps/kmymoney2/templates/fr_FR/otherloan.kmt
+share/apps/kmymoney2/templates/fr_FR/renter.kmt
+share/apps/kmymoney2/templates/fr_FR/retiremt.kmt
+share/apps/kmymoney2/templates/fr_FR/spouseinc.kmt
+share/apps/kmymoney2/templates/fr_FR/spouseretire.kmt
+share/apps/kmymoney2/templates/gl_ES/default_accounts.kmt
+share/apps/kmymoney2/templates/hu_HU/brokerage.kmt
+share/apps/kmymoney2/templates/hu_HU/business.kmt
+share/apps/kmymoney2/templates/hu_HU/carloan.kmt
+share/apps/kmymoney2/templates/hu_HU/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/hu_HU/checkbook.kmt
+share/apps/kmymoney2/templates/hu_HU/childcare.kmt
+share/apps/kmymoney2/templates/hu_HU/common.kmt
+share/apps/kmymoney2/templates/hu_HU/eduloan.kmt
+share/apps/kmymoney2/templates/hu_HU/fixedassets.kmt
+share/apps/kmymoney2/templates/hu_HU/homeloan.kmt
+share/apps/kmymoney2/templates/hu_HU/homeown.kmt
+share/apps/kmymoney2/templates/hu_HU/otherloan.kmt
+share/apps/kmymoney2/templates/hu_HU/renter.kmt
+share/apps/kmymoney2/templates/hu_HU/retiremt.kmt
+share/apps/kmymoney2/templates/hu_HU/spouseinc.kmt
+share/apps/kmymoney2/templates/hu_HU/spouseretire.kmt
+share/apps/kmymoney2/templates/it/brokerage.kmt
+share/apps/kmymoney2/templates/it/carloan.kmt
+share/apps/kmymoney2/templates/it/checkbook.kmt
+share/apps/kmymoney2/templates/it/childcare.kmt
+share/apps/kmymoney2/templates/it/common.kmt
+share/apps/kmymoney2/templates/it/fixedassets.kmt
+share/apps/kmymoney2/templates/it/homeloan.kmt
+share/apps/kmymoney2/templates/it/homeown.kmt
+share/apps/kmymoney2/templates/it/otherloan.kmt
+share/apps/kmymoney2/templates/it/renter.kmt
+share/apps/kmymoney2/templates/it/retiremt.kmt
+share/apps/kmymoney2/templates/it/spouseinc.kmt
+share/apps/kmymoney2/templates/it/spouseretire.kmt
+share/apps/kmymoney2/templates/jp/brokerage.kmt
+share/apps/kmymoney2/templates/jp/business.kmt
+share/apps/kmymoney2/templates/jp/carloan.kmt
+share/apps/kmymoney2/templates/jp/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/jp/checkbook.kmt
+share/apps/kmymoney2/templates/jp/childcare.kmt
+share/apps/kmymoney2/templates/jp/common.kmt
+share/apps/kmymoney2/templates/jp/eduloan.kmt
+share/apps/kmymoney2/templates/jp/fixedassets.kmt
+share/apps/kmymoney2/templates/jp/homeloan.kmt
+share/apps/kmymoney2/templates/jp/homeown.kmt
+share/apps/kmymoney2/templates/jp/otherloan.kmt
+share/apps/kmymoney2/templates/jp/renter.kmt
+share/apps/kmymoney2/templates/jp/retiremt.kmt
+share/apps/kmymoney2/templates/jp/spouseinc.kmt
+share/apps/kmymoney2/templates/jp/spouseretire.kmt
+share/apps/kmymoney2/templates/nl_NL/default_accounts.kmt
+share/apps/kmymoney2/templates/pt_BR/brokerage.kmt
+share/apps/kmymoney2/templates/pt_BR/carloan.kmt
+share/apps/kmymoney2/templates/pt_BR/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/pt_BR/childcare.kmt
+share/apps/kmymoney2/templates/pt_BR/common.kmt
+share/apps/kmymoney2/templates/pt_BR/currency.kmt
+share/apps/kmymoney2/templates/pt_BR/default_accounts.kmt
+share/apps/kmymoney2/templates/pt_BR/eduloan.kmt
+share/apps/kmymoney2/templates/pt_BR/fixedassets.kmt
+share/apps/kmymoney2/templates/pt_BR/homeloan.kmt
+share/apps/kmymoney2/templates/pt_BR/homeown.kmt
+share/apps/kmymoney2/templates/pt_BR/otherloan.kmt
+share/apps/kmymoney2/templates/pt_BR/renter.kmt
+share/apps/kmymoney2/templates/pt_BR/retiremt.kmt
+share/apps/kmymoney2/templates/pt_BR/spouseinc.kmt
+share/apps/kmymoney2/templates/pt_BR/spouseretire.kmt
+share/apps/kmymoney2/templates/pt_PT/brokerage.kmt
+share/apps/kmymoney2/templates/pt_PT/carloan.kmt
+share/apps/kmymoney2/templates/pt_PT/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/pt_PT/childcare.kmt
+share/apps/kmymoney2/templates/pt_PT/common.kmt
+share/apps/kmymoney2/templates/pt_PT/eduloan.kmt
+share/apps/kmymoney2/templates/pt_PT/fixedassets.kmt
+share/apps/kmymoney2/templates/pt_PT/homeloan.kmt
+share/apps/kmymoney2/templates/pt_PT/homeown.kmt
+share/apps/kmymoney2/templates/pt_PT/otherloan.kmt
+share/apps/kmymoney2/templates/pt_PT/renter.kmt
+share/apps/kmymoney2/templates/pt_PT/retiremt.kmt
+share/apps/kmymoney2/templates/pt_PT/spouseinc.kmt
+share/apps/kmymoney2/templates/pt_PT/spouseretire.kmt
+share/apps/kmymoney2/templates/ro_RO/carloan.kmt
+share/apps/kmymoney2/templates/ro_RO/common.kmt
+share/apps/kmymoney2/templates/ro_RO/default_categories-template.kmt
+share/apps/kmymoney2/templates/ro_RO/homeloan.kmt
+share/apps/kmymoney2/templates/ru_RU/default_accounts.kmt
+share/apps/kmymoney2/templates/sk/brokerage.kmt
+share/apps/kmymoney2/templates/sk/carloan.kmt
+share/apps/kmymoney2/templates/sk/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/sk/childcare.kmt
+share/apps/kmymoney2/templates/sk/common.kmt
+share/apps/kmymoney2/templates/sk/currency.kmt
+share/apps/kmymoney2/templates/sk/eduloan.kmt
+share/apps/kmymoney2/templates/sk/fixedassets.kmt
+share/apps/kmymoney2/templates/sk/homeloan.kmt
+share/apps/kmymoney2/templates/sk/homeown.kmt
+share/apps/kmymoney2/templates/sk/otherloan.kmt
+share/apps/kmymoney2/templates/sk/renter.kmt
+share/apps/kmymoney2/templates/sk/retiremt.kmt
+share/apps/kmymoney2/templates/sk/spouseinc.kmt
+share/apps/kmymoney2/templates/sk/spouseretire.kmt
+share/apps/kmymoney2/templates/tr_TR/TEKDUZ.kmt
+share/apps/kmymoney2/templates/tr_TR/brokerage.kmt
+share/apps/kmymoney2/templates/tr_TR/carloan.kmt
+share/apps/kmymoney2/templates/tr_TR/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/tr_TR/checkbook.kmt
+share/apps/kmymoney2/templates/tr_TR/common.kmt
+share/apps/kmymoney2/templates/tr_TR/fixedassets.kmt
+share/apps/kmymoney2/templates/tr_TR/homeloan.kmt
+share/apps/kmymoney2/templates/zh_CN/brokerage.kmt
+share/apps/kmymoney2/templates/zh_CN/business.kmt
+share/apps/kmymoney2/templates/zh_CN/carloan.kmt
+share/apps/kmymoney2/templates/zh_CN/cdmoneymkt.kmt
+share/apps/kmymoney2/templates/zh_CN/checkbook.kmt
+share/apps/kmymoney2/templates/zh_CN/childcare.kmt
+share/apps/kmymoney2/templates/zh_CN/common.kmt
+share/apps/kmymoney2/templates/zh_CN/default_accounts.kmt
+share/apps/kmymoney2/templates/zh_CN/eduloan.kmt
+share/apps/kmymoney2/templates/zh_CN/fixedassets.kmt
+share/apps/kmymoney2/templates/zh_CN/full.kmt
+share/apps/kmymoney2/templates/zh_CN/homeloan.kmt
+share/apps/kmymoney2/templates/zh_CN/homeown.kmt
+share/apps/kmymoney2/templates/zh_CN/otherloan.kmt
+share/apps/kmymoney2/templates/zh_CN/renter.kmt
+share/apps/kmymoney2/templates/zh_CN/retiremt.kmt
+share/apps/kmymoney2/templates/zh_CN/spouseinc.kmt
+share/apps/kmymoney2/templates/zh_CN/spouseretire.kmt
+share/apps/kmymoney2/templates/zh_HK/business.kmt
+share/apps/kmymoney2/templates/zh_TW/business.kmt
+share/apps/kmymoney2/tips
+share/config.kcfg/kmymoney2.kcfg
+share/doc/tde/HTML/en/kmymoney2/account_edit.png
+share/doc/tde/HTML/en/kmymoney2/account_options.png
+share/doc/tde/HTML/en/kmymoney2/accountdropdown.png
+share/doc/tde/HTML/en/kmymoney2/accounts_view.png
+share/doc/tde/HTML/en/kmymoney2/accwiz1.png
+share/doc/tde/HTML/en/kmymoney2/accwiz10.png
+share/doc/tde/HTML/en/kmymoney2/accwiz2.png
+share/doc/tde/HTML/en/kmymoney2/accwiz3.png
+share/doc/tde/HTML/en/kmymoney2/accwiz4.png
+share/doc/tde/HTML/en/kmymoney2/accwiz5.png
+share/doc/tde/HTML/en/kmymoney2/accwiz6.png
+share/doc/tde/HTML/en/kmymoney2/accwiz7.png
+share/doc/tde/HTML/en/kmymoney2/accwiz8.1.png
+share/doc/tde/HTML/en/kmymoney2/accwiz8.2.png
+share/doc/tde/HTML/en/kmymoney2/accwiz8.3.png
+share/doc/tde/HTML/en/kmymoney2/accwiz8.4.png
+share/doc/tde/HTML/en/kmymoney2/accwiz8.5.png
+share/doc/tde/HTML/en/kmymoney2/accwiz9.png
+share/doc/tde/HTML/en/kmymoney2/budgets_view.png
+share/doc/tde/HTML/en/kmymoney2/calendarview.png
+share/doc/tde/HTML/en/kmymoney2/categories.png
+share/doc/tde/HTML/en/kmymoney2/categories_view.png
+share/doc/tde/HTML/en/kmymoney2/category_widget.png
+share/doc/tde/HTML/en/kmymoney2/categoryedit.png
+share/doc/tde/HTML/en/kmymoney2/cleared_state.png
+share/doc/tde/HTML/en/kmymoney2/common
+share/doc/tde/HTML/en/kmymoney2/confirmenter.png
+share/doc/tde/HTML/en/kmymoney2/credits.docbook
+share/doc/tde/HTML/en/kmymoney2/currency_newpriceentry.png
+share/doc/tde/HTML/en/kmymoney2/currency_priceeditor.png
+share/doc/tde/HTML/en/kmymoney2/date_widget.png
+share/doc/tde/HTML/en/kmymoney2/default_prompt.png
+share/doc/tde/HTML/en/kmymoney2/details-accounts.docbook
+share/doc/tde/HTML/en/kmymoney2/details-budgets.docbook
+share/doc/tde/HTML/en/kmymoney2/details-categories.docbook
+share/doc/tde/HTML/en/kmymoney2/details-currencies.docbook
+share/doc/tde/HTML/en/kmymoney2/details-database.docbook
+share/doc/tde/HTML/en/kmymoney2/details-files.docbook
+share/doc/tde/HTML/en/kmymoney2/details-forecast.docbook
+share/doc/tde/HTML/en/kmymoney2/details-formats.docbook
+share/doc/tde/HTML/en/kmymoney2/details-hbciofx.docbook
+share/doc/tde/HTML/en/kmymoney2/details-impexp.docbook
+share/doc/tde/HTML/en/kmymoney2/details-institutions.docbook
+share/doc/tde/HTML/en/kmymoney2/details-integrity.docbook
+share/doc/tde/HTML/en/kmymoney2/details-investments.docbook
+share/doc/tde/HTML/en/kmymoney2/details-ledgers.docbook
+share/doc/tde/HTML/en/kmymoney2/details-loans.docbook
+share/doc/tde/HTML/en/kmymoney2/details-payees.docbook
+share/doc/tde/HTML/en/kmymoney2/details-reconciliation.docbook
+share/doc/tde/HTML/en/kmymoney2/details-reports.docbook
+share/doc/tde/HTML/en/kmymoney2/details-schedules.docbook
+share/doc/tde/HTML/en/kmymoney2/details-search.docbook
+share/doc/tde/HTML/en/kmymoney2/details-settings.docbook
+share/doc/tde/HTML/en/kmymoney2/details-transactions.docbook
+share/doc/tde/HTML/en/kmymoney2/details-widgets.docbook
+share/doc/tde/HTML/en/kmymoney2/enterschedule.png
+share/doc/tde/HTML/en/kmymoney2/find-account.png
+share/doc/tde/HTML/en/kmymoney2/find-amount.png
+share/doc/tde/HTML/en/kmymoney2/find-category.png
+share/doc/tde/HTML/en/kmymoney2/find-date.png
+share/doc/tde/HTML/en/kmymoney2/find-details.png
+share/doc/tde/HTML/en/kmymoney2/find-payee.png
+share/doc/tde/HTML/en/kmymoney2/find-text.png
+share/doc/tde/HTML/en/kmymoney2/finddlg.png
+share/doc/tde/HTML/en/kmymoney2/firsttime.docbook
+share/doc/tde/HTML/en/kmymoney2/forecast_view.png
+share/doc/tde/HTML/en/kmymoney2/gnucash-import_options.png
+share/doc/tde/HTML/en/kmymoney2/gnucash-report.png
+share/doc/tde/HTML/en/kmymoney2/gnucash-select_price_source.png
+share/doc/tde/HTML/en/kmymoney2/home_view.png
+share/doc/tde/HTML/en/kmymoney2/index.cache.bz2
+share/doc/tde/HTML/en/kmymoney2/index.docbook
+share/doc/tde/HTML/en/kmymoney2/institution_options.png
+share/doc/tde/HTML/en/kmymoney2/institution_view.png
+share/doc/tde/HTML/en/kmymoney2/institutions_view.png
+share/doc/tde/HTML/en/kmymoney2/introduction.docbook
+share/doc/tde/HTML/en/kmymoney2/investment-currencywarning.png
+share/doc/tde/HTML/en/kmymoney2/investment-exchangerateeditor.png
+share/doc/tde/HTML/en/kmymoney2/investment-onlineupdate.png
+share/doc/tde/HTML/en/kmymoney2/investment-transactionform.png
+share/doc/tde/HTML/en/kmymoney2/investments_summarytab.png
+share/doc/tde/HTML/en/kmymoney2/investments_view.png
+share/doc/tde/HTML/en/kmymoney2/kmt.png
+share/doc/tde/HTML/en/kmymoney2/ledger_more.png
+share/doc/tde/HTML/en/kmymoney2/ledgers.png
+share/doc/tde/HTML/en/kmymoney2/ledgers_view.png
+share/doc/tde/HTML/en/kmymoney2/ledgerview-numbered.png
+share/doc/tde/HTML/en/kmymoney2/mainwindow_numbered.png
+share/doc/tde/HTML/en/kmymoney2/makemostof.docbook
+share/doc/tde/HTML/en/kmymoney2/new.png
+share/doc/tde/HTML/en/kmymoney2/newacct.png
+share/doc/tde/HTML/en/kmymoney2/newfile-2.png
+share/doc/tde/HTML/en/kmymoney2/newfile-3.png
+share/doc/tde/HTML/en/kmymoney2/newfile-4.png
+share/doc/tde/HTML/en/kmymoney2/newfile-5.png
+share/doc/tde/HTML/en/kmymoney2/newfile-6.png
+share/doc/tde/HTML/en/kmymoney2/newfile.png
+share/doc/tde/HTML/en/kmymoney2/newinst.png
+share/doc/tde/HTML/en/kmymoney2/newsched_numbered.png
+share/doc/tde/HTML/en/kmymoney2/otherdoc.docbook
+share/doc/tde/HTML/en/kmymoney2/outbox_view.png
+share/doc/tde/HTML/en/kmymoney2/payee_history.png
+share/doc/tde/HTML/en/kmymoney2/payee_info.png
+share/doc/tde/HTML/en/kmymoney2/payee_match.png
+share/doc/tde/HTML/en/kmymoney2/payee_widget.png
+share/doc/tde/HTML/en/kmymoney2/payees_view.png
+share/doc/tde/HTML/en/kmymoney2/payeeview.png
+share/doc/tde/HTML/en/kmymoney2/qif_report.png
+share/doc/tde/HTML/en/kmymoney2/qifimport-export.png
+share/doc/tde/HTML/en/kmymoney2/qifimport-qifprofiledate.png
+share/doc/tde/HTML/en/kmymoney2/qifimport-qifprofileeditor.png
+share/doc/tde/HTML/en/kmymoney2/qifimportverify.png
+share/doc/tde/HTML/en/kmymoney2/qifopen.png
+share/doc/tde/HTML/en/kmymoney2/reconcile.png
+share/doc/tde/HTML/en/kmymoney2/reconcile1.png
+share/doc/tde/HTML/en/kmymoney2/reconcile2.png
+share/doc/tde/HTML/en/kmymoney2/reconcile3.png
+share/doc/tde/HTML/en/kmymoney2/reconcile4.png
+share/doc/tde/HTML/en/kmymoney2/reference.docbook
+share/doc/tde/HTML/en/kmymoney2/report_configuration-reporttab.png
+share/doc/tde/HTML/en/kmymoney2/report_configuration-rowscolumns.png
+share/doc/tde/HTML/en/kmymoney2/reports_view-all.png
+share/doc/tde/HTML/en/kmymoney2/reports_view.png
+share/doc/tde/HTML/en/kmymoney2/schedcaltypes.png
+share/doc/tde/HTML/en/kmymoney2/schedmonthday.png
+share/doc/tde/HTML/en/kmymoney2/schedpopup.png
+share/doc/tde/HTML/en/kmymoney2/schedule_view.png
+share/doc/tde/HTML/en/kmymoney2/scheduleview.png
+share/doc/tde/HTML/en/kmymoney2/select_currency.png
+share/doc/tde/HTML/en/kmymoney2/select_database.png
+share/doc/tde/HTML/en/kmymoney2/split_transaction.png
+share/doc/tde/HTML/en/kmymoney2/tipofday.png
+share/doc/tde/HTML/en/kmymoney2/transaction_find.png
+share/doc/tde/HTML/en/kmymoney2/transactionform-off.png
+share/doc/tde/HTML/en/kmymoney2/transactionform.png
+share/doc/tde/HTML/en/kmymoney2/translist.png
+share/doc/tde/HTML/en/kmymoney2/value_widget.png
+share/doc/tde/HTML/en/kmymoney2/views-accounts.docbook
+share/doc/tde/HTML/en/kmymoney2/views-categories.docbook
+share/doc/tde/HTML/en/kmymoney2/views-home.docbook
+share/doc/tde/HTML/en/kmymoney2/views-institutions.docbook
+share/doc/tde/HTML/en/kmymoney2/views-investments.docbook
+share/doc/tde/HTML/en/kmymoney2/views-ledgers.docbook
+share/doc/tde/HTML/en/kmymoney2/views-outbox.docbook
+share/doc/tde/HTML/en/kmymoney2/views-payees.docbook
+share/doc/tde/HTML/en/kmymoney2/views-reports.docbook
+share/doc/tde/HTML/en/kmymoney2/views-schedules.docbook
+share/doc/tde/HTML/en/kmymoney2/whatsnew.docbook
+share/icons/hicolor/128x128/apps/kmymoney2.png
+share/icons/hicolor/128x128/mimetypes/kmy.png
+share/icons/hicolor/16x16/apps/kmymoney2.png
+share/icons/hicolor/16x16/mimetypes/kmy.png
+share/icons/hicolor/32x32/apps/kmymoney2.png
+share/icons/hicolor/32x32/mimetypes/kmy.png
+share/icons/hicolor/48x48/apps/kmymoney2.png
+share/icons/hicolor/48x48/mimetypes/kmy.png
+share/icons/hicolor/64x64/apps/kmymoney2.png
+share/icons/hicolor/64x64/mimetypes/kmy.png
+share/icons/locolor/16x16/apps/kmymoney2.png
+share/icons/locolor/32x32/apps/kmymoney2.png
+share/locale/ca/LC_MESSAGES/kmymoney2.mo
+share/locale/cs/LC_MESSAGES/kmymoney2.mo
+share/locale/da/LC_MESSAGES/kmymoney2.mo
+share/locale/de/LC_MESSAGES/kmymoney2.mo
+share/locale/en_GB/LC_MESSAGES/kmymoney2.mo
+share/locale/es/LC_MESSAGES/kmymoney2.mo
+share/locale/es_AR/LC_MESSAGES/kmymoney2.mo
+share/locale/fi/LC_MESSAGES/kmymoney2.mo
+share/locale/fr/LC_MESSAGES/kmymoney2.mo
+share/locale/gl/LC_MESSAGES/kmymoney2.mo
+share/locale/it/LC_MESSAGES/kmymoney2.mo
+share/locale/lt/LC_MESSAGES/kmymoney2.mo
+share/locale/nl/LC_MESSAGES/kmymoney2.mo
+share/locale/pl/LC_MESSAGES/kmymoney2.mo
+share/locale/pt/LC_MESSAGES/kmymoney2.mo
+share/locale/pt_BR/LC_MESSAGES/kmymoney2.mo
+share/locale/ro/LC_MESSAGES/kmymoney2.mo
+share/locale/ru/LC_MESSAGES/kmymoney2.mo
+share/locale/sk/LC_MESSAGES/kmymoney2.mo
+share/locale/sv/LC_MESSAGES/kmymoney2.mo
+share/locale/tr/LC_MESSAGES/kmymoney2.mo
+share/locale/zh_CN/LC_MESSAGES/kmymoney2.mo
+share/man/man1/kmymoney2.1.gz
+share/mimelnk/application/x-kmymoney2.desktop
+share/services/kmm_ofximport.desktop
+share/servicetypes/kmymoneyimporterplugin.desktop
+share/servicetypes/kmymoneyplugin.desktop
diff --git a/freebsd/applications/office/knowit/Makefile b/freebsd/applications/office/knowit/Makefile
new file mode 100644
index 000000000..36cd6f972
--- /dev/null
+++ b/freebsd/applications/office/knowit/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		knowit-trinity
+COMMENT=		Tool for managing notes [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/office
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/office/knowit/distinfo b/freebsd/applications/office/knowit/distinfo
new file mode 100644
index 000000000..5f92f1c8a
--- /dev/null
+++ b/freebsd/applications/office/knowit/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666650460
+SHA256 (TDE/applications/office/knowit-trinity_14.0.13.orig.tar.xz) = 49f89e791b4b557895ed1b38545e5084a458ec65848c7ea609691451a2131e53
+SIZE (TDE/applications/office/knowit-trinity_14.0.13.orig.tar.xz) = 97268
diff --git a/freebsd/applications/knowit/pkg-descr b/freebsd/applications/office/knowit/pkg-descr
index ea3d4f35c..ea3d4f35c 100644
--- a/freebsd/applications/knowit/pkg-descr
+++ b/freebsd/applications/office/knowit/pkg-descr
diff --git a/freebsd/applications/knowit/pkg-plist b/freebsd/applications/office/knowit/pkg-plist
index b0db5f54b..b0db5f54b 100644
--- a/freebsd/applications/knowit/pkg-plist
+++ b/freebsd/applications/office/knowit/pkg-plist
diff --git a/freebsd/applications/office/tellico/Makefile b/freebsd/applications/office/tellico/Makefile
new file mode 100644
index 000000000..8f597c35f
--- /dev/null
+++ b/freebsd/applications/office/tellico/Makefile
@@ -0,0 +1,49 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tellico-trinity
+COMMENT=		Collection manager for books, videos, music [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/office
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libkcal.so:${PORTSDIR}/x11/trinity/core/tdepim \
+		${TDE_PREFIX}/lib/libkcddb.so:${PORTSDIR}/x11/trinity/core/tdemultimedia \
+		${TDE_PREFIX}/lib/libpoppler-tqt.so:${PORTSDIR}/x11/trinity/core/tdegraphics \
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+BUILD_DEPENDS+=	\
+		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
+
+LIB_DEPENDS+=\
+		libbtparse.so:${PORTSDIR}/textproc/btparse \
+		libexempi.so:${PORTSDIR}/textproc/exempi \
+		libtag.so:${PORTSDIR}/audio/taglib \
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
+		libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libyaz.so:${PORTSDIR}/net/yaz \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+post-build: tde-cmake-check
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/office/tellico/distinfo b/freebsd/applications/office/tellico/distinfo
new file mode 100644
index 000000000..96dff5ff2
--- /dev/null
+++ b/freebsd/applications/office/tellico/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666650535
+SHA256 (TDE/applications/office/tellico-trinity_14.0.13.orig.tar.xz) = 4a12179d009628af1586fdc923796a50ba9e3ba29d85cd2ea0d87bd7b1883fb3
+SIZE (TDE/applications/office/tellico-trinity_14.0.13.orig.tar.xz) = 2855932
diff --git a/freebsd/applications/office/tellico/pkg-descr b/freebsd/applications/office/tellico/pkg-descr
new file mode 100644
index 000000000..0b62571bd
--- /dev/null
+++ b/freebsd/applications/office/tellico/pkg-descr
@@ -0,0 +1,14 @@
+Collection manager for books, videos, music [Trinity]
+
+Tellico is a collection manager for TDE. It includes default collections for
+books, bibliographies, comic books, videos, music, coins, stamps, trading
+cards, and wines, and also allows custom collections; with unlimited
+user-defined fields allowed. Automatically formatted names, sorting by any
+property, filters, automatic ISBN validation and full customization for
+printing or display through XSLT files are some of the features present. It
+can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
+BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
+or any US-MARC compliant z39.50 server.
+
+The files are stored in XML format, avoiding the need for database server.
+It also makes it easy for other softwares to use the Tellico data.
diff --git a/freebsd/applications/office/tellico/pkg-plist b/freebsd/applications/office/tellico/pkg-plist
new file mode 100644
index 000000000..ab42ff4d0
--- /dev/null
+++ b/freebsd/applications/office/tellico/pkg-plist
@@ -0,0 +1,225 @@
+bin/tellico
+share/applications/tde/tellico.desktop
+share/apps/tdeconf_update/tellico-1-3-update.pl
+share/apps/tdeconf_update/tellico-rename.upd
+share/apps/tdeconf_update/tellico.upd
+share/apps/tellico/MARC21slim2MODS3.xsl
+share/apps/tellico/MARC21slimUtils.xsl
+share/apps/tellico/UNIMARC2MODS3.xsl
+share/apps/tellico/amazon2tellico.xsl
+share/apps/tellico/arxiv2tellico.xsl
+share/apps/tellico/bibtex-translation.xml
+share/apps/tellico/bluray-logo.png
+share/apps/tellico/cassette-logo.png
+share/apps/tellico/cd-logo.png
+share/apps/tellico/crossref2tellico.xsl
+share/apps/tellico/data-sources/boardgamegeek.rb
+share/apps/tellico/data-sources/boardgamegeek.rb.spec
+share/apps/tellico/data-sources/dark_horse_comics.py
+share/apps/tellico/data-sources/dark_horse_comics.py.spec
+share/apps/tellico/data-sources/fr.allocine.py
+share/apps/tellico/data-sources/fr.allocine.py.spec
+share/apps/tellico/data-sources/ministerio_de_cultura.py
+share/apps/tellico/data-sources/ministerio_de_cultura.py.spec
+share/apps/tellico/delicious2tellico.xsl
+share/apps/tellico/discogs2tellico.xsl
+share/apps/tellico/dvd-logo.png
+share/apps/tellico/entry-templates/Album.xsl
+share/apps/tellico/entry-templates/Compact.xsl
+share/apps/tellico/entry-templates/Default.xsl
+share/apps/tellico/entry-templates/Fancy.xsl
+share/apps/tellico/entry-templates/Video.xsl
+share/apps/tellico/gcstar2tellico.xsl
+share/apps/tellico/griffith2tellico.py
+share/apps/tellico/hddvd-logo.png
+share/apps/tellico/isbndb2tellico.xsl
+share/apps/tellico/mods2tellico.xsl
+share/apps/tellico/pics/README.icons
+share/apps/tellico/pics/README.quesnay
+share/apps/tellico/pics/album.png
+share/apps/tellico/pics/bibtex.png
+share/apps/tellico/pics/boardgame.png
+share/apps/tellico/pics/book.png
+share/apps/tellico/pics/card.png
+share/apps/tellico/pics/checkmark.png
+share/apps/tellico/pics/coin.png
+share/apps/tellico/pics/comic.png
+share/apps/tellico/pics/file.png
+share/apps/tellico/pics/game.png
+share/apps/tellico/pics/nocover_album.png
+share/apps/tellico/pics/nocover_bibtex.png
+share/apps/tellico/pics/nocover_boardgame.png
+share/apps/tellico/pics/nocover_book.png
+share/apps/tellico/pics/nocover_comic.png
+share/apps/tellico/pics/nocover_game.png
+share/apps/tellico/pics/nocover_video.png
+share/apps/tellico/pics/person-open.png
+share/apps/tellico/pics/person.png
+share/apps/tellico/pics/script.png
+share/apps/tellico/pics/script.svg
+share/apps/tellico/pics/stamp.png
+share/apps/tellico/pics/star_off.png
+share/apps/tellico/pics/star_on.png
+share/apps/tellico/pics/stars1.png
+share/apps/tellico/pics/stars10.png
+share/apps/tellico/pics/stars2.png
+share/apps/tellico/pics/stars3.png
+share/apps/tellico/pics/stars4.png
+share/apps/tellico/pics/stars5.png
+share/apps/tellico/pics/stars6.png
+share/apps/tellico/pics/stars7.png
+share/apps/tellico/pics/stars8.png
+share/apps/tellico/pics/stars9.png
+share/apps/tellico/pics/tellico.png
+share/apps/tellico/pics/tellico.svg
+share/apps/tellico/pics/tellico_mime.svg
+share/apps/tellico/pics/video.png
+share/apps/tellico/pics/wine.png
+share/apps/tellico/pubmed2tellico.xsl
+share/apps/tellico/record-logo.png
+share/apps/tellico/referencer2tellico.xsl
+share/apps/tellico/report-templates/Column_View.xsl
+share/apps/tellico/report-templates/Group_Summary.xsl
+share/apps/tellico/report-templates/Group_View.xsl
+share/apps/tellico/report-templates/Image_List.xsl
+share/apps/tellico/report-templates/Loan_View.xsl
+share/apps/tellico/report-templates/Title_Listing_(Horizontal).xsl
+share/apps/tellico/report-templates/Title_Listing_(Vertical).xsl
+share/apps/tellico/report-templates/Tri-Column.xsl
+share/apps/tellico/shadowAlpha.png
+share/apps/tellico/tellico-by-author.xsl
+share/apps/tellico/tellico-by-title.xsl
+share/apps/tellico/tellico-common.xsl
+share/apps/tellico/tellico-printing.xsl
+share/apps/tellico/tellico.dtd
+share/apps/tellico/tellico.tips
+share/apps/tellico/tellico2gcstar.xsl
+share/apps/tellico/tellico2html.js
+share/apps/tellico/tellico2html.xsl
+share/apps/tellico/tellico2onix.xsl
+share/apps/tellico/tellicoui.rc
+share/apps/tellico/unixref2tellico.xsl
+share/apps/tellico/vhs-logo.png
+share/apps/tellico/welcome.html
+share/apps/tellico/xmp2tellico.xsl
+share/apps/tellico/yahoo2tellico.xsl
+share/apps/tellico/z3950-servers.cfg
+share/config.kcfg/tellico_config.kcfg
+share/config/tellicorc
+share/doc/tde/HTML/en/tellico/advanced.docbook
+share/doc/tde/HTML/en/tellico/amazon-options.png
+share/doc/tde/HTML/en/tellico/common
+share/doc/tde/HTML/en/tellico/configuration.docbook
+share/doc/tde/HTML/en/tellico/csv-dialog.png
+share/doc/tde/HTML/en/tellico/details.docbook
+share/doc/tde/HTML/en/tellico/entry-editor1.png
+share/doc/tde/HTML/en/tellico/entry-editor3.png
+share/doc/tde/HTML/en/tellico/entry-editor4.png
+share/doc/tde/HTML/en/tellico/entry-editor5.png
+share/doc/tde/HTML/en/tellico/export-bibtex.png
+share/doc/tde/HTML/en/tellico/export-csv.png
+share/doc/tde/HTML/en/tellico/export-html.png
+share/doc/tde/HTML/en/tellico/export-options.png
+share/doc/tde/HTML/en/tellico/export-pdb.png
+share/doc/tde/HTML/en/tellico/externalexec-options.png
+share/doc/tde/HTML/en/tellico/faqs.docbook
+share/doc/tde/HTML/en/tellico/fetch-dialog.png
+share/doc/tde/HTML/en/tellico/fields-dialog.png
+share/doc/tde/HTML/en/tellico/filter-dialog.png
+share/doc/tde/HTML/en/tellico/filter-view.png
+share/doc/tde/HTML/en/tellico/fundamentals.docbook
+share/doc/tde/HTML/en/tellico/general-options.png
+share/doc/tde/HTML/en/tellico/hacking.docbook
+share/doc/tde/HTML/en/tellico/imdb-options.png
+share/doc/tde/HTML/en/tellico/importing-exporting.docbook
+share/doc/tde/HTML/en/tellico/index.cache.bz2
+share/doc/tde/HTML/en/tellico/index.docbook
+share/doc/tde/HTML/en/tellico/loan-dialog.png
+share/doc/tde/HTML/en/tellico/loan-view.png
+share/doc/tde/HTML/en/tellico/main-window.png
+share/doc/tde/HTML/en/tellico/menus.docbook
+share/doc/tde/HTML/en/tellico/openoffice-dialog.png
+share/doc/tde/HTML/en/tellico/print-options.png
+share/doc/tde/HTML/en/tellico/report-dialog.png
+share/doc/tde/HTML/en/tellico/source-options.png
+share/doc/tde/HTML/en/tellico/sru-options.png
+share/doc/tde/HTML/en/tellico/template-options.png
+share/doc/tde/HTML/en/tellico/z3950-options.png
+share/doc/tde/HTML/fr/tellico/advanced.docbook
+share/doc/tde/HTML/fr/tellico/amazon-options.png
+share/doc/tde/HTML/fr/tellico/common
+share/doc/tde/HTML/fr/tellico/configuration.docbook
+share/doc/tde/HTML/fr/tellico/csv-dialog.png
+share/doc/tde/HTML/fr/tellico/details.docbook
+share/doc/tde/HTML/fr/tellico/entry-editor1.png
+share/doc/tde/HTML/fr/tellico/entry-editor3.png
+share/doc/tde/HTML/fr/tellico/entry-editor4.png
+share/doc/tde/HTML/fr/tellico/entry-editor5.png
+share/doc/tde/HTML/fr/tellico/export-bibtex.png
+share/doc/tde/HTML/fr/tellico/export-csv.png
+share/doc/tde/HTML/fr/tellico/export-html.png
+share/doc/tde/HTML/fr/tellico/export-options.png
+share/doc/tde/HTML/fr/tellico/export-pdb.png
+share/doc/tde/HTML/fr/tellico/externalexec-options.png
+share/doc/tde/HTML/fr/tellico/faqs.docbook
+share/doc/tde/HTML/fr/tellico/fetch-dialog.png
+share/doc/tde/HTML/fr/tellico/fields-dialog.png
+share/doc/tde/HTML/fr/tellico/filter-dialog.png
+share/doc/tde/HTML/fr/tellico/filter-view.png
+share/doc/tde/HTML/fr/tellico/fundamentals.docbook
+share/doc/tde/HTML/fr/tellico/general-options.png
+share/doc/tde/HTML/fr/tellico/hacking.docbook
+share/doc/tde/HTML/fr/tellico/imdb-options.png
+share/doc/tde/HTML/fr/tellico/importing-exporting.docbook
+share/doc/tde/HTML/fr/tellico/index.cache.bz2
+share/doc/tde/HTML/fr/tellico/index.docbook
+share/doc/tde/HTML/fr/tellico/loan-dialog.png
+share/doc/tde/HTML/fr/tellico/loan-view.png
+share/doc/tde/HTML/fr/tellico/main-window.png
+share/doc/tde/HTML/fr/tellico/menus.docbook
+share/doc/tde/HTML/fr/tellico/openoffice-dialog.png
+share/doc/tde/HTML/fr/tellico/print-options.png
+share/doc/tde/HTML/fr/tellico/report-dialog.png
+share/doc/tde/HTML/fr/tellico/source-options.png
+share/doc/tde/HTML/fr/tellico/sru-options.png
+share/doc/tde/HTML/fr/tellico/template-options.png
+share/doc/tde/HTML/fr/tellico/z3950-options.png
+share/icons/hicolor/128x128/apps/tellico.png
+share/icons/hicolor/128x128/mimetypes/application-x-tellico.png
+share/icons/hicolor/16x16/apps/tellico.png
+share/icons/hicolor/16x16/mimetypes/application-x-tellico.png
+share/icons/hicolor/22x22/apps/tellico.png
+share/icons/hicolor/22x22/mimetypes/application-x-tellico.png
+share/icons/hicolor/32x32/apps/tellico.png
+share/icons/hicolor/32x32/mimetypes/application-x-tellico.png
+share/icons/hicolor/48x48/apps/tellico.png
+share/icons/hicolor/48x48/mimetypes/application-x-tellico.png
+share/icons/hicolor/64x64/apps/tellico.png
+share/icons/hicolor/64x64/mimetypes/application-x-tellico.png
+share/icons/hicolor/scalable/apps/tellico.svg
+share/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
+share/locale/bg/LC_MESSAGES/tellico.mo
+share/locale/ca/LC_MESSAGES/tellico.mo
+share/locale/cs/LC_MESSAGES/tellico.mo
+share/locale/de/LC_MESSAGES/tellico.mo
+share/locale/ee/LC_MESSAGES/tellico.mo
+share/locale/en_GB/LC_MESSAGES/tellico.mo
+share/locale/es/LC_MESSAGES/tellico.mo
+share/locale/fi/LC_MESSAGES/tellico.mo
+share/locale/fr/LC_MESSAGES/tellico.mo
+share/locale/hu/LC_MESSAGES/tellico.mo
+share/locale/it/LC_MESSAGES/tellico.mo
+share/locale/nb/LC_MESSAGES/tellico.mo
+share/locale/nl/LC_MESSAGES/tellico.mo
+share/locale/nn/LC_MESSAGES/tellico.mo
+share/locale/pl/LC_MESSAGES/tellico.mo
+share/locale/pt/LC_MESSAGES/tellico.mo
+share/locale/pt_BR/LC_MESSAGES/tellico.mo
+share/locale/ro/LC_MESSAGES/tellico.mo
+share/locale/ru/LC_MESSAGES/tellico.mo
+share/locale/sv/LC_MESSAGES/tellico.mo
+share/locale/tr/LC_MESSAGES/tellico.mo
+share/locale/uk/LC_MESSAGES/tellico.mo
+share/man/man1/tellico.1.gz
+share/mime/packages/tellico.xml
+share/mimelnk/application/x-tellico.desktop
diff --git a/freebsd/applications/settings/Makefile b/freebsd/applications/settings/Makefile
new file mode 100644
index 000000000..29887ff81
--- /dev/null
+++ b/freebsd/applications/settings/Makefile
@@ -0,0 +1,8 @@
+
+    SUBDIR =
+    SUBDIR += kiosktool
+    SUBDIR += kkbswitch
+    SUBDIR += tde-systemsettings
+    SUBDIR += tdesudo
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/settings/kiosktool/Makefile b/freebsd/applications/settings/kiosktool/Makefile
new file mode 100644
index 000000000..c9a285df4
--- /dev/null
+++ b/freebsd/applications/settings/kiosktool/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kiosktool-trinity
+COMMENT=		Tool to configure the TDE kiosk framework
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/settings
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/settings/kiosktool/distinfo b/freebsd/applications/settings/kiosktool/distinfo
new file mode 100644
index 000000000..51499d037
--- /dev/null
+++ b/freebsd/applications/settings/kiosktool/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666650696
+SHA256 (TDE/applications/settings/kiosktool-trinity_14.0.13.orig.tar.xz) = d9c7a448ea87eeeeb77f16d9ab65f7cb3f74044323287b9cfafb606d8f65c673
+SIZE (TDE/applications/settings/kiosktool-trinity_14.0.13.orig.tar.xz) = 269964
diff --git a/freebsd/applications/kiosktool/pkg-descr b/freebsd/applications/settings/kiosktool/pkg-descr
index 446b22762..446b22762 100644
--- a/freebsd/applications/kiosktool/pkg-descr
+++ b/freebsd/applications/settings/kiosktool/pkg-descr
diff --git a/freebsd/applications/kiosktool/pkg-plist b/freebsd/applications/settings/kiosktool/pkg-plist
index 5d207978e..5d207978e 100644
--- a/freebsd/applications/kiosktool/pkg-plist
+++ b/freebsd/applications/settings/kiosktool/pkg-plist
diff --git a/freebsd/applications/settings/kkbswitch/Makefile b/freebsd/applications/settings/kkbswitch/Makefile
new file mode 100644
index 000000000..dae73d2b8
--- /dev/null
+++ b/freebsd/applications/settings/kkbswitch/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kkbswitch-trinity
+COMMENT=		KKBSwitch – keyboard layout indicator
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		sysutils x11
+DIST_SUBDIR=		TDE/applications/settings
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libkonq.so:${PORTSDIR}/x11/trinity/core/tdebase \
+		${TDE_PREFIX}/lib/libartsc.so:${PORTSDIR}/x11/trinity/dependencies/arts \
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL=ON
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/settings/kkbswitch/distinfo b/freebsd/applications/settings/kkbswitch/distinfo
new file mode 100644
index 000000000..7e2f6d8e1
--- /dev/null
+++ b/freebsd/applications/settings/kkbswitch/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666650774
+SHA256 (TDE/applications/settings/kkbswitch-trinity_14.0.13.orig.tar.xz) = 0541d13bcb3ea5f78fd6068af2c92f64d14c9b9d1afb263cbd45046bf96d259e
+SIZE (TDE/applications/settings/kkbswitch-trinity_14.0.13.orig.tar.xz) = 79328
diff --git a/freebsd/applications/kkbswitch/pkg-descr b/freebsd/applications/settings/kkbswitch/pkg-descr
index e60b3d055..e60b3d055 100644
--- a/freebsd/applications/kkbswitch/pkg-descr
+++ b/freebsd/applications/settings/kkbswitch/pkg-descr
diff --git a/freebsd/applications/kkbswitch/pkg-plist b/freebsd/applications/settings/kkbswitch/pkg-plist
index 050e7e93b..050e7e93b 100644
--- a/freebsd/applications/kkbswitch/pkg-plist
+++ b/freebsd/applications/settings/kkbswitch/pkg-plist
diff --git a/freebsd/applications/settings/tde-systemsettings/Makefile b/freebsd/applications/settings/tde-systemsettings/Makefile
new file mode 100644
index 000000000..6a04135c5
--- /dev/null
+++ b/freebsd/applications/settings/tde-systemsettings/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tde-systemsettings-trinity
+COMMENT=		Easy to use control centre for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/settings
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/settings/tde-systemsettings/distinfo b/freebsd/applications/settings/tde-systemsettings/distinfo
new file mode 100644
index 000000000..bf0d84b2e
--- /dev/null
+++ b/freebsd/applications/settings/tde-systemsettings/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666650832
+SHA256 (TDE/applications/settings/tde-systemsettings-trinity_14.0.13.orig.tar.xz) = 7c801069d1661483a11f78cb53b730a1d565c369719f6562779cccdb619a085c
+SIZE (TDE/applications/settings/tde-systemsettings-trinity_14.0.13.orig.tar.xz) = 74060
diff --git a/freebsd/applications/tde-systemsettings/pkg-descr b/freebsd/applications/settings/tde-systemsettings/pkg-descr
index 6a7c3a1c8..6a7c3a1c8 100644
--- a/freebsd/applications/tde-systemsettings/pkg-descr
+++ b/freebsd/applications/settings/tde-systemsettings/pkg-descr
diff --git a/freebsd/applications/tde-systemsettings/pkg-plist b/freebsd/applications/settings/tde-systemsettings/pkg-plist
index 9fde7e37d..9fde7e37d 100644
--- a/freebsd/applications/tde-systemsettings/pkg-plist
+++ b/freebsd/applications/settings/tde-systemsettings/pkg-plist
diff --git a/freebsd/applications/settings/tdesudo/Makefile b/freebsd/applications/settings/tdesudo/Makefile
new file mode 100644
index 000000000..f59b1281b
--- /dev/null
+++ b/freebsd/applications/settings/tdesudo/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdesudo-trinity
+COMMENT=		sudo frontend for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/settings
+
+RUN_DEPENDS+=	sudo:${PORTSDIR}/security/sudo
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/settings/tdesudo/distinfo b/freebsd/applications/settings/tdesudo/distinfo
new file mode 100644
index 000000000..170b0062a
--- /dev/null
+++ b/freebsd/applications/settings/tdesudo/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666650881
+SHA256 (TDE/applications/settings/tdesudo-trinity_14.0.13.orig.tar.xz) = 86abe3e68d5c382fa5ab16d85b58a840b8e5fb0e0aeed9bbda7cbb3e39ea085a
+SIZE (TDE/applications/settings/tdesudo-trinity_14.0.13.orig.tar.xz) = 28948
diff --git a/freebsd/applications/settings/tdesudo/pkg-descr b/freebsd/applications/settings/tdesudo/pkg-descr
new file mode 100644
index 000000000..dcd42fec2
--- /dev/null
+++ b/freebsd/applications/settings/tdesudo/pkg-descr
@@ -0,0 +1,4 @@
+sudo frontend for Trinity
+
+TDESudo is a graphical frontend for the sudo utility.
+It allows you to run programs as another user by entering your password.
diff --git a/freebsd/applications/settings/tdesudo/pkg-plist b/freebsd/applications/settings/tdesudo/pkg-plist
new file mode 100644
index 000000000..267dc4a33
--- /dev/null
+++ b/freebsd/applications/settings/tdesudo/pkg-plist
@@ -0,0 +1,11 @@
+bin/tdesudo
+share/doc/tde/HTML/en/tdesudo/common
+share/doc/tde/HTML/en/tdesudo/index.cache.bz2
+share/doc/tde/HTML/en/tdesudo/index.docbook
+share/locale/de/LC_MESSAGES/tdesudo.mo
+share/locale/fr/LC_MESSAGES/tdesudo.mo
+share/locale/nl/LC_MESSAGES/tdesudo.mo
+share/locale/pt/LC_MESSAGES/tdesudo.mo
+share/locale/ru/LC_MESSAGES/tdesudo.mo
+share/locale/tr/LC_MESSAGES/tdesudo.mo
+share/man/man1/tdesudo.1.gz
diff --git a/freebsd/applications/system/Makefile b/freebsd/applications/system/Makefile
new file mode 100644
index 000000000..108803f09
--- /dev/null
+++ b/freebsd/applications/system/Makefile
@@ -0,0 +1,19 @@
+
+    SUBDIR =
+    SUBDIR += dolphin
+    SUBDIR += katapult
+    SUBDIR += kbfx
+    SUBDIR += kcmautostart
+    SUBDIR += kdbusnotification
+    SUBDIR += klamav
+    SUBDIR += kooldock
+    SUBDIR += kshutdown
+    SUBDIR += ksystemlog
+    SUBDIR += kvkbd
+    SUBDIR += polkit-agent-tde
+    SUBDIR += tastymenu
+    SUBDIR += tdedocker
+    SUBDIR += tdesshaskpass
+    SUBDIR += yakuake
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/system/dolphin/Makefile b/freebsd/applications/system/dolphin/Makefile
new file mode 100644
index 000000000..2fe76a08f
--- /dev/null
+++ b/freebsd/applications/system/dolphin/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		dolphin-trinity
+COMMENT=		File manager for Trinity focusing on usability
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	d/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		deskutils x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/share/cmake/libkonq.cmake:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE}
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+	ln -s d3lphin ${STAGEDIR}${TDE_PREFIX}/bin/dolphin
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/dolphin/distinfo b/freebsd/applications/system/dolphin/distinfo
new file mode 100644
index 000000000..0406d8a63
--- /dev/null
+++ b/freebsd/applications/system/dolphin/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666739349
+SHA256 (TDE/applications/system/dolphin-trinity_14.0.13.orig.tar.xz) = 26235e565838a6e0ea0b61e29c8e7fb7dcf4f00d835ed97219b5c47164a41969
+SIZE (TDE/applications/system/dolphin-trinity_14.0.13.orig.tar.xz) = 1133696
diff --git a/freebsd/applications/dolphin/pkg-descr b/freebsd/applications/system/dolphin/pkg-descr
index 829188258..829188258 100644
--- a/freebsd/applications/dolphin/pkg-descr
+++ b/freebsd/applications/system/dolphin/pkg-descr
diff --git a/freebsd/applications/system/dolphin/pkg-plist b/freebsd/applications/system/dolphin/pkg-plist
new file mode 100644
index 000000000..ad1c59152
--- /dev/null
+++ b/freebsd/applications/system/dolphin/pkg-plist
@@ -0,0 +1,106 @@
+bin/d3lphin
+bin/dolphin
+share/applications/tde/d3lphin.desktop
+share/apps/d3lphin/d3lphinui.rc
+share/apps/d3lphin/icons/hicolor/128x128/actions/preview.png
+share/apps/d3lphin/icons/hicolor/16x16/actions/editurl.png
+share/apps/d3lphin/icons/hicolor/16x16/actions/preview.png
+share/apps/d3lphin/icons/hicolor/22x22/actions/preview.png
+share/apps/d3lphin/icons/hicolor/32x32/actions/preview.png
+share/apps/d3lphin/icons/hicolor/48x48/actions/preview.png
+share/apps/d3lphin/icons/hicolor/64x64/actions/preview.png
+share/apps/d3lphin/servicemenus/amarok_addaspodcast.desktop
+share/apps/d3lphin/servicemenus/amarok_append.desktop
+share/apps/d3lphin/servicemenus/amarok_play_audiocd.desktop
+share/apps/d3lphin/servicemenus/ark_compress.desktop
+share/apps/d3lphin/servicemenus/ark_extract.desktop
+share/apps/d3lphin/servicemenus/ark_extract_subdir.desktop
+share/apps/d3lphin/servicemenus/compress.desktop
+share/apps/d3lphin/servicemenus/d3lphin_su.desktop
+share/apps/d3lphin/servicemenus/edit_as_root.desktop
+share/apps/d3lphin/servicemenus/encryptfile.desktop
+share/apps/d3lphin/servicemenus/encryptfolder.desktop
+share/apps/d3lphin/servicemenus/floppy_format.desktop
+share/apps/d3lphin/servicemenus/imageconverter.desktop
+share/apps/d3lphin/servicemenus/installfont.desktop
+share/apps/d3lphin/servicemenus/isoservice.desktop
+share/apps/d3lphin/servicemenus/jpegorient.desktop
+share/apps/d3lphin/servicemenus/k3b_audiocd_rip.desktop
+share/apps/d3lphin/servicemenus/k3b_cd_copy.desktop
+share/apps/d3lphin/servicemenus/k3b_create_audio_cd.desktop
+share/apps/d3lphin/servicemenus/k3b_create_video_cd.desktop
+share/apps/d3lphin/servicemenus/k3b_dvd_copy.desktop
+share/apps/d3lphin/servicemenus/k3b_handle_empty_cd.desktop
+share/apps/d3lphin/servicemenus/k3b_handle_empty_dvd.desktop
+share/apps/d3lphin/servicemenus/k3b_videodvd_rip.desktop
+share/apps/d3lphin/servicemenus/k3b_write_bin_image.desktop
+share/apps/d3lphin/servicemenus/k3b_write_iso_image.desktop
+share/apps/d3lphin/servicemenus/kdesktopSetAsBackground.desktop
+share/apps/d3lphin/servicemenus/konqgwenview.desktop
+share/apps/d3lphin/servicemenus/mail_as_attachment.desktop
+share/apps/d3lphin/servicemenus/media_eject.desktop
+share/apps/d3lphin/servicemenus/media_mount.desktop
+share/apps/d3lphin/servicemenus/media_realfolder.desktop
+share/apps/d3lphin/servicemenus/media_safelyremove.desktop
+share/apps/d3lphin/servicemenus/media_unmount.desktop
+share/apps/d3lphin/servicemenus/open_in_digikam.desktop
+share/apps/d3lphin/servicemenus/run_as_root.desktop
+share/apps/d3lphin/servicemenus/smb2rdc.desktop
+share/apps/d3lphin/servicemenus/terminalhere.desktop
+share/apps/d3lphin/servicemenus/text-ada-print.desktop
+share/apps/d3lphin/servicemenus/text-c++-print.desktop
+share/apps/d3lphin/servicemenus/text-c++h-print.desktop
+share/apps/d3lphin/servicemenus/text-ch-print.desktop
+share/apps/d3lphin/servicemenus/text-css-print.desktop
+share/apps/d3lphin/servicemenus/text-diff-print.desktop
+share/apps/d3lphin/servicemenus/text-html-print.desktop
+share/apps/d3lphin/servicemenus/text-java-print.desktop
+share/apps/d3lphin/servicemenus/text-log-print.desktop
+share/apps/d3lphin/servicemenus/text-makefile-print.desktop
+share/apps/d3lphin/servicemenus/text-pas-print.desktop
+share/apps/d3lphin/servicemenus/text-perl-print.desktop
+share/apps/d3lphin/servicemenus/text-print.desktop
+share/apps/d3lphin/servicemenus/text-python-print.desktop
+share/apps/d3lphin/servicemenus/text-tcl-print.desktop
+share/apps/d3lphin/servicemenus/text-tex-print.desktop
+share/apps/d3lphin/servicemenus/text-xml-print.desktop
+share/apps/d3lphin/servicemenus/text-xslt-print.desktop
+share/doc/tde/HTML/en/d3lphin/bookmarkbutton.png
+share/doc/tde/HTML/en/d3lphin/bookmarksidebar.png
+share/doc/tde/HTML/en/d3lphin/breadcrumb.png
+share/doc/tde/HTML/en/d3lphin/browsebutton.png
+share/doc/tde/HTML/en/d3lphin/common
+share/doc/tde/HTML/en/d3lphin/configurationwindow.png
+share/doc/tde/HTML/en/d3lphin/configurationwindow2.png
+share/doc/tde/HTML/en/d3lphin/configurationwindow3.png
+share/doc/tde/HTML/en/d3lphin/directorypath.png
+share/doc/tde/HTML/en/d3lphin/dolphin.png
+share/doc/tde/HTML/en/d3lphin/hiddenfolder.png
+share/doc/tde/HTML/en/d3lphin/index.cache.bz2
+share/doc/tde/HTML/en/d3lphin/index.docbook
+share/doc/tde/HTML/en/d3lphin/informationsidebar.png
+share/doc/tde/HTML/en/d3lphin/split.png
+share/doc/tde/HTML/en/d3lphin/systemmediadirectory.png
+share/doc/tde/HTML/en/d3lphin/toolbarbuttons.png
+share/doc/tde/HTML/en/d3lphin/workspacebuttons.png
+share/icons/hicolor/128x128/apps/d3lphin.png
+share/icons/hicolor/16x16/apps/d3lphin.png
+share/icons/hicolor/22x22/apps/d3lphin.png
+share/icons/hicolor/32x32/apps/d3lphin.png
+share/icons/hicolor/48x48/apps/d3lphin.png
+share/icons/hicolor/64x64/apps/d3lphin.png
+share/locale/cs/LC_MESSAGES/d3lphin.mo
+share/locale/de/LC_MESSAGES/d3lphin.mo
+share/locale/el/LC_MESSAGES/d3lphin.mo
+share/locale/es/LC_MESSAGES/d3lphin.mo
+share/locale/et/LC_MESSAGES/d3lphin.mo
+share/locale/fr/LC_MESSAGES/d3lphin.mo
+share/locale/he/LC_MESSAGES/d3lphin.mo
+share/locale/it/LC_MESSAGES/d3lphin.mo
+share/locale/nl/LC_MESSAGES/d3lphin.mo
+share/locale/pl/LC_MESSAGES/d3lphin.mo
+share/locale/pt/LC_MESSAGES/d3lphin.mo
+share/locale/ru/LC_MESSAGES/d3lphin.mo
+share/locale/sk/LC_MESSAGES/d3lphin.mo
+share/locale/zh_Hans/LC_MESSAGES/d3lphin.mo
+share/man/man1/d3lphin.1.gz
diff --git a/freebsd/applications/system/katapult/Makefile b/freebsd/applications/system/katapult/Makefile
new file mode 100644
index 000000000..337245554
--- /dev/null
+++ b/freebsd/applications/system/katapult/Makefile
@@ -0,0 +1,36 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		katapult-trinity
+COMMENT=		Item launcher for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libXi.so:${PORTSDIR}/x11/libXi
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/katapult/distinfo b/freebsd/applications/system/katapult/distinfo
new file mode 100644
index 000000000..f77e79e60
--- /dev/null
+++ b/freebsd/applications/system/katapult/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666739478
+SHA256 (TDE/applications/system/katapult-trinity_14.0.13.orig.tar.xz) = c1fa8ff1b454f5cd596c32d45315c2231f9b9221b173274239c821ae7858732c
+SIZE (TDE/applications/system/katapult-trinity_14.0.13.orig.tar.xz) = 253372
diff --git a/freebsd/applications/katapult/pkg-descr b/freebsd/applications/system/katapult/pkg-descr
index fe9ff2a1f..fe9ff2a1f 100644
--- a/freebsd/applications/katapult/pkg-descr
+++ b/freebsd/applications/system/katapult/pkg-descr
diff --git a/freebsd/applications/katapult/pkg-plist b/freebsd/applications/system/katapult/pkg-plist
index 9d548c0c0..9d548c0c0 100644
--- a/freebsd/applications/katapult/pkg-plist
+++ b/freebsd/applications/system/katapult/pkg-plist
diff --git a/freebsd/applications/system/kbfx/Makefile b/freebsd/applications/system/kbfx/Makefile
new file mode 100644
index 000000000..e331bbcfb
--- /dev/null
+++ b/freebsd/applications/system/kbfx/Makefile
@@ -0,0 +1,32 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kbfx-trinity
+COMMENT=		An alternative to T-Menu for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/kbfx/distinfo b/freebsd/applications/system/kbfx/distinfo
new file mode 100644
index 000000000..bc1d809a1
--- /dev/null
+++ b/freebsd/applications/system/kbfx/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666739602
+SHA256 (TDE/applications/system/kbfx-trinity_14.0.13.orig.tar.xz) = b2596f1fea248431514da7e035db162017b06c5ba4fb1a458ebf9c8458308a3e
+SIZE (TDE/applications/system/kbfx-trinity_14.0.13.orig.tar.xz) = 2613404
diff --git a/freebsd/applications/kbfx/pkg-descr b/freebsd/applications/system/kbfx/pkg-descr
index 8e93404ab..8e93404ab 100644
--- a/freebsd/applications/kbfx/pkg-descr
+++ b/freebsd/applications/system/kbfx/pkg-descr
diff --git a/freebsd/applications/kbfx/pkg-plist b/freebsd/applications/system/kbfx/pkg-plist
index 347a0de3d..347a0de3d 100644
--- a/freebsd/applications/kbfx/pkg-plist
+++ b/freebsd/applications/system/kbfx/pkg-plist
diff --git a/freebsd/applications/system/kcmautostart/Makefile b/freebsd/applications/system/kcmautostart/Makefile
new file mode 100644
index 000000000..7fb1de1b4
--- /dev/null
+++ b/freebsd/applications/system/kcmautostart/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kcontrol-autostart-trinity
+COMMENT=		autostart module for the Trinity control center
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+DISTSRC=		kcmautostart-trinity-${TDE_VERSION}${TDE_PREVERSION}
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/kcmautostart/distinfo b/freebsd/applications/system/kcmautostart/distinfo
new file mode 100644
index 000000000..28695e827
--- /dev/null
+++ b/freebsd/applications/system/kcmautostart/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666739659
+SHA256 (TDE/applications/system/kcontrol-autostart-trinity_14.0.13.orig.tar.xz) = 0375ab39df6c9fed12051b27446d76cfaf5e1971affb1ce47c4c0295270c9077
+SIZE (TDE/applications/system/kcontrol-autostart-trinity_14.0.13.orig.tar.xz) = 17988
diff --git a/freebsd/applications/kcmautostart/pkg-descr b/freebsd/applications/system/kcmautostart/pkg-descr
index 9fefca64b..9fefca64b 100644
--- a/freebsd/applications/kcmautostart/pkg-descr
+++ b/freebsd/applications/system/kcmautostart/pkg-descr
diff --git a/freebsd/applications/kcmautostart/pkg-plist b/freebsd/applications/system/kcmautostart/pkg-plist
index e336d37e9..e336d37e9 100644
--- a/freebsd/applications/kcmautostart/pkg-plist
+++ b/freebsd/applications/system/kcmautostart/pkg-plist
diff --git a/freebsd/applications/system/kdbusnotification/Makefile b/freebsd/applications/system/kdbusnotification/Makefile
new file mode 100644
index 000000000..d97437480
--- /dev/null
+++ b/freebsd/applications/system/kdbusnotification/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kdbusnotification-trinity
+COMMENT=		DBUS notification service for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/kdbusnotification/distinfo b/freebsd/applications/system/kdbusnotification/distinfo
new file mode 100644
index 000000000..c41268d08
--- /dev/null
+++ b/freebsd/applications/system/kdbusnotification/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666739691
+SHA256 (TDE/applications/system/kdbusnotification-trinity_14.0.13.orig.tar.xz) = 7591bb2ec4367431130b7e0707dc6293660da574f2861b4ca9d75fd798b4fe4a
+SIZE (TDE/applications/system/kdbusnotification-trinity_14.0.13.orig.tar.xz) = 7900
diff --git a/freebsd/applications/kdbusnotification/pkg-descr b/freebsd/applications/system/kdbusnotification/pkg-descr
index bffabfa97..bffabfa97 100644
--- a/freebsd/applications/kdbusnotification/pkg-descr
+++ b/freebsd/applications/system/kdbusnotification/pkg-descr
diff --git a/freebsd/applications/kdbusnotification/pkg-plist b/freebsd/applications/system/kdbusnotification/pkg-plist
index 0ad38911e..0ad38911e 100644
--- a/freebsd/applications/kdbusnotification/pkg-plist
+++ b/freebsd/applications/system/kdbusnotification/pkg-plist
diff --git a/freebsd/applications/system/klamav/Makefile b/freebsd/applications/system/klamav/Makefile
new file mode 100644
index 000000000..c2914caf3
--- /dev/null
+++ b/freebsd/applications/system/klamav/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		klamav-trinity
+COMMENT=		TDE frontend for ClamAV [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libclamav.so:${PORTSDIR}/security/clamav
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/klamav/distinfo b/freebsd/applications/system/klamav/distinfo
new file mode 100644
index 000000000..0371c31b9
--- /dev/null
+++ b/freebsd/applications/system/klamav/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666739743
+SHA256 (TDE/applications/system/klamav-trinity_14.0.13.orig.tar.xz) = 6605d97d0e42925083a0e3c4c5367f3dbf4baec8f0449f8753896f886861d817
+SIZE (TDE/applications/system/klamav-trinity_14.0.13.orig.tar.xz) = 645840
diff --git a/freebsd/applications/klamav/pkg-descr b/freebsd/applications/system/klamav/pkg-descr
index 5d3487387..5d3487387 100644
--- a/freebsd/applications/klamav/pkg-descr
+++ b/freebsd/applications/system/klamav/pkg-descr
diff --git a/freebsd/applications/system/klamav/pkg-plist b/freebsd/applications/system/klamav/pkg-plist
new file mode 100644
index 000000000..0ffb07054
--- /dev/null
+++ b/freebsd/applications/system/klamav/pkg-plist
@@ -0,0 +1,46 @@
+bin/ScanWithKlamAV
+bin/klamav
+bin/klammail
+share/applications/tde/klamav.desktop
+share/apps/klamav/about/aboutklamav.html
+share/apps/klamav/about/klam.png
+share/apps/klamav/about/klamav.css
+share/apps/klamav/about/main.html
+share/apps/klamav/about/nodb.html
+share/apps/klamav/about/top-right-klamav.png
+share/apps/klamav/about/wait.html
+share/apps/klamav/eventsrc
+share/apps/klamav/icons/hicolor/32x32/actions/klamav_scan_found.png
+share/apps/klamav/icons/hicolor/32x32/actions/klamav_scan_safe.png
+share/apps/klamav/icons/hicolor/32x32/actions/klamav_scanning.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_error.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_on_acc_disabled.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_on_acc_enabled.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_quarantining.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_update_required.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_virus.png
+share/apps/klamav/icons/hicolor/48x48/apps/klamav.png
+share/apps/klamav/klamavui.rc
+share/apps/konqueror/servicemenus/klamav-dropdown.desktop
+share/doc/tde/HTML/en/klamav/common
+share/doc/tde/HTML/en/klamav/index.cache.bz2
+share/doc/tde/HTML/en/klamav/index.docbook
+share/doc/tde/HTML/en/klamav/klamav.png
+share/doc/tde/HTML/en/klamav/klamav_error.png
+share/doc/tde/HTML/en/klamav/klamav_on_acc_disabled.png
+share/doc/tde/HTML/en/klamav/klamav_on_acc_enabled.png
+share/doc/tde/HTML/en/klamav/klamav_quarantining.png
+share/doc/tde/HTML/en/klamav/klamav_scan_found.png
+share/doc/tde/HTML/en/klamav/klamav_scan_safe.png
+share/doc/tde/HTML/en/klamav/klamav_scanning.png
+share/doc/tde/HTML/en/klamav/klamav_update_required.png
+share/doc/tde/HTML/en/klamav/klamav_virus.png
+share/icons/hicolor/32x32/apps/klamav.png
+share/icons/hicolor/48x48/apps/klamav.png
+share/locale/de/LC_MESSAGES/klamav.mo
+share/locale/el/LC_MESSAGES/klamav.mo
+share/locale/eo/LC_MESSAGES/klamav.mo
+share/locale/it/LC_MESSAGES/klamav.mo
+share/locale/pt/LC_MESSAGES/klamav.mo
+share/locale/ru/LC_MESSAGES/klamav.mo
diff --git a/freebsd/applications/system/kooldock/Makefile b/freebsd/applications/system/kooldock/Makefile
new file mode 100644
index 000000000..edb7b319c
--- /dev/null
+++ b/freebsd/applications/system/kooldock/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kooldock-trinity
+COMMENT=		Dock for TDE with cool visual enhancements
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/kooldock/distinfo b/freebsd/applications/system/kooldock/distinfo
new file mode 100644
index 000000000..024c6e022
--- /dev/null
+++ b/freebsd/applications/system/kooldock/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666739863
+SHA256 (TDE/applications/system/kooldock-trinity_14.0.13.orig.tar.xz) = 0c528cc8dbe0577e0fee6b990a24dba6cab183bda7e9ca7c17bbd7a785760c62
+SIZE (TDE/applications/system/kooldock-trinity_14.0.13.orig.tar.xz) = 337064
diff --git a/freebsd/applications/kooldock/pkg-descr b/freebsd/applications/system/kooldock/pkg-descr
index 74fca3086..74fca3086 100644
--- a/freebsd/applications/kooldock/pkg-descr
+++ b/freebsd/applications/system/kooldock/pkg-descr
diff --git a/freebsd/applications/kooldock/pkg-plist b/freebsd/applications/system/kooldock/pkg-plist
index 0a24d0970..0a24d0970 100644
--- a/freebsd/applications/kooldock/pkg-plist
+++ b/freebsd/applications/system/kooldock/pkg-plist
diff --git a/freebsd/applications/system/kshutdown/Makefile b/freebsd/applications/system/kshutdown/Makefile
new file mode 100644
index 000000000..265a063e9
--- /dev/null
+++ b/freebsd/applications/system/kshutdown/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kshutdown-trinity
+COMMENT=		An advanced shut down utility for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/kshutdown/distinfo b/freebsd/applications/system/kshutdown/distinfo
new file mode 100644
index 000000000..3827eebb7
--- /dev/null
+++ b/freebsd/applications/system/kshutdown/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666739943
+SHA256 (TDE/applications/system/kshutdown-trinity_14.0.13.orig.tar.xz) = 5c1354eae128b1fa1d978a1c3350be628be2ac202ff0bb286e7f9a7414d9946b
+SIZE (TDE/applications/system/kshutdown-trinity_14.0.13.orig.tar.xz) = 173852
diff --git a/freebsd/applications/kshutdown/pkg-descr b/freebsd/applications/system/kshutdown/pkg-descr
index ed3f4062d..ed3f4062d 100644
--- a/freebsd/applications/kshutdown/pkg-descr
+++ b/freebsd/applications/system/kshutdown/pkg-descr
diff --git a/freebsd/applications/kshutdown/pkg-plist b/freebsd/applications/system/kshutdown/pkg-plist
index 36fc1f881..36fc1f881 100644
--- a/freebsd/applications/kshutdown/pkg-plist
+++ b/freebsd/applications/system/kshutdown/pkg-plist
diff --git a/freebsd/applications/system/ksystemlog/Makefile b/freebsd/applications/system/ksystemlog/Makefile
new file mode 100644
index 000000000..a109bd3d5
--- /dev/null
+++ b/freebsd/applications/system/ksystemlog/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		ksystemlog-trinity
+COMMENT=		System log viewer tool for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/ksystemlog/distinfo b/freebsd/applications/system/ksystemlog/distinfo
new file mode 100644
index 000000000..6069f7413
--- /dev/null
+++ b/freebsd/applications/system/ksystemlog/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740006
+SHA256 (TDE/applications/system/ksystemlog-trinity_14.0.13.orig.tar.xz) = 5659b8b14e2db92becc1e3c6378a6a8284b5945199e430c13e10845b51a79761
+SIZE (TDE/applications/system/ksystemlog-trinity_14.0.13.orig.tar.xz) = 161368
diff --git a/freebsd/applications/ksystemlog/pkg-descr b/freebsd/applications/system/ksystemlog/pkg-descr
index e76c2397f..e76c2397f 100644
--- a/freebsd/applications/ksystemlog/pkg-descr
+++ b/freebsd/applications/system/ksystemlog/pkg-descr
diff --git a/freebsd/applications/ksystemlog/pkg-plist b/freebsd/applications/system/ksystemlog/pkg-plist
index d0dfda63c..d0dfda63c 100644
--- a/freebsd/applications/ksystemlog/pkg-plist
+++ b/freebsd/applications/system/ksystemlog/pkg-plist
diff --git a/freebsd/applications/system/kvkbd/Makefile b/freebsd/applications/system/kvkbd/Makefile
new file mode 100644
index 000000000..bfa6c839e
--- /dev/null
+++ b/freebsd/applications/system/kvkbd/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kvkbd-trinity
+COMMENT=		Virtual keyboard for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libXtst.so:${PORTSDIR}/x11/libXtst \
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/kvkbd/distinfo b/freebsd/applications/system/kvkbd/distinfo
new file mode 100644
index 000000000..088e2b666
--- /dev/null
+++ b/freebsd/applications/system/kvkbd/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740075
+SHA256 (TDE/applications/system/kvkbd-trinity_14.0.13.orig.tar.xz) = d36b39900cc5d81f171b9b327c208e41fc885489736694f72b3d430aaa0d27d4
+SIZE (TDE/applications/system/kvkbd-trinity_14.0.13.orig.tar.xz) = 47444
diff --git a/freebsd/applications/kvkbd/pkg-descr b/freebsd/applications/system/kvkbd/pkg-descr
index 90f39c62e..90f39c62e 100644
--- a/freebsd/applications/kvkbd/pkg-descr
+++ b/freebsd/applications/system/kvkbd/pkg-descr
diff --git a/freebsd/applications/kvkbd/pkg-plist b/freebsd/applications/system/kvkbd/pkg-plist
index 7148f1a1e..7148f1a1e 100644
--- a/freebsd/applications/kvkbd/pkg-plist
+++ b/freebsd/applications/system/kvkbd/pkg-plist
diff --git a/freebsd/applications/system/polkit-agent-tde/Makefile b/freebsd/applications/system/polkit-agent-tde/Makefile
new file mode 100644
index 000000000..7202a6108
--- /dev/null
+++ b/freebsd/applications/system/polkit-agent-tde/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		polkit-agent-tde
+COMMENT=		TDE dialogs for PolicyKit
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	p/${PORTNAME}
+DISTSRC=		${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libpolkit-tqt-agent.so:${PORTSDIR}/x11/trinity/dependencies/polkit-tqt \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/polkit-agent-tde/distinfo b/freebsd/applications/system/polkit-agent-tde/distinfo
new file mode 100644
index 000000000..954a01fa8
--- /dev/null
+++ b/freebsd/applications/system/polkit-agent-tde/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740112
+SHA256 (TDE/applications/system/polkit-agent-tde_14.0.13.orig.tar.xz) = 744f8415bf5797ed899327f95c134caaa3d13d7a1e128214909efc079ccff20b
+SIZE (TDE/applications/system/polkit-agent-tde_14.0.13.orig.tar.xz) = 32616
diff --git a/freebsd/applications/system/polkit-agent-tde/pkg-descr b/freebsd/applications/system/polkit-agent-tde/pkg-descr
new file mode 100644
index 000000000..dfda4c649
--- /dev/null
+++ b/freebsd/applications/system/polkit-agent-tde/pkg-descr
@@ -0,0 +1,10 @@
+TDE dialogs for PolicyKit
+
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+PolicyKit-agent-tde provides a D-Bus session bus service that is used to
+bring up authentication dialogs used for obtaining privileges.
diff --git a/freebsd/applications/system/polkit-agent-tde/pkg-plist b/freebsd/applications/system/polkit-agent-tde/pkg-plist
new file mode 100644
index 000000000..2b4c61cb8
--- /dev/null
+++ b/freebsd/applications/system/polkit-agent-tde/pkg-plist
@@ -0,0 +1,52 @@
+bin/polkit-agent-tde
+share/autostart/polkit-agent-tde.desktop
+share/locale/ar/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/bs/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/ca/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/ca@valencia/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/cs/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/da/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/de/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/el/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/en_GB/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/eo/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/es/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/et/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/fi/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/fr/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/ga/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/gl/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/hr/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/hu/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/is/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/it/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/ja/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/kk/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/km/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/lt/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/mai/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/mr/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/ms/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/nb/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/nds/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/nl/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/pa/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/pl/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/pt/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/pt_BR/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/ro/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/ru/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/sk/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/sl/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/sr/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/sr@ijekavian/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/sr@latin/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/sv/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/th/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/tr/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/ug/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/uk/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/vi/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/zh_CN/LC_MESSAGES/polkit-agent-tde.mo
+share/locale/zh_TW/LC_MESSAGES/polkit-agent-tde.mo
diff --git a/freebsd/applications/system/tastymenu/Makefile b/freebsd/applications/system/tastymenu/Makefile
new file mode 100644
index 000000000..25df0fe27
--- /dev/null
+++ b/freebsd/applications/system/tastymenu/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tastymenu-trinity
+COMMENT=		Replacement for TMenu
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/tastymenu/distinfo b/freebsd/applications/system/tastymenu/distinfo
new file mode 100644
index 000000000..b8a302317
--- /dev/null
+++ b/freebsd/applications/system/tastymenu/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740162
+SHA256 (TDE/applications/system/tastymenu-trinity_14.0.13.orig.tar.xz) = 10031ad387aeaf73f324fb7627c4bbc0da8c7e9f5f38dedc47ed41d708ccb7da
+SIZE (TDE/applications/system/tastymenu-trinity_14.0.13.orig.tar.xz) = 153556
diff --git a/freebsd/applications/tastymenu/pkg-descr b/freebsd/applications/system/tastymenu/pkg-descr
index 1af720d60..1af720d60 100644
--- a/freebsd/applications/tastymenu/pkg-descr
+++ b/freebsd/applications/system/tastymenu/pkg-descr
diff --git a/freebsd/applications/tastymenu/pkg-plist b/freebsd/applications/system/tastymenu/pkg-plist
index 9d4857920..9d4857920 100644
--- a/freebsd/applications/tastymenu/pkg-plist
+++ b/freebsd/applications/system/tastymenu/pkg-plist
diff --git a/freebsd/applications/system/tdedocker/Makefile b/freebsd/applications/system/tdedocker/Makefile
new file mode 100644
index 000000000..c8df1c95a
--- /dev/null
+++ b/freebsd/applications/system/tdedocker/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdedocker-trinity
+COMMENT=		Minimize all applications to system tray [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/tdedocker/distinfo b/freebsd/applications/system/tdedocker/distinfo
new file mode 100644
index 000000000..ac62fe445
--- /dev/null
+++ b/freebsd/applications/system/tdedocker/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740208
+SHA256 (TDE/applications/system/tdedocker-trinity_14.0.13.orig.tar.xz) = 7ab14c626c9ae98c3c0bf8b6d08b43a8450ce9fe01a03f52ba40231f8e2c07f8
+SIZE (TDE/applications/system/tdedocker-trinity_14.0.13.orig.tar.xz) = 74552
diff --git a/freebsd/applications/tdedocker/pkg-descr b/freebsd/applications/system/tdedocker/pkg-descr
index 6ff55daf8..6ff55daf8 100644
--- a/freebsd/applications/tdedocker/pkg-descr
+++ b/freebsd/applications/system/tdedocker/pkg-descr
diff --git a/freebsd/applications/tdedocker/pkg-plist b/freebsd/applications/system/tdedocker/pkg-plist
index 043e4c50c..043e4c50c 100644
--- a/freebsd/applications/tdedocker/pkg-plist
+++ b/freebsd/applications/system/tdedocker/pkg-plist
diff --git a/freebsd/applications/system/tdesshaskpass/Makefile b/freebsd/applications/system/tdesshaskpass/Makefile
new file mode 100644
index 000000000..fa7ad98be
--- /dev/null
+++ b/freebsd/applications/system/tdesshaskpass/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdesshaskpass-trinity
+COMMENT=		Interactively prompt users for a passphrase for ssh-add
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/tdesshaskpass/distinfo b/freebsd/applications/system/tdesshaskpass/distinfo
new file mode 100644
index 000000000..14db2f5f7
--- /dev/null
+++ b/freebsd/applications/system/tdesshaskpass/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740242
+SHA256 (TDE/applications/system/tdesshaskpass-trinity_14.0.13.orig.tar.xz) = 811fd8ee7c94176e8820065a2379b3b9e18e02cacb18ddcae6d9e385ef7d62c9
+SIZE (TDE/applications/system/tdesshaskpass-trinity_14.0.13.orig.tar.xz) = 11144
diff --git a/freebsd/applications/system/tdesshaskpass/pkg-descr b/freebsd/applications/system/tdesshaskpass/pkg-descr
new file mode 100644
index 000000000..97d7b5875
--- /dev/null
+++ b/freebsd/applications/system/tdesshaskpass/pkg-descr
@@ -0,0 +1,3 @@
+Interactively prompt users for a passphrase for ssh-add
+
+A TDE version of ssh-askpass with TDEWallet support.
diff --git a/freebsd/applications/system/tdesshaskpass/pkg-plist b/freebsd/applications/system/tdesshaskpass/pkg-plist
new file mode 100644
index 000000000..1bb802d6e
--- /dev/null
+++ b/freebsd/applications/system/tdesshaskpass/pkg-plist
@@ -0,0 +1,2 @@
+bin/tdesshaskpass
+share/man/man1/tdesshaskpass.1.gz
diff --git a/freebsd/applications/system/yakuake/Makefile b/freebsd/applications/system/yakuake/Makefile
new file mode 100644
index 000000000..b0aded426
--- /dev/null
+++ b/freebsd/applications/system/yakuake/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		yakuake-trinity
+COMMENT=		A Quake-style terminal emulator based on TDE Konsole technology [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	y/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/system
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/system/yakuake/distinfo b/freebsd/applications/system/yakuake/distinfo
new file mode 100644
index 000000000..6fe3cb32d
--- /dev/null
+++ b/freebsd/applications/system/yakuake/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740294
+SHA256 (TDE/applications/system/yakuake-trinity_14.0.13.orig.tar.xz) = 59eff616abcf19900eb581846060ccdea73bc1ecaee608ee10941df0853d675e
+SIZE (TDE/applications/system/yakuake-trinity_14.0.13.orig.tar.xz) = 105940
diff --git a/freebsd/applications/yakuake/pkg-descr b/freebsd/applications/system/yakuake/pkg-descr
index 4cef6bb4d..4cef6bb4d 100644
--- a/freebsd/applications/yakuake/pkg-descr
+++ b/freebsd/applications/system/yakuake/pkg-descr
diff --git a/freebsd/applications/yakuake/pkg-plist b/freebsd/applications/system/yakuake/pkg-plist
index d549c82fc..d549c82fc 100644
--- a/freebsd/applications/yakuake/pkg-plist
+++ b/freebsd/applications/system/yakuake/pkg-plist
diff --git a/freebsd/applications/tastymenu/Makefile b/freebsd/applications/tastymenu/Makefile
deleted file mode 100644
index e8a3d4c7f..000000000
--- a/freebsd/applications/tastymenu/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tastymenu-trinity
-COMMENT=		Replacement for TMenu
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tastymenu/distinfo b/freebsd/applications/tastymenu/distinfo
deleted file mode 100644
index 65a04ab68..000000000
--- a/freebsd/applications/tastymenu/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601621
-SHA256 (TDE/applications/tastymenu-trinity_14.0.10.orig.tar.xz) = 7fd8700acd874819b1f3226f7c41f0e0dadb720abd58b3b69e4b729b7c15e425
-SIZE (TDE/applications/tastymenu-trinity_14.0.10.orig.tar.xz) = 406872
diff --git a/freebsd/applications/tde-style-baghira/Makefile b/freebsd/applications/tde-style-baghira/Makefile
deleted file mode 100644
index 8b5f7cd4d..000000000
--- a/freebsd/applications/tde-style-baghira/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tde-style-baghira-trinity
-COMMENT=		TDE style for Apple junkies :)
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tde-style-baghira/distinfo b/freebsd/applications/tde-style-baghira/distinfo
deleted file mode 100644
index 9b790c99c..000000000
--- a/freebsd/applications/tde-style-baghira/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601649
-SHA256 (TDE/applications/tde-style-baghira-trinity_14.0.10.orig.tar.xz) = b851b6b5b31db2ca4bb7371e3e3f8a05a45f30aa18bc5591d60f94752bffaadf
-SIZE (TDE/applications/tde-style-baghira-trinity_14.0.10.orig.tar.xz) = 649624
diff --git a/freebsd/applications/tde-style-baghira/pkg-plist b/freebsd/applications/tde-style-baghira/pkg-plist
deleted file mode 100644
index 066fa5bf9..000000000
--- a/freebsd/applications/tde-style-baghira/pkg-plist
+++ /dev/null
@@ -1,62 +0,0 @@
-bin/bab
-lib/libbaghirastarter.la
-lib/libbaghirastarter.so
-lib/trinity/b_menu_panelapplet.la
-lib/trinity/b_menu_panelapplet.so
-lib/trinity/plugins/styles/baghira.la
-lib/trinity/plugins/styles/baghira.so
-lib/trinity/tdestyle_baghira_config.la
-lib/trinity/tdestyle_baghira_config.so
-lib/trinity/twin3_baghira.la
-lib/trinity/twin3_baghira.so
-lib/trinity/twin_baghira_config.la
-lib/trinity/twin_baghira_config.so
-lib/usermanager_panelapplet.la
-lib/usermanager_panelapplet.so
-share/apps/baghira/poof.png
-share/apps/kicker/applets/baghira-starter.desktop
-share/apps/kicker/applets/baghira-usermanager.desktop
-share/apps/tdedisplay/color-schemes/AquaBlue.kcsrc
-share/apps/tdedisplay/color-schemes/AquaGraphite.kcsrc
-share/apps/tdestyle/themes/baghira.themerc
-share/apps/twin/baghira.desktop
-share/icons/crystalsvg/128x128/apps/baghira.png
-share/icons/crystalsvg/128x128/apps/baghira_blue.png
-share/icons/crystalsvg/128x128/apps/baghira_grey.png
-share/icons/crystalsvg/128x128/apps/baghira_white.png
-share/icons/crystalsvg/128x128/apps/baghira_yellow.png
-share/icons/crystalsvg/16x16/apps/baghira.png
-share/icons/crystalsvg/16x16/apps/baghira_blue.png
-share/icons/crystalsvg/16x16/apps/baghira_grey.png
-share/icons/crystalsvg/16x16/apps/baghira_white.png
-share/icons/crystalsvg/16x16/apps/baghira_yellow.png
-share/icons/crystalsvg/22x22/actions/bStarter.png
-share/icons/crystalsvg/22x22/actions/bStarter_down.png
-share/icons/crystalsvg/22x22/actions/bStarter_hover.png
-share/icons/crystalsvg/22x22/actions/bab_itunes.png
-share/icons/crystalsvg/22x22/actions/bab_jaguar.png
-share/icons/crystalsvg/22x22/actions/bab_milk.png
-share/icons/crystalsvg/22x22/actions/bab_panther.png
-share/icons/crystalsvg/22x22/actions/bab_tiger.png
-share/icons/crystalsvg/22x22/apps/baghira.png
-share/icons/crystalsvg/22x22/apps/baghira_blue.png
-share/icons/crystalsvg/22x22/apps/baghira_grey.png
-share/icons/crystalsvg/22x22/apps/baghira_white.png
-share/icons/crystalsvg/22x22/apps/baghira_yellow.png
-share/icons/crystalsvg/32x32/apps/baghira.png
-share/icons/crystalsvg/32x32/apps/baghira_blue.png
-share/icons/crystalsvg/32x32/apps/baghira_grey.png
-share/icons/crystalsvg/32x32/apps/baghira_white.png
-share/icons/crystalsvg/32x32/apps/baghira_yellow.png
-share/icons/crystalsvg/48x48/apps/baghira.png
-share/icons/crystalsvg/48x48/apps/baghira_blue.png
-share/icons/crystalsvg/48x48/apps/baghira_grey.png
-share/icons/crystalsvg/48x48/apps/baghira_white.png
-share/icons/crystalsvg/48x48/apps/baghira_yellow.png
-share/icons/crystalsvg/64x64/apps/baghira.png
-share/icons/crystalsvg/64x64/apps/baghira_blue.png
-share/icons/crystalsvg/64x64/apps/baghira_grey.png
-share/icons/crystalsvg/64x64/apps/baghira_white.png
-share/icons/crystalsvg/64x64/apps/baghira_yellow.png
-share/locale/de/LC_MESSAGES/baghira-starter.mo
-share/man/man1/bab.1.gz
diff --git a/freebsd/applications/tde-style-domino/Makefile b/freebsd/applications/tde-style-domino/Makefile
deleted file mode 100644
index 1b081f8a0..000000000
--- a/freebsd/applications/tde-style-domino/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tde-style-domino-trinity
-COMMENT=		Domino widget style and twin decoration for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tde-style-domino/distinfo b/freebsd/applications/tde-style-domino/distinfo
deleted file mode 100644
index 6c3105d20..000000000
--- a/freebsd/applications/tde-style-domino/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601722
-SHA256 (TDE/applications/tde-style-domino-trinity_14.0.10.orig.tar.xz) = 9fd242d657f540c47e31daa885b2f2c188e505a45357467df0938a44bfd4e841
-SIZE (TDE/applications/tde-style-domino-trinity_14.0.10.orig.tar.xz) = 372088
diff --git a/freebsd/applications/tde-style-ia-ora/Makefile b/freebsd/applications/tde-style-ia-ora/Makefile
deleted file mode 100644
index 3ffd239d8..000000000
--- a/freebsd/applications/tde-style-ia-ora/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tde-style-ia-ora-trinity
-COMMENT=		Mandriva Ia Ora theme for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tde-style-ia-ora/distinfo b/freebsd/applications/tde-style-ia-ora/distinfo
deleted file mode 100644
index 9eed79409..000000000
--- a/freebsd/applications/tde-style-ia-ora/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601746
-SHA256 (TDE/applications/tde-style-ia-ora-trinity_14.0.10.orig.tar.xz) = a181b7dddc46c3be34d2466dabd7838a3092d557437ffede0addcc24382109c3
-SIZE (TDE/applications/tde-style-ia-ora-trinity_14.0.10.orig.tar.xz) = 299024
diff --git a/freebsd/applications/tde-style-lipstik/Makefile b/freebsd/applications/tde-style-lipstik/Makefile
deleted file mode 100644
index 1b4d1a2cf..000000000
--- a/freebsd/applications/tde-style-lipstik/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tde-style-lipstik-trinity
-COMMENT=		Lipstik style for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tde-style-lipstik/distinfo b/freebsd/applications/tde-style-lipstik/distinfo
deleted file mode 100644
index 68b37868b..000000000
--- a/freebsd/applications/tde-style-lipstik/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601762
-SHA256 (TDE/applications/tde-style-lipstik-trinity_14.0.10.orig.tar.xz) = 1ead21c83decdfa5fe03e61d9382b3d8029a8e56b17082c928ccca15865d801e
-SIZE (TDE/applications/tde-style-lipstik-trinity_14.0.10.orig.tar.xz) = 81328
diff --git a/freebsd/applications/tde-style-qtcurve/Makefile b/freebsd/applications/tde-style-qtcurve/Makefile
deleted file mode 100644
index 22d9525d0..000000000
--- a/freebsd/applications/tde-style-qtcurve/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tde-style-qtcurve-trinity
-COMMENT=		QtCurve style for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tde-style-qtcurve/distinfo b/freebsd/applications/tde-style-qtcurve/distinfo
deleted file mode 100644
index 21456dcd5..000000000
--- a/freebsd/applications/tde-style-qtcurve/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601777
-SHA256 (TDE/applications/tde-style-qtcurve-trinity_14.0.10.orig.tar.xz) = a386069060a1f2bde0f5bbf602f878081c1efcec7e9e12f6e8f41bff650e7595
-SIZE (TDE/applications/tde-style-qtcurve-trinity_14.0.10.orig.tar.xz) = 414476
diff --git a/freebsd/applications/tde-systemsettings/Makefile b/freebsd/applications/tde-systemsettings/Makefile
deleted file mode 100644
index ab60e7d45..000000000
--- a/freebsd/applications/tde-systemsettings/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tde-systemsettings-trinity
-COMMENT=		Easy to use control centre for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tde-systemsettings/distinfo b/freebsd/applications/tde-systemsettings/distinfo
deleted file mode 100644
index 89466a816..000000000
--- a/freebsd/applications/tde-systemsettings/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601798
-SHA256 (TDE/applications/tde-systemsettings-trinity_14.0.10.orig.tar.xz) = 36d1416e1ba07d5157a2b9b3a1911fe2071c53678025f73d0d742ba9aa86dcdd
-SIZE (TDE/applications/tde-systemsettings-trinity_14.0.10.orig.tar.xz) = 350492
diff --git a/freebsd/applications/tdedocker/Makefile b/freebsd/applications/tdedocker/Makefile
deleted file mode 100644
index a031b4108..000000000
--- a/freebsd/applications/tdedocker/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tdedocker-trinity
-COMMENT=		Minimize all applications to system tray [Trinity]
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tdedocker/distinfo b/freebsd/applications/tdedocker/distinfo
deleted file mode 100644
index af2425f3c..000000000
--- a/freebsd/applications/tdedocker/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601818
-SHA256 (TDE/applications/tdedocker-trinity_14.0.10.orig.tar.xz) = f6a4f364a0b1473e7c6529f27ad19217a89ec4738a9cc19d927a5af22371c6d2
-SIZE (TDE/applications/tdedocker-trinity_14.0.10.orig.tar.xz) = 107216
diff --git a/freebsd/applications/tdeio-ftps/Makefile b/freebsd/applications/tdeio-ftps/Makefile
deleted file mode 100644
index dfdfb6911..000000000
--- a/freebsd/applications/tdeio-ftps/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tdeio-ftps-trinity
-COMMENT=		ftps TDEIO slave for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tdeio-ftps/distinfo b/freebsd/applications/tdeio-ftps/distinfo
deleted file mode 100644
index 0f0c42eb1..000000000
--- a/freebsd/applications/tdeio-ftps/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601836
-SHA256 (TDE/applications/tdeio-ftps-trinity_14.0.10.orig.tar.xz) = b4dc102bd3b980adfda0253f8dc9839d134990eea731e45d26b65f7dc3932724
-SIZE (TDE/applications/tdeio-ftps-trinity_14.0.10.orig.tar.xz) = 68948
diff --git a/freebsd/applications/tdeio-ftps/pkg-plist b/freebsd/applications/tdeio-ftps/pkg-plist
deleted file mode 100644
index ac684fcf9..000000000
--- a/freebsd/applications/tdeio-ftps/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/trinity/tdeio_ftps.la
-lib/trinity/tdeio_ftps.so
-share/locale/de/LC_MESSAGES/tdeio-ftps.mo
-share/services/ftps.protocol
diff --git a/freebsd/applications/tdeio/Makefile b/freebsd/applications/tdeio/Makefile
new file mode 100644
index 000000000..d2b191313
--- /dev/null
+++ b/freebsd/applications/tdeio/Makefile
@@ -0,0 +1,9 @@
+
+    SUBDIR =
+    SUBDIR += tdeio-appinfo
+    SUBDIR += tdeio-ftps
+    SUBDIR += tdeio-gopher
+    SUBDIR += tdeio-locate
+    SUBDIR += tdeio-sword
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/tdeio/tdeio-appinfo/Makefile b/freebsd/applications/tdeio/tdeio-appinfo/Makefile
new file mode 100644
index 000000000..3e2a93b42
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-appinfo/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdeio-appinfo-trinity
+COMMENT=		TDEIO slave for the appinfo protocol
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/tdeio
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/tdeio/tdeio-appinfo/distinfo b/freebsd/applications/tdeio/tdeio-appinfo/distinfo
new file mode 100644
index 000000000..68aa2435c
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-appinfo/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740356
+SHA256 (TDE/applications/tdeio/tdeio-appinfo-trinity_14.0.13.orig.tar.xz) = ee2f65c1cbc914ca5bab387a106fc484fc3e5d3e20d5dcb4f7d55e2c27d1528b
+SIZE (TDE/applications/tdeio/tdeio-appinfo-trinity_14.0.13.orig.tar.xz) = 13688
diff --git a/freebsd/applications/tdeio/tdeio-appinfo/pkg-descr b/freebsd/applications/tdeio/tdeio-appinfo/pkg-descr
new file mode 100644
index 000000000..a04cefe5b
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-appinfo/pkg-descr
@@ -0,0 +1,6 @@
+TDEIO slave for the appinfo protocol
+
+Adds support for the "appinfo:" protocol
+to Konqueror and other TDE applications.
+
+This enables you to perform appinfo: searches in TDE.
diff --git a/freebsd/applications/tdeio/tdeio-appinfo/pkg-plist b/freebsd/applications/tdeio/tdeio-appinfo/pkg-plist
new file mode 100644
index 000000000..c0fc095ed
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-appinfo/pkg-plist
@@ -0,0 +1,3 @@
+lib/trinity/tdeio_appinfo.la
+lib/trinity/tdeio_appinfo.so
+share/services/appinfo.protocol
diff --git a/freebsd/applications/tdeio/tdeio-ftps/Makefile b/freebsd/applications/tdeio/tdeio-ftps/Makefile
new file mode 100644
index 000000000..8e27f6098
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-ftps/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdeio-ftps-trinity
+COMMENT=		ftps TDEIO slave for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/tdeio
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/tdeio/tdeio-ftps/distinfo b/freebsd/applications/tdeio/tdeio-ftps/distinfo
new file mode 100644
index 000000000..35b4d31cb
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-ftps/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740403
+SHA256 (TDE/applications/tdeio/tdeio-ftps-trinity_14.0.13.orig.tar.xz) = cea77dee0892e1b931f57eb827b47fdf612de9b3d5c434822eb18f859ed4d859
+SIZE (TDE/applications/tdeio/tdeio-ftps-trinity_14.0.13.orig.tar.xz) = 36272
diff --git a/freebsd/applications/tdeio-ftps/pkg-descr b/freebsd/applications/tdeio/tdeio-ftps/pkg-descr
index 7012d6cf8..7012d6cf8 100644
--- a/freebsd/applications/tdeio-ftps/pkg-descr
+++ b/freebsd/applications/tdeio/tdeio-ftps/pkg-descr
diff --git a/freebsd/applications/tdeio/tdeio-ftps/pkg-plist b/freebsd/applications/tdeio/tdeio-ftps/pkg-plist
new file mode 100644
index 000000000..e76d0fdf4
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-ftps/pkg-plist
@@ -0,0 +1,4 @@
+lib/trinity/tdeio_ftps.la
+lib/trinity/tdeio_ftps.so
+share/locale/de/LC_MESSAGES/tdeio_ftps.mo
+share/services/ftps.protocol
diff --git a/freebsd/applications/tdeio/tdeio-gopher/Makefile b/freebsd/applications/tdeio/tdeio-gopher/Makefile
new file mode 100644
index 000000000..5da13457d
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-gopher/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdeio-gopher-trinity
+COMMENT=		tdeio-slave for the gopher protocol
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/tdeio
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/tdeio/tdeio-gopher/distinfo b/freebsd/applications/tdeio/tdeio-gopher/distinfo
new file mode 100644
index 000000000..68dfa91bc
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-gopher/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740475
+SHA256 (TDE/applications/tdeio/tdeio-gopher-trinity_14.0.13.orig.tar.xz) = d8ffd0c94d8dce6375b03a3e708dcf6acd5f4b26f7fc8b2d55c7916c7fffbad9
+SIZE (TDE/applications/tdeio/tdeio-gopher-trinity_14.0.13.orig.tar.xz) = 33928
diff --git a/freebsd/applications/tdeio/tdeio-gopher/pkg-descr b/freebsd/applications/tdeio/tdeio-gopher/pkg-descr
new file mode 100644
index 000000000..70755032e
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-gopher/pkg-descr
@@ -0,0 +1,6 @@
+tdeio-slave for the gopher protocol
+
+Adds support for the "gopher:" protocol
+to Konqueror and other TDE applications.
+
+This enables you to perform gopher searches in Konqueror.
diff --git a/freebsd/applications/tdeio/tdeio-gopher/pkg-plist b/freebsd/applications/tdeio/tdeio-gopher/pkg-plist
new file mode 100644
index 000000000..547b4b56d
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-gopher/pkg-plist
@@ -0,0 +1,117 @@
+lib/trinity/tdeio_gopher.la
+lib/trinity/tdeio_gopher.so
+share/doc/tde/HTML/ca/tdeioslave/gopher/common
+share/doc/tde/HTML/ca/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/ca/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/da/tdeioslave/gopher/common
+share/doc/tde/HTML/da/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/da/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/de/tdeioslave/gopher/common
+share/doc/tde/HTML/de/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/de/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/en/tdeioslave/gopher/common
+share/doc/tde/HTML/en/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/en/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/en_GB/tdeioslave/gopher/common
+share/doc/tde/HTML/en_GB/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/en_GB/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/es/tdeioslave/gopher/common
+share/doc/tde/HTML/es/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/es/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/et/tdeioslave/gopher/common
+share/doc/tde/HTML/et/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/et/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/fr/tdeioslave/gopher/common
+share/doc/tde/HTML/fr/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/fr/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/gl/tdeioslave/gopher/common
+share/doc/tde/HTML/gl/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/gl/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/hu/tdeioslave/gopher/common
+share/doc/tde/HTML/hu/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/hu/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/it/tdeioslave/gopher/common
+share/doc/tde/HTML/it/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/it/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/nl/tdeioslave/gopher/common
+share/doc/tde/HTML/nl/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/nl/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/pl/tdeioslave/gopher/common
+share/doc/tde/HTML/pl/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/pl/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/pt/tdeioslave/gopher/common
+share/doc/tde/HTML/pt/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/pt/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/pt_BR/tdeioslave/gopher/common
+share/doc/tde/HTML/pt_BR/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/pt_BR/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/ro/tdeioslave/gopher/common
+share/doc/tde/HTML/ro/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/ro/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/ru/tdeioslave/gopher/common
+share/doc/tde/HTML/ru/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/ru/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/sk/tdeioslave/gopher/common
+share/doc/tde/HTML/sk/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/sk/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/sr/tdeioslave/gopher/common
+share/doc/tde/HTML/sr/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/sr/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/sr@Latn/tdeioslave/gopher/common
+share/doc/tde/HTML/sr@Latn/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/sr@Latn/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/sv/tdeioslave/gopher/common
+share/doc/tde/HTML/sv/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/sv/tdeioslave/gopher/index.docbook
+share/doc/tde/HTML/uk/tdeioslave/gopher/common
+share/doc/tde/HTML/uk/tdeioslave/gopher/index.cache.bz2
+share/doc/tde/HTML/uk/tdeioslave/gopher/index.docbook
+share/locale/ar/LC_MESSAGES/tdeio_gopher.mo
+share/locale/bg/LC_MESSAGES/tdeio_gopher.mo
+share/locale/br/LC_MESSAGES/tdeio_gopher.mo
+share/locale/bs/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ca/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ca@valencia/LC_MESSAGES/tdeio_gopher.mo
+share/locale/cs/LC_MESSAGES/tdeio_gopher.mo
+share/locale/cy/LC_MESSAGES/tdeio_gopher.mo
+share/locale/da/LC_MESSAGES/tdeio_gopher.mo
+share/locale/de/LC_MESSAGES/tdeio_gopher.mo
+share/locale/el/LC_MESSAGES/tdeio_gopher.mo
+share/locale/en_GB/LC_MESSAGES/tdeio_gopher.mo
+share/locale/eo/LC_MESSAGES/tdeio_gopher.mo
+share/locale/es/LC_MESSAGES/tdeio_gopher.mo
+share/locale/et/LC_MESSAGES/tdeio_gopher.mo
+share/locale/fi/LC_MESSAGES/tdeio_gopher.mo
+share/locale/fr/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ga/LC_MESSAGES/tdeio_gopher.mo
+share/locale/gl/LC_MESSAGES/tdeio_gopher.mo
+share/locale/hr/LC_MESSAGES/tdeio_gopher.mo
+share/locale/hu/LC_MESSAGES/tdeio_gopher.mo
+share/locale/is/LC_MESSAGES/tdeio_gopher.mo
+share/locale/it/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ja/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ka/LC_MESSAGES/tdeio_gopher.mo
+share/locale/km/LC_MESSAGES/tdeio_gopher.mo
+share/locale/lt/LC_MESSAGES/tdeio_gopher.mo
+share/locale/lv/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ms/LC_MESSAGES/tdeio_gopher.mo
+share/locale/nb/LC_MESSAGES/tdeio_gopher.mo
+share/locale/nds/LC_MESSAGES/tdeio_gopher.mo
+share/locale/nl/LC_MESSAGES/tdeio_gopher.mo
+share/locale/nn/LC_MESSAGES/tdeio_gopher.mo
+share/locale/pa/LC_MESSAGES/tdeio_gopher.mo
+share/locale/pl/LC_MESSAGES/tdeio_gopher.mo
+share/locale/pt/LC_MESSAGES/tdeio_gopher.mo
+share/locale/pt_BR/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ro/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ru/LC_MESSAGES/tdeio_gopher.mo
+share/locale/rw/LC_MESSAGES/tdeio_gopher.mo
+share/locale/sk/LC_MESSAGES/tdeio_gopher.mo
+share/locale/sv/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ta/LC_MESSAGES/tdeio_gopher.mo
+share/locale/tr/LC_MESSAGES/tdeio_gopher.mo
+share/locale/ug/LC_MESSAGES/tdeio_gopher.mo
+share/locale/uk/LC_MESSAGES/tdeio_gopher.mo
+share/locale/zh_CN/LC_MESSAGES/tdeio_gopher.mo
+share/locale/zh_TW/LC_MESSAGES/tdeio_gopher.mo
+share/services/gopher.protocol
diff --git a/freebsd/applications/tdeio/tdeio-locate/Makefile b/freebsd/applications/tdeio/tdeio-locate/Makefile
new file mode 100644
index 000000000..b70388294
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-locate/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdeio-locate-trinity
+COMMENT=		tdeio-slave for the locate command
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/tdeio
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/tdeio/tdeio-locate/distinfo b/freebsd/applications/tdeio/tdeio-locate/distinfo
new file mode 100644
index 000000000..00e1200f2
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-locate/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740510
+SHA256 (TDE/applications/tdeio/tdeio-locate-trinity_14.0.13.orig.tar.xz) = 20f08ea5296b6f884b771fc8beba3e20940520f7c348e300dedd82f2d81b4ea0
+SIZE (TDE/applications/tdeio/tdeio-locate-trinity_14.0.13.orig.tar.xz) = 61384
diff --git a/freebsd/applications/tdeio/tdeio-locate/pkg-descr b/freebsd/applications/tdeio/tdeio-locate/pkg-descr
new file mode 100644
index 000000000..d69dba6a2
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-locate/pkg-descr
@@ -0,0 +1,8 @@
+tdeio-slave for the locate command
+
+Adds support for the "locate:" and "locater:"
+protocols to Konqueror and other TDE applications.
+
+This enables you to perform locate searches as you
+would in a terminal. The result is displayed just
+as a directory.
diff --git a/freebsd/applications/tdeio/tdeio-locate/pkg-plist b/freebsd/applications/tdeio/tdeio-locate/pkg-plist
new file mode 100644
index 000000000..c9756f460
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-locate/pkg-plist
@@ -0,0 +1,13 @@
+lib/trinity/tdeio_locate.la
+lib/trinity/tdeio_locate.so
+share/doc/tde/HTML/en/tdeioslave/locate/common
+share/doc/tde/HTML/en/tdeioslave/locate/index.cache.bz2
+share/doc/tde/HTML/en/tdeioslave/locate/index.docbook
+share/doc/tde/HTML/en/tdeioslave/locate/screenshot.png
+share/locale/de/LC_MESSAGES/tdeio_locate.mo
+share/locale/fr/LC_MESSAGES/tdeio_locate.mo
+share/locale/pt/LC_MESSAGES/tdeio_locate.mo
+share/services/locate.protocol
+share/services/locater.protocol
+share/services/rlocate.protocol
+share/services/searchproviders/locate.desktop
diff --git a/freebsd/applications/tdeio/tdeio-sword/Makefile b/freebsd/applications/tdeio/tdeio-sword/Makefile
new file mode 100644
index 000000000..927fe7e51
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-sword/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdeio-sword-trinity
+COMMENT=		tdeio-slave for the Sword Bible tool
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/tdeio
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libsword.so:${PORTSDIR}/misc/sword \
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/tdeio/tdeio-sword/distinfo b/freebsd/applications/tdeio/tdeio-sword/distinfo
new file mode 100644
index 000000000..50efa8cc1
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-sword/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666740550
+SHA256 (TDE/applications/tdeio/tdeio-sword-trinity_14.0.13.orig.tar.xz) = 81406e25084bc588b9ab2d1f0879afb699b90282de374916ff1f8b29a467f97a
+SIZE (TDE/applications/tdeio/tdeio-sword-trinity_14.0.13.orig.tar.xz) = 102732
diff --git a/freebsd/applications/tdeio/tdeio-sword/pkg-descr b/freebsd/applications/tdeio/tdeio-sword/pkg-descr
new file mode 100644
index 000000000..2581f0b69
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-sword/pkg-descr
@@ -0,0 +1,7 @@
+tdeio-slave for the Sword Bible tool
+
+TDEio-Sword provides access to Bibles, commentaries
+and other texts in an easy to use and attractive
+interface -- the Konqueror web browser.  It does so
+using the SWORD Bible project and implementing a TDE
+ioslave, providing the sword:/ protocol.
diff --git a/freebsd/applications/tdeio/tdeio-sword/pkg-plist b/freebsd/applications/tdeio/tdeio-sword/pkg-plist
new file mode 100644
index 000000000..a77419ed4
--- /dev/null
+++ b/freebsd/applications/tdeio/tdeio-sword/pkg-plist
@@ -0,0 +1,17 @@
+lib/trinity/tdeio_sword.la
+lib/trinity/tdeio_sword.so
+share/apps/tdeio_sword/swordvertical.png
+share/apps/tdeio_sword/tdeio_sword.css
+share/doc/tde/HTML/en/tdeioslave/sword/common
+share/doc/tde/HTML/en/tdeioslave/sword/index.cache.bz2
+share/doc/tde/HTML/en/tdeioslave/sword/index.docbook
+share/icons/hicolor/128x128/apps/tdeio_sword.png
+share/icons/hicolor/16x16/apps/tdeio_sword.png
+share/icons/hicolor/22x22/apps/tdeio_sword.png
+share/icons/hicolor/32x32/apps/tdeio_sword.png
+share/icons/hicolor/48x48/apps/tdeio_sword.png
+share/icons/hicolor/64x64/apps/tdeio_sword.png
+share/icons/hicolor/scalable/apps/tdeio_sword.svgz
+share/locale/de/LC_MESSAGES/tdeio_sword.mo
+share/locale/pt/LC_MESSAGES/tdeio_sword.mo
+share/services/sword.protocol
diff --git a/freebsd/applications/tdepacman/Makefile b/freebsd/applications/tdepacman/Makefile
deleted file mode 100644
index c06f26ab4..000000000
--- a/freebsd/applications/tdepacman/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tdepacman-trinity
-COMMENT=		A pacman clone game for TDE
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
-		${TDE_PREFIX}/libdata/pkgconfig/libtdegames.pc:${PORTSDIR}/x11/trinity/core/tdegames
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DPKGCONFIG_INSTALL_DIR="${PREFIX}/libdata/pkgconfig"
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tdepacman/distinfo b/freebsd/applications/tdepacman/distinfo
deleted file mode 100644
index 177c77bc1..000000000
--- a/freebsd/applications/tdepacman/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601852
-SHA256 (TDE/applications/tdepacman-trinity_14.0.10.orig.tar.xz) = 015632efe7ddf4767666ac531a592300489843271c329a8e2e17bdb8360e8200
-SIZE (TDE/applications/tdepacman-trinity_14.0.10.orig.tar.xz) = 141844
diff --git a/freebsd/applications/tdepacman/pkg-plist b/freebsd/applications/tdepacman/pkg-plist
deleted file mode 100644
index c3b96f92f..000000000
--- a/freebsd/applications/tdepacman/pkg-plist
+++ /dev/null
@@ -1,114 +0,0 @@
-bin/tdepacman
-share/applications/tde/tdepacman.desktop
-share/apps/tdepacman/fonts/font-small.pbm
-share/apps/tdepacman/fonts/font-smooth.pbm
-share/apps/tdepacman/fonts/font.pbm
-share/apps/tdepacman/maps/mspacman/map01
-share/apps/tdepacman/maps/mspacman/map02
-share/apps/tdepacman/maps/mspacman/map03
-share/apps/tdepacman/maps/mspacman/map04
-share/apps/tdepacman/pics/down.xpm
-share/apps/tdepacman/pics/dying.xpm
-share/apps/tdepacman/pics/eyes.xpm
-share/apps/tdepacman/pics/fruit.xpm
-share/apps/tdepacman/pics/left.xpm
-share/apps/tdepacman/pics/lifes.xpm
-share/apps/tdepacman/pics/monster.xpm
-share/apps/tdepacman/pics/mspacman-tiny/dying.xpm
-share/apps/tdepacman/pics/mspacman-tiny/fruit.xpm
-share/apps/tdepacman/pics/mspacman-tiny/fruitscore.xpm
-share/apps/tdepacman/pics/mspacman-tiny/lifes.xpm
-share/apps/tdepacman/pics/mspacman-tiny/pacman.xpm
-share/apps/tdepacman/pics/mspacman-tiny/point.xpm
-share/apps/tdepacman/pics/mspacman-tiny/point02.xpm
-share/apps/tdepacman/pics/mspacman-tiny/point03.xpm
-share/apps/tdepacman/pics/mspacman-tiny/prison.xpm
-share/apps/tdepacman/pics/mspacman-tiny/prison02.xpm
-share/apps/tdepacman/pics/mspacman-tiny/prison03.xpm
-share/apps/tdepacman/pics/mspacman-tiny/prison04.xpm
-share/apps/tdepacman/pics/mspacman-tiny/prison05.xpm
-share/apps/tdepacman/pics/mspacman-tiny/prison06.xpm
-share/apps/tdepacman/pics/mspacman-tiny/switch.xpm
-share/apps/tdepacman/pics/mspacman-tiny/switch02.xpm
-share/apps/tdepacman/pics/mspacman-tiny/switch03.xpm
-share/apps/tdepacman/pics/mspacman-tiny/wall.xpm
-share/apps/tdepacman/pics/mspacman-tiny/wall02.xpm
-share/apps/tdepacman/pics/mspacman-tiny/wall03.xpm
-share/apps/tdepacman/pics/mspacman-tiny/wall04.xpm
-share/apps/tdepacman/pics/mspacman-tiny/wall05.xpm
-share/apps/tdepacman/pics/mspacman-tiny/wall06.xpm
-share/apps/tdepacman/pics/mspacman/dying.xpm
-share/apps/tdepacman/pics/mspacman/fruit.xpm
-share/apps/tdepacman/pics/mspacman/fruitscore.xpm
-share/apps/tdepacman/pics/mspacman/lifes.xpm
-share/apps/tdepacman/pics/mspacman/pacman.xpm
-share/apps/tdepacman/pics/mspacman/point.xpm
-share/apps/tdepacman/pics/mspacman/point02.xpm
-share/apps/tdepacman/pics/mspacman/point03.xpm
-share/apps/tdepacman/pics/mspacman/prison.xpm
-share/apps/tdepacman/pics/mspacman/prison02.xpm
-share/apps/tdepacman/pics/mspacman/prison03.xpm
-share/apps/tdepacman/pics/mspacman/prison04.xpm
-share/apps/tdepacman/pics/mspacman/prison05.xpm
-share/apps/tdepacman/pics/mspacman/prison06.xpm
-share/apps/tdepacman/pics/mspacman/switch.xpm
-share/apps/tdepacman/pics/mspacman/switch02.xpm
-share/apps/tdepacman/pics/mspacman/switch03.xpm
-share/apps/tdepacman/pics/mspacman/wall.xpm
-share/apps/tdepacman/pics/mspacman/wall02.xpm
-share/apps/tdepacman/pics/mspacman/wall03.xpm
-share/apps/tdepacman/pics/mspacman/wall04.xpm
-share/apps/tdepacman/pics/mspacman/wall05.xpm
-share/apps/tdepacman/pics/mspacman/wall06.xpm
-share/apps/tdepacman/pics/pacman.xpm
-share/apps/tdepacman/pics/point.xpm
-share/apps/tdepacman/pics/prison.xpm
-share/apps/tdepacman/pics/right.xpm
-share/apps/tdepacman/pics/switch.xpm
-share/apps/tdepacman/pics/tiny/dying.xpm
-share/apps/tdepacman/pics/tiny/eyes.xpm
-share/apps/tdepacman/pics/tiny/fruit.xpm
-share/apps/tdepacman/pics/tiny/lifes.xpm
-share/apps/tdepacman/pics/tiny/monster.xpm
-share/apps/tdepacman/pics/tiny/pacman.xpm
-share/apps/tdepacman/pics/tiny/point.xpm
-share/apps/tdepacman/pics/tiny/prison.xpm
-share/apps/tdepacman/pics/tiny/switch.xpm
-share/apps/tdepacman/pics/tiny/wall.xpm
-share/apps/tdepacman/pics/up.xpm
-share/apps/tdepacman/pics/wall.xpm
-share/apps/tdepacman/pics/zacman/dying.xpm
-share/apps/tdepacman/pics/zacman/eyes.xpm
-share/apps/tdepacman/pics/zacman/lifes.xpm
-share/apps/tdepacman/pics/zacman/monster.xpm
-share/apps/tdepacman/pics/zacman/pacman.xpm
-share/apps/tdepacman/pics/zacman/point.xpm
-share/apps/tdepacman/pics/zacman/switch.xpm
-share/apps/tdepacman/pics/zacman/wall.xpm
-share/apps/tdepacman/tdepacmanui.rc
-share/config/tdepacmanrc
-share/doc/tde/HTML/de/tdepacman/tdepacman-1.html
-share/doc/tde/HTML/de/tdepacman/tdepacman-2.html
-share/doc/tde/HTML/de/tdepacman/tdepacman-3.html
-share/doc/tde/HTML/de/tdepacman/tdepacman-4.html
-share/doc/tde/HTML/de/tdepacman/tdepacman-index.html
-share/doc/tde/HTML/de/tdepacman/tdepacman.gif
-share/doc/tde/HTML/en/tdepacman/common
-share/doc/tde/HTML/en/tdepacman/index.cache.bz2
-share/doc/tde/HTML/en/tdepacman/index.docbook
-share/doc/tde/HTML/en/tdepacman/screenshot.png
-share/doc/tde/HTML/en/tdepacman/tdepacman-1.html
-share/doc/tde/HTML/en/tdepacman/tdepacman-2.html
-share/doc/tde/HTML/en/tdepacman/tdepacman-3.html
-share/doc/tde/HTML/en/tdepacman/tdepacman-4.html
-share/doc/tde/HTML/en/tdepacman/tdepacman-index.html
-share/doc/tde/HTML/en/tdepacman/tdepacman.gif
-share/icons/hicolor/16x16/apps/tdepacman.png
-share/icons/hicolor/32x32/apps/tdepacman.png
-share/icons/locolor/16x16/apps/tdepacman.png
-share/icons/locolor/32x32/apps/tdepacman.png
-share/locale/de/LC_MESSAGES/tdepacman.mo
-share/locale/es/LC_MESSAGES/tdepacman.mo
-share/locale/pt/LC_MESSAGES/tdepacman.mo
-share/locale/sv/LC_MESSAGES/tdepacman.mo
-share/man/man1/tdepacman.1.gz
diff --git a/freebsd/applications/tdmtheme/Makefile b/freebsd/applications/tdmtheme/Makefile
deleted file mode 100644
index c90b052f7..000000000
--- a/freebsd/applications/tdmtheme/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		tdmtheme-trinity
-COMMENT=		Theme manager for TDM [Trinity]
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/tdmtheme/distinfo b/freebsd/applications/tdmtheme/distinfo
deleted file mode 100644
index e1ca423ae..000000000
--- a/freebsd/applications/tdmtheme/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601869
-SHA256 (TDE/applications/tdmtheme-trinity_14.0.10.orig.tar.xz) = 412bb39812c175cf95a11bb85b1a9056049f738c8fa41d58136a55866146ea10
-SIZE (TDE/applications/tdmtheme-trinity_14.0.10.orig.tar.xz) = 57036
diff --git a/freebsd/applications/themes/Makefile b/freebsd/applications/themes/Makefile
new file mode 100644
index 000000000..2fbbe6a06
--- /dev/null
+++ b/freebsd/applications/themes/Makefile
@@ -0,0 +1,17 @@
+
+    SUBDIR =
+    SUBDIR += gtk-qt-engine
+    SUBDIR += gtk3-tqt-engine
+    SUBDIR += ksplash-engine-moodin
+    SUBDIR += tde-style-baghira
+    SUBDIR += tde-style-domino
+    SUBDIR += tde-style-ia-ora
+    SUBDIR += tde-style-lipstik
+    SUBDIR += tde-style-qtcurve
+    SUBDIR += tdmtheme
+    SUBDIR += twin-style-crystal
+    SUBDIR += twin-style-dekorator
+    SUBDIR += twin-style-machbunt
+    SUBDIR += twin-style-suse2
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/themes/gtk-qt-engine/Makefile b/freebsd/applications/themes/gtk-qt-engine/Makefile
new file mode 100644
index 000000000..a6e5ef876
--- /dev/null
+++ b/freebsd/applications/themes/gtk-qt-engine/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		gtk-qt-engine-trinity
+COMMENT=		Theme engine using TQt for GTK+ 2.x and Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	g/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11-themes
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE}
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/gtk-qt-engine/distinfo b/freebsd/applications/themes/gtk-qt-engine/distinfo
new file mode 100644
index 000000000..2b0e63ca3
--- /dev/null
+++ b/freebsd/applications/themes/gtk-qt-engine/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666769595
+SHA256 (TDE/applications/themes/gtk-qt-engine-trinity_14.0.13.orig.tar.xz) = 1e11c7c824012f485402f85843441eabed3aafdfebf1f872cc54e6d4cb08138d
+SIZE (TDE/applications/themes/gtk-qt-engine-trinity_14.0.13.orig.tar.xz) = 60212
diff --git a/freebsd/applications/gtk-qt-engine/pkg-descr b/freebsd/applications/themes/gtk-qt-engine/pkg-descr
index b1a3caf17..b1a3caf17 100644
--- a/freebsd/applications/gtk-qt-engine/pkg-descr
+++ b/freebsd/applications/themes/gtk-qt-engine/pkg-descr
diff --git a/freebsd/applications/themes/gtk-qt-engine/pkg-plist b/freebsd/applications/themes/gtk-qt-engine/pkg-plist
new file mode 100644
index 000000000..5f11b1d18
--- /dev/null
+++ b/freebsd/applications/themes/gtk-qt-engine/pkg-plist
@@ -0,0 +1,26 @@
+lib/trinity/kcm_kcmgtk.la
+lib/trinity/kcm_kcmgtk.so
+share/applications/tde/kcmgtk.desktop
+share/doc/tde/HTML/en/kcontrol/gtk/common
+share/doc/tde/HTML/en/kcontrol/gtk/index.cache.bz2
+share/doc/tde/HTML/en/kcontrol/gtk/index.docbook
+share/locale/bg/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/de/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/es/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/fr/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/it/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/nl/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/nn/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/pl/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/ru/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/sv/LC_MESSAGES/gtk-qt-engine.mo
+share/locale/tr/LC_MESSAGES/gtk-qt-engine.mo
+/usr/local/lib/gtk-2.0/2.10.0/engines/libqtengine.la
+/usr/local/lib/gtk-2.0/2.10.0/engines/libqtengine.so
+/usr/local/share/themes/Qt/gtk-2.0/gtkrc
+@dir /usr/local/lib/gtk-2.0/2.10.0/engines
+@dir /usr/local/lib/gtk-2.0/2.10.0
+@dir /usr/local/lib/gtk-2.0
+@dir /usr/local/share/themes/Qt/gtk-2.0
+@dir /usr/local/share/themes/Qt
+@dir /usr/local/share/themes
diff --git a/freebsd/applications/themes/gtk3-tqt-engine/Makefile b/freebsd/applications/themes/gtk3-tqt-engine/Makefile
new file mode 100644
index 000000000..3f2c7d605
--- /dev/null
+++ b/freebsd/applications/themes/gtk3-tqt-engine/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		gtk3-tqt-engine-trinity
+COMMENT=		GTK3 theme engine for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	g/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11-themes
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=\
+		libgdk-3.so:${PORTSDIR}/x11-toolkits/gtk30 \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE}
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/gtk3-tqt-engine/distinfo b/freebsd/applications/themes/gtk3-tqt-engine/distinfo
new file mode 100644
index 000000000..eb1f8145a
--- /dev/null
+++ b/freebsd/applications/themes/gtk3-tqt-engine/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770021
+SHA256 (TDE/applications/themes/gtk3-tqt-engine-trinity_14.0.13.orig.tar.xz) = 883ba126717ae2562d67dc6cf63ff4bec2232b03e7f57e0ce977db4b54130638
+SIZE (TDE/applications/themes/gtk3-tqt-engine-trinity_14.0.13.orig.tar.xz) = 324144
diff --git a/freebsd/applications/gtk3-tqt-engine/pkg-descr b/freebsd/applications/themes/gtk3-tqt-engine/pkg-descr
index a22621c71..a22621c71 100644
--- a/freebsd/applications/gtk3-tqt-engine/pkg-descr
+++ b/freebsd/applications/themes/gtk3-tqt-engine/pkg-descr
diff --git a/freebsd/applications/gtk3-tqt-engine/pkg-plist b/freebsd/applications/themes/gtk3-tqt-engine/pkg-plist
index e64f8db98..e64f8db98 100644
--- a/freebsd/applications/gtk3-tqt-engine/pkg-plist
+++ b/freebsd/applications/themes/gtk3-tqt-engine/pkg-plist
diff --git a/freebsd/applications/themes/ksplash-engine-moodin/Makefile b/freebsd/applications/themes/ksplash-engine-moodin/Makefile
new file mode 100644
index 000000000..2e979dd55
--- /dev/null
+++ b/freebsd/applications/themes/ksplash-engine-moodin/Makefile
@@ -0,0 +1,36 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		ksplash-engine-moodin-trinity
+COMMENT=		Fading splash screen engine for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/lib/libksplashthemes.so:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/ksplash-engine-moodin/distinfo b/freebsd/applications/themes/ksplash-engine-moodin/distinfo
new file mode 100644
index 000000000..178cdb3c9
--- /dev/null
+++ b/freebsd/applications/themes/ksplash-engine-moodin/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770082
+SHA256 (TDE/applications/themes/ksplash-engine-moodin-trinity_14.0.13.orig.tar.xz) = a92509e51b3e9e0aacb37bbc187af9b6b5f885f55b0e38ed07c88735bdf14fd5
+SIZE (TDE/applications/themes/ksplash-engine-moodin-trinity_14.0.13.orig.tar.xz) = 618588
diff --git a/freebsd/applications/ksplash-engine-moodin/pkg-descr b/freebsd/applications/themes/ksplash-engine-moodin/pkg-descr
index adb6f5414..adb6f5414 100644
--- a/freebsd/applications/ksplash-engine-moodin/pkg-descr
+++ b/freebsd/applications/themes/ksplash-engine-moodin/pkg-descr
diff --git a/freebsd/applications/ksplash-engine-moodin/pkg-plist b/freebsd/applications/themes/ksplash-engine-moodin/pkg-plist
index 8af87034f..8af87034f 100644
--- a/freebsd/applications/ksplash-engine-moodin/pkg-plist
+++ b/freebsd/applications/themes/ksplash-engine-moodin/pkg-plist
diff --git a/freebsd/applications/themes/tde-style-baghira/Makefile b/freebsd/applications/themes/tde-style-baghira/Makefile
new file mode 100644
index 000000000..976be5b42
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-baghira/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tde-style-baghira-trinity
+COMMENT=		TDE style for Apple junkies :)
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/tde-style-baghira/distinfo b/freebsd/applications/themes/tde-style-baghira/distinfo
new file mode 100644
index 000000000..088f4464c
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-baghira/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770114
+SHA256 (TDE/applications/themes/tde-style-baghira-trinity_14.0.13.orig.tar.xz) = 2fbb43600fc645cf5bfa1b378ca4532998a1533e288e3cd5cc324929493e2aca
+SIZE (TDE/applications/themes/tde-style-baghira-trinity_14.0.13.orig.tar.xz) = 392728
diff --git a/freebsd/applications/tde-style-baghira/pkg-descr b/freebsd/applications/themes/tde-style-baghira/pkg-descr
index b96cbc1d3..b96cbc1d3 100644
--- a/freebsd/applications/tde-style-baghira/pkg-descr
+++ b/freebsd/applications/themes/tde-style-baghira/pkg-descr
diff --git a/freebsd/applications/themes/tde-style-baghira/pkg-plist b/freebsd/applications/themes/tde-style-baghira/pkg-plist
new file mode 100644
index 000000000..b5da27033
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-baghira/pkg-plist
@@ -0,0 +1,63 @@
+bin/bab
+lib/libbaghirastarter.la
+lib/libbaghirastarter.so
+lib/trinity/b_menu_panelapplet.la
+lib/trinity/b_menu_panelapplet.so
+lib/trinity/plugins/styles/baghira.la
+lib/trinity/plugins/styles/baghira.so
+lib/trinity/tdestyle_baghira_config.la
+lib/trinity/tdestyle_baghira_config.so
+lib/trinity/twin3_baghira.la
+lib/trinity/twin3_baghira.so
+lib/trinity/twin_baghira_config.la
+lib/trinity/twin_baghira_config.so
+lib/usermanager_panelapplet.la
+lib/usermanager_panelapplet.so
+share/applications/tde/bab.desktop
+share/apps/baghira/poof.png
+share/apps/kicker/applets/baghira-starter.desktop
+share/apps/kicker/applets/baghira-usermanager.desktop
+share/apps/tdedisplay/color-schemes/AquaBlue.kcsrc
+share/apps/tdedisplay/color-schemes/AquaGraphite.kcsrc
+share/apps/tdestyle/themes/baghira.themerc
+share/apps/twin/baghira.desktop
+share/icons/crystalsvg/128x128/apps/baghira.png
+share/icons/crystalsvg/128x128/apps/baghira_blue.png
+share/icons/crystalsvg/128x128/apps/baghira_grey.png
+share/icons/crystalsvg/128x128/apps/baghira_white.png
+share/icons/crystalsvg/128x128/apps/baghira_yellow.png
+share/icons/crystalsvg/16x16/apps/baghira.png
+share/icons/crystalsvg/16x16/apps/baghira_blue.png
+share/icons/crystalsvg/16x16/apps/baghira_grey.png
+share/icons/crystalsvg/16x16/apps/baghira_white.png
+share/icons/crystalsvg/16x16/apps/baghira_yellow.png
+share/icons/crystalsvg/22x22/actions/bStarter.png
+share/icons/crystalsvg/22x22/actions/bStarter_down.png
+share/icons/crystalsvg/22x22/actions/bStarter_hover.png
+share/icons/crystalsvg/22x22/actions/bab_itunes.png
+share/icons/crystalsvg/22x22/actions/bab_jaguar.png
+share/icons/crystalsvg/22x22/actions/bab_milk.png
+share/icons/crystalsvg/22x22/actions/bab_panther.png
+share/icons/crystalsvg/22x22/actions/bab_tiger.png
+share/icons/crystalsvg/22x22/apps/baghira.png
+share/icons/crystalsvg/22x22/apps/baghira_blue.png
+share/icons/crystalsvg/22x22/apps/baghira_grey.png
+share/icons/crystalsvg/22x22/apps/baghira_white.png
+share/icons/crystalsvg/22x22/apps/baghira_yellow.png
+share/icons/crystalsvg/32x32/apps/baghira.png
+share/icons/crystalsvg/32x32/apps/baghira_blue.png
+share/icons/crystalsvg/32x32/apps/baghira_grey.png
+share/icons/crystalsvg/32x32/apps/baghira_white.png
+share/icons/crystalsvg/32x32/apps/baghira_yellow.png
+share/icons/crystalsvg/48x48/apps/baghira.png
+share/icons/crystalsvg/48x48/apps/baghira_blue.png
+share/icons/crystalsvg/48x48/apps/baghira_grey.png
+share/icons/crystalsvg/48x48/apps/baghira_white.png
+share/icons/crystalsvg/48x48/apps/baghira_yellow.png
+share/icons/crystalsvg/64x64/apps/baghira.png
+share/icons/crystalsvg/64x64/apps/baghira_blue.png
+share/icons/crystalsvg/64x64/apps/baghira_grey.png
+share/icons/crystalsvg/64x64/apps/baghira_white.png
+share/icons/crystalsvg/64x64/apps/baghira_yellow.png
+share/locale/de/LC_MESSAGES/baghira-starter.mo
+share/man/man1/bab.1.gz
diff --git a/freebsd/applications/themes/tde-style-domino/Makefile b/freebsd/applications/themes/tde-style-domino/Makefile
new file mode 100644
index 000000000..1ec8b5bd6
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-domino/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tde-style-domino-trinity
+COMMENT=		Domino widget style and twin decoration for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/tde-style-domino/distinfo b/freebsd/applications/themes/tde-style-domino/distinfo
new file mode 100644
index 000000000..8fe27433d
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-domino/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770191
+SHA256 (TDE/applications/themes/tde-style-domino-trinity_14.0.13.orig.tar.xz) = 84e33e799d195077703aa469329e69b191d7f5c60aeab224982693dc41655774
+SIZE (TDE/applications/themes/tde-style-domino-trinity_14.0.13.orig.tar.xz) = 116328
diff --git a/freebsd/applications/tde-style-domino/pkg-descr b/freebsd/applications/themes/tde-style-domino/pkg-descr
index e5e9f9e69..e5e9f9e69 100644
--- a/freebsd/applications/tde-style-domino/pkg-descr
+++ b/freebsd/applications/themes/tde-style-domino/pkg-descr
diff --git a/freebsd/applications/tde-style-domino/pkg-plist b/freebsd/applications/themes/tde-style-domino/pkg-plist
index c168d20ed..c168d20ed 100644
--- a/freebsd/applications/tde-style-domino/pkg-plist
+++ b/freebsd/applications/themes/tde-style-domino/pkg-plist
diff --git a/freebsd/applications/themes/tde-style-ia-ora/Makefile b/freebsd/applications/themes/tde-style-ia-ora/Makefile
new file mode 100644
index 000000000..3204c99b5
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-ia-ora/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tde-style-ia-ora-trinity
+COMMENT=		Mandriva Ia Ora theme for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/tde-style-ia-ora/distinfo b/freebsd/applications/themes/tde-style-ia-ora/distinfo
new file mode 100644
index 000000000..d72c799cd
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-ia-ora/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770224
+SHA256 (TDE/applications/themes/tde-style-ia-ora-trinity_14.0.13.orig.tar.xz) = 8fe935a7de393ebe18b9ebcb366b31d5f668f0d3d93e5ebec5578d3a4922b985
+SIZE (TDE/applications/themes/tde-style-ia-ora-trinity_14.0.13.orig.tar.xz) = 44000
diff --git a/freebsd/applications/tde-style-ia-ora/pkg-descr b/freebsd/applications/themes/tde-style-ia-ora/pkg-descr
index da682712f..da682712f 100644
--- a/freebsd/applications/tde-style-ia-ora/pkg-descr
+++ b/freebsd/applications/themes/tde-style-ia-ora/pkg-descr
diff --git a/freebsd/applications/tde-style-ia-ora/pkg-plist b/freebsd/applications/themes/tde-style-ia-ora/pkg-plist
index 6e93ab802..6e93ab802 100644
--- a/freebsd/applications/tde-style-ia-ora/pkg-plist
+++ b/freebsd/applications/themes/tde-style-ia-ora/pkg-plist
diff --git a/freebsd/applications/themes/tde-style-lipstik/Makefile b/freebsd/applications/themes/tde-style-lipstik/Makefile
new file mode 100644
index 000000000..d86f5bf4d
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-lipstik/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tde-style-lipstik-trinity
+COMMENT=		Lipstik style for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/tde-style-lipstik/distinfo b/freebsd/applications/themes/tde-style-lipstik/distinfo
new file mode 100644
index 000000000..c4722f957
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-lipstik/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770329
+SHA256 (TDE/applications/themes/tde-style-lipstik-trinity_14.0.13.orig.tar.xz) = 812af0b9b1113309cc4e856eee03a4188f25a3c8f720add57c958ad54d205562
+SIZE (TDE/applications/themes/tde-style-lipstik-trinity_14.0.13.orig.tar.xz) = 48604
diff --git a/freebsd/applications/tde-style-lipstik/pkg-descr b/freebsd/applications/themes/tde-style-lipstik/pkg-descr
index ab626d92f..ab626d92f 100644
--- a/freebsd/applications/tde-style-lipstik/pkg-descr
+++ b/freebsd/applications/themes/tde-style-lipstik/pkg-descr
diff --git a/freebsd/applications/tde-style-lipstik/pkg-plist b/freebsd/applications/themes/tde-style-lipstik/pkg-plist
index 5a2b44a31..5a2b44a31 100644
--- a/freebsd/applications/tde-style-lipstik/pkg-plist
+++ b/freebsd/applications/themes/tde-style-lipstik/pkg-plist
diff --git a/freebsd/applications/themes/tde-style-qtcurve/Makefile b/freebsd/applications/themes/tde-style-qtcurve/Makefile
new file mode 100644
index 000000000..afaab05ac
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-qtcurve/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tde-style-qtcurve-trinity
+COMMENT=		QtCurve style for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/tde-style-qtcurve/distinfo b/freebsd/applications/themes/tde-style-qtcurve/distinfo
new file mode 100644
index 000000000..1281f6d6f
--- /dev/null
+++ b/freebsd/applications/themes/tde-style-qtcurve/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770463
+SHA256 (TDE/applications/themes/tde-style-qtcurve-trinity_14.0.13.orig.tar.xz) = 932292b422d3d232dae441761d76e88c90800f070fa0a189bd066d07951bda47
+SIZE (TDE/applications/themes/tde-style-qtcurve-trinity_14.0.13.orig.tar.xz) = 161508
diff --git a/freebsd/applications/tde-style-qtcurve/pkg-descr b/freebsd/applications/themes/tde-style-qtcurve/pkg-descr
index 93894c500..93894c500 100644
--- a/freebsd/applications/tde-style-qtcurve/pkg-descr
+++ b/freebsd/applications/themes/tde-style-qtcurve/pkg-descr
diff --git a/freebsd/applications/tde-style-qtcurve/pkg-plist b/freebsd/applications/themes/tde-style-qtcurve/pkg-plist
index 32c922458..32c922458 100644
--- a/freebsd/applications/tde-style-qtcurve/pkg-plist
+++ b/freebsd/applications/themes/tde-style-qtcurve/pkg-plist
diff --git a/freebsd/applications/themes/tdmtheme/Makefile b/freebsd/applications/themes/tdmtheme/Makefile
new file mode 100644
index 000000000..9b293888d
--- /dev/null
+++ b/freebsd/applications/themes/tdmtheme/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		tdmtheme-trinity
+COMMENT=		Theme manager for TDM [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/tdmtheme/distinfo b/freebsd/applications/themes/tdmtheme/distinfo
new file mode 100644
index 000000000..05caadd2e
--- /dev/null
+++ b/freebsd/applications/themes/tdmtheme/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770535
+SHA256 (TDE/applications/themes/tdmtheme-trinity_14.0.13.orig.tar.xz) = 6dcc60255672704a409fda5cd10e7967104f0be82b7f1357e464ea7b41b954ae
+SIZE (TDE/applications/themes/tdmtheme-trinity_14.0.13.orig.tar.xz) = 24252
diff --git a/freebsd/applications/tdmtheme/pkg-descr b/freebsd/applications/themes/tdmtheme/pkg-descr
index 643fe5b00..643fe5b00 100644
--- a/freebsd/applications/tdmtheme/pkg-descr
+++ b/freebsd/applications/themes/tdmtheme/pkg-descr
diff --git a/freebsd/applications/tdmtheme/pkg-plist b/freebsd/applications/themes/tdmtheme/pkg-plist
index 83d0c82a8..83d0c82a8 100644
--- a/freebsd/applications/tdmtheme/pkg-plist
+++ b/freebsd/applications/themes/tdmtheme/pkg-plist
diff --git a/freebsd/applications/themes/twin-style-crystal/Makefile b/freebsd/applications/themes/twin-style-crystal/Makefile
new file mode 100644
index 000000000..5d4c997b6
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-crystal/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		twin-style-crystal-trinity
+COMMENT=		Semi transparant window decoration for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/twin-style-crystal/distinfo b/freebsd/applications/themes/twin-style-crystal/distinfo
new file mode 100644
index 000000000..c79181726
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-crystal/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770564
+SHA256 (TDE/applications/themes/twin-style-crystal-trinity_14.0.13.orig.tar.xz) = 253a96130b17ed9359ced7f51c0f63384bd2171ea25fec4415e9f02ae478a2ea
+SIZE (TDE/applications/themes/twin-style-crystal-trinity_14.0.13.orig.tar.xz) = 163960
diff --git a/freebsd/applications/themes/twin-style-crystal/pkg-descr b/freebsd/applications/themes/twin-style-crystal/pkg-descr
new file mode 100644
index 000000000..2ae46a8cb
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-crystal/pkg-descr
@@ -0,0 +1,9 @@
+Semi transparant window decoration for Trinity
+
+Crystal offers you pseudo transparent titlebar, buttons and borders
+transparent, so you can see more of your lovely background image
+Transparancy and buttons can be costumized to match your wishes.
+Offers rounded corners as well
+
+And it is of course nice to look at. Upstream says:
+"- Don't forget to breathe, while drooling."
diff --git a/freebsd/applications/themes/twin-style-crystal/pkg-plist b/freebsd/applications/themes/twin-style-crystal/pkg-plist
new file mode 100644
index 000000000..3afd7881f
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-crystal/pkg-plist
@@ -0,0 +1,5 @@
+lib/trinity/twin3_crystal.la
+lib/trinity/twin3_crystal.so
+lib/trinity/twin_crystal_config.la
+lib/trinity/twin_crystal_config.so
+share/apps/twin/crystal.desktop
diff --git a/freebsd/applications/themes/twin-style-dekorator/Makefile b/freebsd/applications/themes/twin-style-dekorator/Makefile
new file mode 100644
index 000000000..df2efb3d8
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-dekorator/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		twin-style-dekorator-trinity
+COMMENT=		Window decorations for TDE using user-supplied PNG files
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/twin-style-dekorator/distinfo b/freebsd/applications/themes/twin-style-dekorator/distinfo
new file mode 100644
index 000000000..0ed4c5bd4
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-dekorator/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770599
+SHA256 (TDE/applications/themes/twin-style-dekorator-trinity_14.0.13.orig.tar.xz) = 93229a0bdb5b9ed39a6e3abb18a5cefc83afffdcf6786a06d58b92e64b5a1008
+SIZE (TDE/applications/themes/twin-style-dekorator-trinity_14.0.13.orig.tar.xz) = 130928
diff --git a/freebsd/applications/themes/twin-style-dekorator/pkg-descr b/freebsd/applications/themes/twin-style-dekorator/pkg-descr
new file mode 100644
index 000000000..e78f43b8d
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-dekorator/pkg-descr
@@ -0,0 +1,7 @@
+Window decorations for TDE using user-supplied PNG files
+
+Make your own window decorations easy with deKorator.
+Dekorator uses your own made images for buttons, borders
+and so on, so go ahead and be creative.
+
+This is a window decoration, not a style
diff --git a/freebsd/applications/themes/twin-style-dekorator/pkg-plist b/freebsd/applications/themes/twin-style-dekorator/pkg-plist
new file mode 100644
index 000000000..aa9ad2bca
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-dekorator/pkg-plist
@@ -0,0 +1,107 @@
+lib/trinity/twin3_deKorator.la
+lib/trinity/twin3_deKorator.so
+lib/trinity/twin_deKorator_config.la
+lib/trinity/twin_deKorator_config.so
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/hover/buttonCloseHover.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/hover/buttonMaxHover.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/hover/buttonMinHover.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/hover/buttonRestoreHover.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/hover/buttonShadeDownHover.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/hover/buttonShadeHover.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/normal/buttonClose.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/normal/buttonMax.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/normal/buttonMin.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/normal/buttonRestore.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/normal/buttonShade.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/normal/buttonShadeDown.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/press/buttonClosePress.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/press/buttonMaxPress.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/press/buttonMinPress.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/press/buttonRestorePress.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/press/buttonShadeDownPress.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/buttons/press/buttonShadePress.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/bottomLeftFrameBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/bottomRightFrameBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/leftBottomFrameBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/leftButtonsBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/leftTitleBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/midBottomFrameBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/midLeftFrameBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/midRightFrameBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/midTitleBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/rightBottomFrameBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/rightButtonsBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/rightTitleBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/topLeftCornerBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/topLeftFrameBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/topRightCornerBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/deco/topRightFrameBg.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/masks/buttomLeftCornerBitmap.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/masks/buttomMidBitmap.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/masks/buttomRightCornerBitmap.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/masks/topLeftCornerBitmap.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/masks/topMidBitmap.png
+share/apps/deKorator/themes/Bushido-Yellow-theme/masks/topRightCornerBitmap.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonAboveDownHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonAboveHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonBelowDownHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonBelowHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonCloseHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonHelpHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonMaxHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonMenuHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonMinHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonRestoreHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonShadeDownHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonShadeHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonStickyDownHover.png
+share/apps/deKorator/themes/Default-theme/buttons/hover/buttonStickyHover.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonAbove.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonAboveDown.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonBelow.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonBelowDown.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonClose.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonHelp.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonMax.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonMenu.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonMin.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonRestore.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonShade.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonShadeDown.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonSticky.png
+share/apps/deKorator/themes/Default-theme/buttons/normal/buttonStickyDown.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonAboveDownPress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonAbovePress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonBelowDownPress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonBelowPress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonClosePress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonHelpPress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonMaxPress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonMenuPress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonMinPress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonRestorePress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonShadeDownPress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonShadePress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonStickyDownPress.png
+share/apps/deKorator/themes/Default-theme/buttons/press/buttonStickyPress.png
+share/apps/deKorator/themes/Default-theme/deco/bottomLeftFrameBg.png
+share/apps/deKorator/themes/Default-theme/deco/bottomRightFrameBg.png
+share/apps/deKorator/themes/Default-theme/deco/leftBottomFrameBg.png
+share/apps/deKorator/themes/Default-theme/deco/leftButtonsBg.png
+share/apps/deKorator/themes/Default-theme/deco/leftTitleBg.png
+share/apps/deKorator/themes/Default-theme/deco/midBottomFrameBg.png
+share/apps/deKorator/themes/Default-theme/deco/midLeftFrameBg.png
+share/apps/deKorator/themes/Default-theme/deco/midRightFrameBg.png
+share/apps/deKorator/themes/Default-theme/deco/midTitleBg.png
+share/apps/deKorator/themes/Default-theme/deco/rightBottomFrameBg.png
+share/apps/deKorator/themes/Default-theme/deco/rightButtonsBg.png
+share/apps/deKorator/themes/Default-theme/deco/rightTitleBg.png
+share/apps/deKorator/themes/Default-theme/deco/topLeftCornerBg.png
+share/apps/deKorator/themes/Default-theme/deco/topLeftFrameBg.png
+share/apps/deKorator/themes/Default-theme/deco/topRightCornerBg.png
+share/apps/deKorator/themes/Default-theme/deco/topRightFrameBg.png
+share/apps/deKorator/themes/Default-theme/masks/buttomLeftCornerBitmap.png
+share/apps/deKorator/themes/Default-theme/masks/buttomRightCornerBitmap.png
+share/apps/deKorator/themes/Default-theme/masks/topLeftCornerBitmap.png
+share/apps/deKorator/themes/Default-theme/masks/topRightCornerBitmap.png
+share/apps/twin/deKorator.desktop
diff --git a/freebsd/applications/themes/twin-style-machbunt/Makefile b/freebsd/applications/themes/twin-style-machbunt/Makefile
new file mode 100644
index 000000000..b1f42ba99
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-machbunt/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		twin-style-machbunt-trinity
+COMMENT=		TDE window decoration from SUSE 9.1/9.2
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/twin-style-machbunt/distinfo b/freebsd/applications/themes/twin-style-machbunt/distinfo
new file mode 100644
index 000000000..d8de8d85c
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-machbunt/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770639
+SHA256 (TDE/applications/themes/twin-style-machbunt-trinity_14.0.13.orig.tar.xz) = aecc788344b6b9aaeb34d7b935ac80c088a42fb099990cb5f285dfb3bd44f3a5
+SIZE (TDE/applications/themes/twin-style-machbunt-trinity_14.0.13.orig.tar.xz) = 25384
diff --git a/freebsd/applications/themes/twin-style-machbunt/pkg-descr b/freebsd/applications/themes/twin-style-machbunt/pkg-descr
new file mode 100644
index 000000000..24168884f
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-machbunt/pkg-descr
@@ -0,0 +1,4 @@
+TDE window decoration from SUSE 9.1/9.2
+
+This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+An example color scheme is provided too.
diff --git a/freebsd/applications/themes/twin-style-machbunt/pkg-plist b/freebsd/applications/themes/twin-style-machbunt/pkg-plist
new file mode 100644
index 000000000..68524c479
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-machbunt/pkg-plist
@@ -0,0 +1,4 @@
+lib/trinity/twin3_MachBunt.la
+lib/trinity/twin3_MachBunt.so
+share/apps/tdedisplay/color-schemes/MachBunt.kcsrc
+share/apps/twin/MachBunt.desktop
diff --git a/freebsd/applications/themes/twin-style-suse2/Makefile b/freebsd/applications/themes/twin-style-suse2/Makefile
new file mode 100644
index 000000000..d6f028f6e
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-suse2/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		twin-style-suse2-trinity
+COMMENT=		TDE window decoration from SUSE 9.3
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	t/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/themes
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/share/cmake/twin.cmake:${PORTSDIR}/x11/trinity/core/tdebase
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/themes/twin-style-suse2/distinfo b/freebsd/applications/themes/twin-style-suse2/distinfo
new file mode 100644
index 000000000..d03ba153a
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-suse2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666770666
+SHA256 (TDE/applications/themes/twin-style-suse2-trinity_14.0.13.orig.tar.xz) = 8bc2c043fd6d292b181b65ab542eb7f5ec854764699f5a8cc5e3121c4c055153
+SIZE (TDE/applications/themes/twin-style-suse2-trinity_14.0.13.orig.tar.xz) = 77088
diff --git a/freebsd/applications/themes/twin-style-suse2/pkg-descr b/freebsd/applications/themes/twin-style-suse2/pkg-descr
new file mode 100644
index 000000000..447e91571
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-suse2/pkg-descr
@@ -0,0 +1,8 @@
+TDE window decoration from SUSE 9.3
+
+This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE.
+
+It features in additon to the original theme several new button
+styles and a changeable titlebar image.
+
+A color scheme for TDE is provided too.
diff --git a/freebsd/applications/themes/twin-style-suse2/pkg-plist b/freebsd/applications/themes/twin-style-suse2/pkg-plist
new file mode 100644
index 000000000..02b58f70a
--- /dev/null
+++ b/freebsd/applications/themes/twin-style-suse2/pkg-plist
@@ -0,0 +1,59 @@
+lib/trinity/twin3_SUSE2.la
+lib/trinity/twin3_SUSE2.so
+lib/trinity/twin_SUSE2_config.la
+lib/trinity/twin_SUSE2_config.so
+share/apps/tdedisplay/color-schemes/SUSE2.kcsrc
+share/apps/twin/SUSE2.desktop
+share/apps/twin/pics/SUSE2/blowfish-deco.png
+share/apps/twin/pics/SUSE2/daemon-deco.png
+share/apps/twin/pics/SUSE2/debian-decor.png
+share/apps/twin/pics/SUSE2/debian.png
+share/apps/twin/pics/SUSE2/konqui-deco.png
+share/apps/twin/pics/SUSE2/kroete.png
+share/apps/twin/pics/SUSE2/kubuntu-logo.png
+share/apps/twin/pics/SUSE2/pardus.png
+share/apps/twin/pics/SUSE2/penguin-deco.png
+share/apps/twin/pics/SUSE2/titlebar_decor.png
+share/apps/twin/pics/SUSE2/tux-deco.png
+share/apps/twin/pics/SUSE2/ubuntu.png
+share/locale/bg/LC_MESSAGES/twin-style-suse2.mo
+share/locale/bs/LC_MESSAGES/twin-style-suse2.mo
+share/locale/cs/LC_MESSAGES/twin-style-suse2.mo
+share/locale/cy/LC_MESSAGES/twin-style-suse2.mo
+share/locale/da/LC_MESSAGES/twin-style-suse2.mo
+share/locale/de/LC_MESSAGES/twin-style-suse2.mo
+share/locale/el/LC_MESSAGES/twin-style-suse2.mo
+share/locale/en_GB/LC_MESSAGES/twin-style-suse2.mo
+share/locale/en_US/LC_MESSAGES/twin-style-suse2.mo
+share/locale/es/LC_MESSAGES/twin-style-suse2.mo
+share/locale/et/LC_MESSAGES/twin-style-suse2.mo
+share/locale/fi/LC_MESSAGES/twin-style-suse2.mo
+share/locale/fr/LC_MESSAGES/twin-style-suse2.mo
+share/locale/he/LC_MESSAGES/twin-style-suse2.mo
+share/locale/hi/LC_MESSAGES/twin-style-suse2.mo
+share/locale/hr/LC_MESSAGES/twin-style-suse2.mo
+share/locale/hu/LC_MESSAGES/twin-style-suse2.mo
+share/locale/id/LC_MESSAGES/twin-style-suse2.mo
+share/locale/it/LC_MESSAGES/twin-style-suse2.mo
+share/locale/ja/LC_MESSAGES/twin-style-suse2.mo
+share/locale/km/LC_MESSAGES/twin-style-suse2.mo
+share/locale/ko/LC_MESSAGES/twin-style-suse2.mo
+share/locale/lo/LC_MESSAGES/twin-style-suse2.mo
+share/locale/lt/LC_MESSAGES/twin-style-suse2.mo
+share/locale/nb/LC_MESSAGES/twin-style-suse2.mo
+share/locale/nl/LC_MESSAGES/twin-style-suse2.mo
+share/locale/pa/LC_MESSAGES/twin-style-suse2.mo
+share/locale/pl/LC_MESSAGES/twin-style-suse2.mo
+share/locale/pt/LC_MESSAGES/twin-style-suse2.mo
+share/locale/pt_BR/LC_MESSAGES/twin-style-suse2.mo
+share/locale/ro/LC_MESSAGES/twin-style-suse2.mo
+share/locale/ru/LC_MESSAGES/twin-style-suse2.mo
+share/locale/sk/LC_MESSAGES/twin-style-suse2.mo
+share/locale/sl/LC_MESSAGES/twin-style-suse2.mo
+share/locale/sr/LC_MESSAGES/twin-style-suse2.mo
+share/locale/sv/LC_MESSAGES/twin-style-suse2.mo
+share/locale/ta/LC_MESSAGES/twin-style-suse2.mo
+share/locale/tr/LC_MESSAGES/twin-style-suse2.mo
+share/locale/uk/LC_MESSAGES/twin-style-suse2.mo
+share/locale/zh_CN/LC_MESSAGES/twin-style-suse2.mo
+share/locale/zh_TW/LC_MESSAGES/twin-style-suse2.mo
diff --git a/freebsd/applications/utilities/Makefile b/freebsd/applications/utilities/Makefile
new file mode 100644
index 000000000..02a11561b
--- /dev/null
+++ b/freebsd/applications/utilities/Makefile
@@ -0,0 +1,16 @@
+
+    SUBDIR =
+    SUBDIR += abakus
+    SUBDIR += filelight
+    SUBDIR += kbarcode
+    SUBDIR += kchmviewer
+    SUBDIR += kcpuload
+    SUBDIR += kdirstat
+    SUBDIR += keep
+    SUBDIR += knutclient
+    SUBDIR += kompose
+    SUBDIR += krename
+    SUBDIR += mathemagics
+    SUBDIR += qalculate-tde
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/applications/utilities/abakus/Makefile b/freebsd/applications/utilities/abakus/Makefile
new file mode 100644
index 000000000..5f25926f3
--- /dev/null
+++ b/freebsd/applications/utilities/abakus/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		abakus-trinity
+COMMENT=		Calculator for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	a/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libartsc.so:${PORTSDIR}/x11/trinity/dependencies/arts \
+		${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+BUILD_DEPENDS+=	bison:${PORTSDIR}/devel/bison
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/abakus/distinfo b/freebsd/applications/utilities/abakus/distinfo
new file mode 100644
index 000000000..c86cac869
--- /dev/null
+++ b/freebsd/applications/utilities/abakus/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771286
+SHA256 (TDE/applications/utilities/abakus-trinity_14.0.13.orig.tar.xz) = 2537653cabd051dc6525dfb28c828c0b5d8ad4fa4e1ae15919f0a8d2c6c3a1c0
+SIZE (TDE/applications/utilities/abakus-trinity_14.0.13.orig.tar.xz) = 249160
diff --git a/freebsd/applications/abakus/pkg-descr b/freebsd/applications/utilities/abakus/pkg-descr
index a56afdab0..a56afdab0 100644
--- a/freebsd/applications/abakus/pkg-descr
+++ b/freebsd/applications/utilities/abakus/pkg-descr
diff --git a/freebsd/applications/utilities/abakus/pkg-plist b/freebsd/applications/utilities/abakus/pkg-plist
new file mode 100644
index 000000000..d20d5057d
--- /dev/null
+++ b/freebsd/applications/utilities/abakus/pkg-plist
@@ -0,0 +1,24 @@
+bin/abakus
+share/applications/tde/abakus.desktop
+share/apps/abakus/abakusui.rc
+share/doc/tde/HTML/en/abakus/abakus-degrees-mode.png
+share/doc/tde/HTML/en/abakus/abakus-dnd.png
+share/doc/tde/HTML/en/abakus/abakus-result.png
+share/doc/tde/HTML/en/abakus/common
+share/doc/tde/HTML/en/abakus/index.cache.bz2
+share/doc/tde/HTML/en/abakus/index.docbook
+share/doc/tde/HTML/en/abakus/kcalc-degrees-mode.png
+share/doc/tde/HTML/en/abakus/kcalc-fifty.png
+share/doc/tde/HTML/en/abakus/kcalc-result.png
+share/doc/tde/HTML/en/abakus/kcalc-sine.png
+share/doc/tde/HTML/en/abakus/kcalc-three.png
+share/icons/hicolor/64x64/apps/abakus.png
+share/locale/cs/LC_MESSAGES/abakus.mo
+share/locale/de/LC_MESSAGES/abakus.mo
+share/locale/es/LC_MESSAGES/abakus.mo
+share/locale/it/LC_MESSAGES/abakus.mo
+share/locale/nl/LC_MESSAGES/abakus.mo
+share/locale/pt/LC_MESSAGES/abakus.mo
+share/locale/sk/LC_MESSAGES/abakus.mo
+share/locale/tr/LC_MESSAGES/abakus.mo
+share/man/man1/abakus.1.gz
diff --git a/freebsd/applications/utilities/filelight/Makefile b/freebsd/applications/utilities/filelight/Makefile
new file mode 100644
index 000000000..3454c3205
--- /dev/null
+++ b/freebsd/applications/utilities/filelight/Makefile
@@ -0,0 +1,32 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		filelight-trinity
+COMMENT=		Show where your diskspace is being used
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	f/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		deskutils x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/filelight/distinfo b/freebsd/applications/utilities/filelight/distinfo
new file mode 100644
index 000000000..f53ed9487
--- /dev/null
+++ b/freebsd/applications/utilities/filelight/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771335
+SHA256 (TDE/applications/utilities/filelight-trinity_14.0.13.orig.tar.xz) = bf9639707e52933f3b5f49d56a0e36d3cfccfe0fbb2ba2a82693a3d9ee1a9f14
+SIZE (TDE/applications/utilities/filelight-trinity_14.0.13.orig.tar.xz) = 420620
diff --git a/freebsd/applications/filelight/pkg-descr b/freebsd/applications/utilities/filelight/pkg-descr
index 976f0c347..976f0c347 100644
--- a/freebsd/applications/filelight/pkg-descr
+++ b/freebsd/applications/utilities/filelight/pkg-descr
diff --git a/freebsd/applications/filelight/pkg-plist b/freebsd/applications/utilities/filelight/pkg-plist
index 696d4a3a1..696d4a3a1 100644
--- a/freebsd/applications/filelight/pkg-plist
+++ b/freebsd/applications/utilities/filelight/pkg-plist
diff --git a/freebsd/applications/utilities/kbarcode/Makefile b/freebsd/applications/utilities/kbarcode/Makefile
new file mode 100644
index 000000000..0553cbf0e
--- /dev/null
+++ b/freebsd/applications/utilities/kbarcode/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kbarcode-trinity
+COMMENT=		Barcode and label printing application for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/kbarcode/distinfo b/freebsd/applications/utilities/kbarcode/distinfo
new file mode 100644
index 000000000..611b32fd1
--- /dev/null
+++ b/freebsd/applications/utilities/kbarcode/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771360
+SHA256 (TDE/applications/utilities/kbarcode-trinity_14.0.13.orig.tar.xz) = e56aaf20ec5dabf69c91e06ddf1bc22c35f8c750fac72532320e54eb3789bedc
+SIZE (TDE/applications/utilities/kbarcode-trinity_14.0.13.orig.tar.xz) = 273700
diff --git a/freebsd/applications/kbarcode/pkg-descr b/freebsd/applications/utilities/kbarcode/pkg-descr
index c77a2a48c..c77a2a48c 100644
--- a/freebsd/applications/kbarcode/pkg-descr
+++ b/freebsd/applications/utilities/kbarcode/pkg-descr
diff --git a/freebsd/applications/kbarcode/pkg-plist b/freebsd/applications/utilities/kbarcode/pkg-plist
index 201235465..201235465 100644
--- a/freebsd/applications/kbarcode/pkg-plist
+++ b/freebsd/applications/utilities/kbarcode/pkg-plist
diff --git a/freebsd/applications/utilities/kchmviewer/Makefile b/freebsd/applications/utilities/kchmviewer/Makefile
new file mode 100644
index 000000000..add2edbb7
--- /dev/null
+++ b/freebsd/applications/utilities/kchmviewer/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kchmviewer-trinity
+COMMENT=		CHM viewer for Trinity
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libchm.so:${PORTSDIR}/misc/chmlib
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/kchmviewer/distinfo b/freebsd/applications/utilities/kchmviewer/distinfo
new file mode 100644
index 000000000..b5f150982
--- /dev/null
+++ b/freebsd/applications/utilities/kchmviewer/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771466
+SHA256 (TDE/applications/utilities/kchmviewer-trinity_14.0.13.orig.tar.xz) = 42bc694b1f339b8fa8db41fc1d326e9cdc4ccaaf76fe99c9fcb4ea9d72994904
+SIZE (TDE/applications/utilities/kchmviewer-trinity_14.0.13.orig.tar.xz) = 237404
diff --git a/freebsd/applications/kchmviewer/pkg-descr b/freebsd/applications/utilities/kchmviewer/pkg-descr
index 49a6c624c..49a6c624c 100644
--- a/freebsd/applications/kchmviewer/pkg-descr
+++ b/freebsd/applications/utilities/kchmviewer/pkg-descr
diff --git a/freebsd/applications/kchmviewer/pkg-plist b/freebsd/applications/utilities/kchmviewer/pkg-plist
index 5d8575c72..5d8575c72 100644
--- a/freebsd/applications/kchmviewer/pkg-plist
+++ b/freebsd/applications/utilities/kchmviewer/pkg-plist
diff --git a/freebsd/applications/utilities/kcpuload/Makefile b/freebsd/applications/utilities/kcpuload/Makefile
new file mode 100644
index 000000000..e2a4acf52
--- /dev/null
+++ b/freebsd/applications/utilities/kcpuload/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kcpuload-trinity
+COMMENT=		A CPU meter for Kicker [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/kcpuload/distinfo b/freebsd/applications/utilities/kcpuload/distinfo
new file mode 100644
index 000000000..7b3eb12fb
--- /dev/null
+++ b/freebsd/applications/utilities/kcpuload/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771498
+SHA256 (TDE/applications/utilities/kcpuload-trinity_14.0.13.orig.tar.xz) = ab0da0b8bec7304d4b63034a7654c74563ae651c6cfa90618df7100295e2f542
+SIZE (TDE/applications/utilities/kcpuload-trinity_14.0.13.orig.tar.xz) = 34492
diff --git a/freebsd/applications/kcpuload/pkg-descr b/freebsd/applications/utilities/kcpuload/pkg-descr
index bb9b7d25a..bb9b7d25a 100644
--- a/freebsd/applications/kcpuload/pkg-descr
+++ b/freebsd/applications/utilities/kcpuload/pkg-descr
diff --git a/freebsd/applications/kcpuload/pkg-plist b/freebsd/applications/utilities/kcpuload/pkg-plist
index 86d5ef468..86d5ef468 100644
--- a/freebsd/applications/kcpuload/pkg-plist
+++ b/freebsd/applications/utilities/kcpuload/pkg-plist
diff --git a/freebsd/applications/utilities/kdirstat/Makefile b/freebsd/applications/utilities/kdirstat/Makefile
new file mode 100644
index 000000000..8234ccebf
--- /dev/null
+++ b/freebsd/applications/utilities/kdirstat/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kdirstat-trinity
+COMMENT=		Graphical disk usage display with cleanup facilities [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/kdirstat/distinfo b/freebsd/applications/utilities/kdirstat/distinfo
new file mode 100644
index 000000000..75cdaa55f
--- /dev/null
+++ b/freebsd/applications/utilities/kdirstat/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771518
+SHA256 (TDE/applications/utilities/kdirstat-trinity_14.0.13.orig.tar.xz) = 618d464f52f9b0e76309bc7584b197a60d02c68dba12357231141bfe36295e89
+SIZE (TDE/applications/utilities/kdirstat-trinity_14.0.13.orig.tar.xz) = 203548
diff --git a/freebsd/applications/kdirstat/pkg-descr b/freebsd/applications/utilities/kdirstat/pkg-descr
index 7a6f40e1d..7a6f40e1d 100644
--- a/freebsd/applications/kdirstat/pkg-descr
+++ b/freebsd/applications/utilities/kdirstat/pkg-descr
diff --git a/freebsd/applications/kdirstat/pkg-plist b/freebsd/applications/utilities/kdirstat/pkg-plist
index c0673d8c8..c0673d8c8 100644
--- a/freebsd/applications/kdirstat/pkg-plist
+++ b/freebsd/applications/utilities/kdirstat/pkg-plist
diff --git a/freebsd/applications/utilities/keep/Makefile b/freebsd/applications/utilities/keep/Makefile
new file mode 100644
index 000000000..9fd2ab89d
--- /dev/null
+++ b/freebsd/applications/utilities/keep/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		keep-trinity
+COMMENT=		Backup system for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+RUN_DEPENDS+=	rdiff-backup:${PORTSDIR}/sysutils/py-rdiff-backup
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/keep/distinfo b/freebsd/applications/utilities/keep/distinfo
new file mode 100644
index 000000000..5d10f8b67
--- /dev/null
+++ b/freebsd/applications/utilities/keep/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771548
+SHA256 (TDE/applications/utilities/keep-trinity_14.0.13.orig.tar.xz) = d9759ebe8fc9b8db60f979b349b2ef600f216dccb94579b3f10ffbbcb693c7d1
+SIZE (TDE/applications/utilities/keep-trinity_14.0.13.orig.tar.xz) = 164388
diff --git a/freebsd/applications/keep/pkg-descr b/freebsd/applications/utilities/keep/pkg-descr
index e83371c9a..e83371c9a 100644
--- a/freebsd/applications/keep/pkg-descr
+++ b/freebsd/applications/utilities/keep/pkg-descr
diff --git a/freebsd/applications/keep/pkg-plist b/freebsd/applications/utilities/keep/pkg-plist
index 366d408c6..366d408c6 100644
--- a/freebsd/applications/keep/pkg-plist
+++ b/freebsd/applications/utilities/keep/pkg-plist
diff --git a/freebsd/applications/utilities/knutclient/Makefile b/freebsd/applications/utilities/knutclient/Makefile
new file mode 100644
index 000000000..66da8a987
--- /dev/null
+++ b/freebsd/applications/utilities/knutclient/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		knutclient-trinity
+COMMENT=		A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/knutclient/distinfo b/freebsd/applications/utilities/knutclient/distinfo
new file mode 100644
index 000000000..ee3a7b055
--- /dev/null
+++ b/freebsd/applications/utilities/knutclient/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771580
+SHA256 (TDE/applications/utilities/knutclient-trinity_14.0.13.orig.tar.xz) = 34c242cd7c5e5e5861faa0fae8536349d61b20e2d367d2b74a767f62fb886fc0
+SIZE (TDE/applications/utilities/knutclient-trinity_14.0.13.orig.tar.xz) = 531848
diff --git a/freebsd/applications/knutclient/pkg-descr b/freebsd/applications/utilities/knutclient/pkg-descr
index a507e0b33..a507e0b33 100644
--- a/freebsd/applications/knutclient/pkg-descr
+++ b/freebsd/applications/utilities/knutclient/pkg-descr
diff --git a/freebsd/applications/knutclient/pkg-plist b/freebsd/applications/utilities/knutclient/pkg-plist
index 78a3df489..78a3df489 100644
--- a/freebsd/applications/knutclient/pkg-plist
+++ b/freebsd/applications/utilities/knutclient/pkg-plist
diff --git a/freebsd/applications/utilities/kompose/Makefile b/freebsd/applications/utilities/kompose/Makefile
new file mode 100644
index 000000000..6a74ab783
--- /dev/null
+++ b/freebsd/applications/utilities/kompose/Makefile
@@ -0,0 +1,35 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		kompose-trinity
+COMMENT=		Full screen task manager for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2 \
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/kompose/distinfo b/freebsd/applications/utilities/kompose/distinfo
new file mode 100644
index 000000000..8b47fdf49
--- /dev/null
+++ b/freebsd/applications/utilities/kompose/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771604
+SHA256 (TDE/applications/utilities/kompose-trinity_14.0.13.orig.tar.xz) = f2ca88dbb0c32662fb7fe854d864e84236e2e158eebc28f554b1601da9e210a4
+SIZE (TDE/applications/utilities/kompose-trinity_14.0.13.orig.tar.xz) = 76512
diff --git a/freebsd/applications/kompose/pkg-descr b/freebsd/applications/utilities/kompose/pkg-descr
index c22df765d..c22df765d 100644
--- a/freebsd/applications/kompose/pkg-descr
+++ b/freebsd/applications/utilities/kompose/pkg-descr
diff --git a/freebsd/applications/kompose/pkg-plist b/freebsd/applications/utilities/kompose/pkg-plist
index 1a1e0deb0..1a1e0deb0 100644
--- a/freebsd/applications/kompose/pkg-plist
+++ b/freebsd/applications/utilities/kompose/pkg-plist
diff --git a/freebsd/applications/utilities/krename/Makefile b/freebsd/applications/utilities/krename/Makefile
new file mode 100644
index 000000000..99e4d9404
--- /dev/null
+++ b/freebsd/applications/utilities/krename/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		krename-trinity
+COMMENT=		Powerful batch renamer for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	k/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/krename/distinfo b/freebsd/applications/utilities/krename/distinfo
new file mode 100644
index 000000000..79cbc0593
--- /dev/null
+++ b/freebsd/applications/utilities/krename/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771628
+SHA256 (TDE/applications/utilities/krename-trinity_14.0.13.orig.tar.xz) = 637b5c683be4a3ae91e80ad5c890df25a5213d65e4c91927020eff72fa095b8d
+SIZE (TDE/applications/utilities/krename-trinity_14.0.13.orig.tar.xz) = 188052
diff --git a/freebsd/applications/krename/pkg-descr b/freebsd/applications/utilities/krename/pkg-descr
index 482a94c71..482a94c71 100644
--- a/freebsd/applications/krename/pkg-descr
+++ b/freebsd/applications/utilities/krename/pkg-descr
diff --git a/freebsd/applications/utilities/krename/pkg-plist b/freebsd/applications/utilities/krename/pkg-plist
new file mode 100644
index 000000000..af55b211a
--- /dev/null
+++ b/freebsd/applications/utilities/krename/pkg-plist
@@ -0,0 +1,30 @@
+bin/krename
+share/applications/tde/krename.desktop
+share/apps/konqueror/servicemenus/krename_dir.desktop
+share/apps/konqueror/servicemenus/krenameservicemenu.desktop
+share/apps/krename/krename_system_default_tabbed.xml
+share/apps/krename/krename_system_default_wizard.xml
+share/apps/krename/logo.png
+share/doc/tde/HTML/en/krename/index.html
+share/icons/hicolor/32x32/apps/krename.png
+share/icons/hicolor/48x48/apps/krename.png
+share/icons/locolor/16x16/apps/krename.png
+share/icons/locolor/32x32/apps/krename.png
+share/locale/bs/LC_MESSAGES/krename.mo
+share/locale/de/LC_MESSAGES/krename.mo
+share/locale/es/LC_MESSAGES/krename.mo
+share/locale/fr/LC_MESSAGES/krename.mo
+share/locale/hu/LC_MESSAGES/krename.mo
+share/locale/it/LC_MESSAGES/krename.mo
+share/locale/ja/LC_MESSAGES/krename.mo
+share/locale/nl/LC_MESSAGES/krename.mo
+share/locale/pl/LC_MESSAGES/krename.mo
+share/locale/pt_BR/LC_MESSAGES/krename.mo
+share/locale/ru/LC_MESSAGES/krename.mo
+share/locale/sl/LC_MESSAGES/krename.mo
+share/locale/sv/LC_MESSAGES/krename.mo
+share/locale/tr/LC_MESSAGES/krename.mo
+share/locale/uk/LC_MESSAGES/krename.mo
+share/locale/zh_CN/LC_MESSAGES/krename.mo
+share/locale/zh_TW/LC_MESSAGES/krename.mo
+share/man/man1/krename.1.gz
diff --git a/freebsd/applications/utilities/mathemagics/Makefile b/freebsd/applications/utilities/mathemagics/Makefile
new file mode 100644
index 000000000..e25b193e0
--- /dev/null
+++ b/freebsd/applications/utilities/mathemagics/Makefile
@@ -0,0 +1,34 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		mathemagics-trinity
+COMMENT=		A RPN scientific calculator for TDE
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	m/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/mathemagics/distinfo b/freebsd/applications/utilities/mathemagics/distinfo
new file mode 100644
index 000000000..5c8bde65b
--- /dev/null
+++ b/freebsd/applications/utilities/mathemagics/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771657
+SHA256 (TDE/applications/utilities/mathemagics-trinity_14.0.13.orig.tar.xz) = 578beecb1e768fe6fa4aa27dc3008a8eb353b2f05735e9526cb3625f7be88b44
+SIZE (TDE/applications/utilities/mathemagics-trinity_14.0.13.orig.tar.xz) = 31244
diff --git a/freebsd/applications/mathemagics/pkg-descr b/freebsd/applications/utilities/mathemagics/pkg-descr
index 9563b5af7..9563b5af7 100644
--- a/freebsd/applications/mathemagics/pkg-descr
+++ b/freebsd/applications/utilities/mathemagics/pkg-descr
diff --git a/freebsd/applications/utilities/mathemagics/pkg-plist b/freebsd/applications/utilities/mathemagics/pkg-plist
new file mode 100644
index 000000000..afda523a1
--- /dev/null
+++ b/freebsd/applications/utilities/mathemagics/pkg-plist
@@ -0,0 +1,14 @@
+bin/mathemagics
+share/applications/tde/mathemagics.desktop
+share/apps/mathemagics/mathemagicsui.rc
+share/doc/tde/HTML/en/mathemagics/common
+share/doc/tde/HTML/en/mathemagics/index.cache.bz2
+share/doc/tde/HTML/en/mathemagics/index.docbook
+share/icons/hicolor/22x22/apps/mathemagics.png
+share/icons/hicolor/32x32/apps/mathemagics.png
+share/icons/hicolor/48x48/apps/mathemagics.png
+share/icons/locolor/16x16/apps/mathemagics.png
+share/icons/locolor/32x32/apps/mathemagics.png
+share/locale/el/LC_MESSAGES/mathemagics.mo
+share/locale/ru/LC_MESSAGES/mathemagics.mo
+share/man/man1/mathemagics.1.gz
diff --git a/freebsd/applications/utilities/qalculate-tde/Makefile b/freebsd/applications/utilities/qalculate-tde/Makefile
new file mode 100644
index 000000000..75960c633
--- /dev/null
+++ b/freebsd/applications/utilities/qalculate-tde/Makefile
@@ -0,0 +1,37 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../../trinity.port.mk>
+
+PORTNAME=		qalculate-trinity
+COMMENT=		Powerful and easy to use desktop calculator - TDE version
+TDE_PREVERSION=		
+DISTSRC=		qalculate-tde-trinity-${TDE_VERSION}${TDE_PREVERSION}
+MASTER_SITE_SUBDIR=	q/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		x11
+DIST_SUBDIR=		TDE/applications/utilities
+
+
+BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=	libqalculate.so:math/libqalculate
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL="ON" \
+	-DWITH_ALL_OPTIONS="ON"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/applications/utilities/qalculate-tde/distinfo b/freebsd/applications/utilities/qalculate-tde/distinfo
new file mode 100644
index 000000000..05425eddc
--- /dev/null
+++ b/freebsd/applications/utilities/qalculate-tde/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666771675
+SHA256 (TDE/applications/utilities/qalculate-trinity_14.0.13.orig.tar.xz) = 837550b726cdb4c7cc86a87313de3ee1dba2083e299074f3ab264a11690008cf
+SIZE (TDE/applications/utilities/qalculate-trinity_14.0.13.orig.tar.xz) = 729452
diff --git a/freebsd/applications/utilities/qalculate-tde/pkg-descr b/freebsd/applications/utilities/qalculate-tde/pkg-descr
new file mode 100644
index 000000000..a4796f432
--- /dev/null
+++ b/freebsd/applications/utilities/qalculate-tde/pkg-descr
@@ -0,0 +1,9 @@
+Powerful and easy to use desktop calculator - TDE version
+
+Qalculate! is small and simple to use but with much power and versatility
+underneath.  Features include customizable functions, units, arbitrary
+precision, plotting, and a graphical interface that uses a one-line
+fault-tolerant expression entry (although it supports optional traditional
+buttons).
+
+This package contains the TDE user interface of qalculate.
diff --git a/freebsd/applications/utilities/qalculate-tde/pkg-plist b/freebsd/applications/utilities/qalculate-tde/pkg-plist
new file mode 100644
index 000000000..236ef5782
--- /dev/null
+++ b/freebsd/applications/utilities/qalculate-tde/pkg-plist
@@ -0,0 +1,41 @@
+bin/qalculate-tde
+share/applications/tde/qalculate_tde.desktop
+share/apps/qalculate_tde/qalculate_tdeui.rc
+share/doc/tde/HTML/en/qalculate_tde/calculation-history.png
+share/doc/tde/HTML/en/qalculate_tde/calculator-buttons.png
+share/doc/tde/HTML/en/qalculate_tde/common
+share/doc/tde/HTML/en/qalculate_tde/completion.png
+share/doc/tde/HTML/en/qalculate_tde/convert-number-bases.png
+share/doc/tde/HTML/en/qalculate_tde/convert-unit.png
+share/doc/tde/HTML/en/qalculate_tde/edit-function.png
+share/doc/tde/HTML/en/qalculate_tde/edit-matrix.png
+share/doc/tde/HTML/en/qalculate_tde/edit-unit.png
+share/doc/tde/HTML/en/qalculate_tde/edit-variable.png
+share/doc/tde/HTML/en/qalculate_tde/function-manager.png
+share/doc/tde/HTML/en/qalculate_tde/functions.docbook
+share/doc/tde/HTML/en/qalculate_tde/gnuplot.png
+share/doc/tde/HTML/en/qalculate_tde/import-csv.png
+share/doc/tde/HTML/en/qalculate_tde/index.cache.bz2
+share/doc/tde/HTML/en/qalculate_tde/index.docbook
+share/doc/tde/HTML/en/qalculate_tde/insert-function.png
+share/doc/tde/HTML/en/qalculate_tde/mainwindow.png
+share/doc/tde/HTML/en/qalculate_tde/plot-data.png
+share/doc/tde/HTML/en/qalculate_tde/plot-settings.png
+share/doc/tde/HTML/en/qalculate_tde/rpn-mode.png
+share/doc/tde/HTML/en/qalculate_tde/store-variable.png
+share/doc/tde/HTML/en/qalculate_tde/unit-manager.png
+share/doc/tde/HTML/en/qalculate_tde/units.docbook
+share/doc/tde/HTML/en/qalculate_tde/variable-manager.png
+share/doc/tde/HTML/en/qalculate_tde/variables.docbook
+share/icons/hicolor/128x128/apps/qalculate_tde.png
+share/icons/hicolor/16x16/apps/qalculate_tde.png
+share/icons/hicolor/22x22/apps/qalculate_tde.png
+share/icons/hicolor/32x32/actions/qalculate_convert.png
+share/icons/hicolor/32x32/apps/qalculate_tde.png
+share/icons/hicolor/48x48/apps/qalculate_tde.png
+share/icons/hicolor/64x64/apps/qalculate_tde.png
+share/locale/fr/LC_MESSAGES/qalculate_tde.mo
+share/locale/nl/LC_MESSAGES/qalculate_tde.mo
+share/locale/sv/LC_MESSAGES/qalculate_tde.mo
+share/locale/zh_CN/LC_MESSAGES/qalculate_tde.mo
+share/man/man1/qalculate-tde.1.gz
diff --git a/freebsd/applications/yakuake/Makefile b/freebsd/applications/yakuake/Makefile
deleted file mode 100644
index 2ec32004f..000000000
--- a/freebsd/applications/yakuake/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*-mode: makefile-*-
-# Created by: slavek.banko@axis.cz
-# $FreeBSD$
-#
-
-.include <../../trinity.port.mk>
-
-PORTNAME=		yakuake-trinity
-COMMENT=		A Quake-style terminal emulator based on TDE Konsole technology [Trinity]
-TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	y/${PORTNAME}
-PORTREVISION=		0
-CATEGORIES=		x11
-DIST_SUBDIR=		TDE/applications
-
-
-BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
-
-LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
-
-
-# Build
-post-patch: tde-pathfix
-
-do-configure: tde-cmake-prepare
-	${TDE_CMAKE_CONFIGURE} \
-	-DBUILD_ALL="ON" \
-	-DWITH_ALL_OPTIONS="ON"
-
-do-build: tde-cmake-build
-
-do-install: tde-cmake-install
-
-.include <bsd.port.mk>
diff --git a/freebsd/applications/yakuake/distinfo b/freebsd/applications/yakuake/distinfo
deleted file mode 100644
index 9559d17a4..000000000
--- a/freebsd/applications/yakuake/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1619601884
-SHA256 (TDE/applications/yakuake-trinity_14.0.10.orig.tar.xz) = 2b6d06dea79c7a4eb4f89587ddd2e334d195eda83dc221b78170533c31672279
-SIZE (TDE/applications/yakuake-trinity_14.0.10.orig.tar.xz) = 138744
diff --git a/freebsd/common/Makefile b/freebsd/common/Makefile
new file mode 100644
index 000000000..e6f39de6f
--- /dev/null
+++ b/freebsd/common/Makefile
@@ -0,0 +1,5 @@
+
+    SUBDIR =
+    SUBDIR += cmake
+
+.include <bsd.port.subdir.mk>
diff --git a/freebsd/common/cmake/Makefile b/freebsd/common/cmake/Makefile
new file mode 100644
index 000000000..954690c8f
--- /dev/null
+++ b/freebsd/common/cmake/Makefile
@@ -0,0 +1,33 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../trinity.port.mk>
+
+PORTNAME=		cmake-trinity
+COMMENT=		TDE CMake modules
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	c/${PORTNAME}
+PORTREVISION=		0
+CATEGORIES=		devel
+DIST_SUBDIR=		TDE/common
+PREFIX=			${LOCALBASE}
+
+
+BUILD_DEPENDS=\
+		cmake:${PORTSDIR}/devel/cmake \
+
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+		-DCMAKE_INSTALL_PREFIX="${PREFIX}"
+
+do-build: tde-cmake-build
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/common/cmake/distinfo b/freebsd/common/cmake/distinfo
new file mode 100644
index 000000000..58ccf11d3
--- /dev/null
+++ b/freebsd/common/cmake/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666310079
+SHA256 (TDE/common/cmake-trinity_14.0.13.orig.tar.xz) = 4afff8be0f6da566cbf8594dee759cbddaa7f835c704853ac14c18ef388b963c
+SIZE (TDE/common/cmake-trinity_14.0.13.orig.tar.xz) = 36448
diff --git a/freebsd/common/cmake/pkg-descr b/freebsd/common/cmake/pkg-descr
new file mode 100644
index 000000000..29a6f69c9
--- /dev/null
+++ b/freebsd/common/cmake/pkg-descr
@@ -0,0 +1,7 @@
+TDE CMake modules
+
+TDE uses its own set of modules and macros to simplify CMake rules.
+
+This also includes the TDEL10n module that is used to generate and
+update templates for translations and the modified version of
+intltool-merge used to merge translations into desktop files.
diff --git a/freebsd/common/cmake/pkg-plist b/freebsd/common/cmake/pkg-plist
new file mode 100644
index 000000000..ed3420773
--- /dev/null
+++ b/freebsd/common/cmake/pkg-plist
@@ -0,0 +1,15 @@
+share/cmake/Modules/FindTDE.cmake
+share/cmake/Modules/FindTQt.cmake
+share/cmake/Modules/FindTQtQUI.cmake
+share/cmake/Modules/TDEL10n.cmake
+share/cmake/Modules/TDEMacros.cmake
+share/cmake/Modules/TDESetupPaths.cmake
+share/cmake/Modules/TDEVersion.cmake
+share/cmake/Modules/tde_automoc.cmake
+share/cmake/Modules/tde_l10n_merge.pl
+share/cmake/Modules/tde_uic.cmake
+share/cmake/Templates/tde_dummy_cpp.cmake
+share/cmake/Templates/tde_export_library.cmake
+share/cmake/Templates/tde_libtool_file.cmake
+share/cmake/Templates/tde_tdeinit_executable.cmake
+share/cmake/Templates/tde_tdeinit_module.cmake
diff --git a/freebsd/core/tde-i18n-af/Makefile b/freebsd/core/tde-i18n-af/Makefile
index e64eec51e..60321f267 100644
--- a/freebsd/core/tde-i18n-af/Makefile
+++ b/freebsd/core/tde-i18n-af/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-af/distinfo b/freebsd/core/tde-i18n-af/distinfo
index 1556eca0c..7fd4c272e 100644
--- a/freebsd/core/tde-i18n-af/distinfo
+++ b/freebsd/core/tde-i18n-af/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709135
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885410
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ar/Makefile b/freebsd/core/tde-i18n-ar/Makefile
index e36bf3203..81978fefb 100644
--- a/freebsd/core/tde-i18n-ar/Makefile
+++ b/freebsd/core/tde-i18n-ar/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ar/distinfo b/freebsd/core/tde-i18n-ar/distinfo
index b6b9946e4..dccf595b7 100644
--- a/freebsd/core/tde-i18n-ar/distinfo
+++ b/freebsd/core/tde-i18n-ar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709172
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885412
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-az/Makefile b/freebsd/core/tde-i18n-az/Makefile
index 95834a178..673ac93fb 100644
--- a/freebsd/core/tde-i18n-az/Makefile
+++ b/freebsd/core/tde-i18n-az/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-az/distinfo b/freebsd/core/tde-i18n-az/distinfo
index 1f29322d4..d0afc56b9 100644
--- a/freebsd/core/tde-i18n-az/distinfo
+++ b/freebsd/core/tde-i18n-az/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709513
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885414
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-be/Makefile b/freebsd/core/tde-i18n-be/Makefile
index f4cccc6f9..25c7b837b 100644
--- a/freebsd/core/tde-i18n-be/Makefile
+++ b/freebsd/core/tde-i18n-be/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-be/distinfo b/freebsd/core/tde-i18n-be/distinfo
index 240c9f9ca..45b839b66 100644
--- a/freebsd/core/tde-i18n-be/distinfo
+++ b/freebsd/core/tde-i18n-be/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709577
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885416
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-bg/Makefile b/freebsd/core/tde-i18n-bg/Makefile
index e8430cb61..ab975184b 100644
--- a/freebsd/core/tde-i18n-bg/Makefile
+++ b/freebsd/core/tde-i18n-bg/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-bg/distinfo b/freebsd/core/tde-i18n-bg/distinfo
index 07ff96c00..6608a6446 100644
--- a/freebsd/core/tde-i18n-bg/distinfo
+++ b/freebsd/core/tde-i18n-bg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709691
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885418
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-bn/Makefile b/freebsd/core/tde-i18n-bn/Makefile
index 00f9ff7ce..a0f5e0eaa 100644
--- a/freebsd/core/tde-i18n-bn/Makefile
+++ b/freebsd/core/tde-i18n-bn/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-bn/distinfo b/freebsd/core/tde-i18n-bn/distinfo
index 8f421994b..5a49fe56e 100644
--- a/freebsd/core/tde-i18n-bn/distinfo
+++ b/freebsd/core/tde-i18n-bn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709731
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885420
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-br/Makefile b/freebsd/core/tde-i18n-br/Makefile
index 871d41140..a0e68da5e 100644
--- a/freebsd/core/tde-i18n-br/Makefile
+++ b/freebsd/core/tde-i18n-br/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-br/distinfo b/freebsd/core/tde-i18n-br/distinfo
index 6551ffe75..038438901 100644
--- a/freebsd/core/tde-i18n-br/distinfo
+++ b/freebsd/core/tde-i18n-br/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709766
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885422
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-bs/Makefile b/freebsd/core/tde-i18n-bs/Makefile
index 7599120f3..f1f55cd37 100644
--- a/freebsd/core/tde-i18n-bs/Makefile
+++ b/freebsd/core/tde-i18n-bs/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-bs/distinfo b/freebsd/core/tde-i18n-bs/distinfo
index 0d765c9bb..31ac4ce04 100644
--- a/freebsd/core/tde-i18n-bs/distinfo
+++ b/freebsd/core/tde-i18n-bs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709811
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885424
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ca/Makefile b/freebsd/core/tde-i18n-ca/Makefile
index b7a55f73a..d0205dfdc 100644
--- a/freebsd/core/tde-i18n-ca/Makefile
+++ b/freebsd/core/tde-i18n-ca/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ca/distinfo b/freebsd/core/tde-i18n-ca/distinfo
index 3b7782389..dde2b2c7c 100644
--- a/freebsd/core/tde-i18n-ca/distinfo
+++ b/freebsd/core/tde-i18n-ca/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709858
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885426
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ca/pkg-plist b/freebsd/core/tde-i18n-ca/pkg-plist
index 631cafb65..1b63dbb41 100644
--- a/freebsd/core/tde-i18n-ca/pkg-plist
+++ b/freebsd/core/tde-i18n-ca/pkg-plist
@@ -60,6 +60,9 @@ share/doc/tde/HTML/ca/common/8.png
 share/doc/tde/HTML/ca/common/9.png
 share/doc/tde/HTML/ca/common/appheader.html
 share/doc/tde/HTML/ca/common/artistic-license.html
+share/doc/tde/HTML/ca/common/block_title_bottom.png
+share/doc/tde/HTML/ca/common/block_title_mid.png
+share/doc/tde/HTML/ca/common/block_title_top.png
 share/doc/tde/HTML/ca/common/bottom-left.png
 share/doc/tde/HTML/ca/common/bottom-middle.png
 share/doc/tde/HTML/ca/common/bottom-right.png
@@ -77,6 +80,7 @@ share/doc/tde/HTML/ca/common/fdl-license
 share/doc/tde/HTML/ca/common/fdl-license.html
 share/doc/tde/HTML/ca/common/fdl-notice.html
 share/doc/tde/HTML/ca/common/fdl-translated.html
+share/doc/tde/HTML/ca/common/flat.css
 share/doc/tde/HTML/ca/common/footer.html
 share/doc/tde/HTML/ca/common/gpl-license
 share/doc/tde/HTML/ca/common/gpl-license.html
@@ -94,17 +98,25 @@ share/doc/tde/HTML/ca/common/lgpl-translated.html
 share/doc/tde/HTML/ca/common/logotp3.png
 share/doc/tde/HTML/ca/common/mainfooter.html
 share/doc/tde/HTML/ca/common/mainheader.html
+share/doc/tde/HTML/ca/common/print.css
 share/doc/tde/HTML/ca/common/qpl-license.html
 share/doc/tde/HTML/ca/common/shadow.png
+share/doc/tde/HTML/ca/common/tabs.css
 share/doc/tde/HTML/ca/common/tde-common.css
 share/doc/tde/HTML/ca/common/tde-default.css
 share/doc/tde/HTML/ca/common/tde-docs.css
 share/doc/tde/HTML/ca/common/tde-localised.css
 share/doc/tde/HTML/ca/common/tde-localised.css.template
 share/doc/tde/HTML/ca/common/tde-web.css
+share/doc/tde/HTML/ca/common/tde.css
+share/doc/tde/HTML/ca/common/top-left.jpg
 share/doc/tde/HTML/ca/common/top-left.png
 share/doc/tde/HTML/ca/common/top-middle.png
 share/doc/tde/HTML/ca/common/top-right-konqueror.png
+share/doc/tde/HTML/ca/common/top-right.jpg
+share/doc/tde/HTML/ca/common/top-right.png
+share/doc/tde/HTML/ca/common/top-trinity.jpg
+share/doc/tde/HTML/ca/common/top.jpg
 share/doc/tde/HTML/ca/common/web-docbottom.png
 share/doc/tde/HTML/ca/common/web-doctop.png
 share/doc/tde/HTML/ca/common/x11-license.html
@@ -876,9 +888,6 @@ share/doc/tde/HTML/ca/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/ca/tdeioslave/ftp/common
 share/doc/tde/HTML/ca/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/ca/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/ca/tdeioslave/gopher/common
-share/doc/tde/HTML/ca/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/ca/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/ca/tdeioslave/gzip/common
 share/doc/tde/HTML/ca/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/ca/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-cs/Makefile b/freebsd/core/tde-i18n-cs/Makefile
index 18d938163..442bb0cb0 100644
--- a/freebsd/core/tde-i18n-cs/Makefile
+++ b/freebsd/core/tde-i18n-cs/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-cs/distinfo b/freebsd/core/tde-i18n-cs/distinfo
index f66bbd688..d554cff98 100644
--- a/freebsd/core/tde-i18n-cs/distinfo
+++ b/freebsd/core/tde-i18n-cs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619709956
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885428
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-cs/pkg-plist b/freebsd/core/tde-i18n-cs/pkg-plist
index 85611b35b..91eea362a 100644
--- a/freebsd/core/tde-i18n-cs/pkg-plist
+++ b/freebsd/core/tde-i18n-cs/pkg-plist
@@ -66,6 +66,9 @@ share/doc/tde/HTML/cs/common/8.png
 share/doc/tde/HTML/cs/common/9.png
 share/doc/tde/HTML/cs/common/appheader.html
 share/doc/tde/HTML/cs/common/artistic-license.html
+share/doc/tde/HTML/cs/common/block_title_bottom.png
+share/doc/tde/HTML/cs/common/block_title_mid.png
+share/doc/tde/HTML/cs/common/block_title_top.png
 share/doc/tde/HTML/cs/common/bottom-left.png
 share/doc/tde/HTML/cs/common/bottom-middle.png
 share/doc/tde/HTML/cs/common/bottom-right.png
@@ -83,6 +86,7 @@ share/doc/tde/HTML/cs/common/fdl-license
 share/doc/tde/HTML/cs/common/fdl-license.html
 share/doc/tde/HTML/cs/common/fdl-notice.html
 share/doc/tde/HTML/cs/common/fdl-translated.html
+share/doc/tde/HTML/cs/common/flat.css
 share/doc/tde/HTML/cs/common/footer.html
 share/doc/tde/HTML/cs/common/gpl-license
 share/doc/tde/HTML/cs/common/gpl-license.html
@@ -100,17 +104,25 @@ share/doc/tde/HTML/cs/common/lgpl-translated.html
 share/doc/tde/HTML/cs/common/logotp3.png
 share/doc/tde/HTML/cs/common/mainfooter.html
 share/doc/tde/HTML/cs/common/mainheader.html
+share/doc/tde/HTML/cs/common/print.css
 share/doc/tde/HTML/cs/common/qpl-license.html
 share/doc/tde/HTML/cs/common/shadow.png
+share/doc/tde/HTML/cs/common/tabs.css
 share/doc/tde/HTML/cs/common/tde-common.css
 share/doc/tde/HTML/cs/common/tde-default.css
 share/doc/tde/HTML/cs/common/tde-docs.css
 share/doc/tde/HTML/cs/common/tde-localised.css
 share/doc/tde/HTML/cs/common/tde-localised.css.template
 share/doc/tde/HTML/cs/common/tde-web.css
+share/doc/tde/HTML/cs/common/tde.css
+share/doc/tde/HTML/cs/common/top-left.jpg
 share/doc/tde/HTML/cs/common/top-left.png
 share/doc/tde/HTML/cs/common/top-middle.png
 share/doc/tde/HTML/cs/common/top-right-konqueror.png
+share/doc/tde/HTML/cs/common/top-right.jpg
+share/doc/tde/HTML/cs/common/top-right.png
+share/doc/tde/HTML/cs/common/top-trinity.jpg
+share/doc/tde/HTML/cs/common/top.jpg
 share/doc/tde/HTML/cs/common/web-docbottom.png
 share/doc/tde/HTML/cs/common/web-doctop.png
 share/doc/tde/HTML/cs/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-csb/Makefile b/freebsd/core/tde-i18n-csb/Makefile
index 8e27a6efc..c02ba3848 100644
--- a/freebsd/core/tde-i18n-csb/Makefile
+++ b/freebsd/core/tde-i18n-csb/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-csb/distinfo b/freebsd/core/tde-i18n-csb/distinfo
index 7da22bd13..7ac1bdc66 100644
--- a/freebsd/core/tde-i18n-csb/distinfo
+++ b/freebsd/core/tde-i18n-csb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619710002
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885430
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-cy/Makefile b/freebsd/core/tde-i18n-cy/Makefile
index 2428f6693..a9a9227c7 100644
--- a/freebsd/core/tde-i18n-cy/Makefile
+++ b/freebsd/core/tde-i18n-cy/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-cy/distinfo b/freebsd/core/tde-i18n-cy/distinfo
index 4032bd862..0952422c0 100644
--- a/freebsd/core/tde-i18n-cy/distinfo
+++ b/freebsd/core/tde-i18n-cy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619710034
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885432
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-da/Makefile b/freebsd/core/tde-i18n-da/Makefile
index daeda2960..ed01f1d2a 100644
--- a/freebsd/core/tde-i18n-da/Makefile
+++ b/freebsd/core/tde-i18n-da/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-da/distinfo b/freebsd/core/tde-i18n-da/distinfo
index 6b39936e7..b0c947c9f 100644
--- a/freebsd/core/tde-i18n-da/distinfo
+++ b/freebsd/core/tde-i18n-da/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619710067
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885434
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-da/pkg-plist b/freebsd/core/tde-i18n-da/pkg-plist
index 3ecbdda17..e9c469972 100644
--- a/freebsd/core/tde-i18n-da/pkg-plist
+++ b/freebsd/core/tde-i18n-da/pkg-plist
@@ -146,6 +146,9 @@ share/doc/tde/HTML/da/common/8.png
 share/doc/tde/HTML/da/common/9.png
 share/doc/tde/HTML/da/common/appheader.html
 share/doc/tde/HTML/da/common/artistic-license.html
+share/doc/tde/HTML/da/common/block_title_bottom.png
+share/doc/tde/HTML/da/common/block_title_mid.png
+share/doc/tde/HTML/da/common/block_title_top.png
 share/doc/tde/HTML/da/common/bottom-left.png
 share/doc/tde/HTML/da/common/bottom-middle.png
 share/doc/tde/HTML/da/common/bottom-right.png
@@ -163,6 +166,7 @@ share/doc/tde/HTML/da/common/fdl-license
 share/doc/tde/HTML/da/common/fdl-license.html
 share/doc/tde/HTML/da/common/fdl-notice.html
 share/doc/tde/HTML/da/common/fdl-translated.html
+share/doc/tde/HTML/da/common/flat.css
 share/doc/tde/HTML/da/common/footer.html
 share/doc/tde/HTML/da/common/gpl-license
 share/doc/tde/HTML/da/common/gpl-license.html
@@ -180,17 +184,25 @@ share/doc/tde/HTML/da/common/lgpl-translated.html
 share/doc/tde/HTML/da/common/logotp3.png
 share/doc/tde/HTML/da/common/mainfooter.html
 share/doc/tde/HTML/da/common/mainheader.html
+share/doc/tde/HTML/da/common/print.css
 share/doc/tde/HTML/da/common/qpl-license.html
 share/doc/tde/HTML/da/common/shadow.png
+share/doc/tde/HTML/da/common/tabs.css
 share/doc/tde/HTML/da/common/tde-common.css
 share/doc/tde/HTML/da/common/tde-default.css
 share/doc/tde/HTML/da/common/tde-docs.css
 share/doc/tde/HTML/da/common/tde-localised.css
 share/doc/tde/HTML/da/common/tde-localised.css.template
 share/doc/tde/HTML/da/common/tde-web.css
+share/doc/tde/HTML/da/common/tde.css
+share/doc/tde/HTML/da/common/top-left.jpg
 share/doc/tde/HTML/da/common/top-left.png
 share/doc/tde/HTML/da/common/top-middle.png
 share/doc/tde/HTML/da/common/top-right-konqueror.png
+share/doc/tde/HTML/da/common/top-right.jpg
+share/doc/tde/HTML/da/common/top-right.png
+share/doc/tde/HTML/da/common/top-trinity.jpg
+share/doc/tde/HTML/da/common/top.jpg
 share/doc/tde/HTML/da/common/web-docbottom.png
 share/doc/tde/HTML/da/common/web-doctop.png
 share/doc/tde/HTML/da/common/x11-license.html
@@ -1379,9 +1391,6 @@ share/doc/tde/HTML/da/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/da/tdeioslave/ftp/common
 share/doc/tde/HTML/da/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/da/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/da/tdeioslave/gopher/common
-share/doc/tde/HTML/da/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/da/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/da/tdeioslave/gzip/common
 share/doc/tde/HTML/da/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/da/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-de/Makefile b/freebsd/core/tde-i18n-de/Makefile
index 10ebd3128..45a98e54e 100644
--- a/freebsd/core/tde-i18n-de/Makefile
+++ b/freebsd/core/tde-i18n-de/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-de/distinfo b/freebsd/core/tde-i18n-de/distinfo
index 5909fc0ab..0eaae494b 100644
--- a/freebsd/core/tde-i18n-de/distinfo
+++ b/freebsd/core/tde-i18n-de/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619710221
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885436
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-de/pkg-plist b/freebsd/core/tde-i18n-de/pkg-plist
index 0c2f9224c..ad5681c64 100644
--- a/freebsd/core/tde-i18n-de/pkg-plist
+++ b/freebsd/core/tde-i18n-de/pkg-plist
@@ -175,6 +175,9 @@ share/doc/tde/HTML/de/common/8.png
 share/doc/tde/HTML/de/common/9.png
 share/doc/tde/HTML/de/common/appheader.html
 share/doc/tde/HTML/de/common/artistic-license.html
+share/doc/tde/HTML/de/common/block_title_bottom.png
+share/doc/tde/HTML/de/common/block_title_mid.png
+share/doc/tde/HTML/de/common/block_title_top.png
 share/doc/tde/HTML/de/common/bottom-left.png
 share/doc/tde/HTML/de/common/bottom-middle.png
 share/doc/tde/HTML/de/common/bottom-right.png
@@ -192,6 +195,7 @@ share/doc/tde/HTML/de/common/fdl-license
 share/doc/tde/HTML/de/common/fdl-license.html
 share/doc/tde/HTML/de/common/fdl-notice.html
 share/doc/tde/HTML/de/common/fdl-translated.html
+share/doc/tde/HTML/de/common/flat.css
 share/doc/tde/HTML/de/common/footer.html
 share/doc/tde/HTML/de/common/gpl-license
 share/doc/tde/HTML/de/common/gpl-license.html
@@ -209,17 +213,25 @@ share/doc/tde/HTML/de/common/lgpl-translated.html
 share/doc/tde/HTML/de/common/logotp3.png
 share/doc/tde/HTML/de/common/mainfooter.html
 share/doc/tde/HTML/de/common/mainheader.html
+share/doc/tde/HTML/de/common/print.css
 share/doc/tde/HTML/de/common/qpl-license.html
 share/doc/tde/HTML/de/common/shadow.png
+share/doc/tde/HTML/de/common/tabs.css
 share/doc/tde/HTML/de/common/tde-common.css
 share/doc/tde/HTML/de/common/tde-default.css
 share/doc/tde/HTML/de/common/tde-docs.css
 share/doc/tde/HTML/de/common/tde-localised.css
 share/doc/tde/HTML/de/common/tde-localised.css.template
 share/doc/tde/HTML/de/common/tde-web.css
+share/doc/tde/HTML/de/common/tde.css
+share/doc/tde/HTML/de/common/top-left.jpg
 share/doc/tde/HTML/de/common/top-left.png
 share/doc/tde/HTML/de/common/top-middle.png
 share/doc/tde/HTML/de/common/top-right-konqueror.png
+share/doc/tde/HTML/de/common/top-right.jpg
+share/doc/tde/HTML/de/common/top-right.png
+share/doc/tde/HTML/de/common/top-trinity.jpg
+share/doc/tde/HTML/de/common/top.jpg
 share/doc/tde/HTML/de/common/web-docbottom.png
 share/doc/tde/HTML/de/common/web-doctop.png
 share/doc/tde/HTML/de/common/x11-license.html
@@ -1738,9 +1750,6 @@ share/doc/tde/HTML/de/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/de/tdeioslave/ftp/common
 share/doc/tde/HTML/de/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/de/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/de/tdeioslave/gopher/common
-share/doc/tde/HTML/de/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/de/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/de/tdeioslave/gzip/common
 share/doc/tde/HTML/de/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/de/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-el/Makefile b/freebsd/core/tde-i18n-el/Makefile
index 429f69512..ae0fa001b 100644
--- a/freebsd/core/tde-i18n-el/Makefile
+++ b/freebsd/core/tde-i18n-el/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-el/distinfo b/freebsd/core/tde-i18n-el/distinfo
index b5e65f11a..f1f07dfc5 100644
--- a/freebsd/core/tde-i18n-el/distinfo
+++ b/freebsd/core/tde-i18n-el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619710361
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885438
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-el/pkg-plist b/freebsd/core/tde-i18n-el/pkg-plist
index 2a16b8de7..daf6be723 100644
--- a/freebsd/core/tde-i18n-el/pkg-plist
+++ b/freebsd/core/tde-i18n-el/pkg-plist
@@ -104,6 +104,7 @@ share/locale/el/LC_MESSAGES/kcmcss.mo
 share/locale/el/LC_MESSAGES/kcmenergy.mo
 share/locale/el/LC_MESSAGES/kcmfonts.mo
 share/locale/el/LC_MESSAGES/kcmhtmlsearch.mo
+share/locale/el/LC_MESSAGES/kcmiccconfig.mo
 share/locale/el/LC_MESSAGES/kcmicons.mo
 share/locale/el/LC_MESSAGES/kcminfo.mo
 share/locale/el/LC_MESSAGES/kcminput.mo
@@ -316,6 +317,7 @@ share/locale/el/LC_MESSAGES/ksysguard.mo
 share/locale/el/LC_MESSAGES/ksystemtrayapplet.mo
 share/locale/el/LC_MESSAGES/ksystraycmd.mo
 share/locale/el/LC_MESSAGES/ksysv.mo
+share/locale/el/LC_MESSAGES/ktaskbarapplet.mo
 share/locale/el/LC_MESSAGES/kteatime.mo
 share/locale/el/LC_MESSAGES/kthememanager.mo
 share/locale/el/LC_MESSAGES/ktimemon.mo
@@ -406,6 +408,7 @@ share/locale/el/LC_MESSAGES/secpolicy.mo
 share/locale/el/LC_MESSAGES/spy.mo
 share/locale/el/LC_MESSAGES/superkaramba.mo
 share/locale/el/LC_MESSAGES/synaescope.mo
+share/locale/el/LC_MESSAGES/taskbarextension.mo
 share/locale/el/LC_MESSAGES/tdeabc2mutt.mo
 share/locale/el/LC_MESSAGES/tdeabc_dir.mo
 share/locale/el/LC_MESSAGES/tdeabc_file.mo
diff --git a/freebsd/core/tde-i18n-en_GB/Makefile b/freebsd/core/tde-i18n-en_GB/Makefile
index d2fcfda72..899ed38ab 100644
--- a/freebsd/core/tde-i18n-en_GB/Makefile
+++ b/freebsd/core/tde-i18n-en_GB/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-en_GB/distinfo b/freebsd/core/tde-i18n-en_GB/distinfo
index 8af5313c7..e7082c0ad 100644
--- a/freebsd/core/tde-i18n-en_GB/distinfo
+++ b/freebsd/core/tde-i18n-en_GB/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619710490
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885440
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-en_GB/pkg-plist b/freebsd/core/tde-i18n-en_GB/pkg-plist
index db2b5e521..0fc1f8e5f 100644
--- a/freebsd/core/tde-i18n-en_GB/pkg-plist
+++ b/freebsd/core/tde-i18n-en_GB/pkg-plist
@@ -69,6 +69,9 @@ share/doc/tde/HTML/en_GB/common/8.png
 share/doc/tde/HTML/en_GB/common/9.png
 share/doc/tde/HTML/en_GB/common/appheader.html
 share/doc/tde/HTML/en_GB/common/artistic-license.html
+share/doc/tde/HTML/en_GB/common/block_title_bottom.png
+share/doc/tde/HTML/en_GB/common/block_title_mid.png
+share/doc/tde/HTML/en_GB/common/block_title_top.png
 share/doc/tde/HTML/en_GB/common/bottom-left.png
 share/doc/tde/HTML/en_GB/common/bottom-middle.png
 share/doc/tde/HTML/en_GB/common/bottom-right.png
@@ -86,6 +89,7 @@ share/doc/tde/HTML/en_GB/common/fdl-license
 share/doc/tde/HTML/en_GB/common/fdl-license.html
 share/doc/tde/HTML/en_GB/common/fdl-notice.html
 share/doc/tde/HTML/en_GB/common/fdl-translated.html
+share/doc/tde/HTML/en_GB/common/flat.css
 share/doc/tde/HTML/en_GB/common/footer.html
 share/doc/tde/HTML/en_GB/common/gpl-license
 share/doc/tde/HTML/en_GB/common/gpl-license.html
@@ -103,17 +107,25 @@ share/doc/tde/HTML/en_GB/common/lgpl-translated.html
 share/doc/tde/HTML/en_GB/common/logotp3.png
 share/doc/tde/HTML/en_GB/common/mainfooter.html
 share/doc/tde/HTML/en_GB/common/mainheader.html
+share/doc/tde/HTML/en_GB/common/print.css
 share/doc/tde/HTML/en_GB/common/qpl-license.html
 share/doc/tde/HTML/en_GB/common/shadow.png
+share/doc/tde/HTML/en_GB/common/tabs.css
 share/doc/tde/HTML/en_GB/common/tde-common.css
 share/doc/tde/HTML/en_GB/common/tde-default.css
 share/doc/tde/HTML/en_GB/common/tde-docs.css
 share/doc/tde/HTML/en_GB/common/tde-localised.css
 share/doc/tde/HTML/en_GB/common/tde-localised.css.template
 share/doc/tde/HTML/en_GB/common/tde-web.css
+share/doc/tde/HTML/en_GB/common/tde.css
+share/doc/tde/HTML/en_GB/common/top-left.jpg
 share/doc/tde/HTML/en_GB/common/top-left.png
 share/doc/tde/HTML/en_GB/common/top-middle.png
 share/doc/tde/HTML/en_GB/common/top-right-konqueror.png
+share/doc/tde/HTML/en_GB/common/top-right.jpg
+share/doc/tde/HTML/en_GB/common/top-right.png
+share/doc/tde/HTML/en_GB/common/top-trinity.jpg
+share/doc/tde/HTML/en_GB/common/top.jpg
 share/doc/tde/HTML/en_GB/common/web-docbottom.png
 share/doc/tde/HTML/en_GB/common/web-doctop.png
 share/doc/tde/HTML/en_GB/common/x11-license.html
@@ -567,9 +579,6 @@ share/doc/tde/HTML/en_GB/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/en_GB/tdeioslave/ftp/common
 share/doc/tde/HTML/en_GB/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/en_GB/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/en_GB/tdeioslave/gopher/common
-share/doc/tde/HTML/en_GB/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/en_GB/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/en_GB/tdeioslave/gzip/common
 share/doc/tde/HTML/en_GB/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/en_GB/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-eo/Makefile b/freebsd/core/tde-i18n-eo/Makefile
index c7864d7bd..873e26d52 100644
--- a/freebsd/core/tde-i18n-eo/Makefile
+++ b/freebsd/core/tde-i18n-eo/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-eo/distinfo b/freebsd/core/tde-i18n-eo/distinfo
index 347ad0d9f..8a545e165 100644
--- a/freebsd/core/tde-i18n-eo/distinfo
+++ b/freebsd/core/tde-i18n-eo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619710670
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885442
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-eo/pkg-plist b/freebsd/core/tde-i18n-eo/pkg-plist
index 73b40c53c..4ead71980 100644
--- a/freebsd/core/tde-i18n-eo/pkg-plist
+++ b/freebsd/core/tde-i18n-eo/pkg-plist
@@ -161,6 +161,7 @@ share/locale/eo/LC_MESSAGES/kjots.mo
 share/locale/eo/LC_MESSAGES/kjumpingcube.mo
 share/locale/eo/LC_MESSAGES/klaptopdaemon.mo
 share/locale/eo/LC_MESSAGES/klatin.mo
+share/locale/eo/LC_MESSAGES/klickety.mo
 share/locale/eo/LC_MESSAGES/klines.mo
 share/locale/eo/LC_MESSAGES/klipper.mo
 share/locale/eo/LC_MESSAGES/klock.mo
diff --git a/freebsd/core/tde-i18n-es/Makefile b/freebsd/core/tde-i18n-es/Makefile
index 83c359df0..7173e42f0 100644
--- a/freebsd/core/tde-i18n-es/Makefile
+++ b/freebsd/core/tde-i18n-es/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-es/distinfo b/freebsd/core/tde-i18n-es/distinfo
index b304242a5..c8042eacb 100644
--- a/freebsd/core/tde-i18n-es/distinfo
+++ b/freebsd/core/tde-i18n-es/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619710707
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885444
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-es/pkg-plist b/freebsd/core/tde-i18n-es/pkg-plist
index 891e4dc95..c8231d084 100644
--- a/freebsd/core/tde-i18n-es/pkg-plist
+++ b/freebsd/core/tde-i18n-es/pkg-plist
@@ -378,6 +378,9 @@ share/doc/tde/HTML/es/common/8.png
 share/doc/tde/HTML/es/common/9.png
 share/doc/tde/HTML/es/common/appheader.html
 share/doc/tde/HTML/es/common/artistic-license.html
+share/doc/tde/HTML/es/common/block_title_bottom.png
+share/doc/tde/HTML/es/common/block_title_mid.png
+share/doc/tde/HTML/es/common/block_title_top.png
 share/doc/tde/HTML/es/common/bottom-left.png
 share/doc/tde/HTML/es/common/bottom-middle.png
 share/doc/tde/HTML/es/common/bottom-right.png
@@ -395,6 +398,7 @@ share/doc/tde/HTML/es/common/fdl-license
 share/doc/tde/HTML/es/common/fdl-license.html
 share/doc/tde/HTML/es/common/fdl-notice.html
 share/doc/tde/HTML/es/common/fdl-translated.html
+share/doc/tde/HTML/es/common/flat.css
 share/doc/tde/HTML/es/common/footer.html
 share/doc/tde/HTML/es/common/gpl-license
 share/doc/tde/HTML/es/common/gpl-license.html
@@ -412,17 +416,25 @@ share/doc/tde/HTML/es/common/lgpl-translated.html
 share/doc/tde/HTML/es/common/logotp3.png
 share/doc/tde/HTML/es/common/mainfooter.html
 share/doc/tde/HTML/es/common/mainheader.html
+share/doc/tde/HTML/es/common/print.css
 share/doc/tde/HTML/es/common/qpl-license.html
 share/doc/tde/HTML/es/common/shadow.png
+share/doc/tde/HTML/es/common/tabs.css
 share/doc/tde/HTML/es/common/tde-common.css
 share/doc/tde/HTML/es/common/tde-default.css
 share/doc/tde/HTML/es/common/tde-docs.css
 share/doc/tde/HTML/es/common/tde-localised.css
 share/doc/tde/HTML/es/common/tde-localised.css.template
 share/doc/tde/HTML/es/common/tde-web.css
+share/doc/tde/HTML/es/common/tde.css
+share/doc/tde/HTML/es/common/top-left.jpg
 share/doc/tde/HTML/es/common/top-left.png
 share/doc/tde/HTML/es/common/top-middle.png
 share/doc/tde/HTML/es/common/top-right-konqueror.png
+share/doc/tde/HTML/es/common/top-right.jpg
+share/doc/tde/HTML/es/common/top-right.png
+share/doc/tde/HTML/es/common/top-trinity.jpg
+share/doc/tde/HTML/es/common/top.jpg
 share/doc/tde/HTML/es/common/web-docbottom.png
 share/doc/tde/HTML/es/common/web-doctop.png
 share/doc/tde/HTML/es/common/x11-license.html
@@ -2533,9 +2545,6 @@ share/doc/tde/HTML/es/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/es/tdeioslave/ftp/common
 share/doc/tde/HTML/es/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/es/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/es/tdeioslave/gopher/common
-share/doc/tde/HTML/es/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/es/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/es/tdeioslave/gzip/common
 share/doc/tde/HTML/es/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/es/tdeioslave/gzip/index.docbook
@@ -2915,6 +2924,7 @@ share/locale/es/LC_MESSAGES/kcmcolors.mo
 share/locale/es/LC_MESSAGES/kcmcomponentchooser.mo
 share/locale/es/LC_MESSAGES/kcmcrypto.mo
 share/locale/es/LC_MESSAGES/kcmcss.mo
+share/locale/es/LC_MESSAGES/kcmdisplayconfig.mo
 share/locale/es/LC_MESSAGES/kcmenergy.mo
 share/locale/es/LC_MESSAGES/kcmfonts.mo
 share/locale/es/LC_MESSAGES/kcmhtmlsearch.mo
@@ -3220,6 +3230,7 @@ share/locale/es/LC_MESSAGES/secpolicy.mo
 share/locale/es/LC_MESSAGES/spy.mo
 share/locale/es/LC_MESSAGES/superkaramba.mo
 share/locale/es/LC_MESSAGES/synaescope.mo
+share/locale/es/LC_MESSAGES/taskbarextension.mo
 share/locale/es/LC_MESSAGES/tdeabc2mutt.mo
 share/locale/es/LC_MESSAGES/tdeabc_dir.mo
 share/locale/es/LC_MESSAGES/tdeabc_file.mo
diff --git a/freebsd/core/tde-i18n-et/Makefile b/freebsd/core/tde-i18n-et/Makefile
index 78f8d8aa0..9c914af51 100644
--- a/freebsd/core/tde-i18n-et/Makefile
+++ b/freebsd/core/tde-i18n-et/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-et/distinfo b/freebsd/core/tde-i18n-et/distinfo
index ca8f0b957..214f85118 100644
--- a/freebsd/core/tde-i18n-et/distinfo
+++ b/freebsd/core/tde-i18n-et/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619710853
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885446
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-et/pkg-plist b/freebsd/core/tde-i18n-et/pkg-plist
index fac4920cb..fbda95650 100644
--- a/freebsd/core/tde-i18n-et/pkg-plist
+++ b/freebsd/core/tde-i18n-et/pkg-plist
@@ -53,6 +53,9 @@ share/doc/tde/HTML/et/common/8.png
 share/doc/tde/HTML/et/common/9.png
 share/doc/tde/HTML/et/common/appheader.html
 share/doc/tde/HTML/et/common/artistic-license.html
+share/doc/tde/HTML/et/common/block_title_bottom.png
+share/doc/tde/HTML/et/common/block_title_mid.png
+share/doc/tde/HTML/et/common/block_title_top.png
 share/doc/tde/HTML/et/common/bottom-left.png
 share/doc/tde/HTML/et/common/bottom-middle.png
 share/doc/tde/HTML/et/common/bottom-right.png
@@ -70,6 +73,7 @@ share/doc/tde/HTML/et/common/fdl-license
 share/doc/tde/HTML/et/common/fdl-license.html
 share/doc/tde/HTML/et/common/fdl-notice.html
 share/doc/tde/HTML/et/common/fdl-translated.html
+share/doc/tde/HTML/et/common/flat.css
 share/doc/tde/HTML/et/common/footer.html
 share/doc/tde/HTML/et/common/gpl-license
 share/doc/tde/HTML/et/common/gpl-license.html
@@ -87,17 +91,25 @@ share/doc/tde/HTML/et/common/lgpl-translated.html
 share/doc/tde/HTML/et/common/logotp3.png
 share/doc/tde/HTML/et/common/mainfooter.html
 share/doc/tde/HTML/et/common/mainheader.html
+share/doc/tde/HTML/et/common/print.css
 share/doc/tde/HTML/et/common/qpl-license.html
 share/doc/tde/HTML/et/common/shadow.png
+share/doc/tde/HTML/et/common/tabs.css
 share/doc/tde/HTML/et/common/tde-common.css
 share/doc/tde/HTML/et/common/tde-default.css
 share/doc/tde/HTML/et/common/tde-docs.css
 share/doc/tde/HTML/et/common/tde-localised.css
 share/doc/tde/HTML/et/common/tde-localised.css.template
 share/doc/tde/HTML/et/common/tde-web.css
+share/doc/tde/HTML/et/common/tde.css
+share/doc/tde/HTML/et/common/top-left.jpg
 share/doc/tde/HTML/et/common/top-left.png
 share/doc/tde/HTML/et/common/top-middle.png
 share/doc/tde/HTML/et/common/top-right-konqueror.png
+share/doc/tde/HTML/et/common/top-right.jpg
+share/doc/tde/HTML/et/common/top-right.png
+share/doc/tde/HTML/et/common/top-trinity.jpg
+share/doc/tde/HTML/et/common/top.jpg
 share/doc/tde/HTML/et/common/web-docbottom.png
 share/doc/tde/HTML/et/common/web-doctop.png
 share/doc/tde/HTML/et/common/x11-license.html
@@ -1253,9 +1265,6 @@ share/doc/tde/HTML/et/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/et/tdeioslave/ftp/common
 share/doc/tde/HTML/et/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/et/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/et/tdeioslave/gopher/common
-share/doc/tde/HTML/et/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/et/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/et/tdeioslave/gzip/common
 share/doc/tde/HTML/et/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/et/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-eu/Makefile b/freebsd/core/tde-i18n-eu/Makefile
index 2c07e11e8..780ac6fb1 100644
--- a/freebsd/core/tde-i18n-eu/Makefile
+++ b/freebsd/core/tde-i18n-eu/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-eu/distinfo b/freebsd/core/tde-i18n-eu/distinfo
index d000bd887..c7b5eb730 100644
--- a/freebsd/core/tde-i18n-eu/distinfo
+++ b/freebsd/core/tde-i18n-eu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619711654
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885448
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-eu/pkg-plist b/freebsd/core/tde-i18n-eu/pkg-plist
index 4dd9cedb3..a3aa623f8 100644
--- a/freebsd/core/tde-i18n-eu/pkg-plist
+++ b/freebsd/core/tde-i18n-eu/pkg-plist
@@ -10,6 +10,9 @@ share/doc/tde/HTML/eu/common/8.png
 share/doc/tde/HTML/eu/common/9.png
 share/doc/tde/HTML/eu/common/appheader.html
 share/doc/tde/HTML/eu/common/artistic-license.html
+share/doc/tde/HTML/eu/common/block_title_bottom.png
+share/doc/tde/HTML/eu/common/block_title_mid.png
+share/doc/tde/HTML/eu/common/block_title_top.png
 share/doc/tde/HTML/eu/common/bottom-left.png
 share/doc/tde/HTML/eu/common/bottom-middle.png
 share/doc/tde/HTML/eu/common/bottom-right.png
@@ -27,6 +30,7 @@ share/doc/tde/HTML/eu/common/fdl-license
 share/doc/tde/HTML/eu/common/fdl-license.html
 share/doc/tde/HTML/eu/common/fdl-notice.html
 share/doc/tde/HTML/eu/common/fdl-translated.html
+share/doc/tde/HTML/eu/common/flat.css
 share/doc/tde/HTML/eu/common/footer.html
 share/doc/tde/HTML/eu/common/gpl-license
 share/doc/tde/HTML/eu/common/gpl-license.html
@@ -43,17 +47,25 @@ share/doc/tde/HTML/eu/common/lgpl-license.html
 share/doc/tde/HTML/eu/common/logotp3.png
 share/doc/tde/HTML/eu/common/mainfooter.html
 share/doc/tde/HTML/eu/common/mainheader.html
+share/doc/tde/HTML/eu/common/print.css
 share/doc/tde/HTML/eu/common/qpl-license.html
 share/doc/tde/HTML/eu/common/shadow.png
+share/doc/tde/HTML/eu/common/tabs.css
 share/doc/tde/HTML/eu/common/tde-common.css
 share/doc/tde/HTML/eu/common/tde-default.css
 share/doc/tde/HTML/eu/common/tde-docs.css
 share/doc/tde/HTML/eu/common/tde-localised.css
 share/doc/tde/HTML/eu/common/tde-localised.css.template
 share/doc/tde/HTML/eu/common/tde-web.css
+share/doc/tde/HTML/eu/common/tde.css
+share/doc/tde/HTML/eu/common/top-left.jpg
 share/doc/tde/HTML/eu/common/top-left.png
 share/doc/tde/HTML/eu/common/top-middle.png
 share/doc/tde/HTML/eu/common/top-right-konqueror.png
+share/doc/tde/HTML/eu/common/top-right.jpg
+share/doc/tde/HTML/eu/common/top-right.png
+share/doc/tde/HTML/eu/common/top-trinity.jpg
+share/doc/tde/HTML/eu/common/top.jpg
 share/doc/tde/HTML/eu/common/web-docbottom.png
 share/doc/tde/HTML/eu/common/web-doctop.png
 share/doc/tde/HTML/eu/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-fa/Makefile b/freebsd/core/tde-i18n-fa/Makefile
index 933899c73..ac6d7768c 100644
--- a/freebsd/core/tde-i18n-fa/Makefile
+++ b/freebsd/core/tde-i18n-fa/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-fa/distinfo b/freebsd/core/tde-i18n-fa/distinfo
index 4cae58fe0..2db77dbe2 100644
--- a/freebsd/core/tde-i18n-fa/distinfo
+++ b/freebsd/core/tde-i18n-fa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619711692
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885450
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-fi/Makefile b/freebsd/core/tde-i18n-fi/Makefile
index 8a25e472a..99eab3b17 100644
--- a/freebsd/core/tde-i18n-fi/Makefile
+++ b/freebsd/core/tde-i18n-fi/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-fi/distinfo b/freebsd/core/tde-i18n-fi/distinfo
index be775e5b9..ef9d0b827 100644
--- a/freebsd/core/tde-i18n-fi/distinfo
+++ b/freebsd/core/tde-i18n-fi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619711739
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885452
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-fi/pkg-plist b/freebsd/core/tde-i18n-fi/pkg-plist
index 45234ae06..bf3f0858d 100644
--- a/freebsd/core/tde-i18n-fi/pkg-plist
+++ b/freebsd/core/tde-i18n-fi/pkg-plist
@@ -15,6 +15,9 @@ share/doc/tde/HTML/fi/common/8.png
 share/doc/tde/HTML/fi/common/9.png
 share/doc/tde/HTML/fi/common/appheader.html
 share/doc/tde/HTML/fi/common/artistic-license.html
+share/doc/tde/HTML/fi/common/block_title_bottom.png
+share/doc/tde/HTML/fi/common/block_title_mid.png
+share/doc/tde/HTML/fi/common/block_title_top.png
 share/doc/tde/HTML/fi/common/bottom-left.png
 share/doc/tde/HTML/fi/common/bottom-middle.png
 share/doc/tde/HTML/fi/common/bottom-right.png
@@ -32,6 +35,7 @@ share/doc/tde/HTML/fi/common/fdl-license
 share/doc/tde/HTML/fi/common/fdl-license.html
 share/doc/tde/HTML/fi/common/fdl-notice.html
 share/doc/tde/HTML/fi/common/fdl-translated.html
+share/doc/tde/HTML/fi/common/flat.css
 share/doc/tde/HTML/fi/common/footer.html
 share/doc/tde/HTML/fi/common/gpl-license
 share/doc/tde/HTML/fi/common/gpl-license.html
@@ -49,17 +53,25 @@ share/doc/tde/HTML/fi/common/lgpl-translated.html
 share/doc/tde/HTML/fi/common/logotp3.png
 share/doc/tde/HTML/fi/common/mainfooter.html
 share/doc/tde/HTML/fi/common/mainheader.html
+share/doc/tde/HTML/fi/common/print.css
 share/doc/tde/HTML/fi/common/qpl-license.html
 share/doc/tde/HTML/fi/common/shadow.png
+share/doc/tde/HTML/fi/common/tabs.css
 share/doc/tde/HTML/fi/common/tde-common.css
 share/doc/tde/HTML/fi/common/tde-default.css
 share/doc/tde/HTML/fi/common/tde-docs.css
 share/doc/tde/HTML/fi/common/tde-localised.css
 share/doc/tde/HTML/fi/common/tde-localised.css.template
 share/doc/tde/HTML/fi/common/tde-web.css
+share/doc/tde/HTML/fi/common/tde.css
+share/doc/tde/HTML/fi/common/top-left.jpg
 share/doc/tde/HTML/fi/common/top-left.png
 share/doc/tde/HTML/fi/common/top-middle.png
 share/doc/tde/HTML/fi/common/top-right-konqueror.png
+share/doc/tde/HTML/fi/common/top-right.jpg
+share/doc/tde/HTML/fi/common/top-right.png
+share/doc/tde/HTML/fi/common/top-trinity.jpg
+share/doc/tde/HTML/fi/common/top.jpg
 share/doc/tde/HTML/fi/common/web-docbottom.png
 share/doc/tde/HTML/fi/common/web-doctop.png
 share/doc/tde/HTML/fi/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-fr/Makefile b/freebsd/core/tde-i18n-fr/Makefile
index a4c81677a..8cfc76cdb 100644
--- a/freebsd/core/tde-i18n-fr/Makefile
+++ b/freebsd/core/tde-i18n-fr/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-fr/distinfo b/freebsd/core/tde-i18n-fr/distinfo
index 386592298..486600004 100644
--- a/freebsd/core/tde-i18n-fr/distinfo
+++ b/freebsd/core/tde-i18n-fr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619711798
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885454
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-fr/pkg-plist b/freebsd/core/tde-i18n-fr/pkg-plist
index ee4331a07..bcb898554 100644
--- a/freebsd/core/tde-i18n-fr/pkg-plist
+++ b/freebsd/core/tde-i18n-fr/pkg-plist
@@ -107,6 +107,9 @@ share/doc/tde/HTML/fr/common/8.png
 share/doc/tde/HTML/fr/common/9.png
 share/doc/tde/HTML/fr/common/appheader.html
 share/doc/tde/HTML/fr/common/artistic-license.html
+share/doc/tde/HTML/fr/common/block_title_bottom.png
+share/doc/tde/HTML/fr/common/block_title_mid.png
+share/doc/tde/HTML/fr/common/block_title_top.png
 share/doc/tde/HTML/fr/common/bottom-left.png
 share/doc/tde/HTML/fr/common/bottom-middle.png
 share/doc/tde/HTML/fr/common/bottom-right.png
@@ -124,6 +127,7 @@ share/doc/tde/HTML/fr/common/fdl-license
 share/doc/tde/HTML/fr/common/fdl-license.html
 share/doc/tde/HTML/fr/common/fdl-notice.html
 share/doc/tde/HTML/fr/common/fdl-translated.html
+share/doc/tde/HTML/fr/common/flat.css
 share/doc/tde/HTML/fr/common/footer.html
 share/doc/tde/HTML/fr/common/gpl-license
 share/doc/tde/HTML/fr/common/gpl-license.html
@@ -141,17 +145,25 @@ share/doc/tde/HTML/fr/common/lgpl-translated.html
 share/doc/tde/HTML/fr/common/logotp3.png
 share/doc/tde/HTML/fr/common/mainfooter.html
 share/doc/tde/HTML/fr/common/mainheader.html
+share/doc/tde/HTML/fr/common/print.css
 share/doc/tde/HTML/fr/common/qpl-license.html
 share/doc/tde/HTML/fr/common/shadow.png
+share/doc/tde/HTML/fr/common/tabs.css
 share/doc/tde/HTML/fr/common/tde-common.css
 share/doc/tde/HTML/fr/common/tde-default.css
 share/doc/tde/HTML/fr/common/tde-docs.css
 share/doc/tde/HTML/fr/common/tde-localised.css
 share/doc/tde/HTML/fr/common/tde-localised.css.template
 share/doc/tde/HTML/fr/common/tde-web.css
+share/doc/tde/HTML/fr/common/tde.css
+share/doc/tde/HTML/fr/common/top-left.jpg
 share/doc/tde/HTML/fr/common/top-left.png
 share/doc/tde/HTML/fr/common/top-middle.png
 share/doc/tde/HTML/fr/common/top-right-konqueror.png
+share/doc/tde/HTML/fr/common/top-right.jpg
+share/doc/tde/HTML/fr/common/top-right.png
+share/doc/tde/HTML/fr/common/top-trinity.jpg
+share/doc/tde/HTML/fr/common/top.jpg
 share/doc/tde/HTML/fr/common/web-docbottom.png
 share/doc/tde/HTML/fr/common/web-doctop.png
 share/doc/tde/HTML/fr/common/x11-license.html
@@ -1551,9 +1563,6 @@ share/doc/tde/HTML/fr/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/fr/tdeioslave/ftp/common
 share/doc/tde/HTML/fr/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/fr/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/fr/tdeioslave/gopher/common
-share/doc/tde/HTML/fr/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/fr/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/fr/tdeioslave/gzip/common
 share/doc/tde/HTML/fr/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/fr/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-fy/Makefile b/freebsd/core/tde-i18n-fy/Makefile
index 46a33a27e..83f4882a3 100644
--- a/freebsd/core/tde-i18n-fy/Makefile
+++ b/freebsd/core/tde-i18n-fy/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-fy/distinfo b/freebsd/core/tde-i18n-fy/distinfo
index 695b20bdd..0686ae820 100644
--- a/freebsd/core/tde-i18n-fy/distinfo
+++ b/freebsd/core/tde-i18n-fy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619711944
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885456
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ga/Makefile b/freebsd/core/tde-i18n-ga/Makefile
index b3efb5682..05223a3b3 100644
--- a/freebsd/core/tde-i18n-ga/Makefile
+++ b/freebsd/core/tde-i18n-ga/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ga/distinfo b/freebsd/core/tde-i18n-ga/distinfo
index aff3b32b6..7726efd33 100644
--- a/freebsd/core/tde-i18n-ga/distinfo
+++ b/freebsd/core/tde-i18n-ga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619711987
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885458
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-gl/Makefile b/freebsd/core/tde-i18n-gl/Makefile
index aface7db6..d29691b9d 100644
--- a/freebsd/core/tde-i18n-gl/Makefile
+++ b/freebsd/core/tde-i18n-gl/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-gl/distinfo b/freebsd/core/tde-i18n-gl/distinfo
index 12bf144cd..bbc56af2f 100644
--- a/freebsd/core/tde-i18n-gl/distinfo
+++ b/freebsd/core/tde-i18n-gl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712023
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885460
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-he/Makefile b/freebsd/core/tde-i18n-he/Makefile
index 30ad26555..6a57076b3 100644
--- a/freebsd/core/tde-i18n-he/Makefile
+++ b/freebsd/core/tde-i18n-he/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-he/distinfo b/freebsd/core/tde-i18n-he/distinfo
index 102633784..aeed2809a 100644
--- a/freebsd/core/tde-i18n-he/distinfo
+++ b/freebsd/core/tde-i18n-he/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712056
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885462
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-he/pkg-plist b/freebsd/core/tde-i18n-he/pkg-plist
index 7d80a2944..b7bff49a3 100644
--- a/freebsd/core/tde-i18n-he/pkg-plist
+++ b/freebsd/core/tde-i18n-he/pkg-plist
@@ -63,6 +63,9 @@ share/doc/tde/HTML/he/common/8.png
 share/doc/tde/HTML/he/common/9.png
 share/doc/tde/HTML/he/common/appheader.html
 share/doc/tde/HTML/he/common/artistic-license.html
+share/doc/tde/HTML/he/common/block_title_bottom.png
+share/doc/tde/HTML/he/common/block_title_mid.png
+share/doc/tde/HTML/he/common/block_title_top.png
 share/doc/tde/HTML/he/common/bottom-left.png
 share/doc/tde/HTML/he/common/bottom-middle.png
 share/doc/tde/HTML/he/common/bottom-right.png
@@ -80,6 +83,7 @@ share/doc/tde/HTML/he/common/fdl-license
 share/doc/tde/HTML/he/common/fdl-license.html
 share/doc/tde/HTML/he/common/fdl-notice.html
 share/doc/tde/HTML/he/common/fdl-translated.html
+share/doc/tde/HTML/he/common/flat.css
 share/doc/tde/HTML/he/common/footer.html
 share/doc/tde/HTML/he/common/gpl-license
 share/doc/tde/HTML/he/common/gpl-license.html
@@ -97,17 +101,25 @@ share/doc/tde/HTML/he/common/lgpl-translated.html
 share/doc/tde/HTML/he/common/logotp3.png
 share/doc/tde/HTML/he/common/mainfooter.html
 share/doc/tde/HTML/he/common/mainheader.html
+share/doc/tde/HTML/he/common/print.css
 share/doc/tde/HTML/he/common/qpl-license.html
 share/doc/tde/HTML/he/common/shadow.png
+share/doc/tde/HTML/he/common/tabs.css
 share/doc/tde/HTML/he/common/tde-common.css
 share/doc/tde/HTML/he/common/tde-default.css
 share/doc/tde/HTML/he/common/tde-docs.css
 share/doc/tde/HTML/he/common/tde-localised.css
 share/doc/tde/HTML/he/common/tde-localised.css.template
 share/doc/tde/HTML/he/common/tde-web.css
+share/doc/tde/HTML/he/common/tde.css
+share/doc/tde/HTML/he/common/top-left.jpg
 share/doc/tde/HTML/he/common/top-left.png
 share/doc/tde/HTML/he/common/top-middle.png
 share/doc/tde/HTML/he/common/top-right-konqueror.png
+share/doc/tde/HTML/he/common/top-right.jpg
+share/doc/tde/HTML/he/common/top-right.png
+share/doc/tde/HTML/he/common/top-trinity.jpg
+share/doc/tde/HTML/he/common/top.jpg
 share/doc/tde/HTML/he/common/web-docbottom.png
 share/doc/tde/HTML/he/common/web-doctop.png
 share/doc/tde/HTML/he/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-hi/Makefile b/freebsd/core/tde-i18n-hi/Makefile
index 65be119cc..865313afd 100644
--- a/freebsd/core/tde-i18n-hi/Makefile
+++ b/freebsd/core/tde-i18n-hi/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-hi/distinfo b/freebsd/core/tde-i18n-hi/distinfo
index b12dafea5..adee15cea 100644
--- a/freebsd/core/tde-i18n-hi/distinfo
+++ b/freebsd/core/tde-i18n-hi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712098
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885464
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-hr/Makefile b/freebsd/core/tde-i18n-hr/Makefile
index 73ac1e22c..26b3a30c9 100644
--- a/freebsd/core/tde-i18n-hr/Makefile
+++ b/freebsd/core/tde-i18n-hr/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-hr/distinfo b/freebsd/core/tde-i18n-hr/distinfo
index 9d0585a4f..fbeef6999 100644
--- a/freebsd/core/tde-i18n-hr/distinfo
+++ b/freebsd/core/tde-i18n-hr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712128
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885466
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-hr/pkg-plist b/freebsd/core/tde-i18n-hr/pkg-plist
index 143c9b45c..b7c885831 100644
--- a/freebsd/core/tde-i18n-hr/pkg-plist
+++ b/freebsd/core/tde-i18n-hr/pkg-plist
@@ -10,6 +10,9 @@ share/doc/tde/HTML/hr/common/8.png
 share/doc/tde/HTML/hr/common/9.png
 share/doc/tde/HTML/hr/common/appheader.html
 share/doc/tde/HTML/hr/common/artistic-license.html
+share/doc/tde/HTML/hr/common/block_title_bottom.png
+share/doc/tde/HTML/hr/common/block_title_mid.png
+share/doc/tde/HTML/hr/common/block_title_top.png
 share/doc/tde/HTML/hr/common/bottom-left.png
 share/doc/tde/HTML/hr/common/bottom-middle.png
 share/doc/tde/HTML/hr/common/bottom-right.png
@@ -26,6 +29,7 @@ share/doc/tde/HTML/hr/common/favicon.ico
 share/doc/tde/HTML/hr/common/fdl-license
 share/doc/tde/HTML/hr/common/fdl-license.html
 share/doc/tde/HTML/hr/common/fdl-notice.html
+share/doc/tde/HTML/hr/common/flat.css
 share/doc/tde/HTML/hr/common/footer.html
 share/doc/tde/HTML/hr/common/gpl-license
 share/doc/tde/HTML/hr/common/gpl-license.html
@@ -41,16 +45,24 @@ share/doc/tde/HTML/hr/common/lgpl-license
 share/doc/tde/HTML/hr/common/lgpl-license.html
 share/doc/tde/HTML/hr/common/mainfooter.html
 share/doc/tde/HTML/hr/common/mainheader.html
+share/doc/tde/HTML/hr/common/print.css
 share/doc/tde/HTML/hr/common/qpl-license.html
 share/doc/tde/HTML/hr/common/shadow.png
+share/doc/tde/HTML/hr/common/tabs.css
 share/doc/tde/HTML/hr/common/tde-common.css
 share/doc/tde/HTML/hr/common/tde-default.css
 share/doc/tde/HTML/hr/common/tde-docs.css
 share/doc/tde/HTML/hr/common/tde-localised.css.template
 share/doc/tde/HTML/hr/common/tde-web.css
+share/doc/tde/HTML/hr/common/tde.css
+share/doc/tde/HTML/hr/common/top-left.jpg
 share/doc/tde/HTML/hr/common/top-left.png
 share/doc/tde/HTML/hr/common/top-middle.png
 share/doc/tde/HTML/hr/common/top-right-konqueror.png
+share/doc/tde/HTML/hr/common/top-right.jpg
+share/doc/tde/HTML/hr/common/top-right.png
+share/doc/tde/HTML/hr/common/top-trinity.jpg
+share/doc/tde/HTML/hr/common/top.jpg
 share/doc/tde/HTML/hr/common/web-docbottom.png
 share/doc/tde/HTML/hr/common/web-doctop.png
 share/doc/tde/HTML/hr/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-hu/Makefile b/freebsd/core/tde-i18n-hu/Makefile
index 94cbe361a..aa758416b 100644
--- a/freebsd/core/tde-i18n-hu/Makefile
+++ b/freebsd/core/tde-i18n-hu/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-hu/distinfo b/freebsd/core/tde-i18n-hu/distinfo
index 7a373e17b..d77465eec 100644
--- a/freebsd/core/tde-i18n-hu/distinfo
+++ b/freebsd/core/tde-i18n-hu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712172
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885468
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-hu/pkg-plist b/freebsd/core/tde-i18n-hu/pkg-plist
index 04e0e0fe7..eaa04baf2 100644
--- a/freebsd/core/tde-i18n-hu/pkg-plist
+++ b/freebsd/core/tde-i18n-hu/pkg-plist
@@ -24,6 +24,9 @@ share/doc/tde/HTML/hu/common/8.png
 share/doc/tde/HTML/hu/common/9.png
 share/doc/tde/HTML/hu/common/appheader.html
 share/doc/tde/HTML/hu/common/artistic-license.html
+share/doc/tde/HTML/hu/common/block_title_bottom.png
+share/doc/tde/HTML/hu/common/block_title_mid.png
+share/doc/tde/HTML/hu/common/block_title_top.png
 share/doc/tde/HTML/hu/common/bottom-left.png
 share/doc/tde/HTML/hu/common/bottom-middle.png
 share/doc/tde/HTML/hu/common/bottom-right.png
@@ -41,6 +44,7 @@ share/doc/tde/HTML/hu/common/fdl-license
 share/doc/tde/HTML/hu/common/fdl-license.html
 share/doc/tde/HTML/hu/common/fdl-notice.html
 share/doc/tde/HTML/hu/common/fdl-translated.html
+share/doc/tde/HTML/hu/common/flat.css
 share/doc/tde/HTML/hu/common/footer.html
 share/doc/tde/HTML/hu/common/gpl-license
 share/doc/tde/HTML/hu/common/gpl-license.html
@@ -58,17 +62,25 @@ share/doc/tde/HTML/hu/common/lgpl-translated.html
 share/doc/tde/HTML/hu/common/logotp3.png
 share/doc/tde/HTML/hu/common/mainfooter.html
 share/doc/tde/HTML/hu/common/mainheader.html
+share/doc/tde/HTML/hu/common/print.css
 share/doc/tde/HTML/hu/common/qpl-license.html
 share/doc/tde/HTML/hu/common/shadow.png
+share/doc/tde/HTML/hu/common/tabs.css
 share/doc/tde/HTML/hu/common/tde-common.css
 share/doc/tde/HTML/hu/common/tde-default.css
 share/doc/tde/HTML/hu/common/tde-docs.css
 share/doc/tde/HTML/hu/common/tde-localised.css
 share/doc/tde/HTML/hu/common/tde-localised.css.template
 share/doc/tde/HTML/hu/common/tde-web.css
+share/doc/tde/HTML/hu/common/tde.css
+share/doc/tde/HTML/hu/common/top-left.jpg
 share/doc/tde/HTML/hu/common/top-left.png
 share/doc/tde/HTML/hu/common/top-middle.png
 share/doc/tde/HTML/hu/common/top-right-konqueror.png
+share/doc/tde/HTML/hu/common/top-right.jpg
+share/doc/tde/HTML/hu/common/top-right.png
+share/doc/tde/HTML/hu/common/top-trinity.jpg
+share/doc/tde/HTML/hu/common/top.jpg
 share/doc/tde/HTML/hu/common/web-docbottom.png
 share/doc/tde/HTML/hu/common/web-doctop.png
 share/doc/tde/HTML/hu/common/x11-license.html
@@ -366,9 +378,6 @@ share/doc/tde/HTML/hu/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/hu/tdeioslave/ftp/common
 share/doc/tde/HTML/hu/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/hu/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/hu/tdeioslave/gopher/common
-share/doc/tde/HTML/hu/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/hu/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/hu/tdeioslave/gzip/common
 share/doc/tde/HTML/hu/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/hu/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-is/Makefile b/freebsd/core/tde-i18n-is/Makefile
index 47411fc22..17eee0d6e 100644
--- a/freebsd/core/tde-i18n-is/Makefile
+++ b/freebsd/core/tde-i18n-is/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-is/distinfo b/freebsd/core/tde-i18n-is/distinfo
index b2d7f8291..838974755 100644
--- a/freebsd/core/tde-i18n-is/distinfo
+++ b/freebsd/core/tde-i18n-is/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712245
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885471
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-it/Makefile b/freebsd/core/tde-i18n-it/Makefile
index a5b08c3d5..a24d46708 100644
--- a/freebsd/core/tde-i18n-it/Makefile
+++ b/freebsd/core/tde-i18n-it/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-it/distinfo b/freebsd/core/tde-i18n-it/distinfo
index 47f907ae6..cc5dec155 100644
--- a/freebsd/core/tde-i18n-it/distinfo
+++ b/freebsd/core/tde-i18n-it/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712283
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885473
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-it/pkg-plist b/freebsd/core/tde-i18n-it/pkg-plist
index acdfb741a..f63d04f9e 100644
--- a/freebsd/core/tde-i18n-it/pkg-plist
+++ b/freebsd/core/tde-i18n-it/pkg-plist
@@ -201,6 +201,9 @@ share/doc/tde/HTML/it/common/8.png
 share/doc/tde/HTML/it/common/9.png
 share/doc/tde/HTML/it/common/appheader.html
 share/doc/tde/HTML/it/common/artistic-license.html
+share/doc/tde/HTML/it/common/block_title_bottom.png
+share/doc/tde/HTML/it/common/block_title_mid.png
+share/doc/tde/HTML/it/common/block_title_top.png
 share/doc/tde/HTML/it/common/bottom-left.png
 share/doc/tde/HTML/it/common/bottom-middle.png
 share/doc/tde/HTML/it/common/bottom-right.png
@@ -218,6 +221,7 @@ share/doc/tde/HTML/it/common/fdl-license
 share/doc/tde/HTML/it/common/fdl-license.html
 share/doc/tde/HTML/it/common/fdl-notice.html
 share/doc/tde/HTML/it/common/fdl-translated.html
+share/doc/tde/HTML/it/common/flat.css
 share/doc/tde/HTML/it/common/footer.html
 share/doc/tde/HTML/it/common/gpl-license
 share/doc/tde/HTML/it/common/gpl-license.html
@@ -235,17 +239,25 @@ share/doc/tde/HTML/it/common/lgpl-translated.html
 share/doc/tde/HTML/it/common/logotp3.png
 share/doc/tde/HTML/it/common/mainfooter.html
 share/doc/tde/HTML/it/common/mainheader.html
+share/doc/tde/HTML/it/common/print.css
 share/doc/tde/HTML/it/common/qpl-license.html
 share/doc/tde/HTML/it/common/shadow.png
+share/doc/tde/HTML/it/common/tabs.css
 share/doc/tde/HTML/it/common/tde-common.css
 share/doc/tde/HTML/it/common/tde-default.css
 share/doc/tde/HTML/it/common/tde-docs.css
 share/doc/tde/HTML/it/common/tde-localised.css
 share/doc/tde/HTML/it/common/tde-localised.css.template
 share/doc/tde/HTML/it/common/tde-web.css
+share/doc/tde/HTML/it/common/tde.css
+share/doc/tde/HTML/it/common/top-left.jpg
 share/doc/tde/HTML/it/common/top-left.png
 share/doc/tde/HTML/it/common/top-middle.png
 share/doc/tde/HTML/it/common/top-right-konqueror.png
+share/doc/tde/HTML/it/common/top-right.jpg
+share/doc/tde/HTML/it/common/top-right.png
+share/doc/tde/HTML/it/common/top-trinity.jpg
+share/doc/tde/HTML/it/common/top.jpg
 share/doc/tde/HTML/it/common/web-docbottom.png
 share/doc/tde/HTML/it/common/web-doctop.png
 share/doc/tde/HTML/it/common/x11-license.html
@@ -1456,9 +1468,6 @@ share/doc/tde/HTML/it/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/it/tdeioslave/ftp/common
 share/doc/tde/HTML/it/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/it/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/it/tdeioslave/gopher/common
-share/doc/tde/HTML/it/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/it/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/it/tdeioslave/gzip/common
 share/doc/tde/HTML/it/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/it/tdeioslave/gzip/index.docbook
@@ -1826,6 +1835,8 @@ share/locale/it/LC_MESSAGES/kcmdisplayconfig.mo
 share/locale/it/LC_MESSAGES/kcmenergy.mo
 share/locale/it/LC_MESSAGES/kcmfonts.mo
 share/locale/it/LC_MESSAGES/kcmhtmlsearch.mo
+share/locale/it/LC_MESSAGES/kcmhwmanager.mo
+share/locale/it/LC_MESSAGES/kcmiccconfig.mo
 share/locale/it/LC_MESSAGES/kcmicons.mo
 share/locale/it/LC_MESSAGES/kcminfo.mo
 share/locale/it/LC_MESSAGES/kcminput.mo
@@ -2041,6 +2052,7 @@ share/locale/it/LC_MESSAGES/ksysguard.mo
 share/locale/it/LC_MESSAGES/ksystemtrayapplet.mo
 share/locale/it/LC_MESSAGES/ksystraycmd.mo
 share/locale/it/LC_MESSAGES/ksysv.mo
+share/locale/it/LC_MESSAGES/ktaskbarapplet.mo
 share/locale/it/LC_MESSAGES/kteatime.mo
 share/locale/it/LC_MESSAGES/kthememanager.mo
 share/locale/it/LC_MESSAGES/ktimemon.mo
@@ -2131,6 +2143,7 @@ share/locale/it/LC_MESSAGES/secpolicy.mo
 share/locale/it/LC_MESSAGES/spy.mo
 share/locale/it/LC_MESSAGES/superkaramba.mo
 share/locale/it/LC_MESSAGES/synaescope.mo
+share/locale/it/LC_MESSAGES/taskbarextension.mo
 share/locale/it/LC_MESSAGES/tdeabc2mutt.mo
 share/locale/it/LC_MESSAGES/tdeabc_dir.mo
 share/locale/it/LC_MESSAGES/tdeabc_file.mo
@@ -2177,6 +2190,7 @@ share/locale/it/LC_MESSAGES/tdefile_png.mo
 share/locale/it/LC_MESSAGES/tdefile_pnm.mo
 share/locale/it/LC_MESSAGES/tdefile_po.mo
 share/locale/it/LC_MESSAGES/tdefile_ps.mo
+share/locale/it/LC_MESSAGES/tdefile_raw.mo
 share/locale/it/LC_MESSAGES/tdefile_rfc822.mo
 share/locale/it/LC_MESSAGES/tdefile_rgb.mo
 share/locale/it/LC_MESSAGES/tdefile_rpm.mo
diff --git a/freebsd/core/tde-i18n-ja/Makefile b/freebsd/core/tde-i18n-ja/Makefile
index c50ac2dd7..463448b7c 100644
--- a/freebsd/core/tde-i18n-ja/Makefile
+++ b/freebsd/core/tde-i18n-ja/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ja/distinfo b/freebsd/core/tde-i18n-ja/distinfo
index 88864e49e..2757e0945 100644
--- a/freebsd/core/tde-i18n-ja/distinfo
+++ b/freebsd/core/tde-i18n-ja/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712519
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885475
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ja/pkg-plist b/freebsd/core/tde-i18n-ja/pkg-plist
index bd94c1977..57a6eb378 100644
--- a/freebsd/core/tde-i18n-ja/pkg-plist
+++ b/freebsd/core/tde-i18n-ja/pkg-plist
@@ -10,6 +10,9 @@ share/doc/tde/HTML/ja/common/8.png
 share/doc/tde/HTML/ja/common/9.png
 share/doc/tde/HTML/ja/common/appheader.html
 share/doc/tde/HTML/ja/common/artistic-license.html
+share/doc/tde/HTML/ja/common/block_title_bottom.png
+share/doc/tde/HTML/ja/common/block_title_mid.png
+share/doc/tde/HTML/ja/common/block_title_top.png
 share/doc/tde/HTML/ja/common/bottom-left.png
 share/doc/tde/HTML/ja/common/bottom-middle.png
 share/doc/tde/HTML/ja/common/bottom-right.png
@@ -27,6 +30,7 @@ share/doc/tde/HTML/ja/common/fdl-license
 share/doc/tde/HTML/ja/common/fdl-license.html
 share/doc/tde/HTML/ja/common/fdl-notice.html
 share/doc/tde/HTML/ja/common/fdl-translated.html
+share/doc/tde/HTML/ja/common/flat.css
 share/doc/tde/HTML/ja/common/footer.html
 share/doc/tde/HTML/ja/common/gpl-license
 share/doc/tde/HTML/ja/common/gpl-license.html
@@ -44,17 +48,25 @@ share/doc/tde/HTML/ja/common/lgpl-translated.html
 share/doc/tde/HTML/ja/common/logotp3.png
 share/doc/tde/HTML/ja/common/mainfooter.html
 share/doc/tde/HTML/ja/common/mainheader.html
+share/doc/tde/HTML/ja/common/print.css
 share/doc/tde/HTML/ja/common/qpl-license.html
 share/doc/tde/HTML/ja/common/shadow.png
+share/doc/tde/HTML/ja/common/tabs.css
 share/doc/tde/HTML/ja/common/tde-common.css
 share/doc/tde/HTML/ja/common/tde-default.css
 share/doc/tde/HTML/ja/common/tde-docs.css
 share/doc/tde/HTML/ja/common/tde-localised.css
 share/doc/tde/HTML/ja/common/tde-localised.css.template
 share/doc/tde/HTML/ja/common/tde-web.css
+share/doc/tde/HTML/ja/common/tde.css
+share/doc/tde/HTML/ja/common/top-left.jpg
 share/doc/tde/HTML/ja/common/top-left.png
 share/doc/tde/HTML/ja/common/top-middle.png
 share/doc/tde/HTML/ja/common/top-right-konqueror.png
+share/doc/tde/HTML/ja/common/top-right.jpg
+share/doc/tde/HTML/ja/common/top-right.png
+share/doc/tde/HTML/ja/common/top-trinity.jpg
+share/doc/tde/HTML/ja/common/top.jpg
 share/doc/tde/HTML/ja/common/web-docbottom.png
 share/doc/tde/HTML/ja/common/web-doctop.png
 share/doc/tde/HTML/ja/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-kk/Makefile b/freebsd/core/tde-i18n-kk/Makefile
index 6ba06c1cc..0f9a8cdcc 100644
--- a/freebsd/core/tde-i18n-kk/Makefile
+++ b/freebsd/core/tde-i18n-kk/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-kk/distinfo b/freebsd/core/tde-i18n-kk/distinfo
index 320eedb77..7663c7483 100644
--- a/freebsd/core/tde-i18n-kk/distinfo
+++ b/freebsd/core/tde-i18n-kk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712570
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885477
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-km/Makefile b/freebsd/core/tde-i18n-km/Makefile
index 81ecb69f2..880473419 100644
--- a/freebsd/core/tde-i18n-km/Makefile
+++ b/freebsd/core/tde-i18n-km/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-km/distinfo b/freebsd/core/tde-i18n-km/distinfo
index 64fd07b69..90ce54aa3 100644
--- a/freebsd/core/tde-i18n-km/distinfo
+++ b/freebsd/core/tde-i18n-km/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712608
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885479
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ko/Makefile b/freebsd/core/tde-i18n-ko/Makefile
index bfbc4b2da..89ce59da0 100644
--- a/freebsd/core/tde-i18n-ko/Makefile
+++ b/freebsd/core/tde-i18n-ko/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ko/distinfo b/freebsd/core/tde-i18n-ko/distinfo
index b17cb3b97..e8b6bbcbc 100644
--- a/freebsd/core/tde-i18n-ko/distinfo
+++ b/freebsd/core/tde-i18n-ko/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712652
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885480
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ko/pkg-plist b/freebsd/core/tde-i18n-ko/pkg-plist
index 75b81228d..31ab73f5e 100644
--- a/freebsd/core/tde-i18n-ko/pkg-plist
+++ b/freebsd/core/tde-i18n-ko/pkg-plist
@@ -10,6 +10,9 @@ share/doc/tde/HTML/ko/common/8.png
 share/doc/tde/HTML/ko/common/9.png
 share/doc/tde/HTML/ko/common/appheader.html
 share/doc/tde/HTML/ko/common/artistic-license.html
+share/doc/tde/HTML/ko/common/block_title_bottom.png
+share/doc/tde/HTML/ko/common/block_title_mid.png
+share/doc/tde/HTML/ko/common/block_title_top.png
 share/doc/tde/HTML/ko/common/bottom-left.png
 share/doc/tde/HTML/ko/common/bottom-middle.png
 share/doc/tde/HTML/ko/common/bottom-right.png
@@ -27,6 +30,7 @@ share/doc/tde/HTML/ko/common/fdl-license
 share/doc/tde/HTML/ko/common/fdl-license.html
 share/doc/tde/HTML/ko/common/fdl-notice.html
 share/doc/tde/HTML/ko/common/fdl-translated.html
+share/doc/tde/HTML/ko/common/flat.css
 share/doc/tde/HTML/ko/common/footer.html
 share/doc/tde/HTML/ko/common/gpl-license
 share/doc/tde/HTML/ko/common/gpl-license.html
@@ -43,17 +47,25 @@ share/doc/tde/HTML/ko/common/lgpl-license.html
 share/doc/tde/HTML/ko/common/logotp3.png
 share/doc/tde/HTML/ko/common/mainfooter.html
 share/doc/tde/HTML/ko/common/mainheader.html
+share/doc/tde/HTML/ko/common/print.css
 share/doc/tde/HTML/ko/common/qpl-license.html
 share/doc/tde/HTML/ko/common/shadow.png
+share/doc/tde/HTML/ko/common/tabs.css
 share/doc/tde/HTML/ko/common/tde-common.css
 share/doc/tde/HTML/ko/common/tde-default.css
 share/doc/tde/HTML/ko/common/tde-docs.css
 share/doc/tde/HTML/ko/common/tde-localised.css
 share/doc/tde/HTML/ko/common/tde-localised.css.template
 share/doc/tde/HTML/ko/common/tde-web.css
+share/doc/tde/HTML/ko/common/tde.css
+share/doc/tde/HTML/ko/common/top-left.jpg
 share/doc/tde/HTML/ko/common/top-left.png
 share/doc/tde/HTML/ko/common/top-middle.png
 share/doc/tde/HTML/ko/common/top-right-konqueror.png
+share/doc/tde/HTML/ko/common/top-right.jpg
+share/doc/tde/HTML/ko/common/top-right.png
+share/doc/tde/HTML/ko/common/top-trinity.jpg
+share/doc/tde/HTML/ko/common/top.jpg
 share/doc/tde/HTML/ko/common/web-docbottom.png
 share/doc/tde/HTML/ko/common/web-doctop.png
 share/doc/tde/HTML/ko/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-lt/Makefile b/freebsd/core/tde-i18n-lt/Makefile
index 05a05c795..0db11e2a2 100644
--- a/freebsd/core/tde-i18n-lt/Makefile
+++ b/freebsd/core/tde-i18n-lt/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-lt/distinfo b/freebsd/core/tde-i18n-lt/distinfo
index 65263cee3..aaaa64169 100644
--- a/freebsd/core/tde-i18n-lt/distinfo
+++ b/freebsd/core/tde-i18n-lt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712691
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885483
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-lv/Makefile b/freebsd/core/tde-i18n-lv/Makefile
index 16e455313..8ca555dd0 100644
--- a/freebsd/core/tde-i18n-lv/Makefile
+++ b/freebsd/core/tde-i18n-lv/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-lv/distinfo b/freebsd/core/tde-i18n-lv/distinfo
index dd4637314..be61db97a 100644
--- a/freebsd/core/tde-i18n-lv/distinfo
+++ b/freebsd/core/tde-i18n-lv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619712725
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885485
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-mk/Makefile b/freebsd/core/tde-i18n-mk/Makefile
index 51f3d63a4..9f816bed2 100644
--- a/freebsd/core/tde-i18n-mk/Makefile
+++ b/freebsd/core/tde-i18n-mk/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-mk/distinfo b/freebsd/core/tde-i18n-mk/distinfo
index b50a423f8..a058a6c74 100644
--- a/freebsd/core/tde-i18n-mk/distinfo
+++ b/freebsd/core/tde-i18n-mk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713140
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885487
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-mn/Makefile b/freebsd/core/tde-i18n-mn/Makefile
index 35291f69e..dc924ca2c 100644
--- a/freebsd/core/tde-i18n-mn/Makefile
+++ b/freebsd/core/tde-i18n-mn/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-mn/distinfo b/freebsd/core/tde-i18n-mn/distinfo
index 60b9b3d7b..c3bb5347b 100644
--- a/freebsd/core/tde-i18n-mn/distinfo
+++ b/freebsd/core/tde-i18n-mn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713184
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885489
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ms/Makefile b/freebsd/core/tde-i18n-ms/Makefile
index e18a72622..f2d93a543 100644
--- a/freebsd/core/tde-i18n-ms/Makefile
+++ b/freebsd/core/tde-i18n-ms/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ms/distinfo b/freebsd/core/tde-i18n-ms/distinfo
index 7bc85b815..f097aad12 100644
--- a/freebsd/core/tde-i18n-ms/distinfo
+++ b/freebsd/core/tde-i18n-ms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713263
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885491
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-nb/Makefile b/freebsd/core/tde-i18n-nb/Makefile
index 2894bef9f..53a209417 100644
--- a/freebsd/core/tde-i18n-nb/Makefile
+++ b/freebsd/core/tde-i18n-nb/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-nb/distinfo b/freebsd/core/tde-i18n-nb/distinfo
index 73114990a..9f7aba91d 100644
--- a/freebsd/core/tde-i18n-nb/distinfo
+++ b/freebsd/core/tde-i18n-nb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713299
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885494
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-nds/Makefile b/freebsd/core/tde-i18n-nds/Makefile
index e8e83b6b4..ca310c004 100644
--- a/freebsd/core/tde-i18n-nds/Makefile
+++ b/freebsd/core/tde-i18n-nds/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-nds/distinfo b/freebsd/core/tde-i18n-nds/distinfo
index 1a809b197..7db1d4abc 100644
--- a/freebsd/core/tde-i18n-nds/distinfo
+++ b/freebsd/core/tde-i18n-nds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713356
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885496
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-nl/Makefile b/freebsd/core/tde-i18n-nl/Makefile
index ff23a01f4..a6090418e 100644
--- a/freebsd/core/tde-i18n-nl/Makefile
+++ b/freebsd/core/tde-i18n-nl/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-nl/distinfo b/freebsd/core/tde-i18n-nl/distinfo
index dd7f7d0b4..943d103a4 100644
--- a/freebsd/core/tde-i18n-nl/distinfo
+++ b/freebsd/core/tde-i18n-nl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713400
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885498
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-nl/pkg-plist b/freebsd/core/tde-i18n-nl/pkg-plist
index 6c3e275a3..2977f51d1 100644
--- a/freebsd/core/tde-i18n-nl/pkg-plist
+++ b/freebsd/core/tde-i18n-nl/pkg-plist
@@ -111,6 +111,9 @@ share/doc/tde/HTML/nl/common/8.png
 share/doc/tde/HTML/nl/common/9.png
 share/doc/tde/HTML/nl/common/appheader.html
 share/doc/tde/HTML/nl/common/artistic-license.html
+share/doc/tde/HTML/nl/common/block_title_bottom.png
+share/doc/tde/HTML/nl/common/block_title_mid.png
+share/doc/tde/HTML/nl/common/block_title_top.png
 share/doc/tde/HTML/nl/common/bottom-left.png
 share/doc/tde/HTML/nl/common/bottom-middle.png
 share/doc/tde/HTML/nl/common/bottom-right.png
@@ -128,6 +131,7 @@ share/doc/tde/HTML/nl/common/fdl-license
 share/doc/tde/HTML/nl/common/fdl-license.html
 share/doc/tde/HTML/nl/common/fdl-notice.html
 share/doc/tde/HTML/nl/common/fdl-translated.html
+share/doc/tde/HTML/nl/common/flat.css
 share/doc/tde/HTML/nl/common/footer.html
 share/doc/tde/HTML/nl/common/gpl-license
 share/doc/tde/HTML/nl/common/gpl-license.html
@@ -145,17 +149,25 @@ share/doc/tde/HTML/nl/common/lgpl-translated.html
 share/doc/tde/HTML/nl/common/logotp3.png
 share/doc/tde/HTML/nl/common/mainfooter.html
 share/doc/tde/HTML/nl/common/mainheader.html
+share/doc/tde/HTML/nl/common/print.css
 share/doc/tde/HTML/nl/common/qpl-license.html
 share/doc/tde/HTML/nl/common/shadow.png
+share/doc/tde/HTML/nl/common/tabs.css
 share/doc/tde/HTML/nl/common/tde-common.css
 share/doc/tde/HTML/nl/common/tde-default.css
 share/doc/tde/HTML/nl/common/tde-docs.css
 share/doc/tde/HTML/nl/common/tde-localised.css
 share/doc/tde/HTML/nl/common/tde-localised.css.template
 share/doc/tde/HTML/nl/common/tde-web.css
+share/doc/tde/HTML/nl/common/tde.css
+share/doc/tde/HTML/nl/common/top-left.jpg
 share/doc/tde/HTML/nl/common/top-left.png
 share/doc/tde/HTML/nl/common/top-middle.png
 share/doc/tde/HTML/nl/common/top-right-konqueror.png
+share/doc/tde/HTML/nl/common/top-right.jpg
+share/doc/tde/HTML/nl/common/top-right.png
+share/doc/tde/HTML/nl/common/top-trinity.jpg
+share/doc/tde/HTML/nl/common/top.jpg
 share/doc/tde/HTML/nl/common/web-docbottom.png
 share/doc/tde/HTML/nl/common/web-doctop.png
 share/doc/tde/HTML/nl/common/x11-license.html
@@ -1271,9 +1283,6 @@ share/doc/tde/HTML/nl/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/nl/tdeioslave/ftp/common
 share/doc/tde/HTML/nl/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/nl/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/nl/tdeioslave/gopher/common
-share/doc/tde/HTML/nl/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/nl/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/nl/tdeioslave/gzip/common
 share/doc/tde/HTML/nl/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/nl/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-nn/Makefile b/freebsd/core/tde-i18n-nn/Makefile
index e6d3da7e9..1453bfb16 100644
--- a/freebsd/core/tde-i18n-nn/Makefile
+++ b/freebsd/core/tde-i18n-nn/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-nn/distinfo b/freebsd/core/tde-i18n-nn/distinfo
index 6256faac0..7a3efd129 100644
--- a/freebsd/core/tde-i18n-nn/distinfo
+++ b/freebsd/core/tde-i18n-nn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713536
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885500
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-pa/Makefile b/freebsd/core/tde-i18n-pa/Makefile
index d6df7b564..741dee2f4 100644
--- a/freebsd/core/tde-i18n-pa/Makefile
+++ b/freebsd/core/tde-i18n-pa/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-pa/distinfo b/freebsd/core/tde-i18n-pa/distinfo
index 47ae95e4c..1ad400523 100644
--- a/freebsd/core/tde-i18n-pa/distinfo
+++ b/freebsd/core/tde-i18n-pa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713579
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885502
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-pl/Makefile b/freebsd/core/tde-i18n-pl/Makefile
index 7c10b40a4..e2dfe2606 100644
--- a/freebsd/core/tde-i18n-pl/Makefile
+++ b/freebsd/core/tde-i18n-pl/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-pl/distinfo b/freebsd/core/tde-i18n-pl/distinfo
index e0cb804a0..a24dca61a 100644
--- a/freebsd/core/tde-i18n-pl/distinfo
+++ b/freebsd/core/tde-i18n-pl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713687
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885504
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-pl/pkg-plist b/freebsd/core/tde-i18n-pl/pkg-plist
index 7307b911b..9019ab611 100644
--- a/freebsd/core/tde-i18n-pl/pkg-plist
+++ b/freebsd/core/tde-i18n-pl/pkg-plist
@@ -63,6 +63,9 @@ share/doc/tde/HTML/pl/common/8.png
 share/doc/tde/HTML/pl/common/9.png
 share/doc/tde/HTML/pl/common/appheader.html
 share/doc/tde/HTML/pl/common/artistic-license.html
+share/doc/tde/HTML/pl/common/block_title_bottom.png
+share/doc/tde/HTML/pl/common/block_title_mid.png
+share/doc/tde/HTML/pl/common/block_title_top.png
 share/doc/tde/HTML/pl/common/bottom-left.png
 share/doc/tde/HTML/pl/common/bottom-middle.png
 share/doc/tde/HTML/pl/common/bottom-right.png
@@ -80,6 +83,7 @@ share/doc/tde/HTML/pl/common/fdl-license
 share/doc/tde/HTML/pl/common/fdl-license.html
 share/doc/tde/HTML/pl/common/fdl-notice.html
 share/doc/tde/HTML/pl/common/fdl-translated.html
+share/doc/tde/HTML/pl/common/flat.css
 share/doc/tde/HTML/pl/common/footer.html
 share/doc/tde/HTML/pl/common/gpl-license
 share/doc/tde/HTML/pl/common/gpl-license.html
@@ -97,17 +101,25 @@ share/doc/tde/HTML/pl/common/lgpl-translated.html
 share/doc/tde/HTML/pl/common/logotp3.png
 share/doc/tde/HTML/pl/common/mainfooter.html
 share/doc/tde/HTML/pl/common/mainheader.html
+share/doc/tde/HTML/pl/common/print.css
 share/doc/tde/HTML/pl/common/qpl-license.html
 share/doc/tde/HTML/pl/common/shadow.png
+share/doc/tde/HTML/pl/common/tabs.css
 share/doc/tde/HTML/pl/common/tde-common.css
 share/doc/tde/HTML/pl/common/tde-default.css
 share/doc/tde/HTML/pl/common/tde-docs.css
 share/doc/tde/HTML/pl/common/tde-localised.css
 share/doc/tde/HTML/pl/common/tde-localised.css.template
 share/doc/tde/HTML/pl/common/tde-web.css
+share/doc/tde/HTML/pl/common/tde.css
+share/doc/tde/HTML/pl/common/top-left.jpg
 share/doc/tde/HTML/pl/common/top-left.png
 share/doc/tde/HTML/pl/common/top-middle.png
 share/doc/tde/HTML/pl/common/top-right-konqueror.png
+share/doc/tde/HTML/pl/common/top-right.jpg
+share/doc/tde/HTML/pl/common/top-right.png
+share/doc/tde/HTML/pl/common/top-trinity.jpg
+share/doc/tde/HTML/pl/common/top.jpg
 share/doc/tde/HTML/pl/common/web-docbottom.png
 share/doc/tde/HTML/pl/common/web-doctop.png
 share/doc/tde/HTML/pl/common/x11-license.html
@@ -1030,9 +1042,6 @@ share/doc/tde/HTML/pl/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/pl/tdeioslave/ftp/common
 share/doc/tde/HTML/pl/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/pl/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/pl/tdeioslave/gopher/common
-share/doc/tde/HTML/pl/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/pl/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/pl/tdeioslave/gzip/common
 share/doc/tde/HTML/pl/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/pl/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-pt/Makefile b/freebsd/core/tde-i18n-pt/Makefile
index 4b56f5400..53ee9fe88 100644
--- a/freebsd/core/tde-i18n-pt/Makefile
+++ b/freebsd/core/tde-i18n-pt/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-pt/distinfo b/freebsd/core/tde-i18n-pt/distinfo
index d1aff0028..6e315498f 100644
--- a/freebsd/core/tde-i18n-pt/distinfo
+++ b/freebsd/core/tde-i18n-pt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619713808
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885506
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-pt/pkg-plist b/freebsd/core/tde-i18n-pt/pkg-plist
index c3d1eaac6..64ad717df 100644
--- a/freebsd/core/tde-i18n-pt/pkg-plist
+++ b/freebsd/core/tde-i18n-pt/pkg-plist
@@ -79,6 +79,9 @@ share/doc/tde/HTML/pt/common/8.png
 share/doc/tde/HTML/pt/common/9.png
 share/doc/tde/HTML/pt/common/appheader.html
 share/doc/tde/HTML/pt/common/artistic-license.html
+share/doc/tde/HTML/pt/common/block_title_bottom.png
+share/doc/tde/HTML/pt/common/block_title_mid.png
+share/doc/tde/HTML/pt/common/block_title_top.png
 share/doc/tde/HTML/pt/common/bottom-left.png
 share/doc/tde/HTML/pt/common/bottom-middle.png
 share/doc/tde/HTML/pt/common/bottom-right.png
@@ -96,6 +99,7 @@ share/doc/tde/HTML/pt/common/fdl-license
 share/doc/tde/HTML/pt/common/fdl-license.html
 share/doc/tde/HTML/pt/common/fdl-notice.html
 share/doc/tde/HTML/pt/common/fdl-translated.html
+share/doc/tde/HTML/pt/common/flat.css
 share/doc/tde/HTML/pt/common/footer.html
 share/doc/tde/HTML/pt/common/gpl-license
 share/doc/tde/HTML/pt/common/gpl-license.html
@@ -113,17 +117,25 @@ share/doc/tde/HTML/pt/common/lgpl-translated.html
 share/doc/tde/HTML/pt/common/logotp3.png
 share/doc/tde/HTML/pt/common/mainfooter.html
 share/doc/tde/HTML/pt/common/mainheader.html
+share/doc/tde/HTML/pt/common/print.css
 share/doc/tde/HTML/pt/common/qpl-license.html
 share/doc/tde/HTML/pt/common/shadow.png
+share/doc/tde/HTML/pt/common/tabs.css
 share/doc/tde/HTML/pt/common/tde-common.css
 share/doc/tde/HTML/pt/common/tde-default.css
 share/doc/tde/HTML/pt/common/tde-docs.css
 share/doc/tde/HTML/pt/common/tde-localised.css
 share/doc/tde/HTML/pt/common/tde-localised.css.template
 share/doc/tde/HTML/pt/common/tde-web.css
+share/doc/tde/HTML/pt/common/tde.css
+share/doc/tde/HTML/pt/common/top-left.jpg
 share/doc/tde/HTML/pt/common/top-left.png
 share/doc/tde/HTML/pt/common/top-middle.png
 share/doc/tde/HTML/pt/common/top-right-konqueror.png
+share/doc/tde/HTML/pt/common/top-right.jpg
+share/doc/tde/HTML/pt/common/top-right.png
+share/doc/tde/HTML/pt/common/top-trinity.jpg
+share/doc/tde/HTML/pt/common/top.jpg
 share/doc/tde/HTML/pt/common/web-docbottom.png
 share/doc/tde/HTML/pt/common/web-doctop.png
 share/doc/tde/HTML/pt/common/x11-license.html
@@ -1364,9 +1376,6 @@ share/doc/tde/HTML/pt/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/pt/tdeioslave/ftp/common
 share/doc/tde/HTML/pt/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/pt/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/pt/tdeioslave/gopher/common
-share/doc/tde/HTML/pt/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/pt/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/pt/tdeioslave/gzip/common
 share/doc/tde/HTML/pt/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/pt/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-pt_BR/Makefile b/freebsd/core/tde-i18n-pt_BR/Makefile
index 32f466dd8..ce296180c 100644
--- a/freebsd/core/tde-i18n-pt_BR/Makefile
+++ b/freebsd/core/tde-i18n-pt_BR/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-pt_BR/distinfo b/freebsd/core/tde-i18n-pt_BR/distinfo
index 81b3fc53c..77e386dbe 100644
--- a/freebsd/core/tde-i18n-pt_BR/distinfo
+++ b/freebsd/core/tde-i18n-pt_BR/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619715686
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885508
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-pt_BR/pkg-plist b/freebsd/core/tde-i18n-pt_BR/pkg-plist
index 28a4758d8..b523b3884 100644
--- a/freebsd/core/tde-i18n-pt_BR/pkg-plist
+++ b/freebsd/core/tde-i18n-pt_BR/pkg-plist
@@ -165,6 +165,9 @@ share/doc/tde/HTML/pt_BR/common/8.png
 share/doc/tde/HTML/pt_BR/common/9.png
 share/doc/tde/HTML/pt_BR/common/appheader.html
 share/doc/tde/HTML/pt_BR/common/artistic-license.html
+share/doc/tde/HTML/pt_BR/common/block_title_bottom.png
+share/doc/tde/HTML/pt_BR/common/block_title_mid.png
+share/doc/tde/HTML/pt_BR/common/block_title_top.png
 share/doc/tde/HTML/pt_BR/common/bottom-left.png
 share/doc/tde/HTML/pt_BR/common/bottom-middle.png
 share/doc/tde/HTML/pt_BR/common/bottom-right.png
@@ -182,6 +185,7 @@ share/doc/tde/HTML/pt_BR/common/fdl-license
 share/doc/tde/HTML/pt_BR/common/fdl-license.html
 share/doc/tde/HTML/pt_BR/common/fdl-notice.html
 share/doc/tde/HTML/pt_BR/common/fdl-translated.html
+share/doc/tde/HTML/pt_BR/common/flat.css
 share/doc/tde/HTML/pt_BR/common/footer.html
 share/doc/tde/HTML/pt_BR/common/gpl-license
 share/doc/tde/HTML/pt_BR/common/gpl-license.html
@@ -199,17 +203,25 @@ share/doc/tde/HTML/pt_BR/common/lgpl-translated.html
 share/doc/tde/HTML/pt_BR/common/logotp3.png
 share/doc/tde/HTML/pt_BR/common/mainfooter.html
 share/doc/tde/HTML/pt_BR/common/mainheader.html
+share/doc/tde/HTML/pt_BR/common/print.css
 share/doc/tde/HTML/pt_BR/common/qpl-license.html
 share/doc/tde/HTML/pt_BR/common/shadow.png
+share/doc/tde/HTML/pt_BR/common/tabs.css
 share/doc/tde/HTML/pt_BR/common/tde-common.css
 share/doc/tde/HTML/pt_BR/common/tde-default.css
 share/doc/tde/HTML/pt_BR/common/tde-docs.css
 share/doc/tde/HTML/pt_BR/common/tde-localised.css
 share/doc/tde/HTML/pt_BR/common/tde-localised.css.template
 share/doc/tde/HTML/pt_BR/common/tde-web.css
+share/doc/tde/HTML/pt_BR/common/tde.css
+share/doc/tde/HTML/pt_BR/common/top-left.jpg
 share/doc/tde/HTML/pt_BR/common/top-left.png
 share/doc/tde/HTML/pt_BR/common/top-middle.png
 share/doc/tde/HTML/pt_BR/common/top-right-konqueror.png
+share/doc/tde/HTML/pt_BR/common/top-right.jpg
+share/doc/tde/HTML/pt_BR/common/top-right.png
+share/doc/tde/HTML/pt_BR/common/top-trinity.jpg
+share/doc/tde/HTML/pt_BR/common/top.jpg
 share/doc/tde/HTML/pt_BR/common/web-docbottom.png
 share/doc/tde/HTML/pt_BR/common/web-doctop.png
 share/doc/tde/HTML/pt_BR/common/x11-license.html
@@ -1350,9 +1362,6 @@ share/doc/tde/HTML/pt_BR/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/pt_BR/tdeioslave/ftp/common
 share/doc/tde/HTML/pt_BR/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/pt_BR/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/pt_BR/tdeioslave/gopher/common
-share/doc/tde/HTML/pt_BR/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/pt_BR/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/pt_BR/tdeioslave/gzip/common
 share/doc/tde/HTML/pt_BR/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/pt_BR/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-ro/Makefile b/freebsd/core/tde-i18n-ro/Makefile
index e0a9aae38..5309bb102 100644
--- a/freebsd/core/tde-i18n-ro/Makefile
+++ b/freebsd/core/tde-i18n-ro/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ro/distinfo b/freebsd/core/tde-i18n-ro/distinfo
index d13a8ca68..d828d8368 100644
--- a/freebsd/core/tde-i18n-ro/distinfo
+++ b/freebsd/core/tde-i18n-ro/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619715852
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885510
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ro/pkg-plist b/freebsd/core/tde-i18n-ro/pkg-plist
index de31ff40c..45568beee 100644
--- a/freebsd/core/tde-i18n-ro/pkg-plist
+++ b/freebsd/core/tde-i18n-ro/pkg-plist
@@ -31,6 +31,9 @@ share/doc/tde/HTML/ro/common/8.png
 share/doc/tde/HTML/ro/common/9.png
 share/doc/tde/HTML/ro/common/appheader.html
 share/doc/tde/HTML/ro/common/artistic-license.html
+share/doc/tde/HTML/ro/common/block_title_bottom.png
+share/doc/tde/HTML/ro/common/block_title_mid.png
+share/doc/tde/HTML/ro/common/block_title_top.png
 share/doc/tde/HTML/ro/common/bottom-left.png
 share/doc/tde/HTML/ro/common/bottom-middle.png
 share/doc/tde/HTML/ro/common/bottom-right.png
@@ -48,6 +51,7 @@ share/doc/tde/HTML/ro/common/fdl-license
 share/doc/tde/HTML/ro/common/fdl-license.html
 share/doc/tde/HTML/ro/common/fdl-notice.html
 share/doc/tde/HTML/ro/common/fdl-translated.html
+share/doc/tde/HTML/ro/common/flat.css
 share/doc/tde/HTML/ro/common/footer.html
 share/doc/tde/HTML/ro/common/gpl-license
 share/doc/tde/HTML/ro/common/gpl-license.html
@@ -65,17 +69,25 @@ share/doc/tde/HTML/ro/common/lgpl-translated.html
 share/doc/tde/HTML/ro/common/logotp3.png
 share/doc/tde/HTML/ro/common/mainfooter.html
 share/doc/tde/HTML/ro/common/mainheader.html
+share/doc/tde/HTML/ro/common/print.css
 share/doc/tde/HTML/ro/common/qpl-license.html
 share/doc/tde/HTML/ro/common/shadow.png
+share/doc/tde/HTML/ro/common/tabs.css
 share/doc/tde/HTML/ro/common/tde-common.css
 share/doc/tde/HTML/ro/common/tde-default.css
 share/doc/tde/HTML/ro/common/tde-docs.css
 share/doc/tde/HTML/ro/common/tde-localised.css
 share/doc/tde/HTML/ro/common/tde-localised.css.template
 share/doc/tde/HTML/ro/common/tde-web.css
+share/doc/tde/HTML/ro/common/tde.css
+share/doc/tde/HTML/ro/common/top-left.jpg
 share/doc/tde/HTML/ro/common/top-left.png
 share/doc/tde/HTML/ro/common/top-middle.png
 share/doc/tde/HTML/ro/common/top-right-konqueror.png
+share/doc/tde/HTML/ro/common/top-right.jpg
+share/doc/tde/HTML/ro/common/top-right.png
+share/doc/tde/HTML/ro/common/top-trinity.jpg
+share/doc/tde/HTML/ro/common/top.jpg
 share/doc/tde/HTML/ro/common/web-docbottom.png
 share/doc/tde/HTML/ro/common/web-doctop.png
 share/doc/tde/HTML/ro/common/x11-license.html
@@ -143,9 +155,6 @@ share/doc/tde/HTML/ro/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/ro/tdeioslave/ftp/common
 share/doc/tde/HTML/ro/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/ro/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/ro/tdeioslave/gopher/common
-share/doc/tde/HTML/ro/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/ro/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/ro/tdeioslave/gzip/common
 share/doc/tde/HTML/ro/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/ro/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-ru/Makefile b/freebsd/core/tde-i18n-ru/Makefile
index dcd4c4158..3a63ced54 100644
--- a/freebsd/core/tde-i18n-ru/Makefile
+++ b/freebsd/core/tde-i18n-ru/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ru/distinfo b/freebsd/core/tde-i18n-ru/distinfo
index cc1ab6557..ec5b147f2 100644
--- a/freebsd/core/tde-i18n-ru/distinfo
+++ b/freebsd/core/tde-i18n-ru/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619715899
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885512
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ru/pkg-plist b/freebsd/core/tde-i18n-ru/pkg-plist
index e7063b0fc..eda8372ca 100644
--- a/freebsd/core/tde-i18n-ru/pkg-plist
+++ b/freebsd/core/tde-i18n-ru/pkg-plist
@@ -69,6 +69,9 @@ share/doc/tde/HTML/ru/common/8.png
 share/doc/tde/HTML/ru/common/9.png
 share/doc/tde/HTML/ru/common/appheader.html
 share/doc/tde/HTML/ru/common/artistic-license.html
+share/doc/tde/HTML/ru/common/block_title_bottom.png
+share/doc/tde/HTML/ru/common/block_title_mid.png
+share/doc/tde/HTML/ru/common/block_title_top.png
 share/doc/tde/HTML/ru/common/bottom-left.png
 share/doc/tde/HTML/ru/common/bottom-middle.png
 share/doc/tde/HTML/ru/common/bottom-right.png
@@ -85,6 +88,7 @@ share/doc/tde/HTML/ru/common/favicon.ico
 share/doc/tde/HTML/ru/common/fdl-license
 share/doc/tde/HTML/ru/common/fdl-license.html
 share/doc/tde/HTML/ru/common/fdl-notice.html
+share/doc/tde/HTML/ru/common/flat.css
 share/doc/tde/HTML/ru/common/footer.html
 share/doc/tde/HTML/ru/common/gpl-license
 share/doc/tde/HTML/ru/common/gpl-license.html
@@ -99,17 +103,25 @@ share/doc/tde/HTML/ru/common/lgpl-license
 share/doc/tde/HTML/ru/common/lgpl-license.html
 share/doc/tde/HTML/ru/common/mainfooter.html
 share/doc/tde/HTML/ru/common/mainheader.html
+share/doc/tde/HTML/ru/common/print.css
 share/doc/tde/HTML/ru/common/qpl-license.html
 share/doc/tde/HTML/ru/common/shadow.png
+share/doc/tde/HTML/ru/common/tabs.css
 share/doc/tde/HTML/ru/common/tde-common.css
 share/doc/tde/HTML/ru/common/tde-default.css
 share/doc/tde/HTML/ru/common/tde-docs.css
 share/doc/tde/HTML/ru/common/tde-localised.css
 share/doc/tde/HTML/ru/common/tde-localised.css.template
 share/doc/tde/HTML/ru/common/tde-web.css
+share/doc/tde/HTML/ru/common/tde.css
+share/doc/tde/HTML/ru/common/top-left.jpg
 share/doc/tde/HTML/ru/common/top-left.png
 share/doc/tde/HTML/ru/common/top-middle.png
 share/doc/tde/HTML/ru/common/top-right-konqueror.png
+share/doc/tde/HTML/ru/common/top-right.jpg
+share/doc/tde/HTML/ru/common/top-right.png
+share/doc/tde/HTML/ru/common/top-trinity.jpg
+share/doc/tde/HTML/ru/common/top.jpg
 share/doc/tde/HTML/ru/common/web-docbottom.png
 share/doc/tde/HTML/ru/common/web-doctop.png
 share/doc/tde/HTML/ru/common/x11-license.html
@@ -908,9 +920,6 @@ share/doc/tde/HTML/ru/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/ru/tdeioslave/ftp/common
 share/doc/tde/HTML/ru/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/ru/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/ru/tdeioslave/gopher/common
-share/doc/tde/HTML/ru/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/ru/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/ru/tdeioslave/gzip/common
 share/doc/tde/HTML/ru/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/ru/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-rw/Makefile b/freebsd/core/tde-i18n-rw/Makefile
index 045df34aa..fdc9636dd 100644
--- a/freebsd/core/tde-i18n-rw/Makefile
+++ b/freebsd/core/tde-i18n-rw/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-rw/distinfo b/freebsd/core/tde-i18n-rw/distinfo
index 857f0cbb7..d3f4d8f39 100644
--- a/freebsd/core/tde-i18n-rw/distinfo
+++ b/freebsd/core/tde-i18n-rw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716096
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885514
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-se/Makefile b/freebsd/core/tde-i18n-se/Makefile
index 9015e87f5..385ab1388 100644
--- a/freebsd/core/tde-i18n-se/Makefile
+++ b/freebsd/core/tde-i18n-se/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-se/distinfo b/freebsd/core/tde-i18n-se/distinfo
index 8220d7e86..6af1fe140 100644
--- a/freebsd/core/tde-i18n-se/distinfo
+++ b/freebsd/core/tde-i18n-se/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716144
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885516
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-sk/Makefile b/freebsd/core/tde-i18n-sk/Makefile
index 83a82f32e..daecd8846 100644
--- a/freebsd/core/tde-i18n-sk/Makefile
+++ b/freebsd/core/tde-i18n-sk/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-sk/distinfo b/freebsd/core/tde-i18n-sk/distinfo
index 1b9d7c681..27dac4730 100644
--- a/freebsd/core/tde-i18n-sk/distinfo
+++ b/freebsd/core/tde-i18n-sk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716223
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885518
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-sk/pkg-plist b/freebsd/core/tde-i18n-sk/pkg-plist
index fcf9fe616..e4f5db59b 100644
--- a/freebsd/core/tde-i18n-sk/pkg-plist
+++ b/freebsd/core/tde-i18n-sk/pkg-plist
@@ -165,6 +165,9 @@ share/doc/tde/HTML/sk/common/8.png
 share/doc/tde/HTML/sk/common/9.png
 share/doc/tde/HTML/sk/common/appheader.html
 share/doc/tde/HTML/sk/common/artistic-license.html
+share/doc/tde/HTML/sk/common/block_title_bottom.png
+share/doc/tde/HTML/sk/common/block_title_mid.png
+share/doc/tde/HTML/sk/common/block_title_top.png
 share/doc/tde/HTML/sk/common/bottom-left.png
 share/doc/tde/HTML/sk/common/bottom-middle.png
 share/doc/tde/HTML/sk/common/bottom-right.png
@@ -181,6 +184,7 @@ share/doc/tde/HTML/sk/common/favicon.ico
 share/doc/tde/HTML/sk/common/fdl-license
 share/doc/tde/HTML/sk/common/fdl-license.html
 share/doc/tde/HTML/sk/common/fdl-notice.html
+share/doc/tde/HTML/sk/common/flat.css
 share/doc/tde/HTML/sk/common/footer.html
 share/doc/tde/HTML/sk/common/gpl-license
 share/doc/tde/HTML/sk/common/gpl-license.html
@@ -196,16 +200,24 @@ share/doc/tde/HTML/sk/common/lgpl-license
 share/doc/tde/HTML/sk/common/lgpl-license.html
 share/doc/tde/HTML/sk/common/mainfooter.html
 share/doc/tde/HTML/sk/common/mainheader.html
+share/doc/tde/HTML/sk/common/print.css
 share/doc/tde/HTML/sk/common/qpl-license.html
 share/doc/tde/HTML/sk/common/shadow.png
+share/doc/tde/HTML/sk/common/tabs.css
 share/doc/tde/HTML/sk/common/tde-common.css
 share/doc/tde/HTML/sk/common/tde-default.css
 share/doc/tde/HTML/sk/common/tde-docs.css
 share/doc/tde/HTML/sk/common/tde-localised.css.template
 share/doc/tde/HTML/sk/common/tde-web.css
+share/doc/tde/HTML/sk/common/tde.css
+share/doc/tde/HTML/sk/common/top-left.jpg
 share/doc/tde/HTML/sk/common/top-left.png
 share/doc/tde/HTML/sk/common/top-middle.png
 share/doc/tde/HTML/sk/common/top-right-konqueror.png
+share/doc/tde/HTML/sk/common/top-right.jpg
+share/doc/tde/HTML/sk/common/top-right.png
+share/doc/tde/HTML/sk/common/top-trinity.jpg
+share/doc/tde/HTML/sk/common/top.jpg
 share/doc/tde/HTML/sk/common/web-docbottom.png
 share/doc/tde/HTML/sk/common/web-doctop.png
 share/doc/tde/HTML/sk/common/x11-license.html
@@ -726,9 +738,6 @@ share/doc/tde/HTML/sk/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/sk/tdeioslave/ftp/common
 share/doc/tde/HTML/sk/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/sk/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/sk/tdeioslave/gopher/common
-share/doc/tde/HTML/sk/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/sk/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/sk/tdeioslave/gzip/common
 share/doc/tde/HTML/sk/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/sk/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-sl/Makefile b/freebsd/core/tde-i18n-sl/Makefile
index 640733713..e36cb4716 100644
--- a/freebsd/core/tde-i18n-sl/Makefile
+++ b/freebsd/core/tde-i18n-sl/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-sl/distinfo b/freebsd/core/tde-i18n-sl/distinfo
index f7cb8161d..83e7c40d3 100644
--- a/freebsd/core/tde-i18n-sl/distinfo
+++ b/freebsd/core/tde-i18n-sl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716309
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885520
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-sl/pkg-plist b/freebsd/core/tde-i18n-sl/pkg-plist
index 23a4f7718..ea0fc4915 100644
--- a/freebsd/core/tde-i18n-sl/pkg-plist
+++ b/freebsd/core/tde-i18n-sl/pkg-plist
@@ -40,6 +40,9 @@ share/doc/tde/HTML/sl/common/8.png
 share/doc/tde/HTML/sl/common/9.png
 share/doc/tde/HTML/sl/common/appheader.html
 share/doc/tde/HTML/sl/common/artistic-license.html
+share/doc/tde/HTML/sl/common/block_title_bottom.png
+share/doc/tde/HTML/sl/common/block_title_mid.png
+share/doc/tde/HTML/sl/common/block_title_top.png
 share/doc/tde/HTML/sl/common/bottom-left.png
 share/doc/tde/HTML/sl/common/bottom-middle.png
 share/doc/tde/HTML/sl/common/bottom-right.png
@@ -57,6 +60,7 @@ share/doc/tde/HTML/sl/common/fdl-license
 share/doc/tde/HTML/sl/common/fdl-license.html
 share/doc/tde/HTML/sl/common/fdl-notice.html
 share/doc/tde/HTML/sl/common/fdl-translated.html
+share/doc/tde/HTML/sl/common/flat.css
 share/doc/tde/HTML/sl/common/footer.html
 share/doc/tde/HTML/sl/common/gpl-license
 share/doc/tde/HTML/sl/common/gpl-license.html
@@ -74,17 +78,25 @@ share/doc/tde/HTML/sl/common/lgpl-translated.html
 share/doc/tde/HTML/sl/common/logotp3.png
 share/doc/tde/HTML/sl/common/mainfooter.html
 share/doc/tde/HTML/sl/common/mainheader.html
+share/doc/tde/HTML/sl/common/print.css
 share/doc/tde/HTML/sl/common/qpl-license.html
 share/doc/tde/HTML/sl/common/shadow.png
+share/doc/tde/HTML/sl/common/tabs.css
 share/doc/tde/HTML/sl/common/tde-common.css
 share/doc/tde/HTML/sl/common/tde-default.css
 share/doc/tde/HTML/sl/common/tde-docs.css
 share/doc/tde/HTML/sl/common/tde-localised.css
 share/doc/tde/HTML/sl/common/tde-localised.css.template
 share/doc/tde/HTML/sl/common/tde-web.css
+share/doc/tde/HTML/sl/common/tde.css
+share/doc/tde/HTML/sl/common/top-left.jpg
 share/doc/tde/HTML/sl/common/top-left.png
 share/doc/tde/HTML/sl/common/top-middle.png
 share/doc/tde/HTML/sl/common/top-right-konqueror.png
+share/doc/tde/HTML/sl/common/top-right.jpg
+share/doc/tde/HTML/sl/common/top-right.png
+share/doc/tde/HTML/sl/common/top-trinity.jpg
+share/doc/tde/HTML/sl/common/top.jpg
 share/doc/tde/HTML/sl/common/web-docbottom.png
 share/doc/tde/HTML/sl/common/web-doctop.png
 share/doc/tde/HTML/sl/common/x11-license.html
@@ -295,9 +307,6 @@ share/doc/tde/HTML/sl/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/sl/tdeioslave/ftp/common
 share/doc/tde/HTML/sl/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/sl/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/sl/tdeioslave/gopher/common
-share/doc/tde/HTML/sl/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/sl/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/sl/tdeioslave/gzip/common
 share/doc/tde/HTML/sl/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/sl/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-sr/Makefile b/freebsd/core/tde-i18n-sr/Makefile
index b8800b2c2..f1a80be85 100644
--- a/freebsd/core/tde-i18n-sr/Makefile
+++ b/freebsd/core/tde-i18n-sr/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-sr/distinfo b/freebsd/core/tde-i18n-sr/distinfo
index 7f8793f31..4e881c3a3 100644
--- a/freebsd/core/tde-i18n-sr/distinfo
+++ b/freebsd/core/tde-i18n-sr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716363
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885522
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-sr/pkg-plist b/freebsd/core/tde-i18n-sr/pkg-plist
index b14ee83b5..c5763f040 100644
--- a/freebsd/core/tde-i18n-sr/pkg-plist
+++ b/freebsd/core/tde-i18n-sr/pkg-plist
@@ -35,6 +35,9 @@ share/doc/tde/HTML/sr/common/8.png
 share/doc/tde/HTML/sr/common/9.png
 share/doc/tde/HTML/sr/common/appheader.html
 share/doc/tde/HTML/sr/common/artistic-license.html
+share/doc/tde/HTML/sr/common/block_title_bottom.png
+share/doc/tde/HTML/sr/common/block_title_mid.png
+share/doc/tde/HTML/sr/common/block_title_top.png
 share/doc/tde/HTML/sr/common/bottom-left.png
 share/doc/tde/HTML/sr/common/bottom-middle.png
 share/doc/tde/HTML/sr/common/bottom-right.png
@@ -52,6 +55,7 @@ share/doc/tde/HTML/sr/common/fdl-license
 share/doc/tde/HTML/sr/common/fdl-license.html
 share/doc/tde/HTML/sr/common/fdl-notice.html
 share/doc/tde/HTML/sr/common/fdl-translated.html
+share/doc/tde/HTML/sr/common/flat.css
 share/doc/tde/HTML/sr/common/footer.html
 share/doc/tde/HTML/sr/common/gpl-license
 share/doc/tde/HTML/sr/common/gpl-license.html
@@ -69,17 +73,25 @@ share/doc/tde/HTML/sr/common/lgpl-translated.html
 share/doc/tde/HTML/sr/common/logotp3.png
 share/doc/tde/HTML/sr/common/mainfooter.html
 share/doc/tde/HTML/sr/common/mainheader.html
+share/doc/tde/HTML/sr/common/print.css
 share/doc/tde/HTML/sr/common/qpl-license.html
 share/doc/tde/HTML/sr/common/shadow.png
+share/doc/tde/HTML/sr/common/tabs.css
 share/doc/tde/HTML/sr/common/tde-common.css
 share/doc/tde/HTML/sr/common/tde-default.css
 share/doc/tde/HTML/sr/common/tde-docs.css
 share/doc/tde/HTML/sr/common/tde-localised.css
 share/doc/tde/HTML/sr/common/tde-localised.css.template
 share/doc/tde/HTML/sr/common/tde-web.css
+share/doc/tde/HTML/sr/common/tde.css
+share/doc/tde/HTML/sr/common/top-left.jpg
 share/doc/tde/HTML/sr/common/top-left.png
 share/doc/tde/HTML/sr/common/top-middle.png
 share/doc/tde/HTML/sr/common/top-right-konqueror.png
+share/doc/tde/HTML/sr/common/top-right.jpg
+share/doc/tde/HTML/sr/common/top-right.png
+share/doc/tde/HTML/sr/common/top-trinity.jpg
+share/doc/tde/HTML/sr/common/top.jpg
 share/doc/tde/HTML/sr/common/web-docbottom.png
 share/doc/tde/HTML/sr/common/web-doctop.png
 share/doc/tde/HTML/sr/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-sr@Latn/Makefile b/freebsd/core/tde-i18n-sr@Latn/Makefile
index aae50b274..a799b6be6 100644
--- a/freebsd/core/tde-i18n-sr@Latn/Makefile
+++ b/freebsd/core/tde-i18n-sr@Latn/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-sr@Latn/distinfo b/freebsd/core/tde-i18n-sr@Latn/distinfo
index 352166f64..258e5a390 100644
--- a/freebsd/core/tde-i18n-sr@Latn/distinfo
+++ b/freebsd/core/tde-i18n-sr@Latn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716399
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885524
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-ss/Makefile b/freebsd/core/tde-i18n-ss/Makefile
index 0cdea9354..06e912048 100644
--- a/freebsd/core/tde-i18n-ss/Makefile
+++ b/freebsd/core/tde-i18n-ss/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ss/distinfo b/freebsd/core/tde-i18n-ss/distinfo
index 92a395d27..e8d0ffa74 100644
--- a/freebsd/core/tde-i18n-ss/distinfo
+++ b/freebsd/core/tde-i18n-ss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716430
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885526
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-sv/Makefile b/freebsd/core/tde-i18n-sv/Makefile
index 565b006de..e4c42a951 100644
--- a/freebsd/core/tde-i18n-sv/Makefile
+++ b/freebsd/core/tde-i18n-sv/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-sv/distinfo b/freebsd/core/tde-i18n-sv/distinfo
index ae0eea639..bcace34fb 100644
--- a/freebsd/core/tde-i18n-sv/distinfo
+++ b/freebsd/core/tde-i18n-sv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716479
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885528
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-sv/pkg-plist b/freebsd/core/tde-i18n-sv/pkg-plist
index 111b6c092..b7c27039c 100644
--- a/freebsd/core/tde-i18n-sv/pkg-plist
+++ b/freebsd/core/tde-i18n-sv/pkg-plist
@@ -150,6 +150,9 @@ share/doc/tde/HTML/sv/common/8.png
 share/doc/tde/HTML/sv/common/9.png
 share/doc/tde/HTML/sv/common/appheader.html
 share/doc/tde/HTML/sv/common/artistic-license.html
+share/doc/tde/HTML/sv/common/block_title_bottom.png
+share/doc/tde/HTML/sv/common/block_title_mid.png
+share/doc/tde/HTML/sv/common/block_title_top.png
 share/doc/tde/HTML/sv/common/bottom-left.png
 share/doc/tde/HTML/sv/common/bottom-middle.png
 share/doc/tde/HTML/sv/common/bottom-right.png
@@ -167,6 +170,7 @@ share/doc/tde/HTML/sv/common/fdl-license
 share/doc/tde/HTML/sv/common/fdl-license.html
 share/doc/tde/HTML/sv/common/fdl-notice.html
 share/doc/tde/HTML/sv/common/fdl-translated.html
+share/doc/tde/HTML/sv/common/flat.css
 share/doc/tde/HTML/sv/common/footer.html
 share/doc/tde/HTML/sv/common/gpl-license
 share/doc/tde/HTML/sv/common/gpl-license.html
@@ -184,17 +188,25 @@ share/doc/tde/HTML/sv/common/lgpl-translated.html
 share/doc/tde/HTML/sv/common/logotp3.png
 share/doc/tde/HTML/sv/common/mainfooter.html
 share/doc/tde/HTML/sv/common/mainheader.html
+share/doc/tde/HTML/sv/common/print.css
 share/doc/tde/HTML/sv/common/qpl-license.html
 share/doc/tde/HTML/sv/common/shadow.png
+share/doc/tde/HTML/sv/common/tabs.css
 share/doc/tde/HTML/sv/common/tde-common.css
 share/doc/tde/HTML/sv/common/tde-default.css
 share/doc/tde/HTML/sv/common/tde-docs.css
 share/doc/tde/HTML/sv/common/tde-localised.css
 share/doc/tde/HTML/sv/common/tde-localised.css.template
 share/doc/tde/HTML/sv/common/tde-web.css
+share/doc/tde/HTML/sv/common/tde.css
+share/doc/tde/HTML/sv/common/top-left.jpg
 share/doc/tde/HTML/sv/common/top-left.png
 share/doc/tde/HTML/sv/common/top-middle.png
 share/doc/tde/HTML/sv/common/top-right-konqueror.png
+share/doc/tde/HTML/sv/common/top-right.jpg
+share/doc/tde/HTML/sv/common/top-right.png
+share/doc/tde/HTML/sv/common/top-trinity.jpg
+share/doc/tde/HTML/sv/common/top.jpg
 share/doc/tde/HTML/sv/common/web-docbottom.png
 share/doc/tde/HTML/sv/common/web-doctop.png
 share/doc/tde/HTML/sv/common/x11-license.html
@@ -1999,9 +2011,6 @@ share/doc/tde/HTML/sv/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/sv/tdeioslave/ftp/common
 share/doc/tde/HTML/sv/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/sv/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/sv/tdeioslave/gopher/common
-share/doc/tde/HTML/sv/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/sv/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/sv/tdeioslave/gzip/common
 share/doc/tde/HTML/sv/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/sv/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-ta/Makefile b/freebsd/core/tde-i18n-ta/Makefile
index de860bccc..d12b5f14b 100644
--- a/freebsd/core/tde-i18n-ta/Makefile
+++ b/freebsd/core/tde-i18n-ta/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-ta/distinfo b/freebsd/core/tde-i18n-ta/distinfo
index 72ef52f85..85d827bb9 100644
--- a/freebsd/core/tde-i18n-ta/distinfo
+++ b/freebsd/core/tde-i18n-ta/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716623
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885530
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-te/Makefile b/freebsd/core/tde-i18n-te/Makefile
index bf732df2e..2a441fb09 100644
--- a/freebsd/core/tde-i18n-te/Makefile
+++ b/freebsd/core/tde-i18n-te/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-te/distinfo b/freebsd/core/tde-i18n-te/distinfo
index 44918fd7d..7b57346b1 100644
--- a/freebsd/core/tde-i18n-te/distinfo
+++ b/freebsd/core/tde-i18n-te/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716805
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885532
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-tg/Makefile b/freebsd/core/tde-i18n-tg/Makefile
index be29ae0b8..cedae30a6 100644
--- a/freebsd/core/tde-i18n-tg/Makefile
+++ b/freebsd/core/tde-i18n-tg/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-tg/distinfo b/freebsd/core/tde-i18n-tg/distinfo
index d7e528145..48945b97e 100644
--- a/freebsd/core/tde-i18n-tg/distinfo
+++ b/freebsd/core/tde-i18n-tg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716838
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885534
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-th/Makefile b/freebsd/core/tde-i18n-th/Makefile
index a82e43873..58b70113f 100644
--- a/freebsd/core/tde-i18n-th/Makefile
+++ b/freebsd/core/tde-i18n-th/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-th/distinfo b/freebsd/core/tde-i18n-th/distinfo
index 4f65fa54a..44df0da29 100644
--- a/freebsd/core/tde-i18n-th/distinfo
+++ b/freebsd/core/tde-i18n-th/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716875
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885536
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-tr/Makefile b/freebsd/core/tde-i18n-tr/Makefile
index 237732dea..945374948 100644
--- a/freebsd/core/tde-i18n-tr/Makefile
+++ b/freebsd/core/tde-i18n-tr/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-tr/distinfo b/freebsd/core/tde-i18n-tr/distinfo
index f29a34b7e..b46211e0f 100644
--- a/freebsd/core/tde-i18n-tr/distinfo
+++ b/freebsd/core/tde-i18n-tr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716921
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885538
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-tr/pkg-plist b/freebsd/core/tde-i18n-tr/pkg-plist
index 11fe4b98b..18680a265 100644
--- a/freebsd/core/tde-i18n-tr/pkg-plist
+++ b/freebsd/core/tde-i18n-tr/pkg-plist
@@ -15,6 +15,9 @@ share/doc/tde/HTML/tr/common/8.png
 share/doc/tde/HTML/tr/common/9.png
 share/doc/tde/HTML/tr/common/appheader.html
 share/doc/tde/HTML/tr/common/artistic-license.html
+share/doc/tde/HTML/tr/common/block_title_bottom.png
+share/doc/tde/HTML/tr/common/block_title_mid.png
+share/doc/tde/HTML/tr/common/block_title_top.png
 share/doc/tde/HTML/tr/common/bottom-left.png
 share/doc/tde/HTML/tr/common/bottom-middle.png
 share/doc/tde/HTML/tr/common/bottom-right.png
@@ -31,6 +34,7 @@ share/doc/tde/HTML/tr/common/favicon.ico
 share/doc/tde/HTML/tr/common/fdl-license
 share/doc/tde/HTML/tr/common/fdl-license.html
 share/doc/tde/HTML/tr/common/fdl-notice.html
+share/doc/tde/HTML/tr/common/flat.css
 share/doc/tde/HTML/tr/common/footer.html
 share/doc/tde/HTML/tr/common/gpl-license
 share/doc/tde/HTML/tr/common/gpl-license.html
@@ -47,16 +51,24 @@ share/doc/tde/HTML/tr/common/lgpl-license
 share/doc/tde/HTML/tr/common/lgpl-license.html
 share/doc/tde/HTML/tr/common/mainfooter.html
 share/doc/tde/HTML/tr/common/mainheader.html
+share/doc/tde/HTML/tr/common/print.css
 share/doc/tde/HTML/tr/common/qpl-license.html
 share/doc/tde/HTML/tr/common/shadow.png
+share/doc/tde/HTML/tr/common/tabs.css
 share/doc/tde/HTML/tr/common/tde-common.css
 share/doc/tde/HTML/tr/common/tde-default.css
 share/doc/tde/HTML/tr/common/tde-docs.css
 share/doc/tde/HTML/tr/common/tde-localised.css.template
 share/doc/tde/HTML/tr/common/tde-web.css
+share/doc/tde/HTML/tr/common/tde.css
+share/doc/tde/HTML/tr/common/top-left.jpg
 share/doc/tde/HTML/tr/common/top-left.png
 share/doc/tde/HTML/tr/common/top-middle.png
 share/doc/tde/HTML/tr/common/top-right-konqueror.png
+share/doc/tde/HTML/tr/common/top-right.jpg
+share/doc/tde/HTML/tr/common/top-right.png
+share/doc/tde/HTML/tr/common/top-trinity.jpg
+share/doc/tde/HTML/tr/common/top.jpg
 share/doc/tde/HTML/tr/common/web-docbottom.png
 share/doc/tde/HTML/tr/common/web-doctop.png
 share/doc/tde/HTML/tr/common/x11-license.html
@@ -100,9 +112,6 @@ share/doc/tde/HTML/tr/tdeioslave/floppy/index.docbook
 share/doc/tde/HTML/tr/tdeioslave/ftp/common
 share/doc/tde/HTML/tr/tdeioslave/ftp/index.cache.bz2
 share/doc/tde/HTML/tr/tdeioslave/ftp/index.docbook
-share/doc/tde/HTML/tr/tdeioslave/gopher/common
-share/doc/tde/HTML/tr/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/tr/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/tr/tdeioslave/gzip/common
 share/doc/tde/HTML/tr/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/tr/tdeioslave/gzip/index.docbook
diff --git a/freebsd/core/tde-i18n-uk/Makefile b/freebsd/core/tde-i18n-uk/Makefile
index 58ea5ea39..2bd44a1e1 100644
--- a/freebsd/core/tde-i18n-uk/Makefile
+++ b/freebsd/core/tde-i18n-uk/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-uk/distinfo b/freebsd/core/tde-i18n-uk/distinfo
index f860fb52f..3813ea1b1 100644
--- a/freebsd/core/tde-i18n-uk/distinfo
+++ b/freebsd/core/tde-i18n-uk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716963
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885540
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-uk/pkg-plist b/freebsd/core/tde-i18n-uk/pkg-plist
index 661ef0195..9cc1bd449 100644
--- a/freebsd/core/tde-i18n-uk/pkg-plist
+++ b/freebsd/core/tde-i18n-uk/pkg-plist
@@ -10,6 +10,9 @@ share/doc/tde/HTML/uk/common/8.png
 share/doc/tde/HTML/uk/common/9.png
 share/doc/tde/HTML/uk/common/appheader.html
 share/doc/tde/HTML/uk/common/artistic-license.html
+share/doc/tde/HTML/uk/common/block_title_bottom.png
+share/doc/tde/HTML/uk/common/block_title_mid.png
+share/doc/tde/HTML/uk/common/block_title_top.png
 share/doc/tde/HTML/uk/common/bottom-left.png
 share/doc/tde/HTML/uk/common/bottom-middle.png
 share/doc/tde/HTML/uk/common/bottom-right.png
@@ -26,6 +29,7 @@ share/doc/tde/HTML/uk/common/favicon.ico
 share/doc/tde/HTML/uk/common/fdl-license
 share/doc/tde/HTML/uk/common/fdl-license.html
 share/doc/tde/HTML/uk/common/fdl-notice.html
+share/doc/tde/HTML/uk/common/flat.css
 share/doc/tde/HTML/uk/common/footer.html
 share/doc/tde/HTML/uk/common/gpl-license
 share/doc/tde/HTML/uk/common/gpl-license.html
@@ -41,17 +45,25 @@ share/doc/tde/HTML/uk/common/lgpl-license.html
 share/doc/tde/HTML/uk/common/logotp3.png
 share/doc/tde/HTML/uk/common/mainfooter.html
 share/doc/tde/HTML/uk/common/mainheader.html
+share/doc/tde/HTML/uk/common/print.css
 share/doc/tde/HTML/uk/common/qpl-license.html
 share/doc/tde/HTML/uk/common/shadow.png
+share/doc/tde/HTML/uk/common/tabs.css
 share/doc/tde/HTML/uk/common/tde-common.css
 share/doc/tde/HTML/uk/common/tde-default.css
 share/doc/tde/HTML/uk/common/tde-docs.css
 share/doc/tde/HTML/uk/common/tde-localised.css
 share/doc/tde/HTML/uk/common/tde-localised.css.template
 share/doc/tde/HTML/uk/common/tde-web.css
+share/doc/tde/HTML/uk/common/tde.css
+share/doc/tde/HTML/uk/common/top-left.jpg
 share/doc/tde/HTML/uk/common/top-left.png
 share/doc/tde/HTML/uk/common/top-middle.png
 share/doc/tde/HTML/uk/common/top-right-konqueror.png
+share/doc/tde/HTML/uk/common/top-right.jpg
+share/doc/tde/HTML/uk/common/top-right.png
+share/doc/tde/HTML/uk/common/top-trinity.jpg
+share/doc/tde/HTML/uk/common/top.jpg
 share/doc/tde/HTML/uk/common/web-docbottom.png
 share/doc/tde/HTML/uk/common/web-doctop.png
 share/doc/tde/HTML/uk/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-uz/Makefile b/freebsd/core/tde-i18n-uz/Makefile
index 8a9a73826..44ba3d25c 100644
--- a/freebsd/core/tde-i18n-uz/Makefile
+++ b/freebsd/core/tde-i18n-uz/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-uz/distinfo b/freebsd/core/tde-i18n-uz/distinfo
index e23b64462..7924eaf48 100644
--- a/freebsd/core/tde-i18n-uz/distinfo
+++ b/freebsd/core/tde-i18n-uz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619716998
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885542
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-uz@cyrillic/Makefile b/freebsd/core/tde-i18n-uz@cyrillic/Makefile
index 30e3a9678..393b69dc5 100644
--- a/freebsd/core/tde-i18n-uz@cyrillic/Makefile
+++ b/freebsd/core/tde-i18n-uz@cyrillic/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-uz@cyrillic/distinfo b/freebsd/core/tde-i18n-uz@cyrillic/distinfo
index 2c87bc612..036e59748 100644
--- a/freebsd/core/tde-i18n-uz@cyrillic/distinfo
+++ b/freebsd/core/tde-i18n-uz@cyrillic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619717090
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885544
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-vi/Makefile b/freebsd/core/tde-i18n-vi/Makefile
index 7fbd7c7c0..0dd84f018 100644
--- a/freebsd/core/tde-i18n-vi/Makefile
+++ b/freebsd/core/tde-i18n-vi/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-vi/distinfo b/freebsd/core/tde-i18n-vi/distinfo
index 953af13fd..e1341e4f3 100644
--- a/freebsd/core/tde-i18n-vi/distinfo
+++ b/freebsd/core/tde-i18n-vi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619717127
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885546
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-wa/Makefile b/freebsd/core/tde-i18n-wa/Makefile
index c546f300d..c25578a82 100644
--- a/freebsd/core/tde-i18n-wa/Makefile
+++ b/freebsd/core/tde-i18n-wa/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-wa/distinfo b/freebsd/core/tde-i18n-wa/distinfo
index a33c66d3a..4138f5a2e 100644
--- a/freebsd/core/tde-i18n-wa/distinfo
+++ b/freebsd/core/tde-i18n-wa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619717157
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885548
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-zh_CN/Makefile b/freebsd/core/tde-i18n-zh_CN/Makefile
index f1b3ae68c..77c90742a 100644
--- a/freebsd/core/tde-i18n-zh_CN/Makefile
+++ b/freebsd/core/tde-i18n-zh_CN/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-zh_CN/distinfo b/freebsd/core/tde-i18n-zh_CN/distinfo
index 60c933b6a..d95364190 100644
--- a/freebsd/core/tde-i18n-zh_CN/distinfo
+++ b/freebsd/core/tde-i18n-zh_CN/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619717186
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885550
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-zh_CN/pkg-plist b/freebsd/core/tde-i18n-zh_CN/pkg-plist
index 992c191af..d325a0fa9 100644
--- a/freebsd/core/tde-i18n-zh_CN/pkg-plist
+++ b/freebsd/core/tde-i18n-zh_CN/pkg-plist
@@ -10,6 +10,9 @@ share/doc/tde/HTML/zh_CN/common/8.png
 share/doc/tde/HTML/zh_CN/common/9.png
 share/doc/tde/HTML/zh_CN/common/appheader.html
 share/doc/tde/HTML/zh_CN/common/artistic-license.html
+share/doc/tde/HTML/zh_CN/common/block_title_bottom.png
+share/doc/tde/HTML/zh_CN/common/block_title_mid.png
+share/doc/tde/HTML/zh_CN/common/block_title_top.png
 share/doc/tde/HTML/zh_CN/common/bottom-left.png
 share/doc/tde/HTML/zh_CN/common/bottom-middle.png
 share/doc/tde/HTML/zh_CN/common/bottom-right.png
@@ -27,6 +30,7 @@ share/doc/tde/HTML/zh_CN/common/fdl-license
 share/doc/tde/HTML/zh_CN/common/fdl-license.html
 share/doc/tde/HTML/zh_CN/common/fdl-notice.html
 share/doc/tde/HTML/zh_CN/common/fdl-translated.html
+share/doc/tde/HTML/zh_CN/common/flat.css
 share/doc/tde/HTML/zh_CN/common/footer.html
 share/doc/tde/HTML/zh_CN/common/gpl-license
 share/doc/tde/HTML/zh_CN/common/gpl-license.html
@@ -44,17 +48,25 @@ share/doc/tde/HTML/zh_CN/common/lgpl-translated.html
 share/doc/tde/HTML/zh_CN/common/logotp3.png
 share/doc/tde/HTML/zh_CN/common/mainfooter.html
 share/doc/tde/HTML/zh_CN/common/mainheader.html
+share/doc/tde/HTML/zh_CN/common/print.css
 share/doc/tde/HTML/zh_CN/common/qpl-license.html
 share/doc/tde/HTML/zh_CN/common/shadow.png
+share/doc/tde/HTML/zh_CN/common/tabs.css
 share/doc/tde/HTML/zh_CN/common/tde-common.css
 share/doc/tde/HTML/zh_CN/common/tde-default.css
 share/doc/tde/HTML/zh_CN/common/tde-docs.css
 share/doc/tde/HTML/zh_CN/common/tde-localised.css
 share/doc/tde/HTML/zh_CN/common/tde-localised.css.template
 share/doc/tde/HTML/zh_CN/common/tde-web.css
+share/doc/tde/HTML/zh_CN/common/tde.css
+share/doc/tde/HTML/zh_CN/common/top-left.jpg
 share/doc/tde/HTML/zh_CN/common/top-left.png
 share/doc/tde/HTML/zh_CN/common/top-middle.png
 share/doc/tde/HTML/zh_CN/common/top-right-konqueror.png
+share/doc/tde/HTML/zh_CN/common/top-right.jpg
+share/doc/tde/HTML/zh_CN/common/top-right.png
+share/doc/tde/HTML/zh_CN/common/top-trinity.jpg
+share/doc/tde/HTML/zh_CN/common/top.jpg
 share/doc/tde/HTML/zh_CN/common/web-docbottom.png
 share/doc/tde/HTML/zh_CN/common/web-doctop.png
 share/doc/tde/HTML/zh_CN/common/x11-license.html
diff --git a/freebsd/core/tde-i18n-zh_TW/Makefile b/freebsd/core/tde-i18n-zh_TW/Makefile
index a43af9011..a107040bf 100644
--- a/freebsd/core/tde-i18n-zh_TW/Makefile
+++ b/freebsd/core/tde-i18n-zh_TW/Makefile
@@ -18,7 +18,6 @@ PKGNAMEPREFIX=		${PORTLANG}-
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tde-i18n-${PORTLANG}
 EXTRACT_AFTER_ARGS+= \
-	'${EXTRACT_BASE}cmake/' \
 	'${EXTRACT_BASE}template/' \
 	'${EXTRACT_BASE}translations/' \
 	'${EXTRACT_BASE}tde-i18n-${PORTLANG}/' \
diff --git a/freebsd/core/tde-i18n-zh_TW/distinfo b/freebsd/core/tde-i18n-zh_TW/distinfo
index f9d0a19aa..e8bcedf79 100644
--- a/freebsd/core/tde-i18n-zh_TW/distinfo
+++ b/freebsd/core/tde-i18n-zh_TW/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619717218
-SHA256 (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = daabfe08469afb5abc8109132786cb6ab087ed599dfd7f0118e97424a3f94566
-SIZE (TDE/core/tde-i18n-trinity_14.0.10.orig.tar.xz) = 195371428
+TIMESTAMP = 1666885552
+SHA256 (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = ff6ef6e94d5bccb81f087d5eb79d5dd3fec0c3ca0c7c419dcd56f02cceb5db03
+SIZE (TDE/core/tde-i18n-trinity_14.0.13.orig.tar.xz) = 195485024
diff --git a/freebsd/core/tde-i18n-zh_TW/pkg-plist b/freebsd/core/tde-i18n-zh_TW/pkg-plist
index 01e3cc816..6c1c8fc83 100644
--- a/freebsd/core/tde-i18n-zh_TW/pkg-plist
+++ b/freebsd/core/tde-i18n-zh_TW/pkg-plist
@@ -10,6 +10,9 @@ share/doc/tde/HTML/zh_TW/common/8.png
 share/doc/tde/HTML/zh_TW/common/9.png
 share/doc/tde/HTML/zh_TW/common/appheader.html
 share/doc/tde/HTML/zh_TW/common/artistic-license.html
+share/doc/tde/HTML/zh_TW/common/block_title_bottom.png
+share/doc/tde/HTML/zh_TW/common/block_title_mid.png
+share/doc/tde/HTML/zh_TW/common/block_title_top.png
 share/doc/tde/HTML/zh_TW/common/bottom-left.png
 share/doc/tde/HTML/zh_TW/common/bottom-middle.png
 share/doc/tde/HTML/zh_TW/common/bottom-right.png
@@ -27,6 +30,7 @@ share/doc/tde/HTML/zh_TW/common/fdl-license
 share/doc/tde/HTML/zh_TW/common/fdl-license.html
 share/doc/tde/HTML/zh_TW/common/fdl-notice.html
 share/doc/tde/HTML/zh_TW/common/fdl-translated.html
+share/doc/tde/HTML/zh_TW/common/flat.css
 share/doc/tde/HTML/zh_TW/common/footer.html
 share/doc/tde/HTML/zh_TW/common/gpl-license
 share/doc/tde/HTML/zh_TW/common/gpl-license.html
@@ -44,17 +48,25 @@ share/doc/tde/HTML/zh_TW/common/lgpl-translated.html
 share/doc/tde/HTML/zh_TW/common/logotp3.png
 share/doc/tde/HTML/zh_TW/common/mainfooter.html
 share/doc/tde/HTML/zh_TW/common/mainheader.html
+share/doc/tde/HTML/zh_TW/common/print.css
 share/doc/tde/HTML/zh_TW/common/qpl-license.html
 share/doc/tde/HTML/zh_TW/common/shadow.png
+share/doc/tde/HTML/zh_TW/common/tabs.css
 share/doc/tde/HTML/zh_TW/common/tde-common.css
 share/doc/tde/HTML/zh_TW/common/tde-default.css
 share/doc/tde/HTML/zh_TW/common/tde-docs.css
 share/doc/tde/HTML/zh_TW/common/tde-localised.css
 share/doc/tde/HTML/zh_TW/common/tde-localised.css.template
 share/doc/tde/HTML/zh_TW/common/tde-web.css
+share/doc/tde/HTML/zh_TW/common/tde.css
+share/doc/tde/HTML/zh_TW/common/top-left.jpg
 share/doc/tde/HTML/zh_TW/common/top-left.png
 share/doc/tde/HTML/zh_TW/common/top-middle.png
 share/doc/tde/HTML/zh_TW/common/top-right-konqueror.png
+share/doc/tde/HTML/zh_TW/common/top-right.jpg
+share/doc/tde/HTML/zh_TW/common/top-right.png
+share/doc/tde/HTML/zh_TW/common/top-trinity.jpg
+share/doc/tde/HTML/zh_TW/common/top.jpg
 share/doc/tde/HTML/zh_TW/common/web-docbottom.png
 share/doc/tde/HTML/zh_TW/common/web-doctop.png
 share/doc/tde/HTML/zh_TW/common/x11-license.html
diff --git a/freebsd/core/tdeaccessibility/distinfo b/freebsd/core/tdeaccessibility/distinfo
index 9dae85d28..e4ed4ad65 100644
--- a/freebsd/core/tdeaccessibility/distinfo
+++ b/freebsd/core/tdeaccessibility/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619341475
-SHA256 (TDE/core/tdeaccessibility-trinity_14.0.10.orig.tar.xz) = d337759abc7c11526d7010de6eedeb3e877ec92665faba052cc0d47650ae2b3b
-SIZE (TDE/core/tdeaccessibility-trinity_14.0.10.orig.tar.xz) = 6212556
+TIMESTAMP = 1666514074
+SHA256 (TDE/core/tdeaccessibility-trinity_14.0.13.orig.tar.xz) = 36c5b2211543a74a082d17814a1bded57323bb513aa63dd232b06819410e2e69
+SIZE (TDE/core/tdeaccessibility-trinity_14.0.13.orig.tar.xz) = 6193500
diff --git a/freebsd/core/tdeaddons/distinfo b/freebsd/core/tdeaddons/distinfo
index d214727d2..60bc5a8eb 100644
--- a/freebsd/core/tdeaddons/distinfo
+++ b/freebsd/core/tdeaddons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619341586
-SHA256 (TDE/core/tdeaddons-trinity_14.0.10.orig.tar.xz) = 98148e9effc3838dd4e9011be6b2593e2de3a8c9e237eedbe13d50cb4963c64a
-SIZE (TDE/core/tdeaddons-trinity_14.0.10.orig.tar.xz) = 1493356
+TIMESTAMP = 1666514221
+SHA256 (TDE/core/tdeaddons-trinity_14.0.13.orig.tar.xz) = 9e9b34ca6cb52d91459e84ee7451e0ea97a3eb4f70f57bace018e20416883d7d
+SIZE (TDE/core/tdeaddons-trinity_14.0.13.orig.tar.xz) = 1466852
diff --git a/freebsd/core/tdeaddons/pkg-plist b/freebsd/core/tdeaddons/pkg-plist
index 9e005e6d1..a610e31b5 100644
--- a/freebsd/core/tdeaddons/pkg-plist
+++ b/freebsd/core/tdeaddons/pkg-plist
@@ -314,25 +314,6 @@ share/doc/tde/HTML/en/kate-plugins/sort_plugin_en.png
 share/doc/tde/HTML/en/kate-plugins/textfilter.docbook
 share/doc/tde/HTML/en/kate-plugins/xmlcheck.docbook
 share/doc/tde/HTML/en/kate-plugins/xmltools.docbook
-share/doc/tde/HTML/en/khelpcenter/docprimer/common
-share/doc/tde/HTML/en/khelpcenter/docprimer/index.cache.bz2
-share/doc/tde/HTML/en/khelpcenter/docprimer/index.docbook
-share/doc/tde/HTML/en/khelpcenter/docprimer/kate-plugin.png
-share/doc/tde/HTML/en/khelpcenter/docprimer/kate-validate-xml.png
-share/doc/tde/HTML/en/khelpcenter/docprimer/quanta-doc-primer.png
-share/doc/tde/HTML/en/khelpcenter/docprimer/quanta-doc-structure.png
-share/doc/tde/HTML/en/khelpcenter/docprimer/quanta-entities.png
-share/doc/tde/HTML/en/khelpcenter/docprimer/quanta-tag.png
-share/doc/tde/HTML/en/khelpcenter/docprimer/quanta-toolbars.png
-share/doc/tde/HTML/en/khelpcenter/docprimer/quanta.png
-share/doc/tde/HTML/en/khelpcenter/docprimer/xmlval.png
-share/doc/tde/HTML/en/khelpcenter/docprimer/xsltproc.png
-share/doc/tde/HTML/en/khelpcenter/markup/common
-share/doc/tde/HTML/en/khelpcenter/markup/index.cache.bz2
-share/doc/tde/HTML/en/khelpcenter/markup/index.docbook
-share/doc/tde/HTML/en/khelpcenter/styleguide/common
-share/doc/tde/HTML/en/khelpcenter/styleguide/index.cache.bz2
-share/doc/tde/HTML/en/khelpcenter/styleguide/index.docbook
 share/doc/tde/HTML/en/kicker-applets/common
 share/doc/tde/HTML/en/kicker-applets/index.cache.bz2
 share/doc/tde/HTML/en/kicker-applets/index.docbook
@@ -430,6 +411,16 @@ share/icons/hicolor/scalable/apps/metabar.svgz
 share/icons/locolor/16x16/apps/autorefresh.png
 share/icons/locolor/16x16/apps/ktimemon.png
 share/icons/locolor/32x32/apps/ktimemon.png
+share/man/man1/atlantikdesigner.1.gz
+share/man/man1/exif.py.1.gz
+share/man/man1/fsview.1.gz
+share/man/man1/jpegorient.1.gz
+share/man/man1/ksig.1.gz
+share/man/man1/lnkforward.1.gz
+share/man/man1/noatunsynaescope.bin.1.gz
+share/man/man1/noatuntippecanoe.bin.1.gz
+share/man/man1/noatuntyler.bin.1.gz
+share/man/man1/orient.py.1.gz
 share/mimelnk/application/x-win-lnk.desktop
 share/services/akregator_konqplugin.desktop
 share/services/ark_plugin.desktop
diff --git a/freebsd/core/tdeadmin/distinfo b/freebsd/core/tdeadmin/distinfo
index fdec38674..d835e8252 100644
--- a/freebsd/core/tdeadmin/distinfo
+++ b/freebsd/core/tdeadmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619341692
-SHA256 (TDE/core/tdeadmin-trinity_14.0.10.orig.tar.xz) = a3ba56c994fccb7ae3b7983534514e439f3c3c75e63b6677031aa3a07cee6a8d
-SIZE (TDE/core/tdeadmin-trinity_14.0.10.orig.tar.xz) = 1543996
+TIMESTAMP = 1666514326
+SHA256 (TDE/core/tdeadmin-trinity_14.0.13.orig.tar.xz) = ad9aa93399dde8162010b2272669d37b3dd6a42be669ee4dff1a6d6bdc919784
+SIZE (TDE/core/tdeadmin-trinity_14.0.13.orig.tar.xz) = 1514812
diff --git a/freebsd/core/tdeartwork/distinfo b/freebsd/core/tdeartwork/distinfo
index 3e69f9afe..90d832451 100644
--- a/freebsd/core/tdeartwork/distinfo
+++ b/freebsd/core/tdeartwork/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619341778
-SHA256 (TDE/core/tdeartwork-trinity_14.0.10.orig.tar.xz) = e3729e96b413569a03acb210c33ba6692f2b1760eca54af637d4fe1f1d3ffbbb
-SIZE (TDE/core/tdeartwork-trinity_14.0.10.orig.tar.xz) = 32418160
+TIMESTAMP = 1666514404
+SHA256 (TDE/core/tdeartwork-trinity_14.0.13.orig.tar.xz) = 2cf8926ccaf04d4127f82e8a6b72d975440a4ffc56621e2174f4bb60adae7480
+SIZE (TDE/core/tdeartwork-trinity_14.0.13.orig.tar.xz) = 32386116
diff --git a/freebsd/core/tdeartwork/pkg-plist b/freebsd/core/tdeartwork/pkg-plist
index 605cfc249..31087f420 100644
--- a/freebsd/core/tdeartwork/pkg-plist
+++ b/freebsd/core/tdeartwork/pkg-plist
@@ -20,6 +20,7 @@ bin/kvm.kss
 bin/kwave.kss
 bin/kxsconfig
 bin/kxsrun
+bin/tdeasciiquarium.kss
 bin/tdepartsaver.kss
 bin/xscreensaver-getimage
 bin/xscreensaver-getimage-file
@@ -332,6 +333,7 @@ share/applnk/System/ScreenSavers/surfaces.desktop
 share/applnk/System/ScreenSavers/swirl.desktop
 share/applnk/System/ScreenSavers/t3d.desktop
 share/applnk/System/ScreenSavers/tangram.desktop
+share/applnk/System/ScreenSavers/tdeasciiquarium.desktop
 share/applnk/System/ScreenSavers/tdepartsaver.desktop
 share/applnk/System/ScreenSavers/tessellimage.desktop
 share/applnk/System/ScreenSavers/thornbird.desktop
@@ -8390,6 +8392,30 @@ share/icons/slick/64x64/places/trashcan_empty.png
 share/icons/slick/64x64/places/trashcan_full.png
 share/icons/slick/64x64/places/www.png
 share/icons/slick/index.theme
+share/man/man1/kbanner.kss.1.gz
+share/man/man1/kblob.kss.1.gz
+share/man/man1/kclock.kss.1.gz
+share/man/man1/keuphoria.kss.1.gz
+share/man/man1/kfiresaver.kss.1.gz
+share/man/man1/kflux.kss.1.gz
+share/man/man1/kfountain.kss.1.gz
+share/man/man1/kgravity.kss.1.gz
+share/man/man1/klines.kss.1.gz
+share/man/man1/klorenz.kss.1.gz
+share/man/man1/kpendulum.kss.1.gz
+share/man/man1/kpolygon.kss.1.gz
+share/man/man1/krotation.kss.1.gz
+share/man/man1/kscience.kss.1.gz
+share/man/man1/kslideshow.kss.1.gz
+share/man/man1/ksolarwinds.kss.1.gz
+share/man/man1/kspace.kss.1.gz
+share/man/man1/kswarm.kss.1.gz
+share/man/man1/kvm.kss.1.gz
+share/man/man1/kwave.kss.1.gz
+share/man/man1/kxsconfig.1.gz
+share/man/man1/kxsrun.1.gz
+share/man/man1/tdeasciiquarium.kss.1.gz
+share/man/man1/tdepartsaver.kss.1.gz
 share/sounds/KDE_Logout_new.wav
 share/sounds/KDE_Startup_new.wav
 share/wallpapers/Appropriately-Left-Handed-2.jpg
diff --git a/freebsd/core/tdebase/Makefile b/freebsd/core/tdebase/Makefile
index d7da375d8..02aa7d0e2 100644
--- a/freebsd/core/tdebase/Makefile
+++ b/freebsd/core/tdebase/Makefile
@@ -36,6 +36,7 @@ LIB_DEPENDS+=\
 		libconfig.so:${PORTSDIR}/devel/libconfig \
 		libldap.so:${PORTSDIR}/net/openldap24-client \
 		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
+		libssh.so:${PORTSDIR}/security/libssh \
 		libxkbfile.so:${PORTSDIR}/x11/libxkbfile \
 		libXss.so:${PORTSDIR}/x11/libXScrnSaver \
 		libXtst.so:${PORTSDIR}/x11/libXtst \
diff --git a/freebsd/core/tdebase/distinfo b/freebsd/core/tdebase/distinfo
index 803efa92e..9ff285f96 100644
--- a/freebsd/core/tdebase/distinfo
+++ b/freebsd/core/tdebase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619315534
-SHA256 (TDE/core/tdebase-trinity_14.0.10.orig.tar.xz) = 07452017452fc9b4824bb0ffb115dc14929916131e44f943b227c0dd7eaed0c0
-SIZE (TDE/core/tdebase-trinity_14.0.10.orig.tar.xz) = 30435504
+TIMESTAMP = 1666361113
+SHA256 (TDE/core/tdebase-trinity_14.0.13.orig.tar.xz) = 8f952fb456af2a92a53cc95d3081e6c945c779d44a800fa9d02f2ea90d3d8fbb
+SIZE (TDE/core/tdebase-trinity_14.0.13.orig.tar.xz) = 30564196
diff --git a/freebsd/core/tdebase/pkg-plist b/freebsd/core/tdebase/pkg-plist
index 9ae14dae3..06fb339a6 100644
--- a/freebsd/core/tdebase/pkg-plist
+++ b/freebsd/core/tdebase/pkg-plist
@@ -2390,6 +2390,9 @@ share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.07.docbook
 share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.08.docbook
 share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.09.docbook
 share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.10.docbook
+share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.11.docbook
+share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.12.docbook
+share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.13.docbook
 share/doc/tde/HTML/en/khelpcenter/shadow1.png
 share/doc/tde/HTML/en/khelpcenter/support.docbook
 share/doc/tde/HTML/en/khelpcenter/tdelogo2.png
@@ -2645,9 +2648,6 @@ share/doc/tde/HTML/en/tdeioslave/ftp/index.docbook
 share/doc/tde/HTML/en/tdeioslave/ghelp/common
 share/doc/tde/HTML/en/tdeioslave/ghelp/index.cache.bz2
 share/doc/tde/HTML/en/tdeioslave/ghelp/index.docbook
-share/doc/tde/HTML/en/tdeioslave/gopher/common
-share/doc/tde/HTML/en/tdeioslave/gopher/index.cache.bz2
-share/doc/tde/HTML/en/tdeioslave/gopher/index.docbook
 share/doc/tde/HTML/en/tdeioslave/gzip/common
 share/doc/tde/HTML/en/tdeioslave/gzip/index.cache.bz2
 share/doc/tde/HTML/en/tdeioslave/gzip/index.docbook
@@ -3766,6 +3766,8 @@ share/locale/l10n/bo/entry.desktop
 share/locale/l10n/bo/flag.png
 share/locale/l10n/br/entry.desktop
 share/locale/l10n/br/flag.png
+share/locale/l10n/braille/entry.desktop
+share/locale/l10n/braille/flag.png
 share/locale/l10n/bs/entry.desktop
 share/locale/l10n/bs/flag.png
 share/locale/l10n/bt/entry.desktop
@@ -3839,6 +3841,8 @@ share/locale/l10n/eg/entry.desktop
 share/locale/l10n/eg/flag.png
 share/locale/l10n/eh/entry.desktop
 share/locale/l10n/eh/flag.png
+share/locale/l10n/eo/entry.desktop
+share/locale/l10n/eo/flag.png
 share/locale/l10n/er/entry.desktop
 share/locale/l10n/er/flag.png
 share/locale/l10n/es/entry.desktop
@@ -3921,6 +3925,8 @@ share/locale/l10n/jo/entry.desktop
 share/locale/l10n/jo/flag.png
 share/locale/l10n/jp/entry.desktop
 share/locale/l10n/jp/flag.png
+share/locale/l10n/jv/entry.desktop
+share/locale/l10n/jv/flag.png
 share/locale/l10n/ke/entry.desktop
 share/locale/l10n/ke/flag.png
 share/locale/l10n/kg/entry.desktop
@@ -3977,6 +3983,8 @@ share/locale/l10n/mg/entry.desktop
 share/locale/l10n/mg/flag.png
 share/locale/l10n/mh/entry.desktop
 share/locale/l10n/mh/flag.png
+share/locale/l10n/mi/entry.desktop
+share/locale/l10n/mi/flag.png
 share/locale/l10n/middleeast.desktop
 share/locale/l10n/mk/entry.desktop
 share/locale/l10n/mk/flag.png
@@ -4183,6 +4191,51 @@ share/locale/l10n/zm/entry.desktop
 share/locale/l10n/zm/flag.png
 share/locale/l10n/zw/entry.desktop
 share/locale/l10n/zw/flag.png
+share/man/man1/appletproxy.1.gz
+share/man/man1/drkonqi.1.gz
+share/man/man1/extensionproxy.1.gz
+share/man/man1/gentdmconf.1.gz
+share/man/man1/kappfinder.1.gz
+share/man/man1/kasbar.1.gz
+share/man/man1/kate.1.gz
+share/man/man1/kblankscrn.kss.1.gz
+share/man/man1/kcheckpass.1.gz
+share/man/man1/kcminit.1.gz
+share/man/man1/kdcop.1.gz
+share/man/man1/kdialog.1.gz
+share/man/man1/keditbookmarks.1.gz
+share/man/man1/kfind.1.gz
+share/man/man1/kfmclient.1.gz
+share/man/man1/khotkeys.1.gz
+share/man/man1/kicker.1.gz
+share/man/man1/kjobviewer.1.gz
+share/man/man1/kmenuedit.1.gz
+share/man/man1/knetattach.1.gz
+share/man/man1/konqueror.1.gz
+share/man/man1/konsole.1.gz
+share/man/man1/kpager.1.gz
+share/man/man1/kpersonalizer.1.gz
+share/man/man1/kprinter.1.gz
+share/man/man1/krandom.kss.1.gz
+share/man/man1/kreadconfig.1.gz
+share/man/man1/krootimage.1.gz
+share/man/man1/kstart.1.gz
+share/man/man1/ksystraycmd.1.gz
+share/man/man1/ktrash.1.gz
+share/man/man1/kwrite.1.gz
+share/man/man1/kwriteconfig.1.gz
+share/man/man1/kxkb.1.gz
+share/man/man1/starttde.1.gz
+share/man/man1/tdedebugdialog.1.gz
+share/man/man1/tdeio_media_mounthelper.1.gz
+share/man/man1/tdeio_system_documenthelper.1.gz
+share/man/man1/tdepasswd.1.gz
+share/man/man1/tdeprintfax.1.gz
+share/man/man1/tdesu.1.gz
+share/man/man1/tdm.1.gz
+share/man/man1/tdm_config.1.gz
+share/man/man1/tdm_greet.1.gz
+share/man/man1/tdmctl.1.gz
 share/mimelnk/application/x-konsole.desktop
 share/mimelnk/application/x-ksysguard.desktop
 share/mimelnk/application/x-ktheme.desktop
diff --git a/freebsd/core/tdeedu/Makefile b/freebsd/core/tdeedu/Makefile
index c7f879e61..4db88dfda 100644
--- a/freebsd/core/tdeedu/Makefile
+++ b/freebsd/core/tdeedu/Makefile
@@ -13,7 +13,7 @@ PORTREVISION=		0
 CATEGORIES=		x11 misc
 DIST_SUBDIR=		TDE/core
 
-USES+=		python
+USES+=		python:3.9
 
 BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libartskde.so:${PORTSDIR}/x11/trinity/core/tdelibs \
 		${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
@@ -25,6 +25,7 @@ BUILD_DEPENDS+=\
 		doxygen:${PORTSDIR}/devel/doxygen \
 		ocamlopt:${PORTSDIR}/lang/ocaml \
 		${LOCALBASE}/lib/ocaml/facile/facile.a:${PORTSDIR}/math/facile \
+		${LOCALBASE}/lib/ocaml/libnums.a:${PORTSDIR}/math/ocaml-num \
 
 LIB_DEPENDS+=	\
 		libasound.so:${PORTSDIR}/audio/alsa-lib \
diff --git a/freebsd/core/tdeedu/distinfo b/freebsd/core/tdeedu/distinfo
index e9c840ccb..e8ca0af8b 100644
--- a/freebsd/core/tdeedu/distinfo
+++ b/freebsd/core/tdeedu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619316655
-SHA256 (TDE/core/tdeedu-trinity_14.0.10.orig.tar.xz) = ec1450b395af07ff88707029af2f3715c2297e52d29fa675a44b8f1d3e39d527
-SIZE (TDE/core/tdeedu-trinity_14.0.10.orig.tar.xz) = 24728556
+TIMESTAMP = 1666508256
+SHA256 (TDE/core/tdeedu-trinity_14.0.13.orig.tar.xz) = 0e03eb1e360a997dee11000780b9db9993314a4f8fa2a53a56fbe6314729680b
+SIZE (TDE/core/tdeedu-trinity_14.0.13.orig.tar.xz) = 24701400
diff --git a/freebsd/core/tdeedu/pkg-plist b/freebsd/core/tdeedu/pkg-plist
index 83f4bfcfe..25c435d5d 100644
--- a/freebsd/core/tdeedu/pkg-plist
+++ b/freebsd/core/tdeedu/pkg-plist
@@ -2118,6 +2118,7 @@ share/doc/tde/HTML/en/kig/script_wizard.png
 share/doc/tde/HTML/en/kig/script_wizard_entering_code.png
 share/doc/tde/HTML/en/kig/scripting-api/annotated.html
 share/doc/tde/HTML/en/kig/scripting-api/bc_s.png
+share/doc/tde/HTML/en/kig/scripting-api/bc_sd.png
 share/doc/tde/HTML/en/kig/scripting-api/bdwn.png
 share/doc/tde/HTML/en/kig/scripting-api/bogus__imp_8h_source.html
 share/doc/tde/HTML/en/kig/scripting-api/circle__imp_8h_source.html
@@ -2309,9 +2310,19 @@ share/doc/tde/HTML/en/kig/scripting-api/cubic__imp_8h_source.html
 share/doc/tde/HTML/en/kig/scripting-api/curve__imp_8h_source.html
 share/doc/tde/HTML/en/kig/scripting-api/dir_1c7a207dd97aedc340b7c3fda6025d43.html
 share/doc/tde/HTML/en/kig/scripting-api/dir_4114b53f6f2b40728c6671fd130cc631.html
+share/doc/tde/HTML/en/kig/scripting-api/dir_4114b53f6f2b40728c6671fd130cc631_dep.map
+share/doc/tde/HTML/en/kig/scripting-api/dir_4114b53f6f2b40728c6671fd130cc631_dep.md5
+share/doc/tde/HTML/en/kig/scripting-api/dir_4114b53f6f2b40728c6671fd130cc631_dep.png
 share/doc/tde/HTML/en/kig/scripting-api/dir_4f87c533471e6f4e042ec5e11e6983d3.html
+share/doc/tde/HTML/en/kig/scripting-api/dir_4f87c533471e6f4e042ec5e11e6983d3_dep.map
+share/doc/tde/HTML/en/kig/scripting-api/dir_4f87c533471e6f4e042ec5e11e6983d3_dep.md5
+share/doc/tde/HTML/en/kig/scripting-api/dir_4f87c533471e6f4e042ec5e11e6983d3_dep.png
 share/doc/tde/HTML/en/kig/scripting-api/dir_a51f329fd72020235c75891adf6e40e8.html
+share/doc/tde/HTML/en/kig/scripting-api/dir_a51f329fd72020235c75891adf6e40e8_dep.map
+share/doc/tde/HTML/en/kig/scripting-api/dir_a51f329fd72020235c75891adf6e40e8_dep.md5
+share/doc/tde/HTML/en/kig/scripting-api/dir_a51f329fd72020235c75891adf6e40e8_dep.png
 share/doc/tde/HTML/en/kig/scripting-api/doc.png
+share/doc/tde/HTML/en/kig/scripting-api/docd.png
 share/doc/tde/HTML/en/kig/scripting-api/doxygen.css
 share/doc/tde/HTML/en/kig/scripting-api/doxygen.svg
 share/doc/tde/HTML/en/kig/scripting-api/dynsections.js
@@ -2319,9 +2330,13 @@ share/doc/tde/HTML/en/kig/scripting-api/files.html
 share/doc/tde/HTML/en/kig/scripting-api/folderclosed.png
 share/doc/tde/HTML/en/kig/scripting-api/folderopen.png
 share/doc/tde/HTML/en/kig/scripting-api/form_0.png
+share/doc/tde/HTML/en/kig/scripting-api/form_0_dark.png
 share/doc/tde/HTML/en/kig/scripting-api/form_1.png
+share/doc/tde/HTML/en/kig/scripting-api/form_1_dark.png
 share/doc/tde/HTML/en/kig/scripting-api/form_2.png
+share/doc/tde/HTML/en/kig/scripting-api/form_2_dark.png
 share/doc/tde/HTML/en/kig/scripting-api/form_3.png
+share/doc/tde/HTML/en/kig/scripting-api/form_3_dark.png
 share/doc/tde/HTML/en/kig/scripting-api/formula.repository
 share/doc/tde/HTML/en/kig/scripting-api/functions.html
 share/doc/tde/HTML/en/kig/scripting-api/functions_b.html
@@ -2395,19 +2410,26 @@ share/doc/tde/HTML/en/kig/scripting-api/jquery.js
 share/doc/tde/HTML/en/kig/scripting-api/kigtransform_8h_source.html
 share/doc/tde/HTML/en/kig/scripting-api/line__imp_8h_source.html
 share/doc/tde/HTML/en/kig/scripting-api/nav_f.png
+share/doc/tde/HTML/en/kig/scripting-api/nav_fd.png
 share/doc/tde/HTML/en/kig/scripting-api/nav_g.png
 share/doc/tde/HTML/en/kig/scripting-api/nav_h.png
+share/doc/tde/HTML/en/kig/scripting-api/nav_hd.png
 share/doc/tde/HTML/en/kig/scripting-api/object__imp_8h_source.html
 share/doc/tde/HTML/en/kig/scripting-api/open.png
 share/doc/tde/HTML/en/kig/scripting-api/other__imp_8h_source.html
 share/doc/tde/HTML/en/kig/scripting-api/point__imp_8h_source.html
 share/doc/tde/HTML/en/kig/scripting-api/splitbar.png
+share/doc/tde/HTML/en/kig/scripting-api/splitbard.png
 share/doc/tde/HTML/en/kig/scripting-api/sync_off.png
 share/doc/tde/HTML/en/kig/scripting-api/sync_on.png
 share/doc/tde/HTML/en/kig/scripting-api/tab_a.png
+share/doc/tde/HTML/en/kig/scripting-api/tab_ad.png
 share/doc/tde/HTML/en/kig/scripting-api/tab_b.png
+share/doc/tde/HTML/en/kig/scripting-api/tab_bd.png
 share/doc/tde/HTML/en/kig/scripting-api/tab_h.png
+share/doc/tde/HTML/en/kig/scripting-api/tab_hd.png
 share/doc/tde/HTML/en/kig/scripting-api/tab_s.png
+share/doc/tde/HTML/en/kig/scripting-api/tab_sd.png
 share/doc/tde/HTML/en/kig/scripting-api/tabs.css
 share/doc/tde/HTML/en/kig/selecting_objects.png
 share/doc/tde/HTML/en/kig/simple_locus_construction.png
diff --git a/freebsd/core/tdegames/distinfo b/freebsd/core/tdegames/distinfo
index 2ac8c34d1..e48afa36a 100644
--- a/freebsd/core/tdegames/distinfo
+++ b/freebsd/core/tdegames/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619317119
-SHA256 (TDE/core/tdegames-trinity_14.0.10.orig.tar.xz) = b430aa579cf45307f1b3954156c200439338749e048549ff5fae8fc4f02f62ce
-SIZE (TDE/core/tdegames-trinity_14.0.10.orig.tar.xz) = 8848492
+TIMESTAMP = 1666509877
+SHA256 (TDE/core/tdegames-trinity_14.0.13.orig.tar.xz) = 3bb593edf8e6ecf68d4f433a29dd14687493fa3c8c0450870ba79a73589b5773
+SIZE (TDE/core/tdegames-trinity_14.0.13.orig.tar.xz) = 8822544
diff --git a/freebsd/core/tdegraphics/Makefile b/freebsd/core/tdegraphics/Makefile
index 1228a3cbb..3743c4835 100644
--- a/freebsd/core/tdegraphics/Makefile
+++ b/freebsd/core/tdegraphics/Makefile
@@ -9,11 +9,12 @@ PORTNAME=		tdegraphics-trinity
 COMMENT=		Trinity graphics apps
 TDE_PREVERSION=		
 MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		x11 graphics
 DIST_SUBDIR=		TDE/core
 
 USE_XORG+=	xxf86vm
+USE_GL=		gl
 
 
 BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libartsc.so:${PORTSDIR}/x11/trinity/dependencies/arts \
@@ -28,7 +29,6 @@ LIB_DEPENDS+=\
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libglut.so:${PORTSDIR}/graphics/freeglut \
 		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 \
 		libOpenEXR.so:${PORTSDIR}/graphics/openexr \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
diff --git a/freebsd/core/tdegraphics/distinfo b/freebsd/core/tdegraphics/distinfo
index 0f918fe1a..c7c40daf4 100644
--- a/freebsd/core/tdegraphics/distinfo
+++ b/freebsd/core/tdegraphics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619218811
-SHA256 (TDE/core/tdegraphics-trinity_14.0.10.orig.tar.xz) = 666fda139d1936613790a562068b2b670b308cfd9455d0ce0f824529e489063b
-SIZE (TDE/core/tdegraphics-trinity_14.0.10.orig.tar.xz) = 5835300
+TIMESTAMP = 1666470290
+SHA256 (TDE/core/tdegraphics-trinity_14.0.13.orig.tar.xz) = 8938782f5da7b505475f1cc0ae79d1c3f8c443f1a4910a05fbabe32ff2a6ddfb
+SIZE (TDE/core/tdegraphics-trinity_14.0.13.orig.tar.xz) = 5808680
diff --git a/freebsd/core/tdegraphics/pkg-plist b/freebsd/core/tdegraphics/pkg-plist
index e3e4f7d19..9dd5508a8 100644
--- a/freebsd/core/tdegraphics/pkg-plist
+++ b/freebsd/core/tdegraphics/pkg-plist
@@ -945,6 +945,7 @@ share/apps/tdeiconedit/pics/window_new.png
 share/apps/tdeiconedit/tdeiconeditui.rc
 share/cmake/kviewshell.cmake
 share/cmake/libkscan.cmake
+share/cmake/libpoppler-tqt.cmake
 share/config.kcfg/djvumultipage.kcfg
 share/config.kcfg/kdvi.kcfg
 share/config.kcfg/kghostview.kcfg
@@ -1200,6 +1201,22 @@ share/icons/hicolor/scalable/apps/kfaxview.svgz
 share/icons/hicolor/scalable/apps/kolourpaint.svgz
 share/icons/hicolor/scalable/apps/kpdf.svgz
 share/icons/hicolor/scalable/apps/ksnapshot.svgz
+share/man/man1/kcolorchooser.1.gz
+share/man/man1/kcoloredit.1.gz
+share/man/man1/kdvi.1.gz
+share/man/man1/kfax.1.gz
+share/man/man1/kfaxview.1.gz
+share/man/man1/kghostview.1.gz
+share/man/man1/kolourpaint.1.gz
+share/man/man1/kooka.1.gz
+share/man/man1/kpdf.1.gz
+share/man/man1/kpovmodeler.1.gz
+share/man/man1/kruler.1.gz
+share/man/man1/ksnapshot.1.gz
+share/man/man1/kuickshow.1.gz
+share/man/man1/kview.1.gz
+share/man/man1/kviewshell.1.gz
+share/man/man1/tdeiconedit.1.gz
 share/mimelnk/text/mrml.desktop
 share/services/camera.protocol
 share/services/djvumultipage.desktop
diff --git a/freebsd/core/tdelibs/Makefile b/freebsd/core/tdelibs/Makefile
index 3e94fadf3..0fe7e4cfd 100644
--- a/freebsd/core/tdelibs/Makefile
+++ b/freebsd/core/tdelibs/Makefile
@@ -9,7 +9,7 @@ PORTNAME=		tdelibs-trinity
 COMMENT=		Core libraries and binaries for all TDE applications
 TDE_PREVERSION=		
 MASTER_SITE_SUBDIR=	t/${PORTNAME}
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		x11
 DIST_SUBDIR=		TDE/core
 
@@ -28,15 +28,15 @@ BUILD_DEPENDS+=\
 LIB_DEPENDS+=\
 		libbz2.so:${PORTSDIR}/archivers/bzip2 \
 		libgamin-1.so:${PORTSDIR}/devel/gamin \
+		libpcre.so:${PORTSDIR}/devel/pcre \
 		libmagic.so:${PORTSDIR}/sysutils/file \
 		libidn.so:${PORTSDIR}/dns/libidn \
 		libjasper.so:${PORTSDIR}/graphics/jasper \
 		libOpenEXR.so:${PORTSDIR}/graphics/openexr \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libcups.so:${PORTSDIR}/print/cups \
-		libfreetype.so:${PORTSDIR}/print/freetype \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libssl.so:${PORTSDIR}/security/openssl \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower \
 		libaspell.so:${PORTSDIR}/textproc/aspell \
 		libxslt.so:${PORTSDIR}/textproc/libxslt \
 		libXcomposite.so:${PORTSDIR}/x11/libXcomposite \
@@ -71,12 +71,6 @@ do-configure: tde-cmake-prepare
 	-DWITH_GAMIN=ON \
 	-DWITH_TDEHWLIB=OFF \
 	-DWITH_TDEHWLIB_DAEMONS=OFF \
-	-DWITH_HAL=OFF \
-	-DWITH_DEVKITPOWER=OFF \
-	-DWITH_LOGINDPOWER=OFF \
-	-DWITH_UPOWER=ON \
-	-DWITH_UDISKS=OFF \
-	-DWITH_UDISKS2=OFF \
 	-DWITH_UTEMPTER=OFF \
 	-DWITH_CONSOLEKIT=ON \
 	-DWITH_NETWORK_MANAGER_BACKEND=OFF \
diff --git a/freebsd/core/tdelibs/distinfo b/freebsd/core/tdelibs/distinfo
index 7267ad256..4ca7f6b54 100644
--- a/freebsd/core/tdelibs/distinfo
+++ b/freebsd/core/tdelibs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619183762
-SHA256 (TDE/core/tdelibs-trinity_14.0.10.orig.tar.xz) = 83f9f5dce432777a693e019d7670ec2a4d62a5e8e59ccb44d5d7a35fe308eac5
-SIZE (TDE/core/tdelibs-trinity_14.0.10.orig.tar.xz) = 15436056
+TIMESTAMP = 1666354489
+SHA256 (TDE/core/tdelibs-trinity_14.0.13.orig.tar.xz) = 862ba6d5fe3bd00a64a84543796d2982db8f8f37ded919545955e97ba9f28de6
+SIZE (TDE/core/tdelibs-trinity_14.0.13.orig.tar.xz) = 15590428
diff --git a/freebsd/core/tdelibs/pkg-plist b/freebsd/core/tdelibs/pkg-plist
index 186ac555d..d456d2ebc 100644
--- a/freebsd/core/tdelibs/pkg-plist
+++ b/freebsd/core/tdelibs/pkg-plist
@@ -1053,6 +1053,8 @@ lib/trinity/libtdecertpart.la
 lib/trinity/libtdecertpart.so
 lib/trinity/libtdehtmlpart.la
 lib/trinity/libtdehtmlpart.so
+lib/trinity/libtdemarkdown.la
+lib/trinity/libtdemarkdown.so
 lib/trinity/libtdemultipart.la
 lib/trinity/libtdemultipart.so
 lib/trinity/libtdeprint_management_module.la
@@ -1306,6 +1308,7 @@ share/apps/katepart/syntax/magma.xml
 share/apps/katepart/syntax/makefile.xml
 share/apps/katepart/syntax/mako.xml
 share/apps/katepart/syntax/mandoc.xml
+share/apps/katepart/syntax/markdown.xml
 share/apps/katepart/syntax/mason.xml
 share/apps/katepart/syntax/mathematica.xml
 share/apps/katepart/syntax/matlab.xml
@@ -2914,6 +2917,7 @@ share/apps/tdehtml/tdehtml.rc
 share/apps/tdehtml/tdehtml_browser.rc
 share/apps/tdehtml/tdehtml_popupmenu.rc
 share/apps/tdeio_uiserver/icons/crystalsvg/16x16/apps/tdeio_uiserver.png
+share/apps/tdemarkdown/markdown_part.rc
 share/apps/tdenewstuff/types
 share/apps/tdeprint/apsdriver1
 share/apps/tdeprint/apsdriver2
@@ -3174,6 +3178,9 @@ share/doc/tde/HTML/en/common/8.png
 share/doc/tde/HTML/en/common/9.png
 share/doc/tde/HTML/en/common/appheader.html
 share/doc/tde/HTML/en/common/artistic-license.html
+share/doc/tde/HTML/en/common/block_title_bottom.png
+share/doc/tde/HTML/en/common/block_title_mid.png
+share/doc/tde/HTML/en/common/block_title_top.png
 share/doc/tde/HTML/en/common/bottom-left.png
 share/doc/tde/HTML/en/common/bottom-middle.png
 share/doc/tde/HTML/en/common/bottom-right.png
@@ -3190,6 +3197,7 @@ share/doc/tde/HTML/en/common/favicon.ico
 share/doc/tde/HTML/en/common/fdl-license
 share/doc/tde/HTML/en/common/fdl-license.html
 share/doc/tde/HTML/en/common/fdl-notice.html
+share/doc/tde/HTML/en/common/flat.css
 share/doc/tde/HTML/en/common/footer.html
 share/doc/tde/HTML/en/common/gpl-license
 share/doc/tde/HTML/en/common/gpl-license.html
@@ -3204,16 +3212,24 @@ share/doc/tde/HTML/en/common/lgpl-license
 share/doc/tde/HTML/en/common/lgpl-license.html
 share/doc/tde/HTML/en/common/mainfooter.html
 share/doc/tde/HTML/en/common/mainheader.html
+share/doc/tde/HTML/en/common/print.css
 share/doc/tde/HTML/en/common/qpl-license.html
 share/doc/tde/HTML/en/common/shadow.png
+share/doc/tde/HTML/en/common/tabs.css
 share/doc/tde/HTML/en/common/tde-common.css
 share/doc/tde/HTML/en/common/tde-default.css
 share/doc/tde/HTML/en/common/tde-docs.css
 share/doc/tde/HTML/en/common/tde-localised.css.template
 share/doc/tde/HTML/en/common/tde-web.css
+share/doc/tde/HTML/en/common/tde.css
+share/doc/tde/HTML/en/common/top-left.jpg
 share/doc/tde/HTML/en/common/top-left.png
 share/doc/tde/HTML/en/common/top-middle.png
 share/doc/tde/HTML/en/common/top-right-konqueror.png
+share/doc/tde/HTML/en/common/top-right.jpg
+share/doc/tde/HTML/en/common/top-right.png
+share/doc/tde/HTML/en/common/top-trinity.jpg
+share/doc/tde/HTML/en/common/top.jpg
 share/doc/tde/HTML/en/common/web-docbottom.png
 share/doc/tde/HTML/en/common/web-doctop.png
 share/doc/tde/HTML/en/common/x11-license.html
@@ -6074,6 +6090,7 @@ share/mimelnk/text/docbook.desktop
 share/mimelnk/text/enriched.desktop
 share/mimelnk/text/html.desktop
 share/mimelnk/text/javascript.desktop
+share/mimelnk/text/markdown.desktop
 share/mimelnk/text/plain.desktop
 share/mimelnk/text/rdf.desktop
 share/mimelnk/text/rss.desktop
@@ -6164,6 +6181,7 @@ share/services/kgzipfilter.desktop
 share/services/kjavaappletviewer.desktop
 share/services/knotify.desktop
 share/services/kxzfilter.desktop
+share/services/markdown_part.desktop
 share/services/metainfo.protocol
 share/services/mms.protocol
 share/services/mmst.protocol
diff --git a/freebsd/core/tdemultimedia/distinfo b/freebsd/core/tdemultimedia/distinfo
index a1493c2b1..dc1ae6fa9 100644
--- a/freebsd/core/tdemultimedia/distinfo
+++ b/freebsd/core/tdemultimedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619217636
-SHA256 (TDE/core/tdemultimedia-trinity_14.0.10.orig.tar.xz) = a645e966feb63986d6de0dbf8c243a6b1fd765d2cab3d722ee2aeff4d7e2662c
-SIZE (TDE/core/tdemultimedia-trinity_14.0.10.orig.tar.xz) = 4862288
+TIMESTAMP = 1666466779
+SHA256 (TDE/core/tdemultimedia-trinity_14.0.13.orig.tar.xz) = fd00ed07ee132df5b437a1d91141ff7e67b4a20c9b189cc2ba2fd725985a6c2e
+SIZE (TDE/core/tdemultimedia-trinity_14.0.13.orig.tar.xz) = 4838200
diff --git a/freebsd/core/tdemultimedia/pkg-plist b/freebsd/core/tdemultimedia/pkg-plist
index 012894930..66a762262 100644
--- a/freebsd/core/tdemultimedia/pkg-plist
+++ b/freebsd/core/tdemultimedia/pkg-plist
@@ -379,6 +379,7 @@ lib/mcop/RawWriter.mcopclass
 lib/mcop/SplayPlayObject.mcopclass
 lib/mcop/VoiceRemoval.mcopclass
 lib/mcop/WAVPlayObject.mcopclass
+lib/mcop/akodeFFMPEGPlayObject.mcopclass
 lib/mcop/akodeMPCPlayObject.mcopclass
 lib/mcop/akodeMPEGPlayObject.mcopclass
 lib/mcop/akodePlayObject.mcopclass
@@ -1202,6 +1203,13 @@ share/icons/hicolor/scalable/apps/artsbuilder.svgz
 share/icons/hicolor/scalable/apps/artscontrol.svgz
 share/icons/locolor/16x16/apps/kaudiocreator.png
 share/icons/locolor/32x32/apps/kaudiocreator.png
+share/man/man1/juk.1.gz
+share/man/man1/kaboodle.1.gz
+share/man/man1/kaudiocreator.1.gz
+share/man/man1/kmix.1.gz
+share/man/man1/kmixctrl.1.gz
+share/man/man1/krec.1.gz
+share/man/man1/noatun.1.gz
 share/mimelnk/application/x-artsbuilder.desktop
 share/mimelnk/audio/x-karaoke.desktop
 share/mimelnk/interface/x-winamp-skin.desktop
diff --git a/freebsd/core/tdenetwork/Makefile b/freebsd/core/tdenetwork/Makefile
index 0be497774..e4d38e5fa 100644
--- a/freebsd/core/tdenetwork/Makefile
+++ b/freebsd/core/tdenetwork/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
 		libtqca.so:${PORTSDIR}/x11/trinity/dependencies/tqca \
 
 BUILD_DEPENDS+=\
-		${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat \
+		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
 
 LIB_DEPENDS+=\
 		libgadu.so:${PORTSDIR}/polish/libgadu \
@@ -37,10 +37,12 @@ post-patch: tde-pathfix
 do-configure: tde-cmake-prepare
 	${TDE_CMAKE_CONFIGURE} \
 	\
+	-DWITH_ALL_OPTIONS="ON" \
+	-DWITH_JINGLE="OFF" \
+	-DWITH_SPEEX="OFF" \
+	-DWITH_GSM="OFF" \
+	-DWITH_XMMS="OFF" \
 	-DBUILD_ALL="ON" \
-	-DWITH_LIBXSLT="ON" \
-	-DWITH_ARTS="ON" \
-	-DWITH_SLP="ON" \
 	-DBUILD_KOPETE_PROTOCOL_ALL="ON" \
 	-DBUILD_KOPETE_PLUGIN_ALL="ON" \
 	-DBUILD_WIFI="OFF" \
diff --git a/freebsd/core/tdenetwork/distinfo b/freebsd/core/tdenetwork/distinfo
index 23d9a8e7a..5a8a85d06 100644
--- a/freebsd/core/tdenetwork/distinfo
+++ b/freebsd/core/tdenetwork/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619218347
-SHA256 (TDE/core/tdenetwork-trinity_14.0.10.orig.tar.xz) = e9d670380049d75b2160e3a0a3365f75337ffe3f7f25ed4adc6d992f6aa7b203
-SIZE (TDE/core/tdenetwork-trinity_14.0.10.orig.tar.xz) = 6798104
+TIMESTAMP = 1666469467
+SHA256 (TDE/core/tdenetwork-trinity_14.0.13.orig.tar.xz) = 5b3557c4e3b1bb06c9a4dba1b24fe721598a217ef01a0240c92080f3a4969229
+SIZE (TDE/core/tdenetwork-trinity_14.0.13.orig.tar.xz) = 6766304
diff --git a/freebsd/core/tdenetwork/pkg-plist b/freebsd/core/tdenetwork/pkg-plist
index 4f28641dd..073d929ea 100644
--- a/freebsd/core/tdenetwork/pkg-plist
+++ b/freebsd/core/tdenetwork/pkg-plist
@@ -1245,9 +1245,6 @@ share/doc/tde/HTML/en/kcontrol/kcmsambaconf/index.docbook
 share/doc/tde/HTML/en/kcontrol/kcmtalkd/common
 share/doc/tde/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
 share/doc/tde/HTML/en/kcontrol/kcmtalkd/index.docbook
-share/doc/tde/HTML/en/kcontrol/kcmwifi/common
-share/doc/tde/HTML/en/kcontrol/kcmwifi/index.cache.bz2
-share/doc/tde/HTML/en/kcontrol/kcmwifi/index.docbook
 share/doc/tde/HTML/en/kcontrol/lanbrowser/common
 share/doc/tde/HTML/en/kcontrol/lanbrowser/index.cache.bz2
 share/doc/tde/HTML/en/kcontrol/lanbrowser/index.docbook
@@ -1357,9 +1354,6 @@ share/doc/tde/HTML/en/ksirc/index.docbook
 share/doc/tde/HTML/en/ktalkd/common
 share/doc/tde/HTML/en/ktalkd/index.cache.bz2
 share/doc/tde/HTML/en/ktalkd/index.docbook
-share/doc/tde/HTML/en/kwifimanager/common
-share/doc/tde/HTML/en/kwifimanager/index.cache.bz2
-share/doc/tde/HTML/en/kwifimanager/index.docbook
 share/doc/tde/HTML/en/lisa/common
 share/doc/tde/HTML/en/lisa/index.cache.bz2
 share/doc/tde/HTML/en/lisa/index.docbook
@@ -1415,7 +1409,6 @@ share/icons/crystalsvg/16x16/actions/jabber_invisible.png
 share/icons/crystalsvg/16x16/actions/jabber_na.png
 share/icons/crystalsvg/16x16/actions/jabber_offline.png
 share/icons/crystalsvg/16x16/actions/jabber_online.png
-share/icons/crystalsvg/16x16/actions/jabber_original.png
 share/icons/crystalsvg/16x16/actions/jabber_raw.png
 share/icons/crystalsvg/16x16/actions/jabber_serv_off.png
 share/icons/crystalsvg/16x16/actions/jabber_serv_on.png
@@ -1554,7 +1547,6 @@ share/icons/hicolor/16x16/actions/jabber_invisible.png
 share/icons/hicolor/16x16/actions/jabber_na.png
 share/icons/hicolor/16x16/actions/jabber_offline.png
 share/icons/hicolor/16x16/actions/jabber_online.png
-share/icons/hicolor/16x16/actions/jabber_original.png
 share/icons/hicolor/16x16/actions/jabber_raw.png
 share/icons/hicolor/16x16/actions/jabber_serv_off.png
 share/icons/hicolor/16x16/actions/jabber_serv_on.png
@@ -1605,6 +1597,11 @@ share/icons/hicolor/scalable/apps/kdict.svgz
 share/icons/hicolor/scalable/apps/kopete2.svgz
 share/icons/locolor/16x16/apps/krfb.png
 share/icons/locolor/32x32/apps/krfb.png
+share/man/man1/kdict.1.gz
+share/man/man1/kget.1.gz
+share/man/man1/kopete.1.gz
+share/man/man8/lisa.8.gz
+share/man/man8/reslisa.8.gz
 share/mimelnk/application/x-icq.desktop
 share/mimelnk/application/x-kgetlist.desktop
 share/mimelnk/application/x-kopete-emoticons.desktop
diff --git a/freebsd/core/tdepim/distinfo b/freebsd/core/tdepim/distinfo
index ecec76ac7..d46eb7587 100644
--- a/freebsd/core/tdepim/distinfo
+++ b/freebsd/core/tdepim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619216221
-SHA256 (TDE/core/tdepim-trinity_14.0.10.orig.tar.xz) = 140114d97788468d515b9b5e3a8ee7d601dbf58f7d55e36d2eb3759540b4909d
-SIZE (TDE/core/tdepim-trinity_14.0.10.orig.tar.xz) = 9417440
+TIMESTAMP = 1666362005
+SHA256 (TDE/core/tdepim-trinity_14.0.13.orig.tar.xz) = 00de14bb95a0dafb59b2e2f0eff70eb74a36bd90c4fbdd254681aadcf5319b91
+SIZE (TDE/core/tdepim-trinity_14.0.13.orig.tar.xz) = 9389556
diff --git a/freebsd/core/tdesdk/Makefile b/freebsd/core/tdesdk/Makefile
index 8486595de..fb6f53eee 100644
--- a/freebsd/core/tdesdk/Makefile
+++ b/freebsd/core/tdesdk/Makefile
@@ -38,7 +38,6 @@ do-configure: tde-cmake-prepare
 	${TDE_CMAKE_CONFIGURE} \
 	\
 	-DBUILD_ALL="ON" \
-	-DBUILD_KMTRACE="OFF" \
 	-DWITH_DBSEARCHENGINE="ON" \
 	-DWITH_KCAL="ON"
 
diff --git a/freebsd/core/tdesdk/distinfo b/freebsd/core/tdesdk/distinfo
index 82a11524a..c42c2708c 100644
--- a/freebsd/core/tdesdk/distinfo
+++ b/freebsd/core/tdesdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619317520
-SHA256 (TDE/core/tdesdk-trinity_14.0.10.orig.tar.xz) = a4a32a3d9df960617a366b2bc327e7bc5ecb52fcf06e6bf6b7f6328ea79419f5
-SIZE (TDE/core/tdesdk-trinity_14.0.10.orig.tar.xz) = 3744996
+TIMESTAMP = 1666472209
+SHA256 (TDE/core/tdesdk-trinity_14.0.13.orig.tar.xz) = 04700b662c5e3140def5cb9d09af9d4d34a33d98422bd089b8a986613d22d7ec
+SIZE (TDE/core/tdesdk-trinity_14.0.13.orig.tar.xz) = 3730420
diff --git a/freebsd/core/tdesdk/pkg-plist b/freebsd/core/tdesdk/pkg-plist
index d14720a91..7717f4cbe 100644
--- a/freebsd/core/tdesdk/pkg-plist
+++ b/freebsd/core/tdesdk/pkg-plist
@@ -21,6 +21,7 @@ bin/cvsrevertlast
 bin/cvsservice
 bin/cvsversion
 bin/cxxmetric
+bin/demangle
 bin/dprof2calltree
 bin/extend_dmalloc
 bin/extractattr
@@ -38,6 +39,9 @@ bin/kde-build
 bin/kdedoc
 bin/kdelnk2desktop.py
 bin/kdemangen.pl
+bin/kminspector
+bin/kmmatch
+bin/kmtrace
 bin/kompare
 bin/kstartperf
 bin/kuiviewer
@@ -104,8 +108,12 @@ include/kbabel/searchengine.h
 include/kbabel/tagextractor.h
 include/kprofilemethod.h
 include/kspy.h
+include/ktrace.h
 include/repository_stub.h
 include/tdeunittest/runnergui.h
+lib/kmtrace/libktrace.la
+lib/kmtrace/libktrace.so
+lib/kmtrace/libktrace_s.a
 lib/libcvsservice.la
 lib/libcvsservice.so
 lib/libcvsservice.so.0
@@ -494,6 +502,7 @@ share/apps/kbugbuster/pics/bars.png
 share/apps/kbugbuster/pics/logo.png
 share/apps/kbugbuster/pics/tools.png
 share/apps/kbugbuster/pics/top-right.png
+share/apps/kmtrace/kde.excludes
 share/apps/kompare/komparepartui.rc
 share/apps/kompare/kompareui.rc
 share/apps/konqueror/servicemenus/subversion.desktop
@@ -928,14 +937,71 @@ share/icons/locolor/32x32/apps/kbabeldict.png
 share/icons/locolor/32x32/apps/kbugbuster.png
 share/icons/locolor/32x32/apps/kuiviewer.png
 share/icons/locolor/32x32/apps/tdecachegrind.png
+share/man/man1/adddebug.1.gz
+share/man/man1/build-progress.sh.1.gz
+share/man/man1/catalogmanager.1.gz
 share/man/man1/cervisia.1.gz
+share/man/man1/cheatmake.1.gz
+share/man/man1/create_cvsignore.1.gz
+share/man/man1/create_makefile.1.gz
+share/man/man1/create_makefiles.1.gz
+share/man/man1/cvs-clean.1.gz
+share/man/man1/cvs2dist.1.gz
+share/man/man1/cvsaskpass.1.gz
+share/man/man1/cvsbackport.1.gz
 share/man/man1/cvsblame.1.gz
 share/man/man1/cvscheck.1.gz
+share/man/man1/cvsforwardport.1.gz
+share/man/man1/cvslastchange.1.gz
+share/man/man1/cvslastlog.1.gz
+share/man/man1/cvsrevertlast.1.gz
+share/man/man1/cvsservice.1.gz
 share/man/man1/cvsversion.1.gz
+share/man/man1/cxxmetric.1.gz
+share/man/man1/demangle.1.gz
+share/man/man1/dprof2calltree.1.gz
+share/man/man1/extend_dmalloc.1.gz
+share/man/man1/extractattr.1.gz
+share/man/man1/extractrc.1.gz
+share/man/man1/findmissingcrystal.1.gz
+share/man/man1/fixkdeincludes.1.gz
+share/man/man1/fixuifiles.1.gz
+share/man/man1/hotshot2calltree.1.gz
 share/man/man1/includemocs.1.gz
+share/man/man1/kapptemplate.1.gz
+share/man/man1/kbabel.1.gz
+share/man/man1/kbabeldict.1.gz
+share/man/man1/kbugbuster.1.gz
 share/man/man1/kde-build.1.gz
+share/man/man1/kdedoc.1.gz
+share/man/man1/kdelnk2desktop.py.1.gz
+share/man/man1/kdemangen.pl.1.gz
+share/man/man1/kminspector.1.gz
+share/man/man1/kmmatch.1.gz
+share/man/man1/kmtrace.1.gz
+share/man/man1/kompare.1.gz
+share/man/man1/kuiviewer.1.gz
+share/man/man1/licensecheck.1.gz
+share/man/man1/makeobj.1.gz
+share/man/man1/memprof2calltree.1.gz
 share/man/man1/noncvslist.1.gz
+share/man/man1/op2calltree.1.gz
+share/man/man1/package_crystalsvg.1.gz
+share/man/man1/png2mng.pl.1.gz
+share/man/man1/po2xml.1.gz
+share/man/man1/pprof2calltree.1.gz
+share/man/man1/pruneemptydirs.1.gz
+share/man/man1/qtdoc.1.gz
+share/man/man1/split2po.1.gz
+share/man/man1/swappo.1.gz
+share/man/man1/tdecachegrind.1.gz
+share/man/man1/tdekillall.1.gz
 share/man/man1/tdesvn-build.1.gz
+share/man/man1/testkspy.1.gz
+share/man/man1/transxx.1.gz
+share/man/man1/umbrello.1.gz
+share/man/man1/xml2pot.1.gz
+share/man/man1/zonetab2pot.py.1.gz
 share/mimelnk/application/x-tdecachegrind.desktop
 share/mimelnk/application/x-umbrello.desktop
 share/services/cvsservice.desktop
diff --git a/freebsd/core/tdetoys/Makefile b/freebsd/core/tdetoys/Makefile
index 975e35026..541e03bee 100644
--- a/freebsd/core/tdetoys/Makefile
+++ b/freebsd/core/tdetoys/Makefile
@@ -15,6 +15,7 @@ DIST_SUBDIR=		TDE/core
 
 
 BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs \
+		${TDE_PREFIX}/include/konqsidebarplugin.h:${PORTSDIR}/x11/trinity/core/tdebase \
 
 LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
 
diff --git a/freebsd/core/tdetoys/distinfo b/freebsd/core/tdetoys/distinfo
index d0863a71f..254bbb151 100644
--- a/freebsd/core/tdetoys/distinfo
+++ b/freebsd/core/tdetoys/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619357480
-SHA256 (TDE/core/tdetoys-trinity_14.0.10.orig.tar.xz) = 351e0869573ecb3136e52bac8fc32ba059b0da6bee26fcb8d9a191420ce14cca
-SIZE (TDE/core/tdetoys-trinity_14.0.10.orig.tar.xz) = 2546364
+TIMESTAMP = 1666508020
+SHA256 (TDE/core/tdetoys-trinity_14.0.13.orig.tar.xz) = 9ffc7a3a61accf2ab8a0ca043b2b6dde97b61d55ffd5ed00fb78f2f957fe75dc
+SIZE (TDE/core/tdetoys-trinity_14.0.13.orig.tar.xz) = 2520752
diff --git a/freebsd/core/tdetoys/pkg-plist b/freebsd/core/tdetoys/pkg-plist
index 7de3a30dd..e9afd12b2 100644
--- a/freebsd/core/tdetoys/pkg-plist
+++ b/freebsd/core/tdetoys/pkg-plist
@@ -22,6 +22,8 @@ lib/trinity/kweatherreport.la
 lib/trinity/kweatherreport.so
 lib/trinity/weather_panelapplet.la
 lib/trinity/weather_panelapplet.so
+lib/trinity/weather_sidebar.la
+lib/trinity/weather_sidebar.so
 lib/trinity/ww_panelapplet.la
 lib/trinity/ww_panelapplet.so
 share/applications/tde/amor.desktop
@@ -461,6 +463,8 @@ share/apps/kmoon/pics/moon7.png
 share/apps/kmoon/pics/moon8.png
 share/apps/kmoon/pics/moon9.png
 share/apps/kodo/numbers.png
+share/apps/konqsidebartng/add/weatherbar_add.desktop
+share/apps/konqsidebartng/entries/weatherbar.desktop
 share/apps/kteatime/eventsrc
 share/apps/kteatime/icons/crystalsvg/22x22/actions/mug.png
 share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_anim1.png
diff --git a/freebsd/core/tdeutils/distinfo b/freebsd/core/tdeutils/distinfo
index 8c6280fa1..9c5475bb1 100644
--- a/freebsd/core/tdeutils/distinfo
+++ b/freebsd/core/tdeutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619357519
-SHA256 (TDE/core/tdeutils-trinity_14.0.10.orig.tar.xz) = ed54b6e3a0dc07f5034c67363a3119c9f4f5ef6b5dae528aa7149706e1dc55bf
-SIZE (TDE/core/tdeutils-trinity_14.0.10.orig.tar.xz) = 2253848
+TIMESTAMP = 1666508076
+SHA256 (TDE/core/tdeutils-trinity_14.0.13.orig.tar.xz) = e560319bde053f6e696cd1fe7c879735ab54fe245daef1f01575a31f1a7aa461
+SIZE (TDE/core/tdeutils-trinity_14.0.13.orig.tar.xz) = 2231300
diff --git a/freebsd/core/tdeutils/pkg-plist b/freebsd/core/tdeutils/pkg-plist
index e37c8bff2..4957620d4 100644
--- a/freebsd/core/tdeutils/pkg-plist
+++ b/freebsd/core/tdeutils/pkg-plist
@@ -302,27 +302,9 @@ share/doc/tde/HTML/en/kcharselect/index.docbook
 share/doc/tde/HTML/en/kcontrol/kcmlirc/common
 share/doc/tde/HTML/en/kcontrol/kcmlirc/index.cache.bz2
 share/doc/tde/HTML/en/kcontrol/kcmlirc/index.docbook
-share/doc/tde/HTML/en/kcontrol/kcmlowbatcrit/common
-share/doc/tde/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
-share/doc/tde/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
-share/doc/tde/HTML/en/kcontrol/kcmlowbatwarn/common
-share/doc/tde/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
-share/doc/tde/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
-share/doc/tde/HTML/en/kcontrol/kvaio/common
-share/doc/tde/HTML/en/kcontrol/kvaio/index.cache.bz2
-share/doc/tde/HTML/en/kcontrol/kvaio/index.docbook
-share/doc/tde/HTML/en/kcontrol/laptop/common
-share/doc/tde/HTML/en/kcontrol/laptop/index.cache.bz2
-share/doc/tde/HTML/en/kcontrol/laptop/index.docbook
-share/doc/tde/HTML/en/kcontrol/powerctrl/common
-share/doc/tde/HTML/en/kcontrol/powerctrl/index.cache.bz2
-share/doc/tde/HTML/en/kcontrol/powerctrl/index.docbook
 share/doc/tde/HTML/en/kcontrol/storagedevices/common
 share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2
 share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook
-share/doc/tde/HTML/en/kcontrol/thinkpad/common
-share/doc/tde/HTML/en/kcontrol/thinkpad/index.cache.bz2
-share/doc/tde/HTML/en/kcontrol/thinkpad/index.docbook
 share/doc/tde/HTML/en/kdf/common
 share/doc/tde/HTML/en/kdf/index.cache.bz2
 share/doc/tde/HTML/en/kdf/index.docbook
@@ -464,6 +446,16 @@ share/icons/hicolor/scalable/apps/ark.svgz
 share/icons/hicolor/scalable/apps/kcalc.svgz
 share/icons/locolor/16x16/apps/irkick.png
 share/icons/locolor/32x32/apps/irkick.png
+share/man/man1/ark.1.gz
+share/man/man1/kcalc.1.gz
+share/man/man1/kcharselect.1.gz
+share/man/man1/kdf.1.gz
+share/man/man1/kedit.1.gz
+share/man/man1/kfloppy.1.gz
+share/man/man1/kgpg.1.gz
+share/man/man1/khexedit.1.gz
+share/man/man1/kwikdisk.1.gz
+share/man/man1/superkaramba.1.gz
 share/mimelnk/application/x-superkaramba.desktop
 share/services/ark_part.desktop
 share/services/kbyteseditwidget.desktop
diff --git a/freebsd/core/tdevelop/distinfo b/freebsd/core/tdevelop/distinfo
index 763e65207..aeaae9fe5 100644
--- a/freebsd/core/tdevelop/distinfo
+++ b/freebsd/core/tdevelop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619357766
-SHA256 (TDE/core/tdevelop-trinity_14.0.10.orig.tar.xz) = 1e754e020c17bcc47c2a54140656bb7f1b640d9f5d0aa03e36e14f4c724b74cd
-SIZE (TDE/core/tdevelop-trinity_14.0.10.orig.tar.xz) = 6493272
+TIMESTAMP = 1666514784
+SHA256 (TDE/core/tdevelop-trinity_14.0.13.orig.tar.xz) = 3c102f03d28f092453da2cbacaac0d7c6630f8d760901b1b3517695ed2508ebf
+SIZE (TDE/core/tdevelop-trinity_14.0.13.orig.tar.xz) = 6463204
diff --git a/freebsd/core/tdewebdev/distinfo b/freebsd/core/tdewebdev/distinfo
index b0a445d47..e80c82f25 100644
--- a/freebsd/core/tdewebdev/distinfo
+++ b/freebsd/core/tdewebdev/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619358853
-SHA256 (TDE/core/tdewebdev-trinity_14.0.10.orig.tar.xz) = c479ccaa37a00d867d772fa9306aceebfb6cf5a1c442b8952eaf352b1286d75b
-SIZE (TDE/core/tdewebdev-trinity_14.0.10.orig.tar.xz) = 4983356
+TIMESTAMP = 1666515828
+SHA256 (TDE/core/tdewebdev-trinity_14.0.13.orig.tar.xz) = dc71608a0b0a6c098c8b1733fc31879f9277d262a54f90aaca2ef220952ac1c5
+SIZE (TDE/core/tdewebdev-trinity_14.0.13.orig.tar.xz) = 4976352
diff --git a/freebsd/core/tdewebdev/pkg-plist b/freebsd/core/tdewebdev/pkg-plist
index 43d3fe7d4..337c1a72b 100644
--- a/freebsd/core/tdewebdev/pkg-plist
+++ b/freebsd/core/tdewebdev/pkg-plist
@@ -473,6 +473,113 @@ share/apps/quanta/dtep/html-transitional/s.tag
 share/apps/quanta/dtep/html-transitional/t.tag
 share/apps/quanta/dtep/html-transitional/u.tag
 share/apps/quanta/dtep/html-transitional/v.tag
+share/apps/quanta/dtep/html5/a.tag
+share/apps/quanta/dtep/html5/abbr.tag
+share/apps/quanta/dtep/html5/acronym.tag
+share/apps/quanta/dtep/html5/address.tag
+share/apps/quanta/dtep/html5/applet.tag
+share/apps/quanta/dtep/html5/area.tag
+share/apps/quanta/dtep/html5/article.tag
+share/apps/quanta/dtep/html5/aside.tag
+share/apps/quanta/dtep/html5/audio.tag
+share/apps/quanta/dtep/html5/b.tag
+share/apps/quanta/dtep/html5/base.tag
+share/apps/quanta/dtep/html5/bdi.tag
+share/apps/quanta/dtep/html5/bdo.tag
+share/apps/quanta/dtep/html5/big.tag
+share/apps/quanta/dtep/html5/blockquote.tag
+share/apps/quanta/dtep/html5/body.tag
+share/apps/quanta/dtep/html5/br.tag
+share/apps/quanta/dtep/html5/button.tag
+share/apps/quanta/dtep/html5/caption.tag
+share/apps/quanta/dtep/html5/center.tag
+share/apps/quanta/dtep/html5/cite.tag
+share/apps/quanta/dtep/html5/code.tag
+share/apps/quanta/dtep/html5/col.tag
+share/apps/quanta/dtep/html5/colgroup.tag
+share/apps/quanta/dtep/html5/common.tag
+share/apps/quanta/dtep/html5/data.tag
+share/apps/quanta/dtep/html5/dd.tag
+share/apps/quanta/dtep/html5/del.tag
+share/apps/quanta/dtep/html5/description.rc
+share/apps/quanta/dtep/html5/details.tag
+share/apps/quanta/dtep/html5/dfn.tag
+share/apps/quanta/dtep/html5/dir.tag
+share/apps/quanta/dtep/html5/div.tag
+share/apps/quanta/dtep/html5/dl.tag
+share/apps/quanta/dtep/html5/dt.tag
+share/apps/quanta/dtep/html5/em.tag
+share/apps/quanta/dtep/html5/embed.tag
+share/apps/quanta/dtep/html5/empty.tag
+share/apps/quanta/dtep/html5/fieldset.tag
+share/apps/quanta/dtep/html5/figcaption.tag
+share/apps/quanta/dtep/html5/figure.tag
+share/apps/quanta/dtep/html5/footer.tag
+share/apps/quanta/dtep/html5/form.tag
+share/apps/quanta/dtep/html5/head.tag
+share/apps/quanta/dtep/html5/header.tag
+share/apps/quanta/dtep/html5/headings.tag
+share/apps/quanta/dtep/html5/hr.tag
+share/apps/quanta/dtep/html5/html.tag
+share/apps/quanta/dtep/html5/i.tag
+share/apps/quanta/dtep/html5/img.tag
+share/apps/quanta/dtep/html5/input.tag
+share/apps/quanta/dtep/html5/ins.tag
+share/apps/quanta/dtep/html5/kbd.tag
+share/apps/quanta/dtep/html5/label.tag
+share/apps/quanta/dtep/html5/legend.tag
+share/apps/quanta/dtep/html5/li.tag
+share/apps/quanta/dtep/html5/link.tag
+share/apps/quanta/dtep/html5/main.tag
+share/apps/quanta/dtep/html5/map.tag
+share/apps/quanta/dtep/html5/mark.tag
+share/apps/quanta/dtep/html5/meta.tag
+share/apps/quanta/dtep/html5/nav.tag
+share/apps/quanta/dtep/html5/noscript.tag
+share/apps/quanta/dtep/html5/object.tag
+share/apps/quanta/dtep/html5/ol.tag
+share/apps/quanta/dtep/html5/optgroup.tag
+share/apps/quanta/dtep/html5/option.tag
+share/apps/quanta/dtep/html5/p.tag
+share/apps/quanta/dtep/html5/param.tag
+share/apps/quanta/dtep/html5/picture.tag
+share/apps/quanta/dtep/html5/pre.tag
+share/apps/quanta/dtep/html5/q.tag
+share/apps/quanta/dtep/html5/rb.tag
+share/apps/quanta/dtep/html5/rbc.tag
+share/apps/quanta/dtep/html5/rp.tag
+share/apps/quanta/dtep/html5/rt.tag
+share/apps/quanta/dtep/html5/rtc.tag
+share/apps/quanta/dtep/html5/ruby.tag
+share/apps/quanta/dtep/html5/samp.tag
+share/apps/quanta/dtep/html5/script.tag
+share/apps/quanta/dtep/html5/section.tag
+share/apps/quanta/dtep/html5/select.tag
+share/apps/quanta/dtep/html5/small.tag
+share/apps/quanta/dtep/html5/source.tag
+share/apps/quanta/dtep/html5/span.tag
+share/apps/quanta/dtep/html5/strong.tag
+share/apps/quanta/dtep/html5/style.tag
+share/apps/quanta/dtep/html5/sub.tag
+share/apps/quanta/dtep/html5/sup.tag
+share/apps/quanta/dtep/html5/svg.tag
+share/apps/quanta/dtep/html5/table.tag
+share/apps/quanta/dtep/html5/tbody.tag
+share/apps/quanta/dtep/html5/td.tag
+share/apps/quanta/dtep/html5/textarea.tag
+share/apps/quanta/dtep/html5/tfoot.tag
+share/apps/quanta/dtep/html5/th.tag
+share/apps/quanta/dtep/html5/thead.tag
+share/apps/quanta/dtep/html5/time.tag
+share/apps/quanta/dtep/html5/title.tag
+share/apps/quanta/dtep/html5/tr.tag
+share/apps/quanta/dtep/html5/track.tag
+share/apps/quanta/dtep/html5/tt.tag
+share/apps/quanta/dtep/html5/u.tag
+share/apps/quanta/dtep/html5/ul.tag
+share/apps/quanta/dtep/html5/var.tag
+share/apps/quanta/dtep/html5/video.tag
+share/apps/quanta/dtep/html5/wbr.tag
 share/apps/quanta/dtep/kde-docbook-4.1.2/a.tag
 share/apps/quanta/dtep/kde-docbook-4.1.2/b.tag
 share/apps/quanta/dtep/kde-docbook-4.1.2/c.tag
@@ -1156,6 +1263,8 @@ share/apps/quanta/scripts/gubed_install.kmdr
 share/apps/quanta/scripts/gubed_install.kmdr.info
 share/apps/quanta/scripts/htmlquickstart.kmdr
 share/apps/quanta/scripts/htmlquickstart.kmdr.info
+share/apps/quanta/scripts/htmlquickstart5.kmdr
+share/apps/quanta/scripts/htmlquickstart5.kmdr.info
 share/apps/quanta/scripts/info.css
 share/apps/quanta/scripts/info.xsl
 share/apps/quanta/scripts/listwizard.kmdr
@@ -1178,6 +1287,7 @@ share/apps/quanta/templates/binaries/images/png/demo.png
 share/apps/quanta/templates/binaries/others/print.pdf
 share/apps/quanta/templates/documents/.dirinfo
 share/apps/quanta/templates/documents/html/demo.html
+share/apps/quanta/templates/documents/html5/demo.html
 share/apps/quanta/templates/documents/others/demo.txt
 share/apps/quanta/templates/documents/scripts/demo.script
 share/apps/quanta/templates/images/.dirinfo
@@ -1186,6 +1296,7 @@ share/apps/quanta/templates/images/others/demo.tif
 share/apps/quanta/templates/images/png/demo.png
 share/apps/quanta/templates/pages/.dirinfo
 share/apps/quanta/templates/pages/docbook/tde-doc-template.docbook
+share/apps/quanta/templates/pages/html5/base.html
 share/apps/quanta/templates/pages/html_4.0.1/basic.html
 share/apps/quanta/templates/pages/php/demo.php
 share/apps/quanta/templates/pages/special/drag_n_drop_men.html
@@ -1240,6 +1351,99 @@ share/apps/quanta/toolbar/form.png
 share/apps/quanta/toolbar/frame.png
 share/apps/quanta/toolbar/ftab.png
 share/apps/quanta/toolbar/ftpclient.png
+share/apps/quanta/toolbar/html5_DT.png
+share/apps/quanta/toolbar/html5_a.png
+share/apps/quanta/toolbar/html5_abbr.png
+share/apps/quanta/toolbar/html5_address.png
+share/apps/quanta/toolbar/html5_area.png
+share/apps/quanta/toolbar/html5_article.png
+share/apps/quanta/toolbar/html5_aside.png
+share/apps/quanta/toolbar/html5_audio.png
+share/apps/quanta/toolbar/html5_b.png
+share/apps/quanta/toolbar/html5_base.png
+share/apps/quanta/toolbar/html5_bdi.png
+share/apps/quanta/toolbar/html5_bdo.png
+share/apps/quanta/toolbar/html5_big.png
+share/apps/quanta/toolbar/html5_blockquote.png
+share/apps/quanta/toolbar/html5_body.png
+share/apps/quanta/toolbar/html5_br.png
+share/apps/quanta/toolbar/html5_caption.png
+share/apps/quanta/toolbar/html5_center.png
+share/apps/quanta/toolbar/html5_cite.png
+share/apps/quanta/toolbar/html5_code.png
+share/apps/quanta/toolbar/html5_col.png
+share/apps/quanta/toolbar/html5_colgroup.png
+share/apps/quanta/toolbar/html5_com.png
+share/apps/quanta/toolbar/html5_data.png
+share/apps/quanta/toolbar/html5_dd.png
+share/apps/quanta/toolbar/html5_del.png
+share/apps/quanta/toolbar/html5_details.png
+share/apps/quanta/toolbar/html5_dir.png
+share/apps/quanta/toolbar/html5_div.png
+share/apps/quanta/toolbar/html5_dl.png
+share/apps/quanta/toolbar/html5_dt.png
+share/apps/quanta/toolbar/html5_embed.png
+share/apps/quanta/toolbar/html5_figcaption.png
+share/apps/quanta/toolbar/html5_figure.png
+share/apps/quanta/toolbar/html5_font.png
+share/apps/quanta/toolbar/html5_footer.png
+share/apps/quanta/toolbar/html5_h1.png
+share/apps/quanta/toolbar/html5_h2.png
+share/apps/quanta/toolbar/html5_h3.png
+share/apps/quanta/toolbar/html5_h4.png
+share/apps/quanta/toolbar/html5_h5.png
+share/apps/quanta/toolbar/html5_h6.png
+share/apps/quanta/toolbar/html5_head.png
+share/apps/quanta/toolbar/html5_header.png
+share/apps/quanta/toolbar/html5_hr.png
+share/apps/quanta/toolbar/html5_html.png
+share/apps/quanta/toolbar/html5_i.png
+share/apps/quanta/toolbar/html5_img.png
+share/apps/quanta/toolbar/html5_ins.png
+share/apps/quanta/toolbar/html5_kbd.png
+share/apps/quanta/toolbar/html5_li.png
+share/apps/quanta/toolbar/html5_link.png
+share/apps/quanta/toolbar/html5_main.png
+share/apps/quanta/toolbar/html5_map.png
+share/apps/quanta/toolbar/html5_mark.png
+share/apps/quanta/toolbar/html5_meta.png
+share/apps/quanta/toolbar/html5_nav.png
+share/apps/quanta/toolbar/html5_noscript.png
+share/apps/quanta/toolbar/html5_object.png
+share/apps/quanta/toolbar/html5_ol.png
+share/apps/quanta/toolbar/html5_p.png
+share/apps/quanta/toolbar/html5_picture.png
+share/apps/quanta/toolbar/html5_pre.png
+share/apps/quanta/toolbar/html5_q.png
+share/apps/quanta/toolbar/html5_rp.png
+share/apps/quanta/toolbar/html5_rt.png
+share/apps/quanta/toolbar/html5_ruby.png
+share/apps/quanta/toolbar/html5_samp.png
+share/apps/quanta/toolbar/html5_script.png
+share/apps/quanta/toolbar/html5_section.png
+share/apps/quanta/toolbar/html5_small.png
+share/apps/quanta/toolbar/html5_source.png
+share/apps/quanta/toolbar/html5_span.png
+share/apps/quanta/toolbar/html5_strong.png
+share/apps/quanta/toolbar/html5_style.png
+share/apps/quanta/toolbar/html5_sub.png
+share/apps/quanta/toolbar/html5_sup.png
+share/apps/quanta/toolbar/html5_svg.png
+share/apps/quanta/toolbar/html5_table.png
+share/apps/quanta/toolbar/html5_tbody.png
+share/apps/quanta/toolbar/html5_td.png
+share/apps/quanta/toolbar/html5_tfoot.png
+share/apps/quanta/toolbar/html5_th.png
+share/apps/quanta/toolbar/html5_thead.png
+share/apps/quanta/toolbar/html5_time.png
+share/apps/quanta/toolbar/html5_title.png
+share/apps/quanta/toolbar/html5_tr.png
+share/apps/quanta/toolbar/html5_track.png
+share/apps/quanta/toolbar/html5_u.png
+share/apps/quanta/toolbar/html5_ul.png
+share/apps/quanta/toolbar/html5_var.png
+share/apps/quanta/toolbar/html5_video.png
+share/apps/quanta/toolbar/html5_wbr.png
 share/apps/quanta/toolbar/java.png
 share/apps/quanta/toolbar/lineedit.png
 share/apps/quanta/toolbar/linepas.png
@@ -1418,6 +1622,10 @@ share/apps/quanta/toolbars/html/other.toolbar.tgz
 share/apps/quanta/toolbars/html/standard.toolbar.tgz
 share/apps/quanta/toolbars/html/style.toolbar.tgz
 share/apps/quanta/toolbars/html/tables.toolbar.tgz
+share/apps/quanta/toolbars/html5/base.toolbar.tgz
+share/apps/quanta/toolbars/html5/meta.toolbar.tgz
+share/apps/quanta/toolbars/html5/style.toolbar.tgz
+share/apps/quanta/toolbars/html5/tools.toolbar.tgz
 share/apps/quanta/toolbars/kde-docbook/kde-docbook-admonitions.toolbar.tgz
 share/apps/quanta/toolbars/kde-docbook/kde-docbook-images.toolbar.tgz
 share/apps/quanta/toolbars/kde-docbook/kde-docbook-list.toolbar.tgz
diff --git a/freebsd/dependencies/Makefile b/freebsd/dependencies/Makefile
index a03c90de3..719b2c3d3 100644
--- a/freebsd/dependencies/Makefile
+++ b/freebsd/dependencies/Makefile
@@ -16,10 +16,11 @@
     SUBDIR += avahi-tqt
     SUBDIR += dbus-tqt
     SUBDIR += dbus-1-tqt
+    SUBDIR += polkit-tqt
     SUBDIR += imlib
     SUBDIR += libart-lgpl
     SUBDIR += libcaldav
     SUBDIR += libcarddav
-    SUBDIR += pinentry-tqt
+#    SUBDIR += pinentry-tqt
 
 .include <bsd.port.subdir.mk>
diff --git a/freebsd/dependencies/akode/Makefile b/freebsd/dependencies/akode/Makefile
index f615d23ad..a4f70dd72 100644
--- a/freebsd/dependencies/akode/Makefile
+++ b/freebsd/dependencies/akode/Makefile
@@ -9,7 +9,7 @@ PORTNAME=		akode
 COMMENT=		akode plugin for aRts
 TDE_PREVERSION=		
 MASTER_SITE_SUBDIR=	a/${PORTNAME}
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		audio
 DISTSRC=		${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
 DIST_SUBDIR=		TDE/dependencies
@@ -33,6 +33,7 @@ OPTIONS_DEFAULT=ALSA_SINK \
 		OSS_SINK \
 		PULSE_SINK \
 		\
+		FFMPEG_DECODER \
 		MPC_DECODER \
 		MPEG_DECODER \
 		XIPH_DECODER \
diff --git a/freebsd/dependencies/akode/distinfo b/freebsd/dependencies/akode/distinfo
index f9789096e..49ac13029 100644
--- a/freebsd/dependencies/akode/distinfo
+++ b/freebsd/dependencies/akode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619169273
-SHA256 (TDE/dependencies/akode_14.0.10.orig.tar.xz) = 96c49cea2f7dfc66e3839ff36b31eabd405678859651228b34ff6fcfba84a7f2
-SIZE (TDE/dependencies/akode_14.0.10.orig.tar.xz) = 106856
+TIMESTAMP = 1666341758
+SHA256 (TDE/dependencies/akode_14.0.13.orig.tar.xz) = ec33a0a11e92fa4fccadc59c3eed4fd872877272a880d93c8d233c81440b18d4
+SIZE (TDE/dependencies/akode_14.0.13.orig.tar.xz) = 75000
diff --git a/freebsd/dependencies/akode/pkg-plist b/freebsd/dependencies/akode/pkg-plist
index f9e412a07..202e2d94d 100644
--- a/freebsd/dependencies/akode/pkg-plist
+++ b/freebsd/dependencies/akode/pkg-plist
@@ -31,6 +31,8 @@ lib/libakode.so.2
 lib/libakode.so.2.0.0
 %%ALSA_SINK%%lib/libakode_alsa_sink.la
 %%ALSA_SINK%%lib/libakode_alsa_sink.so
+%%FFMPEG_DECODER%%lib/libakode_ffmpeg_decoder.la
+%%FFMPEG_DECODER%%lib/libakode_ffmpeg_decoder.so
 %%JACK_SINK%%lib/libakode_jack_sink.la
 %%JACK_SINK%%lib/libakode_jack_sink.so
 %%PULSE_SINK%%lib/libakode_pulse_sink.la
diff --git a/freebsd/dependencies/arts/Makefile b/freebsd/dependencies/arts/Makefile
index 7fd31df17..0e1048681 100644
--- a/freebsd/dependencies/arts/Makefile
+++ b/freebsd/dependencies/arts/Makefile
@@ -9,7 +9,7 @@ PORTNAME=		arts-trinity
 COMMENT=		aRts (analog realtime synthesizer) - the TDE sound system
 TDE_PREVERSION=		
 MASTER_SITE_SUBDIR=	a/${PORTNAME}
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		audio
 DIST_SUBDIR=		TDE/dependencies
 
diff --git a/freebsd/dependencies/arts/distinfo b/freebsd/dependencies/arts/distinfo
index 209db5a79..056ccd9db 100644
--- a/freebsd/dependencies/arts/distinfo
+++ b/freebsd/dependencies/arts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619174304
-SHA256 (TDE/dependencies/arts-trinity_14.0.10.orig.tar.xz) = 04b1033ff36e3c214b9fb92a967539d629257ab47aa89812c0de1dad70a9216d
-SIZE (TDE/dependencies/arts-trinity_14.0.10.orig.tar.xz) = 692288
+TIMESTAMP = 1666346107
+SHA256 (TDE/dependencies/arts-trinity_14.0.13.orig.tar.xz) = e89bd53ae2c0b831355499f57b8679aa25240b7ffbaf797d09f340f5b8b12255
+SIZE (TDE/dependencies/arts-trinity_14.0.13.orig.tar.xz) = 663772
diff --git a/freebsd/dependencies/arts/pkg-plist b/freebsd/dependencies/arts/pkg-plist
index 5816aa8f3..a3c8be521 100644
--- a/freebsd/dependencies/arts/pkg-plist
+++ b/freebsd/dependencies/arts/pkg-plist
@@ -176,3 +176,6 @@ lib/mcop/soundserver.mcopclass
 lib/mcop/soundserver.mcoptype
 libdata/pkgconfig/arts.pc
 libdata/pkgconfig/artsc.pc
+share/man/man1/artsc-config-trinity.1.gz
+share/man/man1/artscat-trinity.1.gz
+share/man/man1/artsdsp-trinity.1.gz
diff --git a/freebsd/dependencies/avahi-tqt/distinfo b/freebsd/dependencies/avahi-tqt/distinfo
index fb6a13d7d..dc88ae388 100644
--- a/freebsd/dependencies/avahi-tqt/distinfo
+++ b/freebsd/dependencies/avahi-tqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619174588
-SHA256 (TDE/dependencies/avahi-tqt_14.0.10.orig.tar.xz) = 46fe92905c4597eb0a3b7a08d910a790cf5456a89b045fcf931eca83d95da4bb
-SIZE (TDE/dependencies/avahi-tqt_14.0.10.orig.tar.xz) = 44524
+TIMESTAMP = 1666346235
+SHA256 (TDE/dependencies/avahi-tqt_14.0.13.orig.tar.xz) = 0cfa5236193ff352c27d1a680d82dce286d3c1c23810a87297eb7278d1012186
+SIZE (TDE/dependencies/avahi-tqt_14.0.13.orig.tar.xz) = 11724
diff --git a/freebsd/dependencies/dbus-1-tqt/distinfo b/freebsd/dependencies/dbus-1-tqt/distinfo
index 7212f6aed..a98136da6 100644
--- a/freebsd/dependencies/dbus-1-tqt/distinfo
+++ b/freebsd/dependencies/dbus-1-tqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619174602
-SHA256 (TDE/dependencies/dbus-1-tqt_14.0.10.orig.tar.xz) = 3662b16301abe0e36bef96e65abfdcab29d8fcc39cf79d7d5a1136e8b1ba9d9a
-SIZE (TDE/dependencies/dbus-1-tqt_14.0.10.orig.tar.xz) = 105888
+TIMESTAMP = 1666346252
+SHA256 (TDE/dependencies/dbus-1-tqt_14.0.13.orig.tar.xz) = 591f07a504aeaef99b13b685e19b4bc18b9ba72be2c730f43059fe5df90bf95c
+SIZE (TDE/dependencies/dbus-1-tqt_14.0.13.orig.tar.xz) = 73384
diff --git a/freebsd/dependencies/dbus-tqt/distinfo b/freebsd/dependencies/dbus-tqt/distinfo
index 2e17401cd..f4ed42036 100644
--- a/freebsd/dependencies/dbus-tqt/distinfo
+++ b/freebsd/dependencies/dbus-tqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619174621
-SHA256 (TDE/dependencies/dbus-tqt_14.0.10.orig.tar.xz) = c5c1f59f848979be22dde5e08e6451eab9792652c8f859928137de07a231f28b
-SIZE (TDE/dependencies/dbus-tqt_14.0.10.orig.tar.xz) = 168740
+TIMESTAMP = 1666346269
+SHA256 (TDE/dependencies/dbus-tqt_14.0.13.orig.tar.xz) = bdd977527e1ae241f299ffed8bd13a8b4f4e0cc7978a50c64e665dfed50f0336
+SIZE (TDE/dependencies/dbus-tqt_14.0.13.orig.tar.xz) = 136552
diff --git a/freebsd/dependencies/imlib/Makefile b/freebsd/dependencies/imlib/Makefile
index da85f0488..33841a3a7 100644
--- a/freebsd/dependencies/imlib/Makefile
+++ b/freebsd/dependencies/imlib/Makefile
@@ -9,7 +9,7 @@ PORTNAME=		imlib
 COMMENT=		A graphic library for enlightenment package
 MASTER_SITE_SUBDIR=	i/${PORTNAME}
 PORTVERSION=		1.9.15
-PORTREVISION=		16
+PORTREVISION=		17
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_TDE_DEPS}
 DISTNAME=		${PORTNAME}_${PORTVERSION}
diff --git a/freebsd/dependencies/imlib/files/patch-search-system-include-for-xshm.diff b/freebsd/dependencies/imlib/files/patch-search-system-include-for-xshm.diff
index 359d44a1f..47271a097 100644
--- a/freebsd/dependencies/imlib/files/patch-search-system-include-for-xshm.diff
+++ b/freebsd/dependencies/imlib/files/patch-search-system-include-for-xshm.diff
@@ -1,11 +1,13 @@
 --- imlib-1.9.15.orig/configure.in
 +++ imlib-1.9.15/configure.in
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,9 @@
      AC_MSG_RESULT(no)
      no_xshm=yes
    else
 -    if test -f "$x_includes/X11/extensions/XShm.h"; then
-+    if test -f "$x_includes/X11/extensions/XShm.h" || test -f "/usr/include/X11/extensions/XShm.h"; then
++    if test -f "$x_includes/X11/extensions/XShm.h" || \
++       test -f "/usr/include/X11/extensions/XShm.h" || \
++       test -f "/usr/local/include/X11/extensions/XShm.h"; then
        AC_MSG_RESULT(yes)
        AC_DEFINE(HAVE_XSHM_H, 1, [ ])
      else
diff --git a/freebsd/dependencies/libart-lgpl/distinfo b/freebsd/dependencies/libart-lgpl/distinfo
index 9d3253bbe..eb862b6e0 100644
--- a/freebsd/dependencies/libart-lgpl/distinfo
+++ b/freebsd/dependencies/libart-lgpl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619169325
-SHA256 (TDE/dependencies/libart-lgpl_14.0.10.orig.tar.xz) = 1a00f6d128f91200690ae37645d0f9e94dd0d3e0cfb706f8a086ac7d9fb571f3
-SIZE (TDE/dependencies/libart-lgpl_14.0.10.orig.tar.xz) = 126864
+TIMESTAMP = 1666341824
+SHA256 (TDE/dependencies/libart-lgpl_14.0.13.orig.tar.xz) = 8fd94607405569f556e1c521fd76dd3818aa277b2f533fa01d9de0755ae5a148
+SIZE (TDE/dependencies/libart-lgpl_14.0.13.orig.tar.xz) = 94180
diff --git a/freebsd/dependencies/libcaldav/distinfo b/freebsd/dependencies/libcaldav/distinfo
index 100945167..a18ae3b34 100644
--- a/freebsd/dependencies/libcaldav/distinfo
+++ b/freebsd/dependencies/libcaldav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619169363
-SHA256 (TDE/dependencies/libcaldav_14.0.10.orig.tar.xz) = ecc5bd8a953ca043eae20b323882a80a37af02d6fefb7b65d21ed389192fe3b7
-SIZE (TDE/dependencies/libcaldav_14.0.10.orig.tar.xz) = 220560
+TIMESTAMP = 1666343476
+SHA256 (TDE/dependencies/libcaldav_14.0.13.orig.tar.xz) = c44a594a71613576bcc8a03e06a1b33da91601e5644bfc9132f7997f2e679a0c
+SIZE (TDE/dependencies/libcaldav_14.0.13.orig.tar.xz) = 187956
diff --git a/freebsd/dependencies/libcarddav/distinfo b/freebsd/dependencies/libcarddav/distinfo
index 9cd3fa0cb..ee6b76a61 100644
--- a/freebsd/dependencies/libcarddav/distinfo
+++ b/freebsd/dependencies/libcarddav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619169379
-SHA256 (TDE/dependencies/libcarddav_14.0.10.orig.tar.xz) = 5f53e9e47e3877842fa9e61d1c3950d925a9b82c0b544afeb2c1b446825306e4
-SIZE (TDE/dependencies/libcarddav_14.0.10.orig.tar.xz) = 364564
+TIMESTAMP = 1666343505
+SHA256 (TDE/dependencies/libcarddav_14.0.13.orig.tar.xz) = 2082209e27394d878c37ac23eae7810f0dedb9c3a3680af77dba7ad725c08b14
+SIZE (TDE/dependencies/libcarddav_14.0.13.orig.tar.xz) = 332552
diff --git a/freebsd/dependencies/pinentry-tqt/Makefile b/freebsd/dependencies/pinentry-tqt/Makefile
index 9820e5dae..9b1692210 100644
--- a/freebsd/dependencies/pinentry-tqt/Makefile
+++ b/freebsd/dependencies/pinentry-tqt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/security/pinentry/Makefile 517058 2019-11-08 13:17:00Z tobik $
 
 PORTNAME=	pinentry
-PORTVERSION=	1.1.1
+PORTVERSION=	1.2.1
 PORTREVISION?=	0
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/pinentry
diff --git a/freebsd/dependencies/pinentry-tqt/distinfo b/freebsd/dependencies/pinentry-tqt/distinfo
index d6c54a5d6..35c5bd158 100644
--- a/freebsd/dependencies/pinentry-tqt/distinfo
+++ b/freebsd/dependencies/pinentry-tqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618558453
-SHA256 (pinentry-1.1.1.tar.bz2) = cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f
-SIZE (pinentry-1.1.1.tar.bz2) = 515723
+TIMESTAMP = 1665433941
+SHA256 (pinentry-1.2.1.tar.bz2) = 457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067
+SIZE (pinentry-1.2.1.tar.bz2) = 547698
diff --git a/freebsd/dependencies/polkit-tqt/Makefile b/freebsd/dependencies/polkit-tqt/Makefile
new file mode 100644
index 000000000..312972a93
--- /dev/null
+++ b/freebsd/dependencies/polkit-tqt/Makefile
@@ -0,0 +1,42 @@
+# -*-mode: makefile-*-
+# Created by: slavek.banko@axis.cz
+# $FreeBSD$
+#
+
+.include <../../trinity.port.mk>
+
+PORTNAME=		polkit-tqt
+COMMENT=		PolicyKit-tqt library
+TDE_PREVERSION=		
+MASTER_SITE_SUBDIR=	p/${PORTNAME}
+DISTSRC=		${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
+PORTREVISION=		0
+CATEGORIES=		sysutils
+DIST_SUBDIR=		TDE/dependencies
+PREFIX=			${LOCALBASE}
+
+
+BUILD_DEPENDS+=	tmoc:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
+		libdbus-1-tqt.so:${PORTSDIR}/x11/trinity/dependencies/dbus-1-tqt \
+		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
+
+# Build
+post-patch: tde-pathfix
+
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+		-DPKGCONFIG_INSTALL_DIR="${PREFIX}/libdata/pkgconfig" \
+		-DBUILD_ALL=ON \
+		-DBUILD_EXAMPLES=OFF \
+		-DWITH_ALL_OPTIONS=ON \
+
+do-build: tde-cmake-build
+
+post-build: tde-cmake-check
+
+do-install: tde-cmake-install
+
+.include <bsd.port.mk>
diff --git a/freebsd/dependencies/polkit-tqt/distinfo b/freebsd/dependencies/polkit-tqt/distinfo
new file mode 100644
index 000000000..0de92fd00
--- /dev/null
+++ b/freebsd/dependencies/polkit-tqt/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1666346393
+SHA256 (TDE/dependencies/polkit-tqt_14.0.13.orig.tar.xz) = d5400786f93ff99c980efba2be4415cf5b104d05b639c623970593ac1c3ce9ef
+SIZE (TDE/dependencies/polkit-tqt_14.0.13.orig.tar.xz) = 54140
diff --git a/freebsd/dependencies/polkit-tqt/pkg-descr b/freebsd/dependencies/polkit-tqt/pkg-descr
new file mode 100644
index 000000000..5561f423e
--- /dev/null
+++ b/freebsd/dependencies/polkit-tqt/pkg-descr
@@ -0,0 +1,13 @@
+PolicyKit-tqt library
+
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+libpolkit-tqt provides convenience classes and methods for TQt/TDE
+applications that want to use PolicyKit.
+
+This package contains the files necessary for running applications that use
+the libpolkit-tqt library.
diff --git a/freebsd/dependencies/polkit-tqt/pkg-plist b/freebsd/dependencies/polkit-tqt/pkg-plist
new file mode 100644
index 000000000..5c6f93d1e
--- /dev/null
+++ b/freebsd/dependencies/polkit-tqt/pkg-plist
@@ -0,0 +1,40 @@
+include/polkit-tqt/PolkitTQt/ActionDescription
+include/polkit-tqt/PolkitTQt/Agent/Listener
+include/polkit-tqt/PolkitTQt/Agent/Session
+include/polkit-tqt/PolkitTQt/Authority
+include/polkit-tqt/PolkitTQt/Details
+include/polkit-tqt/PolkitTQt/Gui/Action
+include/polkit-tqt/PolkitTQt/Gui/ActionButton
+include/polkit-tqt/PolkitTQt/Gui/ActionButtons
+include/polkit-tqt/PolkitTQt/Identity
+include/polkit-tqt/PolkitTQt/Subject
+include/polkit-tqt/PolkitTQt/TemporaryAuthorization
+include/polkit-tqt/polkit-tqt-actiondescription.h
+include/polkit-tqt/polkit-tqt-agent-listener.h
+include/polkit-tqt/polkit-tqt-agent-session.h
+include/polkit-tqt/polkit-tqt-authority.h
+include/polkit-tqt/polkit-tqt-details.h
+include/polkit-tqt/polkit-tqt-export.h
+include/polkit-tqt/polkit-tqt-gui-action.h
+include/polkit-tqt/polkit-tqt-gui-actionbutton.h
+include/polkit-tqt/polkit-tqt-gui-actionbuttons.h
+include/polkit-tqt/polkit-tqt-identity.h
+include/polkit-tqt/polkit-tqt-subject.h
+include/polkit-tqt/polkit-tqt-temporaryauthorization.h
+lib/cmake/polkit-tqt.cmake
+lib/libpolkit-tqt-agent.la
+lib/libpolkit-tqt-agent.so
+lib/libpolkit-tqt-agent.so.0
+lib/libpolkit-tqt-agent.so.0.0.0
+lib/libpolkit-tqt-core.la
+lib/libpolkit-tqt-core.so
+lib/libpolkit-tqt-core.so.0
+lib/libpolkit-tqt-core.so.0.0.0
+lib/libpolkit-tqt-gui.la
+lib/libpolkit-tqt-gui.so
+lib/libpolkit-tqt-gui.so.0
+lib/libpolkit-tqt-gui.so.0.0.0
+libdata/pkgconfig/polkit-tqt-agent.pc
+libdata/pkgconfig/polkit-tqt-core.pc
+libdata/pkgconfig/polkit-tqt-gui.pc
+libdata/pkgconfig/polkit-tqt.pc
diff --git a/freebsd/dependencies/tqca-tls/Makefile b/freebsd/dependencies/tqca-tls/Makefile
index 544afe7d7..9ba5bb9b8 100644
--- a/freebsd/dependencies/tqca-tls/Makefile
+++ b/freebsd/dependencies/tqca-tls/Makefile
@@ -8,27 +8,27 @@
 PORTNAME=		tqca-tls
 COMMENT=		TLS plugin for the TQt Cryptographic Architecture (TQCA)
 TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	t/${PORTNAME}
+MASTER_SITE_SUBDIR=	t/tqca
 PORTREVISION=		0
 CATEGORIES=		devel
-DISTSRC=		${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
+DISTNAME=		tqca_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
+DISTSRC=		tqca-trinity-${TDE_VERSION}${TDE_PREVERSION}
 DIST_SUBDIR=		TDE/dependencies
 PREFIX=			${LOCALBASE}
 
-
-BUILD_DEPENDS+=	tqmake:${PORTSDIR}/x11/trinity/dependencies/tqmake
-
 LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
 		libtqca.so:${PORTSDIR}/x11/trinity/dependencies/tqca \
 		libssl.so:${PORTSDIR}/security/openssl
 
-# Build
+
 post-patch: tde-pathfix
 
 do-configure: tde-cmake-prepare
 	${TDE_CMAKE_CONFIGURE} \
 	-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-	-DPKGCONFIG_INSTALL_DIR="${PREFIX}/libdata/pkgconfig"
+	-DPKGCONFIG_INSTALL_DIR="${PREFIX}/libdata/pkgconfig" \
+	-DBUILD_ALL="OFF" \
+	-DBUILD_TQCA_TLS="ON" \
 	-DWITH_ALL_OPTIONS="ON"
 
 do-build: tde-cmake-build
diff --git a/freebsd/dependencies/tqca-tls/distinfo b/freebsd/dependencies/tqca-tls/distinfo
index f1902afba..aa3b162b4 100644
--- a/freebsd/dependencies/tqca-tls/distinfo
+++ b/freebsd/dependencies/tqca-tls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619182304
-SHA256 (TDE/dependencies/tqca-tls_14.0.10.orig.tar.xz) = b73e9932231a580b7716a81f8b7948842dffc07b5d35b9a95355074fd1691151
-SIZE (TDE/dependencies/tqca-tls_14.0.10.orig.tar.xz) = 53660
+TIMESTAMP = 1666346306
+SHA256 (TDE/dependencies/tqca_14.0.13.orig.tar.xz) = db806e8b64c8119ce632caa266b78b0b3dcca92296dbbecfa804c1e0d0762c93
+SIZE (TDE/dependencies/tqca_14.0.13.orig.tar.xz) = 34928
diff --git a/freebsd/dependencies/tqca-tls/pkg-descr b/freebsd/dependencies/tqca-tls/pkg-descr
index 80fabd133..8b29efb75 100644
--- a/freebsd/dependencies/tqca-tls/pkg-descr
+++ b/freebsd/dependencies/tqca-tls/pkg-descr
@@ -1,6 +1 @@
-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.
+libtqca provides TQt interface for security plugins
diff --git a/freebsd/dependencies/tqca/Makefile b/freebsd/dependencies/tqca/Makefile
index e1618364a..d93adceba 100644
--- a/freebsd/dependencies/tqca/Makefile
+++ b/freebsd/dependencies/tqca/Makefile
@@ -8,13 +8,16 @@
 PORTNAME=		libtqca
 COMMENT=		libtqca provides TQt interface for security plugins
 TDE_PREVERSION=		
-MASTER_SITE_SUBDIR=	libt/${PORTNAME}
+MASTER_SITE_SUBDIR=	t/tqca
 PORTREVISION=		0
 CATEGORIES=		devel
+DISTNAME=		tqca_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
 DISTSRC=		tqca-trinity-${TDE_VERSION}${TDE_PREVERSION}
 DIST_SUBDIR=		TDE/dependencies
 PREFIX=			${LOCALBASE}
 
+LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
+
 
 post-patch: tde-pathfix
 
@@ -22,6 +25,8 @@ do-configure: tde-cmake-prepare
 	${TDE_CMAKE_CONFIGURE} \
 	-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 	-DPKGCONFIG_INSTALL_DIR="${PREFIX}/libdata/pkgconfig" \
+	-DBUILD_ALL="OFF" \
+	-DBUILD_TQCA="ON" \
 	-DWITH_ALL_OPTIONS="ON"
 
 do-build: tde-cmake-build
diff --git a/freebsd/dependencies/tqca/distinfo b/freebsd/dependencies/tqca/distinfo
index 73dc1ccb3..497fc3118 100644
--- a/freebsd/dependencies/tqca/distinfo
+++ b/freebsd/dependencies/tqca/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619174676
-SHA256 (TDE/dependencies/libtqca_14.0.10.orig.tar.xz) = 60df36e644463c906af3e9bcefe255632e8710ec0f08610d5afd933adb1d107e
-SIZE (TDE/dependencies/libtqca_14.0.10.orig.tar.xz) = 60868
+TIMESTAMP = 1666346288
+SHA256 (TDE/dependencies/tqca_14.0.13.orig.tar.xz) = db806e8b64c8119ce632caa266b78b0b3dcca92296dbbecfa804c1e0d0762c93
+SIZE (TDE/dependencies/tqca_14.0.13.orig.tar.xz) = 34928
diff --git a/freebsd/dependencies/tqmake/distinfo b/freebsd/dependencies/tqmake/distinfo
index 7efb37565..cde609a17 100644
--- a/freebsd/dependencies/tqmake/distinfo
+++ b/freebsd/dependencies/tqmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619163241
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 1790a5794fb32f271f4e5ad9d9c719f79b8033d74ac055bd279c86c7393b075a
-SIZE (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 10964092
+TIMESTAMP = 1666310591
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 1f6884a7b66466255e79d8d5ac33183467a85396afbefc7d255b34663c3464f9
+SIZE (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 10960436
diff --git a/freebsd/dependencies/tqmake/files/qconfig.cpp b/freebsd/dependencies/tqmake/files/qconfig.cpp
index ff1ee16b4..9185217c6 100644
--- a/freebsd/dependencies/tqmake/files/qconfig.cpp
+++ b/freebsd/dependencies/tqmake/files/qconfig.cpp
@@ -9,7 +9,7 @@ const char *tqInstallPathDocs()         { return "/usr/local/share/doc/tqt3"; }
 const char *tqInstallPathHeaders()      { return "/usr/local/include/tqt3"; }
 const char *tqInstallPathLibs()         { return "/usr/local/lib"; }
 const char *tqInstallPathBins()         { return "/usr/local/bin"; }
-const char *tqInstallPathPlugins()      { return "/usr/local/plugins/tqt3"; }
+const char *tqInstallPathPlugins()      { return "/usr/local/lib/tqt3/plugins"; }
 const char *tqInstallPathData()         { return "/usr/local/share/tqt3"; }
 const char *tqInstallPathTranslations() { return "/usr/local/translations/tqt3"; }
 const char *tqInstallPathSysconf()      { return "/usr/local/etc"; }
diff --git a/freebsd/dependencies/tqt3-ibase-plugin/distinfo b/freebsd/dependencies/tqt3-ibase-plugin/distinfo
index eb3d5316d..ac0fb5041 100644
--- a/freebsd/dependencies/tqt3-ibase-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-ibase-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619164977
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 1790a5794fb32f271f4e5ad9d9c719f79b8033d74ac055bd279c86c7393b075a
-SIZE (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 10964092
+TIMESTAMP = 1666313449
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 1f6884a7b66466255e79d8d5ac33183467a85396afbefc7d255b34663c3464f9
+SIZE (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 10960436
diff --git a/freebsd/dependencies/tqt3-ibase-plugin/pkg-plist b/freebsd/dependencies/tqt3-ibase-plugin/pkg-plist
index b2d2d1d0b..7c9f467ce 100644
--- a/freebsd/dependencies/tqt3-ibase-plugin/pkg-plist
+++ b/freebsd/dependencies/tqt3-ibase-plugin/pkg-plist
@@ -1,2 +1,2 @@
 lib/tqt3/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrm lib/tqt3/plugins/sqldrivers
+@dir lib/tqt3/plugins/sqldrivers
diff --git a/freebsd/dependencies/tqt3-mysql-plugin/distinfo b/freebsd/dependencies/tqt3-mysql-plugin/distinfo
index af6433fad..21aa4fb78 100644
--- a/freebsd/dependencies/tqt3-mysql-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619165007
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 1790a5794fb32f271f4e5ad9d9c719f79b8033d74ac055bd279c86c7393b075a
-SIZE (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 10964092
+TIMESTAMP = 1666313535
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 1f6884a7b66466255e79d8d5ac33183467a85396afbefc7d255b34663c3464f9
+SIZE (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 10960436
diff --git a/freebsd/dependencies/tqt3-mysql-plugin/pkg-plist b/freebsd/dependencies/tqt3-mysql-plugin/pkg-plist
index b2d2d1d0b..7c9f467ce 100644
--- a/freebsd/dependencies/tqt3-mysql-plugin/pkg-plist
+++ b/freebsd/dependencies/tqt3-mysql-plugin/pkg-plist
@@ -1,2 +1,2 @@
 lib/tqt3/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrm lib/tqt3/plugins/sqldrivers
+@dir lib/tqt3/plugins/sqldrivers
diff --git a/freebsd/dependencies/tqt3-odbc-plugin/distinfo b/freebsd/dependencies/tqt3-odbc-plugin/distinfo
index 7a9763e3c..8f2bfad8d 100644
--- a/freebsd/dependencies/tqt3-odbc-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-odbc-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619165021
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 1790a5794fb32f271f4e5ad9d9c719f79b8033d74ac055bd279c86c7393b075a
-SIZE (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 10964092
+TIMESTAMP = 1666313567
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 1f6884a7b66466255e79d8d5ac33183467a85396afbefc7d255b34663c3464f9
+SIZE (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 10960436
diff --git a/freebsd/dependencies/tqt3-odbc-plugin/pkg-plist b/freebsd/dependencies/tqt3-odbc-plugin/pkg-plist
index b2d2d1d0b..7c9f467ce 100644
--- a/freebsd/dependencies/tqt3-odbc-plugin/pkg-plist
+++ b/freebsd/dependencies/tqt3-odbc-plugin/pkg-plist
@@ -1,2 +1,2 @@
 lib/tqt3/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrm lib/tqt3/plugins/sqldrivers
+@dir lib/tqt3/plugins/sqldrivers
diff --git a/freebsd/dependencies/tqt3-pgsql-plugin/distinfo b/freebsd/dependencies/tqt3-pgsql-plugin/distinfo
index adaff09ad..9ea0dc84b 100644
--- a/freebsd/dependencies/tqt3-pgsql-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-pgsql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619165035
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 1790a5794fb32f271f4e5ad9d9c719f79b8033d74ac055bd279c86c7393b075a
-SIZE (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 10964092
+TIMESTAMP = 1666313584
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 1f6884a7b66466255e79d8d5ac33183467a85396afbefc7d255b34663c3464f9
+SIZE (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 10960436
diff --git a/freebsd/dependencies/tqt3-pgsql-plugin/pkg-plist b/freebsd/dependencies/tqt3-pgsql-plugin/pkg-plist
index b2d2d1d0b..7c9f467ce 100644
--- a/freebsd/dependencies/tqt3-pgsql-plugin/pkg-plist
+++ b/freebsd/dependencies/tqt3-pgsql-plugin/pkg-plist
@@ -1,2 +1,2 @@
 lib/tqt3/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrm lib/tqt3/plugins/sqldrivers
+@dir lib/tqt3/plugins/sqldrivers
diff --git a/freebsd/dependencies/tqt3-sqlite-plugin/distinfo b/freebsd/dependencies/tqt3-sqlite-plugin/distinfo
index 5dc14116f..0c618f177 100644
--- a/freebsd/dependencies/tqt3-sqlite-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-sqlite-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619165051
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 1790a5794fb32f271f4e5ad9d9c719f79b8033d74ac055bd279c86c7393b075a
-SIZE (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 10964092
+TIMESTAMP = 1666313618
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 1f6884a7b66466255e79d8d5ac33183467a85396afbefc7d255b34663c3464f9
+SIZE (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 10960436
diff --git a/freebsd/dependencies/tqt3-sqlite-plugin/pkg-plist b/freebsd/dependencies/tqt3-sqlite-plugin/pkg-plist
index b2d2d1d0b..7c9f467ce 100644
--- a/freebsd/dependencies/tqt3-sqlite-plugin/pkg-plist
+++ b/freebsd/dependencies/tqt3-sqlite-plugin/pkg-plist
@@ -1,2 +1,2 @@
 lib/tqt3/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrm lib/tqt3/plugins/sqldrivers
+@dir lib/tqt3/plugins/sqldrivers
diff --git a/freebsd/dependencies/tqt3-sqlite3-plugin/distinfo b/freebsd/dependencies/tqt3-sqlite3-plugin/distinfo
index 208abf927..a773186e5 100644
--- a/freebsd/dependencies/tqt3-sqlite3-plugin/distinfo
+++ b/freebsd/dependencies/tqt3-sqlite3-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619165068
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 1790a5794fb32f271f4e5ad9d9c719f79b8033d74ac055bd279c86c7393b075a
-SIZE (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 10964092
+TIMESTAMP = 1666313629
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 1f6884a7b66466255e79d8d5ac33183467a85396afbefc7d255b34663c3464f9
+SIZE (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 10960436
diff --git a/freebsd/dependencies/tqt3-sqlite3-plugin/pkg-plist b/freebsd/dependencies/tqt3-sqlite3-plugin/pkg-plist
index b2d2d1d0b..7c9f467ce 100644
--- a/freebsd/dependencies/tqt3-sqlite3-plugin/pkg-plist
+++ b/freebsd/dependencies/tqt3-sqlite3-plugin/pkg-plist
@@ -1,2 +1,2 @@
 lib/tqt3/plugins/sqldrivers/libqsql%%DB%%.so
-@dirrm lib/tqt3/plugins/sqldrivers
+@dir lib/tqt3/plugins/sqldrivers
diff --git a/freebsd/dependencies/tqt3/distinfo b/freebsd/dependencies/tqt3/distinfo
index dff8188a5..09651c4d5 100644
--- a/freebsd/dependencies/tqt3/distinfo
+++ b/freebsd/dependencies/tqt3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619163301
-SHA256 (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 1790a5794fb32f271f4e5ad9d9c719f79b8033d74ac055bd279c86c7393b075a
-SIZE (TDE/dependencies/tqt-x11-free_14.0.10.orig.tar.xz) = 10964092
+TIMESTAMP = 1666311050
+SHA256 (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 1f6884a7b66466255e79d8d5ac33183467a85396afbefc7d255b34663c3464f9
+SIZE (TDE/dependencies/tqt-x11-free_14.0.13.orig.tar.xz) = 10960436
diff --git a/freebsd/dependencies/tqt3/pkg-plist b/freebsd/dependencies/tqt3/pkg-plist
index 869e1e781..0e6cd9c71 100644
--- a/freebsd/dependencies/tqt3/pkg-plist
+++ b/freebsd/dependencies/tqt3/pkg-plist
@@ -2446,19 +2446,20 @@ share/pixmaps/tqtconfig.png
 %%DATADIR%%/translations/qt_ja.qm
 %%DATADIR%%/translations/qt_nb.qm
 %%DATADIR%%/translations/qt_pt-br.qm
+%%DATADIR%%/translations/qt_pt.qm
 %%DATADIR%%/translations/qt_ru.qm
 %%DATADIR%%/translations/qt_sk.qm
 %%DATADIR%%/translations/qt_zh-cn.qm
 %%DATADIR%%/translations/qt_zh-tw.qm
-@dirrm %%DATADIR%%/bin
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/doc/html
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%/phrasebooks
-@dirrmtry share/tqt3
-@dirrm lib/tqt3/plugins/designer
-@dirrm lib/tqt3/plugins
-@dirrm include/tqt3/private
-@dirrm include/tqt3
+@dir %%DATADIR%%/bin
+@dir %%DATADIR%%/lib
+@dir %%DATADIR%%/doc/html
+@dir %%DATADIR%%/doc
+@dir %%DATADIR%%/templates
+@dir %%DATADIR%%/translations
+@dir %%DATADIR%%/phrasebooks
+@dir share/tqt3
+@dir lib/tqt3/plugins/designer
+@dir lib/tqt3/plugins
+@dir include/tqt3/private
+@dir include/tqt3
diff --git a/freebsd/dependencies/tqtinterface/distinfo b/freebsd/dependencies/tqtinterface/distinfo
index b4dddbf5e..c01984cf7 100644
--- a/freebsd/dependencies/tqtinterface/distinfo
+++ b/freebsd/dependencies/tqtinterface/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619169099
-SHA256 (TDE/dependencies/libtqtinterface_14.0.10.orig.tar.xz) = b2b005b1b8e989403edcd188837cd97d9ccf20e46b8b296854d272f4a179165a
-SIZE (TDE/dependencies/libtqtinterface_14.0.10.orig.tar.xz) = 605784
+TIMESTAMP = 1666336978
+SHA256 (TDE/dependencies/libtqtinterface_14.0.13.orig.tar.xz) = aad8f9bc196a808854ca1fb8d53300568ba45586ddddafe531e5b54196f65a8e
+SIZE (TDE/dependencies/libtqtinterface_14.0.13.orig.tar.xz) = 574388
diff --git a/freebsd/dependencies/tqtinterface/pkg-plist b/freebsd/dependencies/tqtinterface/pkg-plist
index 607f598b1..2650617d0 100644
--- a/freebsd/dependencies/tqtinterface/pkg-plist
+++ b/freebsd/dependencies/tqtinterface/pkg-plist
@@ -391,5 +391,5 @@ lib/libtqt.so.4
 lib/libtqt.so.4.2.0
 libdata/pkgconfig/tqt.pc
 libdata/pkgconfig/tqtqui.pc
-@dirrm include/tqt/Qt
-@dirrm include/tqt
+@dir include/tqt/Qt
+@dir include/tqt
diff --git a/freebsd/libraries/kipi-plugins/distinfo b/freebsd/libraries/kipi-plugins/distinfo
index 41bb0dce1..2e6cd9dd3 100644
--- a/freebsd/libraries/kipi-plugins/distinfo
+++ b/freebsd/libraries/kipi-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619379209
-SHA256 (TDE/libraries/kipi-plugins-trinity_14.0.10.orig.tar.xz) = 089795a8ed4b06f39b5a9361578699f9a1a6df995a436e277e6573be8443c59a
-SIZE (TDE/libraries/kipi-plugins-trinity_14.0.10.orig.tar.xz) = 6614160
+TIMESTAMP = 1666521351
+SHA256 (TDE/libraries/kipi-plugins-trinity_14.0.13.orig.tar.xz) = 101999fb273bd3bef0b393b18687c55b106e672417743df634da51c72475370d
+SIZE (TDE/libraries/kipi-plugins-trinity_14.0.13.orig.tar.xz) = 6582012
diff --git a/freebsd/libraries/libkdcraw/Makefile b/freebsd/libraries/libkdcraw/Makefile
index 124e9e337..a22638ff9 100644
--- a/freebsd/libraries/libkdcraw/Makefile
+++ b/freebsd/libraries/libkdcraw/Makefile
@@ -14,9 +14,6 @@ CATEGORIES=		graphics devel
 DIST_SUBDIR=		TDE/libraries
 
 
-# Use gmake for automake build
-USES=		gmake
-
 BUILD_DEPENDS+=	${TDE_PREFIX}/lib/libtdecore.so:${PORTSDIR}/x11/trinity/core/tdelibs
 
 LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface
@@ -28,11 +25,13 @@ LIB_DEPENDS+=\
 # Build
 post-patch: tde-pathfix
 
-do-configure: tde-autotools-prepare
-	${TDE_AUTOTOOLS_CONFIGURE}
+do-configure: tde-cmake-prepare
+	${TDE_CMAKE_CONFIGURE} \
+	-DBUILD_ALL=ON \
+	-DWITH_ALL_OPTIONS=ON
 
-do-build: tde-autotools-build
+do-build: tde-cmake-build
 
-do-install: tde-autotools-install
+do-install: tde-cmake-install
 
 .include <bsd.port.mk>
diff --git a/freebsd/libraries/libkdcraw/distinfo b/freebsd/libraries/libkdcraw/distinfo
index bbe02d2a0..68df49485 100644
--- a/freebsd/libraries/libkdcraw/distinfo
+++ b/freebsd/libraries/libkdcraw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619361114
-SHA256 (TDE/libraries/libkdcraw-trinity_14.0.10.orig.tar.xz) = fbd21a5bc824a98e783f90d63a11f96a9ee6ebeb9e059458df5bfc2a13a09e35
-SIZE (TDE/libraries/libkdcraw-trinity_14.0.10.orig.tar.xz) = 548908
+TIMESTAMP = 1666521275
+SHA256 (TDE/libraries/libkdcraw-trinity_14.0.13.orig.tar.xz) = db44f7404d0a36a77bcd53d629ddf22f0cf2b3a59a9000ba2fa3c5f8ed0dcf14
+SIZE (TDE/libraries/libkdcraw-trinity_14.0.13.orig.tar.xz) = 266572
diff --git a/freebsd/libraries/libkdcraw/pkg-plist b/freebsd/libraries/libkdcraw/pkg-plist
index 0f8b40fee..8b3aed5ba 100644
--- a/freebsd/libraries/libkdcraw/pkg-plist
+++ b/freebsd/libraries/libkdcraw/pkg-plist
@@ -36,4 +36,5 @@ share/locale/sr/LC_MESSAGES/libkdcraw.mo
 share/locale/sr@Latn/LC_MESSAGES/libkdcraw.mo
 share/locale/sv/LC_MESSAGES/libkdcraw.mo
 share/locale/th/LC_MESSAGES/libkdcraw.mo
+share/locale/tr/LC_MESSAGES/libkdcraw.mo
 share/locale/uk/LC_MESSAGES/libkdcraw.mo
diff --git a/freebsd/libraries/libkexiv2/distinfo b/freebsd/libraries/libkexiv2/distinfo
index d047a36dc..a87822d12 100644
--- a/freebsd/libraries/libkexiv2/distinfo
+++ b/freebsd/libraries/libkexiv2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619361175
-SHA256 (TDE/libraries/libkexiv2-trinity_14.0.10.orig.tar.xz) = 1f625b4ea4e1724a78a5b231df4d82916f1876f4630dbf0e0b3a8e40659c9396
-SIZE (TDE/libraries/libkexiv2-trinity_14.0.10.orig.tar.xz) = 64404
+TIMESTAMP = 1666521302
+SHA256 (TDE/libraries/libkexiv2-trinity_14.0.13.orig.tar.xz) = 0f8487816613133671ddd1dde0c84035787634c6c0f5e2f7f6ee9244a23b53db
+SIZE (TDE/libraries/libkexiv2-trinity_14.0.13.orig.tar.xz) = 31672
diff --git a/freebsd/libraries/libkipi/distinfo b/freebsd/libraries/libkipi/distinfo
index f3247b5d6..fa869d301 100644
--- a/freebsd/libraries/libkipi/distinfo
+++ b/freebsd/libraries/libkipi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619361199
-SHA256 (TDE/libraries/libkipi-trinity_14.0.10.orig.tar.xz) = 5aafaa52ab9d92814cc843ede2e64336bdabd8959d6c9d3b5a3e1a7b6e4b3747
-SIZE (TDE/libraries/libkipi-trinity_14.0.10.orig.tar.xz) = 382504
+TIMESTAMP = 1666521325
+SHA256 (TDE/libraries/libkipi-trinity_14.0.13.orig.tar.xz) = 13db76f0ed4ffc30c997e18705b99434891f8593ca2bf30842271991ceaa55de
+SIZE (TDE/libraries/libkipi-trinity_14.0.13.orig.tar.xz) = 96512
diff --git a/freebsd/libraries/libksquirrel/Makefile b/freebsd/libraries/libksquirrel/Makefile
index 0f339d5e2..f7258c560 100644
--- a/freebsd/libraries/libksquirrel/Makefile
+++ b/freebsd/libraries/libksquirrel/Makefile
@@ -34,7 +34,7 @@ LIB_DEPENDS+=\
 		libgif.so:${PORTSDIR}/graphics/giflib \
 		libiconv.so:${PORTSDIR}/converters/libiconv \
 		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libIlmImf.so:${PORTSDIR}/graphics/openexr \
+		libOpenEXR.so:${PORTSDIR}/graphics/openexr \
 		libmng.so:${PORTSDIR}/graphics/libmng \
 		libnetpbm.so:${PORTSDIR}/graphics/netpbm \
 		librsvg-2.so:${PORTSDIR}/graphics/librsvg2 \
diff --git a/freebsd/libraries/libksquirrel/distinfo b/freebsd/libraries/libksquirrel/distinfo
index c61106d38..f89b83eb6 100644
--- a/freebsd/libraries/libksquirrel/distinfo
+++ b/freebsd/libraries/libksquirrel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619379672
-SHA256 (TDE/libraries/libksquirrel-trinity_14.0.10.orig.tar.xz) = dea7a20066bb8e61b1612d09698c11a13096edfdf20184d1d860b99bf0232f2d
-SIZE (TDE/libraries/libksquirrel-trinity_14.0.10.orig.tar.xz) = 787660
+TIMESTAMP = 1666523143
+SHA256 (TDE/libraries/libksquirrel-trinity_14.0.13.orig.tar.xz) = ce0fbc42a81bb061de977b3b58589d6a6106830cf7ca34dc43e03d4b3924aa1f
+SIZE (TDE/libraries/libksquirrel-trinity_14.0.13.orig.tar.xz) = 759596
diff --git a/freebsd/libraries/libksquirrel/pkg-plist b/freebsd/libraries/libksquirrel/pkg-plist
index a6de87028..763494177 100644
--- a/freebsd/libraries/libksquirrel/pkg-plist
+++ b/freebsd/libraries/libksquirrel/pkg-plist
@@ -293,3 +293,20 @@ share/ksquirrel-libs/libkls_svg.so.ui
 share/ksquirrel-libs/libkls_tiff.so.ui
 share/ksquirrel-libs/libkls_xcf.so.ui
 share/ksquirrel-libs/rgbmap
+share/man/man1/ksquirrel-libs-camera2ppm.1.gz
+share/man/man1/ksquirrel-libs-dcraw.1.gz
+share/man/man1/ksquirrel-libs-dicom2png.1.gz
+share/man/man1/ksquirrel-libs-fig2ppm.1.gz
+share/man/man1/ksquirrel-libs-iff2ppm.1.gz
+share/man/man1/ksquirrel-libs-leaf2ppm.1.gz
+share/man/man1/ksquirrel-libs-ljpeg2ppm-s.1.gz
+share/man/man1/ksquirrel-libs-ljpeg2ppm.1.gz
+share/man/man1/ksquirrel-libs-mac2ppm.1.gz
+share/man/man1/ksquirrel-libs-neo2ppm.1.gz
+share/man/man1/ksquirrel-libs-pi12ppm.1.gz
+share/man/man1/ksquirrel-libs-pi32ppm.1.gz
+share/man/man1/ksquirrel-libs-svg2png.1.gz
+share/man/man1/ksquirrel-libs-ttf2pnm.1.gz
+share/man/man1/ksquirrel-libs-utah2ppm.1.gz
+share/man/man1/ksquirrel-libs-xcf2pnm.1.gz
+share/man/man1/ksquirrel-libs-xim2ppm.1.gz
diff --git a/freebsd/libraries/libtdeldap/distinfo b/freebsd/libraries/libtdeldap/distinfo
index 7376373c0..fdf31fb2a 100644
--- a/freebsd/libraries/libtdeldap/distinfo
+++ b/freebsd/libraries/libtdeldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619361220
-SHA256 (TDE/libraries/libtdeldap-trinity_14.0.10.orig.tar.xz) = fe3a6b7687e0ff6bca577043063133237ec01ed9cb9d88d7ec3bdb48ed0b4cad
-SIZE (TDE/libraries/libtdeldap-trinity_14.0.10.orig.tar.xz) = 64568
+TIMESTAMP = 1666521364
+SHA256 (TDE/libraries/libtdeldap-trinity_14.0.13.orig.tar.xz) = 1195e2a6f75e910453f01952374aec0de40cf00bc21e85a50aaeb94e190b2ada
+SIZE (TDE/libraries/libtdeldap-trinity_14.0.13.orig.tar.xz) = 31804
diff --git a/freebsd/trinity.port.mk b/freebsd/trinity.port.mk
index 9447df31b..cc6819266 100644
--- a/freebsd/trinity.port.mk
+++ b/freebsd/trinity.port.mk
@@ -1,10 +1,10 @@
 ### General information
 
-TDE_VERSION?=	14.0.10
+TDE_VERSION?=	14.0.13
 TDE_PREFIX=	/opt/trinity
 PREFIX=		${TDE_PREFIX}
 
-HOMEPAGE=		http://www.trinitydesktop.org/
+HOMEPAGE=		https://www.trinitydesktop.org/
 MAINTAINER?=		slavek.banko@axis.cz
 MASTER_SITE_TDE?=	http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-r14.0.x/pool/main/%SUBDIR%/ \
 			http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-sb/pool/main-r14/%SUBDIR%/
@@ -39,8 +39,7 @@ EXTRACT_DEPENDS=\
 BUILD_DEPENDS=\
 		automake:${PORTSDIR}/devel/automake \
 		libtool:${PORTSDIR}/devel/libtool \
-		cmake:${PORTSDIR}/devel/cmake \
-		ninja:${PORTSDIR}/devel/ninja \
+		${LOCALBASE}/share/cmake/Modules/TDEMacros.cmake:${PORTSDIR}/x11/trinity/common/cmake \
 		gettext:${PORTSDIR}/devel/gettext \
 		gfind:${PORTSDIR}/misc/findutils \
 		gsed:${PORTSDIR}/textproc/gsed \
diff --git a/raspbian/raspbian-bookworm b/raspbian/raspbian-bookworm
new file mode 120000
index 000000000..99541159c
--- /dev/null
+++ b/raspbian/raspbian-bookworm
@@ -0,0 +1 @@
+../debian/bookworm
\ No newline at end of file
diff --git a/redhat/Makefile b/redhat/Makefile
index a90f04b34..a7f4aeae0 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.0})
+TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.13})
 TDE_GIT_DIR := $(shell cd ../../tde; pwd)
 TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd)
 RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))"
@@ -23,128 +23,139 @@ buildpkg = \
   echo
 
 
-all:	dependencies main libraries applications i18n meta
-dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls tqscintilla 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 codeine 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 keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora 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
+all: common dependencies main libraries applications i18n meta external
+common: cmake
+dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav polkit-tqt sip4-tqt tqca tqscintilla 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 pytde
+applications: abakus amarok basket bibletime codeine 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 keximdb kftpgrabber kile kima kiosktool kkbswitch klamav klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice kompose konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab polkit-agent-tde potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-appinfo tdeio-apt tdeio-ftps tdeio-gopher tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tdesshaskpass tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal twin-style-dekorator twin-style-machbunt twin-style-suse2 wlassistant yakuake
+i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
+### Trinity Common
+
+cmake:
+	$(call buildpkg,common/cmake)
 
 ### Trinity Dependencies
-akode:	tqtinterface trinity-filesystem
+akode: tqtinterface trinity-filesystem
 	$(call buildpkg,dependencies/akode)
 
-arts:	tqtinterface trinity-filesystem esound
+arts: tqtinterface trinity-filesystem esound
 	$(call buildpkg,dependencies/arts)
 
-avahi-tqt:	tqtinterface
+avahi-tqt: tqtinterface
 	$(call buildpkg,dependencies/avahi-tqt)
 
-dbus-1-tqt:	tqtinterface
+dbus-1-tqt: tqtinterface
 	$(call buildpkg,dependencies/dbus-1-tqt)
 
 dbus-tqt: tqtinterface
 	$(call buildpkg,dependencies/dbus-tqt)
 
-libart_lgpl:	tqtinterface
+libart_lgpl: tqtinterface
 	$(call buildpkg,dependencies/libart-lgpl)
 
 libcaldav: tqtinterface
 	$(call buildpkg,dependencies/libcaldav)
 
-libcarddav:	tqtinterface
+libcarddav: tqtinterface
 	$(call buildpkg,dependencies/libcarddav)
 
-python-tqt: sip4-tqt tdelibs tqscintilla
-	$(call buildpkg,dependencies/python-tqt)
+polkit-tqt: tqtinterface dbus-1-tqt
+ifeq (,$(filter $(DIST), .el5 .el6 ))
+	$(call buildpkg,dependencies/polkit-tqt)
+endif
+
+pytqt: sip4-tqt tdelibs tqscintilla
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
+	$(call buildpkg,dependencies/pytqt)
+endif
 
 sip4-tqt:
+ifeq (,$(filter $(DIST), .el9 ))
 	$(call buildpkg,dependencies/sip4-tqt)
+endif
 
-tqca:	tqtinterface
+tqca: tqtinterface
 	$(call buildpkg,dependencies/tqca)
 
-tqca-tls: tqtinterface tqca
-	$(call buildpkg,dependencies/tqca-tls)
-
-tqscintilla: tqca-tls tdelibs
+tqscintilla: tqca tdelibs
 	$(call buildpkg,dependencies/tqscintilla)
 
 tqt3:
 	$(call buildpkg,dependencies/tqt3)
 
-tqtinterface:	tqt3
+tqtinterface: tqt3
 	$(call buildpkg,dependencies/tqtinterface)
 
 # Main packages
-tdeaccessibility:	tdebase tdemultimedia
-	$(call buildpkg,main/tdeaccessibility)
+tdeaccessibility: tdebase tdemultimedia
+	$(call buildpkg,core/tdeaccessibility)
 
-tdeaddons:	tdebase tdegames tdemultimedia tdenetwork tdepim
-	$(call buildpkg,main/tdeaddons)
+tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim
+	$(call buildpkg,core/tdeaddons)
 
-tdeadmin:	tdebase
-	$(call buildpkg,main/tdeadmin)
+tdeadmin: tdebase
+	$(call buildpkg,core/tdeadmin)
 
-tdeartwork:	tdebase
-	$(call buildpkg,main/tdeartwork)
+tdeartwork: tdebase
+	$(call buildpkg,core/tdeartwork)
 
-tdebase:	tdelibs htdig fileshareset pinentry-tqt
-	$(call buildpkg,main/tdebase)
+tdebase: tdelibs htdig fileshareset pinentry-tqt
+	$(call buildpkg,core/tdebase)
 
-tdebindings:	tdebase tqscintilla
-	$(call buildpkg,main/tdebindings)
+tdebindings: tdebase tqscintilla
+	$(call buildpkg,core/tdebindings)
 
-tdeedu:	tdebase
-	$(call buildpkg,main/tdeedu)
+tdeedu: tdebase
+	$(call buildpkg,core/tdeedu)
 
-tdegames:	tdebase tdemultimedia
-	$(call buildpkg,main/tdegames)
+tdegames: tdebase tdemultimedia
+	$(call buildpkg,core/tdegames)
 
-tdegraphics:	tdebase lcms
-	$(call buildpkg,main/tdegraphics)
+tdegraphics: tdebase lcms
+	$(call buildpkg,core/tdegraphics)
 
-tdelibs:	brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl
-	$(call buildpkg,main/tdelibs)
+tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl
+	$(call buildpkg,core/tdelibs)
 
-tdemultimedia:	tdebase akode
-	$(call buildpkg,main/tdemultimedia)
+tdemultimedia: tdebase akode
+	$(call buildpkg,core/tdemultimedia)
 
-tdenetwork:	tdebase rdesktop
-	$(call buildpkg,main/tdenetwork)
+tdenetwork: tdebase rdesktop
+	$(call buildpkg,core/tdenetwork)
 
-tdepim:	tdebase libcaldav libcarddav
-	$(call buildpkg,main/tdepim)
+tdepim: tdebase libcaldav libcarddav
+	$(call buildpkg,core/tdepim)
 
-tdesdk:		tdebase tdebindings
-	$(call buildpkg,main/tdesdk)
+tdesdk: tdebase tdebindings tdepim
+	$(call buildpkg,core/tdesdk)
 
-tdetoys:	tdebase
-	$(call buildpkg,main/tdetoys)
+tdetoys: tdebase
+	$(call buildpkg,core/tdetoys)
 
-tdeutils:	tdebase
-	$(call buildpkg,main/tdeutils)
+tdeutils: tdebase
+	$(call buildpkg,core/tdeutils)
 
-tdevelop:	tdebase tdesdk
-	$(call buildpkg,main/tdevelop)
+tdevelop: tdebase tdesdk
+	$(call buildpkg,core/tdevelop)
 
-tdewebdev:	tdebase tdesdk
-	$(call buildpkg,main/tdewebdev)
+tdewebdev: tdebase tdesdk
+	$(call buildpkg,core/tdewebdev)
 
 ### 3rd party libraries and tools
 brp-check-trinity:
-ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw ))
+ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/brp-check-trinity)
 endif
 
 esound:
-ifneq (,$(filter $(DIST), .el8 .mga6 .mga7 .mga8 .oss151 .oss152 .osstw ))
+ifneq (,$(filter $(DIST), .mga6 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/esound)
 endif
 
 htdig:
-ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 .mga8 ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga6 .mga7 .mga8 ))
 	$(call buildpkg,extras/htdig)
 endif
 
@@ -154,7 +165,7 @@ ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw ))
 endif
 
 lcms:
-ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .mga8 .oss151 .oss152 .osstw ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .mga7 .mga8 .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/lcms)
 endif
 
@@ -162,7 +173,7 @@ libbeagle:
 	$(call buildpkg,3rdparty/libbeagle)
 
 mp4v2:
-ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw ))
+ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw ))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
@@ -184,436 +195,471 @@ ifneq (,$(filter $(DIST),.oss150 .oss151))
 endif
 
 wv2:
-ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 .fc34))
+ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .el9 .fc30 .fc31 .fc32 .fc33 .fc34 .fc35 .fc36 .fc37))
 	$(call buildpkg,3rdparty/wv2)
 endif
 
 
 ### Trinity Libraries
-kipi-plugins:	tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
+kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi
 	$(call buildpkg,libraries/kipi-plugins)
 
-libkdcraw:	tqtinterface lcms
+libkdcraw: tqtinterface lcms
 	$(call buildpkg,libraries/libkdcraw)
 
-libkexiv2:	tqtinterface tdelibs
+libkexiv2: tqtinterface tdelibs
 	$(call buildpkg,libraries/libkexiv2)
 
-libkipi:	tqtinterface
+libkipi: tqtinterface
 	$(call buildpkg,libraries/libkipi)
 
-libksquirrel:	tdelibs
+libksquirrel: tdelibs
 	$(call buildpkg,libraries/libksquirrel)
 
-libtdeldap:	tqtinterface
+libtdeldap: tqtinterface
 	$(call buildpkg,libraries/libtdeldap)
 
-libtqt-perl:	tqtinterface
+libtqt-perl: tqtinterface
 	$(call buildpkg,libraries/libtqt-perl)
 
-mlt:	tqtinterface
+mlt: tqtinterface
 	$(call buildpkg,libraries/mlt)
 
-pytdeextensions:	tqtinterface python-trinity
+pytdeextensions: tqtinterface pytde
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
 	$(call buildpkg,libraries/pytdeextensions)
+endif
 
-python-trinity:	tqtinterface python-tqt
-	$(call buildpkg,libraries/python-trinity)
+pytde: tqtinterface pytqt
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
+	$(call buildpkg,libraries/pytde)
+endif
 
 ### Trinity Applications
-abakus:	tdebase
-	$(call buildpkg,applications/abakus)
+abakus: tdebase
+	$(call buildpkg,applications/utilities/abakus)
 
-adept:	tdebase
-	$(call buildpkg,applications/adept)
+adept: tdebase
+	$(call buildpkg,applications/system/adept)
 
-amarok:	tdebase mp4v2
-	$(call buildpkg,applications/amarok)
+amarok: tdebase mp4v2
+	$(call buildpkg,applications/multimedia/amarok)
 
-basket:	tdebase tdepim
-	$(call buildpkg,applications/basket)
+basket: tdebase tdepim
+	$(call buildpkg,applications/office/basket)
 
-bibletime:	tdebase
-	$(call buildpkg,applications/bibletime)
+bibletime: tdebase
+	$(call buildpkg,applications/misc/bibletime)
 
-codeine:	tdebase
-	$(call buildpkg,applications/codeine)
+codeine: tdebase
+	$(call buildpkg,applications/multimedia/codeine)
 
-compizconfig-backend-kconfig:	tdebase
-	$(call buildpkg,applications/compizconfig-backend-kconfig)
+compizconfig-backend-kconfig: tdebase
+	$(call buildpkg,applications/misc/compizconfig-backend-kconfig)
 
-desktop-effects-tde:	tdebase
-	$(call buildpkg,applications/desktop-effects-tde)
+desktop-effects-tde: tdebase
+	$(call buildpkg,applications/misc/desktop-effects-tde)
 
-digikam:	tdebase libkdcraw libkexiv2 libkipi libksquirrel
-	$(call buildpkg,applications/digikam)
+digikam: tdebase libkdcraw libkexiv2 libkipi libksquirrel
+	$(call buildpkg,applications/graphics/digikam)
 
-dolphin:	tdebase
-	$(call buildpkg,applications/dolphin)
+dolphin: tdebase
+	$(call buildpkg,applications/system/dolphin)
 
-filelight:	tdebase
-	$(call buildpkg,applications/filelight)
+filelight: tdebase
+	$(call buildpkg,applications/utilities/filelight)
 
-filelight-l10n:	tdebase
+filelight-l10n: tdebase
 	$(call buildpkg,applications/filelight-l10n)
 
-fusion-icon:	tdebase
-	$(call buildpkg,applications/fusion-icon)
+fusion-icon: tdebase
+	$(call buildpkg,applications/misc/fusion-icon)
 
-gtk3-tqt-engine:	tdebase
+gtk3-tqt-engine: tdebase
 ifeq (,$(filter $(DIST),.el5 .el6))
-	$(call buildpkg,applications/gtk3-tqt-engine)
+	$(call buildpkg,applications/themes/gtk3-tqt-engine)
 endif
 
-gtk-qt-engine:	tdebase
+gtk-qt-engine: tdebase
 ifeq (,$(filter $(DIST),.el5))
-	$(call buildpkg,applications/gtk-qt-engine)
+	$(call buildpkg,applications/themes/gtk-qt-engine)
 endif
 
-gwenview:	tdebase
-	$(call buildpkg,applications/gwenview)
+gwenview: tdebase
+	$(call buildpkg,applications/graphics/gwenview)
 
-k3b:	tdebase
-	$(call buildpkg,applications/k3b)
+k3b: tdebase
+	$(call buildpkg,applications/multimedia/k3b)
 
-k9copy:	tdebase k3b
-	$(call buildpkg,applications/k9copy)
+k9copy: tdebase k3b
+	$(call buildpkg,applications/multimedia/k9copy)
 
-kaffeine:	tdebase
-	$(call buildpkg,applications/kaffeine)
+kaffeine: tdebase
+	$(call buildpkg,applications/multimedia/kaffeine)
 
-kaffeine-mozilla:	tdebase kaffeine
-	$(call buildpkg,applications/kaffeine-mozilla)
+kaffeine-mozilla: tdebase kaffeine
+	$(call buildpkg,applications/multimedia/kaffeine-mozilla)
 
-kasablanca:	tdebase
-	$(call buildpkg,applications/kasablanca)
+kasablanca: tdebase
+	$(call buildpkg,applications/internet/kasablanca)
 
-katapult:	tdebase
-	$(call buildpkg,applications/katapult)
+katapult: tdebase
+	$(call buildpkg,applications/system/katapult)
 
-kbarcode:	tdebase
-	$(call buildpkg,applications/kbarcode)
+kbarcode: tdebase
+	$(call buildpkg,applications/utilities/kbarcode)
 
-kbfx:	tdebase
-	$(call buildpkg,applications/kbfx)
+kbfx: tdebase
+	$(call buildpkg,applications/system/kbfx)
 
-kbibtex:	tdebase
-	$(call buildpkg,applications/kbibtex)
+kbibtex: tdebase
+	$(call buildpkg,applications/office/kbibtex)
 
-kbiff:	tdebase
-	$(call buildpkg,applications/kbiff)
+kbiff: tdebase
+	$(call buildpkg,applications/internet/kbiff)
 
-kbookreader:	tdebase
-	$(call buildpkg,applications/kbookreader)
+kbookreader: tdebase
+	$(call buildpkg,applications/office/kbookreader)
 
-kchmviewer:	tdebase
-	$(call buildpkg,applications/kchmviewer)
+kchmviewer: tdebase
+	$(call buildpkg,applications/utilities/kchmviewer)
 
-kcmautostart:	tdebase
-	$(call buildpkg,applications/kcmautostart)
+kcmautostart: tdebase
+	$(call buildpkg,applications/system/kcmautostart)
 
-kcmldap:	tdebase libtdeldap
-	$(call buildpkg,applications/kcmldap)
+kcmldap: tdebase libtdeldap
+	$(call buildpkg,applications/misc/kcmldap)
 
-kcmldapcontroller:	tdebase kcmldap
-	$(call buildpkg,applications/kcmldapcontroller)
+kcmldapcontroller: tdebase kcmldap
+	$(call buildpkg,applications/misc/kcmldapcontroller)
 
-kcmldapmanager:	tdebase kcmldap
-	$(call buildpkg,applications/kcmldapmanager)
+kcmldapmanager: tdebase kcmldap
+	$(call buildpkg,applications/misc/kcmldapmanager)
 
-kcpuload:	tdebase
-	$(call buildpkg,applications/kcpuload)
+kcpuload: tdebase
+	$(call buildpkg,applications/utilities/kcpuload)
 
-kdbg:	tdebase
-	$(call buildpkg,applications/kdbg)
+kdbg: tdebase
+	$(call buildpkg,applications/development/kdbg)
 
-kdbusnotification:	tdebase
-	$(call buildpkg,applications/kdbusnotification)
+kdbusnotification: tdebase
+	$(call buildpkg,applications/system/kdbusnotification)
 
-kdiff3:	tdebase
-	$(call buildpkg,applications/kdiff3)
+kdiff3: tdebase
+	$(call buildpkg,applications/development/kdiff3)
 
-kdirstat:	tdebase
-	$(call buildpkg,applications/kdirstat)
+kdirstat: tdebase
+	$(call buildpkg,applications/utilities/kdirstat)
 
-kdpkg:	tdebase
-	$(call buildpkg,applications/kdpkg)
+kdpkg: tdebase
+	$(call buildpkg,applications/settings/kdpkg)
 
-keep:	tdebase rdiff-backup
-	$(call buildpkg,applications/keep)
+keep: tdebase rdiff-backup
+	$(call buildpkg,applications/utilities/keep)
 
-kerberostray:	tdebase
-	$(call buildpkg,applications/kerberostray)
+kerberostray: tdebase
+	$(call buildpkg,applications/misc/kerberostray)
 
-keximdb:	tdebase koffice
-	$(call buildpkg,applications/keximdb)
+keximdb: tdebase koffice
+	$(call buildpkg,applications/office/keximdb)
 
-kftpgrabber:	tdebase
-	$(call buildpkg,applications/kftpgrabber)
+kftpgrabber: tdebase
+	$(call buildpkg,applications/internet/kftpgrabber)
 
-kgtk-qt3:	tdebase
-	$(call buildpkg,applications/kgtk-qt3)
+kgtk-qt3: tdebase
+	$(call buildpkg,applications/themes/kgtk-qt3)
 
-kile:	tdebase
-	$(call buildpkg,applications/kile)
+kile: tdebase
+	$(call buildpkg,applications/office/kile)
 
-kima:	tdebase
-	$(call buildpkg,applications/kima)
+kima: tdebase
+	$(call buildpkg,applications/settings/kima)
 
-kiosktool:	tdebase
-	$(call buildpkg,applications/kiosktool)
+kiosktool: tdebase
+	$(call buildpkg,applications/settings/kiosktool)
 
-kkbswitch:	tdebase
-	$(call buildpkg,applications/kkbswitch)
+kkbswitch: tdebase
+	$(call buildpkg,applications/settings/kkbswitch)
 
-klamav:	tdebase
+klamav: tdebase
 # Requires clamav >= 0.101.0
 ifeq (,$(filter $(DIST), .el5 .el6 .mga6))
-	$(call buildpkg,applications/klamav)
+	$(call buildpkg,applications/system/klamav)
 endif
 
-klcddimmer:	tdebase
-	$(call buildpkg,applications/klcddimmer)
+klcddimmer: tdebase
+	$(call buildpkg,applications/settings/klcddimmer)
 
-kmplayer:	tdebase
-	$(call buildpkg,applications/kmplayer)
+kmplayer: tdebase
+	$(call buildpkg,applications/multimedia/kmplayer)
 
-kmyfirewall:	tdebase
-	$(call buildpkg,applications/kmyfirewall)
+kmyfirewall: tdebase
+	$(call buildpkg,applications/settings/kmyfirewall)
 
-kmymoney:	tdebase recode
-	$(call buildpkg,applications/kmymoney)
+kmymoney: tdebase recode
+	$(call buildpkg,applications/office/kmymoney)
 
-knemo:	tdebase
-	$(call buildpkg,applications/knemo)
+knemo: tdebase
+	$(call buildpkg,applications/system/knemo)
 
-knetload:	tdebase
-	$(call buildpkg,applications/knetload)
+knetload: tdebase
+	$(call buildpkg,applications/system/knetload)
 
-knetstats:	tdebase
-	$(call buildpkg,applications/knetstats)
+knetstats: tdebase
+	$(call buildpkg,applications/system/knetstats)
 
-knetworkmanager8:	tdebase
+knetworkmanager8: tdebase
 ifneq (,$(filter $(DIST),.el6))
-	$(call buildpkg,applications/knetworkmanager8)
+	$(call buildpkg,applications/settings/knetworkmanager8)
 endif
 
-knights:	tdebase
-	$(call buildpkg,applications/knights)
+knights: tdebase
+	$(call buildpkg,applications/games/knights)
 
-knmap:	tdebase
-	$(call buildpkg,applications/knmap)
+knmap: tdebase
+	$(call buildpkg,applications/internet/knmap)
 
-knowit:	tdebase
-	$(call buildpkg,applications/knowit)
+knowit: tdebase
+	$(call buildpkg,applications/office/knowit)
 
-knutclient:	tdebase
-	$(call buildpkg,applications/knutclient)
+knutclient: tdebase
+	$(call buildpkg,applications/utilities/knutclient)
 
-koffice:	tdebase tdegraphics wv2
-	$(call buildpkg,applications/koffice)
+koffice: tdebase tdegraphics wv2
+	$(call buildpkg,applications/office/koffice)
 
-kompose:	tdebase
-	$(call buildpkg,applications/kompose)
+kompose: tdebase
+	$(call buildpkg,applications/utilities/kompose)
 
-konversation:	tdebase
-	$(call buildpkg,applications/konversation)
+konversation: tdebase
+	$(call buildpkg,applications/internet/konversation)
 
-kooldock:	tdebase
-	$(call buildpkg,applications/kooldock)
+kooldock: tdebase
+	$(call buildpkg,applications/system/kooldock)
 
-kopete-otr:	tdebase tdenetwork
-	$(call buildpkg,applications/kopete-otr)
+kopete-otr: tdebase tdenetwork
+	$(call buildpkg,applications/internet/kopete-otr)
 
-kpicosim:	tdebase
-	$(call buildpkg,applications/kpicosim)
+kpicosim: tdebase
+	$(call buildpkg,applications/development/kpicosim)
 
-kpilot:	tdebase tdepim
-ifeq (,$(filter $(DIST),.el5))
-	$(call buildpkg,applications/kpilot)
+kpilot: tdebase tdepim
+ifeq (,$(filter $(DIST),.el5 .oss154 .osstw))
+	$(call buildpkg,applications/office/kpilot)
 endif
 
-kpowersave:	tdebase
-	$(call buildpkg,applications/kpowersave)
+kpowersave: tdebase
+	$(call buildpkg,applications/system/kpowersave)
 
-krecipes:	tdebase
-	$(call buildpkg,applications/krecipes)
+krecipes: tdebase
+	$(call buildpkg,applications/misc/krecipes)
 
-krename:	tdebase
-	$(call buildpkg,applications/krename)
+krename: tdebase
+	$(call buildpkg,applications/utilities/krename)
 
-krusader:	tdebase tdebindings
-	$(call buildpkg,applications/krusader)
+krusader: tdebase tdebindings
+	$(call buildpkg,applications/system/krusader)
 
-kscope:	tdebase
-	$(call buildpkg,applications/kscope)
+kscope: tdebase
+	$(call buildpkg,applications/development/kscope)
 
-ksensors:	tdebase
-	$(call buildpkg,applications/ksensors)
+ksensors: tdebase
+	$(call buildpkg,applications/utilities/ksensors)
 
-kshowmail:	tdebase tdepim
-	$(call buildpkg,applications/kshowmail)
+kshowmail: tdebase tdepim
+	$(call buildpkg,applications/internet/kshowmail)
 
-kshutdown:	tdebase
-	$(call buildpkg,applications/kshutdown)
+kshutdown: tdebase
+	$(call buildpkg,applications/system/kshutdown)
 
-ksplash-engine-moodin:	tdebase
-	$(call buildpkg,applications/ksplash-engine-moodin)
+ksplash-engine-moodin: tdebase
+	$(call buildpkg,applications/themes/ksplash-engine-moodin)
 
-ksquirrel:	tdebase libkipi libksquirrel
-	$(call buildpkg,applications/ksquirrel)
+ksquirrel: tdebase libkipi libksquirrel
+	$(call buildpkg,applications/graphics/ksquirrel)
 
-kstreamripper:	tdebase
-	$(call buildpkg,applications/kstreamripper)
+kstreamripper: tdebase
+	$(call buildpkg,applications/internet/kstreamripper)
 
-ksystemlog:	tdebase
-	$(call buildpkg,applications/ksystemlog)
+ksystemlog: tdebase
+	$(call buildpkg,applications/system/ksystemlog)
 
-ktechlab:	tdebase
-	$(call buildpkg,applications/ktechlab)
+ktechlab: tdebase
+	$(call buildpkg,applications/development/ktechlab)
 
-ktorrent:	tdebase
-	$(call buildpkg,applications/ktorrent)
+ktorrent: tdebase
+	$(call buildpkg,applications/internet/ktorrent)
 
-kvirc:	tdebase
-	$(call buildpkg,applications/kvirc)
+kvirc: tdebase
+	$(call buildpkg,applications/internet/kvirc)
 
-kvkbd:	tdebase
-	$(call buildpkg,applications/kvkbd)
+kvkbd: tdebase
+	$(call buildpkg,applications/system/kvkbd)
 
-kvpnc:	tdebase
-	$(call buildpkg,applications/kvpnc)
+kvpnc: tdebase
+	$(call buildpkg,applications/internet/kvpnc)
 
-kxmleditor:	tdebase
-	$(call buildpkg,applications/kxmleditor)
+kxmleditor: tdebase
+	$(call buildpkg,applications/development/kxmleditor)
 
 mathemagics: tdebase
-	$(call buildpkg,applications/mathemagics)
+	$(call buildpkg,applications/utilities/mathemagics)
 
-mplayerthumbs:	tdebase
-	$(call buildpkg,applications/mplayerthumbs)
+mplayerthumbs: tdebase
+ifeq (,$(filter $(DIST),.el9))
+	$(call buildpkg,applications/multimedia/mplayerthumbs)
+endif
 
-piklab:	tdebase
-	$(call buildpkg,applications/piklab)
+piklab: tdebase
+	$(call buildpkg,applications/development/piklab)
 
-potracegui:	tdebase
-	$(call buildpkg,applications/potracegui)
+polkit-agent-tde: tdebase
+ifeq (,$(filter $(DIST), .el5 .el6 ))
+	$(call buildpkg,applications/system/polkit-agent-tde)
+endif
+
+potracegui: tdebase
+	$(call buildpkg,applications/graphics/potracegui)
 
 qalculate-tde:
-	$(call buildpkg,applications/qalculate-tde)
+	$(call buildpkg,applications/utilities/qalculate-tde)
 
-qt4-tqt-theme-engine:	tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el8 .osstw))
-	$(call buildpkg,applications/qt4-tqt-theme-engine)
+qt4-tqt-theme-engine: tdebase
+ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .oss153 .oss154 .osstw))
+	$(call buildpkg,applications/themes/qt4-tqt-theme-engine)
 endif
 
-rosegarden:	tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8))
-	$(call buildpkg,applications/rosegarden)
+rosegarden: tdebase
+ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8 .el9))
+	$(call buildpkg,applications/multimedia/rosegarden)
 endif
 
-smartcardauth:	tdebase
-	$(call buildpkg,applications/smartcardauth)
+smartcardauth: tdebase
+	$(call buildpkg,applications/system/smartcardauth)
 
-smb4k:	tdebase
-	$(call buildpkg,applications/smb4k)
+smb4k: tdebase
+	$(call buildpkg,applications/internet/smb4k)
 
-soundkonverter:	tdebase
-	$(call buildpkg,applications/soundkonverter)
+soundkonverter: tdebase
+	$(call buildpkg,applications/multimedia/soundkonverter)
 
 tastymenu:
-	$(call buildpkg,applications/tastymenu)
+	$(call buildpkg,applications/system/tastymenu)
+
+tdedocker: tdebase
+	$(call buildpkg,applications/system/tdedocker)
 
-tdedocker:	tdebase
-	$(call buildpkg,applications/tdedocker)
+tde-guidance: tdebase pytdeextensions
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
+	$(call buildpkg,applications/settings/tde-guidance)
+endif
+
+tdeio-appinfo: tdebase
+ifeq (,$(filter $(DIST), .el5 .el6 ))
+	$(call buildpkg,applications/tdeio/tdeio-appinfo)
+endif
 
-tde-guidance:	tdebase pytdeextensions
-	$(call buildpkg,applications/tde-guidance)
+tdeio-apt: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-apt)
 
-tdeio-apt:	tdebase
-	$(call buildpkg,applications/tdeio-apt)
+tdeio-ftps: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-ftps)
 
-tdeio-ftps:	tdebase
-	$(call buildpkg,applications/tdeio-ftps)
+tdeio-gopher: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-gopher)
 
-tdeio-locate:	tdebase
-	$(call buildpkg,applications/tdeio-locate)
+tdeio-locate: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-locate)
 
-tdeio-sword:	tdebase
-	$(call buildpkg,applications/tdeio-sword)
+tdeio-sword: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-sword)
 
-tdeio-umountwrapper:	tdebase
-	$(call buildpkg,applications/tdeio-umountwrapper)
+tdeio-umountwrapper: tdebase
+	$(call buildpkg,applications/tdeio/tdeio-umountwrapper)
 
-tdenetworkmanager:	tdebase
+tdenetworkmanager: tdebase
 ifeq (,$(filter $(DIST),.el5 .el6))
-	$(call buildpkg,applications/tdenetworkmanager)
+	$(call buildpkg,applications/settings/tdenetworkmanager)
 endif
 
-tdepacman:	tdebase
-	$(call buildpkg,applications/tdepacman)
+tdepacman: tdebase
+	$(call buildpkg,applications/games/tdepacman)
 
-tdepowersave:	tdebase
+tdepowersave: tdebase
 ifeq (,$(filter $(DIST),.el5))
-	$(call buildpkg,applications/tdepowersave)
+	$(call buildpkg,applications/system/tdepowersave)
 endif
 
-tderadio:	tdebase
-	$(call buildpkg,applications/tderadio)
+tderadio: tdebase
+	$(call buildpkg,applications/multimedia/tderadio)
 
-tde-style-baghira:	tdebase
-	$(call buildpkg,applications/tde-style-baghira)
+tdesshaskpass: tdebase
+	$(call buildpkg,applications/system/tdesshaskpass)
 
-tde-style-domino:	tdebase
-	$(call buildpkg,applications/tde-style-domino)
+tde-style-baghira: tdebase
+	$(call buildpkg,applications/themes/tde-style-baghira)
 
-tde-style-ia-ora:	tdebase
-	$(call buildpkg,applications/tde-style-ia-ora)
+tde-style-domino: tdebase
+	$(call buildpkg,applications/themes/tde-style-domino)
 
-tde-style-lipstik:	tdebase
-	$(call buildpkg,applications/tde-style-lipstik)
+tde-style-ia-ora: tdebase
+	$(call buildpkg,applications/themes/tde-style-ia-ora)
 
-tde-style-qtcurve:	tdebase
-	$(call buildpkg,applications/tde-style-qtcurve)
+tde-style-lipstik: tdebase
+	$(call buildpkg,applications/themes/tde-style-lipstik)
 
-tdesudo:	tdebase
-	$(call buildpkg,applications/tdesudo)
+tde-style-qtcurve: tdebase
+	$(call buildpkg,applications/themes/tde-style-qtcurve)
 
-tdesvn:	tdebase
-	$(call buildpkg,applications/tdesvn)
+tdesudo: tdebase
+	$(call buildpkg,applications/settings/tdesudo)
 
-tde-systemsettings:	tdebase
-	$(call buildpkg,applications/tde-systemsettings)
+tdesvn: tdebase
+	$(call buildpkg,applications/development/tdesvn)
 
-tdmtheme:	tdebase
+tde-systemsettings: tdebase
+ifeq (,$(filter $(DIST), .el9 .oss154 ))
+	$(call buildpkg,applications/settings/tde-systemsettings)
+endif
+
+tdmtheme: tdebase
 	$(call buildpkg,applications/tdmtheme)
 
-tellico:	tdebase tdegraphics tdemultimedia tdepim
-	$(call buildpkg,applications/tellico)
+tellico: tdebase tdegraphics tdemultimedia tdepim
+	$(call buildpkg,applications/office/tellico)
+
+tork: tdebase
+	$(call buildpkg,applications/internet/tork)
+
+twin-style-crystal: tdebase
+	$(call buildpkg,applications/themes/twin-style-crystal)
+
+twin-style-dekorator: tdebase
+	$(call buildpkg,applications/themes/twin-style-dekorator)
 
-tork:	tdebase
-	$(call buildpkg,applications/tork)
+twin-style-machbunt: tdebase
+	$(call buildpkg,applications/themes/twin-style-machbunt)
 
-twin-style-crystal:	tdebase
-	$(call buildpkg,applications/twin-style-crystal)
+twin-style-suse2: tdebase
+	$(call buildpkg,applications/themes/twin-style-suse2)
 
-wlassistant:	tdebase
-	$(call buildpkg,applications/wlassistant)
+wlassistant: tdebase
+	$(call buildpkg,applications/settings/wlassistant)
 
-yakuake:	tdebase
-	$(call buildpkg,applications/yakuake)
+yakuake: tdebase
+	$(call buildpkg,applications/system/yakuake)
 
 ### Trinity Translations
-gwenview-i18n:	tdebase
-	$(call buildpkg,applications/gwenview-i18n)
+gwenview-i18n: tdebase
+	$(call buildpkg,applications/graphics/gwenview-i18n)
 
-k3b-i18n:	tdebase
-	$(call buildpkg,applications/k3b-i18n)
+k3b-i18n: tdebase
+	$(call buildpkg,applications/multimedia/k3b-i18n)
 
-koffice-i18n:	tdebase
-	$(call buildpkg,applications/koffice-i18n)
+koffice-i18n: tdebase
+	$(call buildpkg,applications/office/koffice-i18n)
 
-tde-i18n:	tdebase
+tde-i18n: tdebase
 	$(call buildpkg,tde-i18n)
 
 ### Meta packages
@@ -624,7 +670,7 @@ meta:
 fileshareset:
 	$(call buildpkg,extras/fileshareset)
 
-pinentry-tqt:	tqtinterface
+pinentry-tqt: tqtinterface
 ifeq (,$(filter $(DIST), .el5 .el6 .el7 ))
 	$(call buildpkg,extras/pinentry-tqt)
 endif
@@ -638,7 +684,7 @@ git:
 	cd "$(TDE_GIT_DIR)" && ./scripts/switch_all_submodules_to_head_and_clean anonymous
 
 tarballs:
-	cd "$(TDE_GIT_DIR)" && COMPRESS=pigz SUFFIX=0 ./scripts/create_all_tarballs
+	cd "$(TDE_GIT_DIR)" && COMPRESS=pigz SUFFIX=0 TARBALLS_BASE="${HOME}/tde/tarballs/${TDE_VERSION}" ./scripts/create_all_tarballs
 
 
 # External packages
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec
deleted file mode 100644
index 62089a300..000000000
--- a/redhat/applications/abakus/abakus.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-#
-# spec file for package abakus (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg abakus
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.91
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Calculator for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-BuildRequires:	bison
-BuildRequires:	flex
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-AbaKus is a complex calculator, which provides
-many different kinds of calculations.
-Think of it as bc (the command-line calculator) with a nice GUI.
-It also gives information about mathematical variables and
-has the user-friendly menu options of a normal TDE application.
-
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/abakus.desktop" Utility Calculator
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/abakus
-%{tde_datadir}/apps/abakus/
-%{tde_datadir}/icons/hicolor/*/apps/abakus.png
-%{tde_tdedocdir}/HTML/en/abakus/
-%{tde_tdeappdir}/abakus.desktop
-
-
-%changelog
diff --git a/redhat/applications/adept/adept.spec b/redhat/applications/adept/adept.spec
deleted file mode 100644
index ce793ba34..000000000
--- a/redhat/applications/adept/adept.spec
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# spec file for package adept (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
-%define tde_pkg adept
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-
-# TDE specific building variables
-%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:		Package management suite for Trinity
-Version:		2.1.3
-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://lpnotfr.free.fr/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-util
-
-BuildRequires:	libapt-front-devel
-
-Requires:		%{name}-manager = %{version}-%{release}
-Requires:		%{name}-installer = %{version}-%{release}
-Requires:		%{name}-updater = %{version}-%{release}
-Requires:		%{name}-notifier = %{version}-%{release}
-Requires:		%{name}-batch = %{version}-%{release}
-
-
-%description
-These packages belong to the adept suite:
- * adept-manager - package manager
- * adept-installer - application manager
- * adept-updater - system upgrade wizard
- * adept-notifier - systray notification of available updates
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG ChangeLog COPYING
-
-##########
-
-%package common
-Requires:		trinity-konsole
-Summary:		Package manager for Trinity -- common files
-
-%description common
-Icons and other common files for all adept components.
-
-##########
-
-%package manager
-Requires:		%{name}-common = %{version}-%{release}
-Summary:		package manager for Trinity
- 
-%description manager
-Adept Manager is a graphical user interface for package management.
-
-Besides these basic functions the following features are provided:
- * Search and filter the list of available packages (also using debtags)
- * Perform smart system upgrades
- * Edit the list of used repositories (sources.list)
- * Configure packages through the debconf system
-
-Please also install libtqt-perl if you want the TDE Debconf frontend
-to function.
-
-##########
-
-%package installer
-Requires:		%{name}-common = %{version}-%{release}
-Summary:		simple user interface for application management (for Trinity)
-
-%description installer
-Adept Installer presents a list of applications available through the
-Advanced Package Tool (APT). An application is considered a package
-that contains a .desktop file for use with TDE, GNOME or other
-desktop environment.
-
-##########
-
-%package updater
-Requires:		%{name}-common = %{version}-%{release}
-Summary:		system update tool for Trinity
-
-%description updater
-Adept Updater provides a simple wizard-style user interface to system
-upgrades. It uses same algorithms as apt-get dist-upgrade.
-
-##########
-
-%package notifier
-Requires:		%{name}-common = %{version}-%{release}
-Requires:		%{name}-updater = %{version}-%{release}
-Summary:		System tray notifier of available system updates
- 
-%description notifier
-Adept Notifier provides a system tray icon notifying the user of
-available updates.  It will run Adept Updater for the user when
-clicked.
-
-##########
-
-%package batch
-Requires:		%{name}-manager = %{version}-%{release}
-Summary:		command line install for Adept
-
-%description batch
-Adept Batch lets you install packages with Adept from the
-command line.  It is intended for shell scripts and being run
-by external applications.
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --enable-rpath \
-  --enable-closure \
-  \
-  --with-extra-includes=%{_includedir}/tqt3 \
-  \
-  --enable-adept
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-
-%changelog
diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec
deleted file mode 100644
index 1a5d0ed81..000000000
--- a/redhat/applications/amarok/amarok.spec
+++ /dev/null
@@ -1,536 +0,0 @@
-#
-# spec file for package amarok (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg amarok
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.4.10
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Media player for TDE
-Group:		Applications/Multimedia
-URL:		http://www.trinitydesktop.org/
-#Url:		http://amarok.kde.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-konqueror-devel >= %{tde_version}
-
-BuildRequires:	trinity-filesystem >= %{tde_version}
-Requires:		trinity-filesystem >= %{tde_version}
-
-BuildRequires:	desktop-file-utils
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	gettext
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# ALSA support
-BuildRequires:	alsa-lib-devel
-
-# ESOUND support
-BuildRequires:	esound-devel
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# LIBTOOL
-BuildRequires:	libtool
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-BuildRequires:	libusb-devel
-BuildRequires:	mysql-devel
-BuildRequires:	postgresql-devel
-BuildRequires:	SDL-devel
-BuildRequires:	taglib-devel
-BuildRequires:	sqlite-devel
-
-# not used anymore, in favor of libvisual ? -- Rex
-#{?fedora:BuildRequires:  xmms-devel}
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# DBUS support
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-
-# DBUS-(T)QT support
-%if 0%{?rhel} == 4
-BuildRequires:	dbus-qt
-%else
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-%endif
-
-# DAAP support
-%define with_daap 0
-
-# IFP support
-#  IFP package is broken under PCLinuxOS.
-%if 0%{?pclinuxos} == 0
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_ifp 1
-BuildRequires:	libifp-devel
-%endif
-%endif
-
-# KARMA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-%define with_karma 1
-BuildRequires:	libkarma-devel
-BuildRequires:	karma-sharp
-%endif
-%endif
-
-# GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_gpod 1
-BuildRequires:	libgpod-devel >= 0.4.2
-%endif
-
-# MTP players
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_mtp 1
-BuildRequires:	libmtp-devel
-%endif
-
-# Creative Nomad Jukebox
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-%define with_njb 1
-BuildRequires:	libnjb-devel
-%endif
-
-# VISUAL support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_libvisual 1
-BuildRequires:	libvisual-devel
-%endif
-
-# MUSICBRAINZ support
-%if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version}
-%if 0%{?fedora} >= 24
-BuildRequires:	libmusicbrainz5-devel
-%else
-BuildRequires:	libmusicbrainz-devel
-%endif
-%endif
-
-# TUNEPIMP support
-%if 0%{?pclinuxos}
-BuildRequires:	libofa-devel
-%endif
-%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
-BuildRequires:	libtunepimp-devel
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} < 1500
-BuildRequires:	libtunepimp-devel
-%endif
-%if 0%{?fedora} && 0%{?fedora} <= 23
-BuildRequires:	libtunepimp-devel
-%endif
-
-# INOTIFY support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_inotify 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}inotifytools-devel
-%endif
-%endif
-
-# XINE support
-%if 0%{?fedora} && 0%{?fedora} <= 31
-%define with_xine 1
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?rhel} && 0%{?rhel} <= 7
-#define with_xine 1
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define with_xine 1
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%if 0%{?sle_version} && 0%{?sle_version} <= 150000
-%define with_xine 1
-BuildRequires: libxine-devel
-%endif
-
-# YAUAP support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_yauap 1
-%endif
-
-# AKODE support
-%define with_akode 0
-%if 0 && 0%{?with_akode}
-BuildRequires:	trinity-akode-devel
-%endif
-
-# MP4V2 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_mp4v2 1
-BuildRequires:	libmp4v2-devel
-%endif
-
-# ruby
-BuildRequires:	ruby
-BuildRequires:	ruby-devel
-%if 0%{?fedora} >= 19
-BuildRequires:	rubypick
-%endif
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-# To open the selected browser, works with Patch2
-Requires:		xdg-utils
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
-
-%description
-Amarok is a multimedia player with:
- - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by the various engines
- - audio effects, like reverb and compressor
- - compatible with the .m3u and .pls formats for playlists
- - nice GUI, integrates into the TDE look, but with a unique touch
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{tde_bindir}/amarok
-%{tde_bindir}/amarokapp
-%{tde_bindir}/amarokcollectionscanner
-%{tde_bindir}/amarok_proxy.rb
-%{tde_datadir}/apps/amarok/
-%{tde_datadir}/icons/crystalsvg/*/actions/covermanager.png
-%{tde_datadir}/icons/crystalsvg/*/actions/dynamic.png
-%{tde_datadir}/icons/crystalsvg/*/actions/equalizer.png
-%{tde_datadir}/icons/crystalsvg/*/actions/mini_dock.png
-%{tde_datadir}/icons/crystalsvg/*/actions/player_playlist_2.png
-%{tde_datadir}/icons/crystalsvg/*/actions/podcast.png
-%{tde_datadir}/icons/crystalsvg/*/actions/podcast_new.png
-%{tde_datadir}/icons/crystalsvg/*/actions/random.png
-%{tde_datadir}/icons/crystalsvg/*/actions/repeat_playlist.png
-%{tde_datadir}/icons/crystalsvg/*/actions/repeat_track.png
-%{tde_datadir}/icons/crystalsvg/*/actions/visualizations.png
-%{tde_datadir}/icons/crystalsvg/*/actions/wiki.png
-%{tde_datadir}/icons/crystalsvg/*/actions/amarok_podcast.png
-%{tde_datadir}/icons/crystalsvg/*/actions/amarok_podcast_new.png
-%{tde_datadir}/icons/crystalsvg/*/actions/amazon_locale.png
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_tdeappdir}/*.desktop
-%{tde_datadir}/servicetypes/*.desktop
-%{tde_datadir}/apps/profiles/amarok.profile.xml
-%config(noreplace) %{tde_confdir}/amarokrc
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/services/amarokitpc.protocol
-%{tde_datadir}/services/amaroklastfm.protocol
-%{tde_datadir}/services/amarokpcast.protocol
-%{tde_mandir}/man1/amarok.1*
-%{tde_mandir}/man1/amarokapp.1*
-%{tde_mandir}/man1/amarokcollectionscanner.1*
-# -libs ?  -- Rex
-%{tde_libdir}/libamarok.so.0
-%{tde_libdir}/libamarok.so.0.0.0
-# DAAP
-%if 0%{?with_daap}
-%{tde_bindir}/amarok_daapserver.rb
-%{tde_tdelibdir}/libamarok_daap-mediadevice.*
-%{tde_datadir}/services/amarok_daap-mediadevice.desktop
-%endif
-# Mass-storage
-%{tde_datadir}/services/amarok_massstorage-device.desktop
-%{tde_tdelibdir}/libamarok_massstorage-device.*
-# NFS
-%{tde_datadir}/services/amarok_nfs-device.desktop
-%{tde_tdelibdir}/libamarok_nfs-device.*
-# SMB
-%{tde_datadir}/services/amarok_smb-device.desktop
-%{tde_tdelibdir}/libamarok_smb-device.*
-# IPod
-%if 0%{?with_gpod}
-%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
-%endif
-# VFAT
-%{tde_datadir}/services/amarok_generic-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_generic-mediadevice.*
-# iRiver
-%if 0%{?with_ifp}
-%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
-%endif
-# Creative Zen
-%if 0%{?with_njb}
-%{tde_datadir}/services/amarok_njb-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_njb-mediadevice.*
-%endif
-# MTP players
-%if 0%{?with_mtp}
-%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
-%endif
-# Rio Karma
-%if 0%{?with_karma}
-%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
-%endif
-# Void engine (noop)
-%{tde_datadir}/services/amarok_void-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_void-engine_plugin.*
-# Xine engine
-%if 0%{?with_xine}
-%{tde_datadir}/services/amarok_xine-engine.desktop
-%{tde_tdelibdir}/libamarok_xine-engine.*
-%endif
-## Gstreamer engine
-#{tde_datadir}/services/amarok_gst10engine_plugin.desktop
-#{tde_tdelibdir}/libamarok_gst10engine_plugin.*
-# YAUAP
-%if 0%{?with_yauap}
-%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
-%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
-%endif
-# AKODE
-%if 0 && 0%{?with_akode}
-%{tde_datadir}/services/amarok_aKode-engine.desktop
-%{tde_tdelibdir}/libamarok_aKode-engine.*
-%endif
-
-##########
-
-%package konqueror
-Summary:		Amarok konqueror (service menus, sidebar) support
-Group:			Applications/Multimedia
-
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-konqueror
-
-%description konqueror
-%{summary}.
-
-%files konqueror
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_tdelibdir}/konqsidebar_universalamarok.*
-%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
-
-
-##########
-
-%if 0%{?with_libvisual}
-
-%package visualisation
-Summary:		Visualisation plugins for Amarok
-Group:			Applications/Multimedia
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-# No plugins by default, we need libvisual-plugins
-#Requires:   libvisual-plugins
-
-%description visualisation
-Amarok can use visualisation plugins from different origins.
-Right now, only xmms is supported, which means that you can
-use any of xmms' visualisation plugins with Amarok.
-
-%files visualisation
-%defattr(-,root,root,-)
-%{tde_bindir}/amarok_libvisual
-%{tde_mandir}/man1/amarok_libvisual.1*
-
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Fix some Ruby stuff
-if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" &>/dev/null; then
-  %__sed -i "amarok/src/mediadevice/daap/ConfigureChecks.cmake" \
-         -e "s|Config::|RbConfig::|g" \
-         -e "s|Config\.|RbConfig\.|g"
-fi
-
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-%__sed -i "amarok/src/scripts/common/Publisher.py" \
-          "amarok/src/scripts/common/Zeroconf.py" \
-          "amarok/src/scripts/playlist2html/Playlist.py" \
-          "amarok/src/scripts/playlist2html/playlist2html.py" \
-          "amarok/src/scripts/playlist2html/PlaylistServer.py" \
-          "amarok/src/scripts/webcontrol/Playlist.py" \
-          "amarok/src/scripts/webcontrol/RequestHandler.py" \
-          "amarok/src/scripts/webcontrol/WebControl.py" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  %{?with_libvisual:-DWITH_LIBVISUAL=ON} \
-  -DWITH_KONQSIDEBAR=ON \
-  %{?with_xine:-DWITH_XINE=ON} %{?!with_xine:-DWITH_XINE=OFF}\
-  %{?with_yauap:-DWITH_YAUAP=ON} \
-  -DWITH_AKODE=OFF \
-  %{?with_gpod:-DWITH_IPOD=ON} \
-  %{?with_ifp:-DWITH_IFP=ON} \
-  %{?with_njb:-DWITH_NJB=ON} \
-  %{?with_mtp:-DWITH_MTP=ON} \
-  %{?with_karma:-DWITH_RIOKARMA=ON} \
-  %{!?with_daap:-DWITH_DAAP=OFF} \
-  %{?with_mp4v2:-DWITH_MP4V2=ON} \
-  %{?with_inotify:-DWITH_INOTIFY=ON} \
-  -DWITH_SYSTEM_SQLITE=ON \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -fr $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-
-# unpackaged files
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-# Removes '.so' to avoid automatic -devel dependency
-%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
-
-# Locales
-%find_lang %{tde_pkg}
-
-# HTML
-for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    [ "$lang" == "en" ] && d=en/amarok || d=$lang
-    echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> amarok.lang
-  fi
-done
-
-
-
-%clean
-%__rm -fr $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/basket/basket.spec
deleted file mode 100644
index fae03c587..000000000
--- a/redhat/applications/basket/basket.spec
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-# spec file for package basket (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg basket
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0.3.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Taking care of your ideas
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
-BuildRequires:	trinity-kontact-devel >= %{tde_version}
-
-BuildRequires:	desktop-file-utils
-BuildRequires:	gpgme-devel
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-This application is mainly an all-purpose notes taker. It provide several baskets where
-to drop every sort of items: text, rich text, links, images, sounds, files, colors,
-application launcher... Objects can be edited, copied, dragged... So, you can arrange
-them as you want ! This application can be used to quickly drop web objects (link, text,
-images...) or notes, as well as to free your clutered desktop (if any). It is also useful
-to collect informations for a report. Those data can be shared with co-workers by exporting
-baskets to HTML.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  \
-  -DBUILD_ALL=ON \
-  -DWITH_ALL_OPTIONS="ON" \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "Extended Clipboard" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
-%endif
-
-# Apps that should stay in TDE
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/basket
-%{tde_tdeappdir}/basket.desktop
-%{tde_datadir}/apps/basket/
-%dir %{tde_datadir}/apps/kontact/ksettingsdialog
-%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
-%{tde_libdir}/libbasketcommon.la
-%{tde_libdir}/libbasketcommon.so
-%{tde_tdelibdir}/basketthumbcreator.la
-%{tde_tdelibdir}/basketthumbcreator.so
-%{tde_tdelibdir}/kcm_basket.la
-%{tde_tdelibdir}/kcm_basket.so
-%{tde_tdelibdir}/libbasketpart.la
-%{tde_tdelibdir}/libbasketpart.so
-%{tde_tdelibdir}/libkontact_basket.la
-%{tde_tdelibdir}/libkontact_basket.so
-%config(noreplace) %{tde_confdir}/magic/basket.magic
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
-%{tde_datadir}/mimelnk/application/x-basket-template.desktop
-%{tde_datadir}/services/basket_config_apps.desktop
-%{tde_datadir}/services/basket_config_baskets.desktop
-%{tde_datadir}/services/basket_config_general.desktop
-%{tde_datadir}/services/basket_config_new_notes.desktop
-%{tde_datadir}/services/basket_config_notes_appearance.desktop
-%{tde_datadir}/services/basket_part.desktop
-%{tde_datadir}/services/basketthumbcreator.desktop
-%{tde_datadir}/services/kontact/basket.desktop
-%{tde_tdedocdir}/HTML/en/basket/
-%config(noreplace) %{tde_confdir}/magic/basket.magic.mgc
-%{tde_mandir}/man1/basket.*
-
-
-%changelog
diff --git a/redhat/applications/bibletime/bibletime.spec b/redhat/applications/bibletime/bibletime.spec
deleted file mode 100644
index d88ac81ce..000000000
--- a/redhat/applications/bibletime/bibletime.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# spec file for package bibletime (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/
-#
-
-# Required for PCLinuxOS: removes the ldflag '--no-undefined'
-%if 0%{?pclinuxos}
-%define _disable_ld_no_undefined 1
-%endif
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg bibletime
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.6.6.0
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		A bible study tool for Trinity
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# BOOST support
-BuildRequires:   boost-devel
-
-# Requires: clucene
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires:	clucene-core-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}clucene-devel
-%endif
-
-# Requires: sword
-BuildRequires:	sword-devel
-Requires:		sword
-
-%description
-BibleTime is a free and easy to use bible study tool for UNIX systems.
-It requires a working TDE environment and the SWORD library.
-BibleTime provides easy handling of digitized texts (Bibles, commentaries
-and lexicons) and powerful features to work with these texts (search in
-texts, write own notes, save, print etc.).
- 
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
-CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11"
-%endif
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-# Not SMP safe !
-%__make -C bibletime/frontend
-
-# SMP safe !
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
-
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/bibletime
-%{tde_tdeincludedir}/bibletimeinterface.h
-%{tde_datadir}/applications/bibletime.desktop
-%{tde_datadir}/apps/bibletime/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_tdedocdir}/HTML/en/bibletime/
-
-
-%changelog
diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/codeine/codeine.spec
deleted file mode 100644
index 7baa22743..000000000
--- a/redhat/applications/codeine/codeine.spec
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# spec file for package kaffeine (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg codeine
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.0.1
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Simple TDE video player
-Group:			Applications/Multimedia
-URL:			http://kaffeine.sourceforge.net/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
-%define with_xine 1
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-
-%description
-A video player with a different philosophy: simple, uncluttered interface
-
-Features:
-- Plays DVDs, VCDs, all video formats supported by Xine
-- Bundled with a simple web-page KPart
-- Starts quickly
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  \
-  -DBUILD_ALL=ON \
-  -DWITH_ALL_OPTIONS=ON \
-  \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING FAQ README TODO
-%{tde_bindir}/codeine
-%{tde_tdeappdir}/codeine.desktop
-%{tde_datadir}/apps/codeine/
-%{tde_datadir}/apps/konqueror/servicemenus/codeine_play_dvd.desktop
-%{tde_tdedocdir}/HTML/en/codeine/
-%{tde_datadir}/icons/hicolor/*/apps/codeine.png
-%{tde_mandir}/man1/codeine.1*
-%{tde_datadir}/services/codeine_part.desktop
-%{tde_tdelibdir}/libcodeine.la
-%{tde_tdelibdir}/libcodeine.so
-
-
-%changelog
diff --git a/redhat/applications/development/kdbg/kdbg.spec b/redhat/applications/development/kdbg/kdbg.spec
new file mode 100644
index 000000000..f15f9e9d5
--- /dev/null
+++ b/redhat/applications/development/kdbg/kdbg.spec
@@ -0,0 +1,179 @@
+#
+# spec file for package kdbg (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kdbg
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		2.2.2
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Graphical debugger interface [Trinity]
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KDbg is a graphical user interface to gdb, the GNU debugger.  It provides
+an intuitive interface for setting breakpoints, inspecting variables,
+stepping through code and much more.  KDbg requires TDE but you can of
+course debug any program.
+
+KDbg can also debug XSLT (XML stylesheet translation) scripts by
+interfacing with xsldbg.  For this the package kxsldbg must be installed.
+
+Features include the following:
+* Inspection of variable values in a tree structure.
+* Direct member: For certain compound data types the most important
+  member values are displayed next to the variable name, so that it is
+  not necessary to expand the subtree of that variable in order to see
+  the member value.  KDbg can also display Qt's QString values, which
+  are Unicode strings.
+* Debugger at your finger tips: The basic debugger functions (step,
+  next, run, finish, until, set/clear/enable/disable breakpoint) are
+  bound to function keys F5 through F10.  Quick and easy.
+* View source code, search text, set program arguments and environment
+  variables, display arbitrary expressions.
+* Debugging of core dumps, attaching to running processes is possible.
+* Conditional breakpoints.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  \
+  -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_bindir}/kdbg
+%{tde_tdeappdir}/kdbg.desktop
+%{tde_datadir}/apps/kdbg/
+%config(noreplace) %{tde_confdir}/kdbgrc
+%lang(de) %{tde_tdedocdir}/HTML/de/kdbg/
+%lang(en) %{tde_tdedocdir}/HTML/en/kdbg/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
+%{tde_datadir}/icons/hicolor/*/apps/kdbg.png
+%{tde_datadir}/icons/locolor/*/apps/kdbg.png
+%{tde_mandir}/man1/kdbg.*
+
+
+%changelog
diff --git a/redhat/applications/development/kdiff3/kdiff3.spec b/redhat/applications/development/kdiff3/kdiff3.spec
new file mode 100644
index 000000000..7b901eb50
--- /dev/null
+++ b/redhat/applications/development/kdiff3/kdiff3.spec
@@ -0,0 +1,184 @@
+#
+# spec file for package kdiff3 (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kdiff3
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.9.91
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	KDiff3 is a utility for comparing and/or merging two or three text files or directories.
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+Shows the differences line by line and character by character (!).
+Provides an automatic merge-facility and
+an integrated editor for comfortable solving of merge-conflicts.
+Supports TDEIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
+Unicode & UTF-8 support
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kdiff3.desktop" Development RevisionControl
+%endif
+
+# Unwanted files
+# These are not HTML files but weird files in wrong place ??
+%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
+
+%find_lang %{tde_pkg}
+%find_lang %{tde_pkg}_plugin
+cat "%{tde_pkg}_plugin.lang" >>"%{tde_pkg}.lang"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/kdiff3
+%{tde_datadir}/apps/kdiff3/
+%{tde_datadir}/apps/kdiff3part/
+%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png
+%{tde_datadir}/icons/locolor/*/apps/kdiff3.png
+%{tde_docdir}/kdiff3/
+%{tde_tdedocdir}/HTML/*/kdiff3/
+%{tde_datadir}/services/kdiff3_plugin.desktop
+%{tde_datadir}/services/kdiff3part.desktop
+%{tde_tdeappdir}/kdiff3.desktop
+%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
+%{tde_mandir}/man*/*
+%{tde_tdelibdir}/libkdiff3part.la
+%{tde_tdelibdir}/libkdiff3part.so
+%{tde_tdelibdir}/libkdiff3plugin.la
+%{tde_tdelibdir}/libkdiff3plugin.so
+
+%changelog
diff --git a/redhat/applications/development/kpicosim/kpicosim.spec b/redhat/applications/development/kpicosim/kpicosim.spec
new file mode 100644
index 000000000..be5aabf54
--- /dev/null
+++ b/redhat/applications/development/kpicosim/kpicosim.spec
@@ -0,0 +1,173 @@
+#
+# spec file for package kpicosim (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kpicosim
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.6a
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+kpicosim is a development environment for the Xilinx
+PicoBlaze-3 soft-core processor for the TDE Desktop (Linux).
+The environment has an editor with syntax highlighting, compiler,
+simulator and export functions to VHDL, HEX and MEM files.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Move desktop icon to XDG directory
+if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
+  %__mkdir_p %{buildroot}%{tde_tdeappdir}
+  %__mv "%{buildroot}%{tde_datadir}/applnk/Development/kpicosim.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -D kpicosim -C "%summary" kpicosim Development IDE
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.md
+%{tde_bindir}/kpicosim
+%{tde_tdeappdir}/kpicosim.desktop
+%{tde_datadir}/apps/katepart/syntax/psm.xml
+%{tde_datadir}/apps/kpicosim
+%{tde_tdedocdir}/HTML/en/kpicosim
+%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
+%{tde_mandir}/man*/kpicosim.*
+
+
+%changelog
diff --git a/redhat/applications/development/kscope/kscope.spec b/redhat/applications/development/kscope/kscope.spec
new file mode 100644
index 000000000..ff4a09b2c
--- /dev/null
+++ b/redhat/applications/development/kscope/kscope.spec
@@ -0,0 +1,190 @@
+#
+# spec file for package kscope (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kscope
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.6.2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Source editing environment for TDE
+Group:		Applications/Internet
+URL:		http://kscope.sourceforge.net
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+Requires:		cscope
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	flex
+BuildRequires:	bison
+
+
+%description
+KScope is a TDE front-end to Cscope. It provides a source-editing environment
+for large C projects. KScope is focused on source editing and analysis.
+
+KScope is built around an efficient mechanism for code-navigation, which
+allows the user to run queries on the code.
+
+The types of queries KScope can run include:
+* Get all references to a symbol
+* Find the definition of a symbol
+* Find all functions called by or calling to a function
+* Find an EGrep pattern
+* Find all files #including some file
+
+These queries are handled by an underlying Cscope process. KScope simply
+serves as a front-end to this process, feeding it with queries, and parsing
+its output into result lists. The items in those lists can later be selected
+to open an editor at the matching line.
+
+Main Features:
+* Multiple editor windows (using your favourite TDE editor)
+* Project management
+* Front-end to most Cscope queries
+* Tag list for every open editor
+* Call-tree window
+* Session management, including saving and restoring queries
+* Works with externally-built cscope.out files
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file %{tde_pkg} Development IDE
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md ChangeLog
+%{tde_bindir}/kscope
+%{tde_tdeappdir}/kscope.desktop
+%{tde_datadir}/apps/kscope/
+%{tde_tdedocdir}/HTML/en/kscope/
+%{tde_datadir}/icons/hicolor/*/apps/kscope.png
+%{tde_datadir}/icons/locolor/*/apps/kscope.png
+%{tde_mandir}/man1/kscope.1*
+
+
+%changelog
diff --git a/redhat/applications/development/ktechlab/ktechlab.spec b/redhat/applications/development/ktechlab/ktechlab.spec
new file mode 100644
index 000000000..2e4c66048
--- /dev/null
+++ b/redhat/applications/development/ktechlab/ktechlab.spec
@@ -0,0 +1,171 @@
+#
+# spec file for package ktechlab (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg ktechlab
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Circuit simulator for microcontrollers and electronics [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+%if 0%{?fedora}
+#BuildRequires:	gpsim-devel
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KTechlab is a circuit simulator with a nice, clickable and discoverable
+interface. It supports many discrete components, logic circuits as well
+as PIC programming in its own Basic dialect and some form of assembler. 
+
+Homepage: http://ktechlab.org/
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GPSIM=OFF \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r -n ktechlab Science Math
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/ktechlab
+%{tde_bindir}/microbe
+%{tde_tdeappdir}/ktechlab.desktop
+%{tde_datadir}/apps/katepart/syntax/microbe.xml
+%{tde_datadir}/apps/ktechlab
+%{tde_datadir}/config.kcfg/ktechlab.kcfg
+%{tde_tdedocdir}/HTML/en/ktechlab/
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/mimelnk/application/x-circuit.desktop
+%{tde_datadir}/mimelnk/application/x-flowcode.desktop
+%{tde_datadir}/mimelnk/application/x-ktechlab.desktop
+%{tde_datadir}/mimelnk/application/x-microbe.desktop
+%{tde_mandir}/man1/ktechlab.1*
+%{tde_mandir}/man1/microbe.1*
+
+
+%changelog
diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec
new file mode 100644
index 000000000..4635ee43f
--- /dev/null
+++ b/redhat/applications/development/kxmleditor/kxmleditor.spec
@@ -0,0 +1,165 @@
+#
+# spec file for package kxmleditor (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kxmleditor
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.1.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	XML Editor for TDE
+Group:		Applications/Multimedia
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KXML Editor is a simple program, that displays and edits the contents of an
+XML file. It can be embedded in Quanta, and used with DCOP.
+
+The left side contains a tree representing the XML document structure. The
+right side contains a list of attributes for the selected XML element and its
+contents.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/kxmleditor
+%{tde_libdir}/libkxmleditorpart.la
+%{tde_libdir}/libkxmleditorpart.so
+%{tde_libdir}/libkxmleditorpart.so.1
+%{tde_libdir}/libkxmleditorpart.so.1.0.0
+%{tde_tdeappdir}/kxmleditor.desktop
+%{tde_datadir}/apps/kxmleditor/
+%{tde_tdedocdir}/HTML/en/kxmleditor/
+%{tde_datadir}/icons/hicolor/*/apps/kxmleditor.png
+%{tde_datadir}/icons/locolor/*/apps/kxmleditor.png
+%{tde_datadir}/services/kxmleditorpart.desktop
+%{tde_mandir}/man1/kxmleditor.1*
+
+
+%post
+
+
+%postun
+
+
+%changelog
diff --git a/redhat/applications/development/piklab/piklab.spec b/redhat/applications/development/piklab/piklab.spec
new file mode 100644
index 000000000..86906fb80
--- /dev/null
+++ b/redhat/applications/development/piklab/piklab.spec
@@ -0,0 +1,194 @@
+#
+# spec file for package piklab (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg piklab
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.15.2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	IDE for PIC-microcontroller development [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# READLINE support
+BuildRequires:	readline-devel
+
+# LIBUSB support
+%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+BuildRequires:  %{_lib}usb1.0-devel
+BuildRequires:  %{_lib}usb-compat0.1-devel
+%else
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
+BuildRequires:	libusb-devel
+%endif
+%endif
+
+
+%description
+Piklab is an integrated development environment for applications based on
+Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment.
+
+Support for several compiler and assembler toolchains is integrated. The
+GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and
+PICkit2 programmers, the PicStart+ programmer, and most direct programmers
+are supported. A command-line programmer and debugger are also available.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+# Warning: --enable-final causes FTBFS
+# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --disable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+%if 0%{?rhel} == 5
+  --disable-libreadline \
+%endif
+
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
+touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in"
+%endif
+
+%__make %{?_smp_mflags}
+
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
+touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in"
+%endif
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Incorrect extension on manpage
+%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
+
+%find_lang %{tde_pkg}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/piklab
+%{tde_bindir}/piklab-coff
+%{tde_bindir}/piklab-hex
+%{tde_bindir}/piklab-prog
+%{tde_tdeappdir}/piklab.desktop
+%{tde_datadir}/apps/katepart/syntax/asm-pic.xml
+%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml
+%{tde_datadir}/apps/katepart/syntax/coff-pic.xml
+%{tde_datadir}/apps/katepart/syntax/jal-pic.xml
+%{tde_datadir}/apps/piklab
+%{tde_tdedocdir}/HTML/en/piklab
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/mimelnk/application/x-piklab.desktop
+%{tde_mandir}/man1/piklab-coff.1
+%{tde_mandir}/man1/piklab-hex.1
+%{tde_mandir}/man1/piklab-prog.1
+%{tde_mandir}/man1/piklab.1
+
+
+%changelog
diff --git a/redhat/applications/development/tdesvn/tdesvn.spec b/redhat/applications/development/tdesvn/tdesvn.spec
new file mode 100644
index 000000000..6813b17ad
--- /dev/null
+++ b/redhat/applications/development/tdesvn/tdesvn.spec
@@ -0,0 +1,316 @@
+#
+# spec file for package tdesvn (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdesvn
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Subversion client with tight TDE integration
+Group:		Applications/Utilities
+URL:		http://www.elliptique.net/~ken/kima/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# SVN support
+BuildRequires:	subversion-devel
+
+# SQLITE support
+BuildRequires:	sqlite-devel
+BuildRequires:	libtqt3-mt-sqlite3
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+Requires:		%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdesvn < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdesvn = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+TDESvn is a graphical client for the subversion revision control
+system (svn).
+
+Besides offering common and advanced svn operations, it features
+a tight integration into TDE and can be embedded into other TDE 
+applications like konqueror via the TDE component technology KParts.
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{tde_bindir}/tdesvn
+%{tde_bindir}/tdesvnaskpass
+%{tde_tdelibdir}/tdesvnpart.la
+%{tde_tdelibdir}/tdesvnpart.so
+%{tde_datadir}/applications/tde/tdesvn.desktop
+%{tde_datadir}/apps/tdeconf_update/tdesvn-use-external-update.sh
+%{tde_datadir}/apps/tdeconf_update/tdesvnpartrc-use-external.upd
+%{tde_datadir}/apps/tdesvn/
+%{tde_datadir}/apps/tdesvnpart/
+%{tde_datadir}/apps/konqueror/servicemenus/tdesvn_subversion.desktop
+%{tde_datadir}/config.kcfg/tdesvn_part.kcfg
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.svgz
+%{tde_mandir}/man1/tdesvn.1*
+%{tde_mandir}/man1/tdesvnaskpass.1*
+%lang(en) %{tde_tdedocdir}/HTML/en/tdesvn/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/tdesvn/
+%{tde_libdir}/libksvnwidgets.la
+%{tde_libdir}/libksvnwidgets.so
+%{tde_libdir}/libsvnfrontend.la
+%{tde_libdir}/libsvnfrontend.so
+%{tde_libdir}/libtdesvncfgreader.la
+%{tde_libdir}/libtdesvncfgreader.so
+%{tde_libdir}/libtdesvnevents.la
+%{tde_libdir}/libtdesvnevents.so
+%{tde_libdir}/libtdesvnhelpers.la
+%{tde_libdir}/libtdesvnhelpers.so
+
+##########
+
+%package -n trinity-libsvnqt
+Group:			Development/Libraries
+Summary:		Qt wrapper library for subversion [Trinity]
+
+%description -n trinity-libsvnqt
+This package provides svnqt, a Qt wrapper library around the 
+subversion library.
+
+It is based on the RapidSvn SvnCpp library, a subversion client API 
+written in C++.
+
+%files -n trinity-libsvnqt
+%defattr(-,root,root,-)
+%{tde_libdir}/libsvnqt.so.4
+%{tde_libdir}/libsvnqt.so.4.2.2
+
+##########
+
+%package -n trinity-libsvnqt-devel
+Group:			Development/Libraries
+Requires:		trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		qt-devel
+Requires:		subversion-devel
+Summary:		Qt wrapper library for subversion (development files) [Trinity]
+
+%description -n trinity-libsvnqt-devel
+This package contains the header files and symbolic links that developers
+using svnqt will need.
+
+%files -n trinity-libsvnqt-devel
+%defattr(-,root,root,-)
+%{tde_includedir}/svnqt
+%{tde_libdir}/libsvnqt.so
+
+##########
+
+%package tdeio-plugins
+Group:			Development/Libraries
+Conflicts:	trinity-kdesdk-tdeio-plugins
+Summary:		subversion I/O slaves for Trinity
+
+Obsoletes:	trinity-kdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tdeio-plugins
+This packages includes TDEIO slaves for svn, svn+file, svn+http, 
+svn+https, svn+ssh. This allows you to access subversion repositories 
+inside any TDEIO enabled TDE application.
+
+This package is part of tdesvn-trinity.
+
+%post tdeio-plugins
+for proto in svn+file svn+http svn+https svn+ssh svn; do
+  update-alternatives --install \
+    %{tde_datadir}/services/${proto}.protocol \
+    ${proto}.protocol \
+    %{tde_datadir}/services/${proto}.protocol_tdesvn \
+    20
+done
+
+%preun tdeio-plugins
+if [ $1 -eq 0 ]; then
+  for proto in svn+file svn+http svn+https svn+ssh svn; do
+    update-alternatives --remove \
+      ${proto}.protocol \
+      %{tde_datadir}/services/${proto}.protocol_tdesvn || :
+  done
+fi
+
+%files tdeio-plugins
+%defattr(-,root,root,-)
+%{tde_datadir}/services/kded/tdesvnd.desktop
+%{tde_datadir}/services/ksvn+file.protocol
+%{tde_datadir}/services/ksvn+http.protocol
+%{tde_datadir}/services/ksvn+https.protocol
+%{tde_datadir}/services/ksvn+ssh.protocol
+%{tde_datadir}/services/ksvn.protocol
+%{tde_datadir}/services/svn+file.protocol_tdesvn
+%{tde_datadir}/services/svn+http.protocol_tdesvn
+%{tde_datadir}/services/svn+https.protocol_tdesvn
+%{tde_datadir}/services/svn+ssh.protocol_tdesvn
+%{tde_datadir}/services/svn.protocol_tdesvn
+%{tde_tdelibdir}/tdeio_ksvn.la
+%{tde_tdelibdir}/tdeio_ksvn.so
+%{tde_tdelibdir}/kded_tdesvnd.la
+%{tde_tdelibdir}/kded_tdesvnd.so
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+rm -f src/svnqt/CMakeLists.txt.orig
+#rm -fr src/svnqt/cache/sqlite3/
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+# SMP safe !
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Installs SVN protocols as alternatives
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn
+
+# Locales
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "SVN Client" %{tde_pkg} Development RevisionControl
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/digikam/digikam.spec b/redhat/applications/digikam/digikam.spec
deleted file mode 100644
index 7dd4a2fb5..000000000
--- a/redhat/applications/digikam/digikam.spec
+++ /dev/null
@@ -1,388 +0,0 @@
-#
-# spec file for package digikam (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg digikam
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.9.6
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Digital photo management application for TDE
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		digikam-open_in_digikam.desktop
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-libkexiv2-devel
-BuildRequires:	trinity-libkdcraw-devel
-BuildRequires:	trinity-libkipi-devel
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-BuildRequires:	libtiff-devel
-BuildRequires:	gettext
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# LCMS support
-%if 0%{?suse_version} || 0%{?rhel} >= 7
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-
-# GPHOTO2 support
-%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	gphoto2-devel
-%else
-BuildRequires:	libgphoto2-devel
-%endif
-
-# JASPER support
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%else
-BuildRequires:	jasper-devel
-%endif
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-# SQLITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	sqlite3-devel
-%else
-BuildRequires:	sqlite-devel
-%endif
-
-Requires:		trinity-libkexiv2
-Requires:		trinity-libkdcraw
-Requires:		trinity-libkipi
-
-%description
-An easy to use and powerful digital photo management
-application, which makes importing, organizing and manipulating
-digital photos a "snap".  An interface is provided to connect to
-your digital camera, preview the images and download and/or
-delete them.
-
-The digiKam built-in image editor makes the common photo correction
-a simple task. The image editor is extensible via plugins and,
-the digikamimageplugins project has been merged to digiKam core
-since release 0.9.2, all useful image editor plugins are available
-in the base installation.
-
-digiKam can also make use of the KIPI image handling plugins to
-extend its capabilities even further for photo manipulations,
-import and export, etc. The kipi-plugins package contains many
-very useful extentions.
-
-digiKam is based in part on the work of the Independent JPEG Group.
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/digikam
-%{tde_bindir}/digikamthemedesigner
-%{tde_bindir}/digitaglinktree
-%{tde_bindir}/showfoto
-%{tde_libdir}/libdigikam.so.0
-%{tde_libdir}/libdigikam.so.0.0.0
-%{tde_tdelibdir}/tdeio_digikamalbums.la
-%{tde_tdelibdir}/tdeio_digikamalbums.so
-%{tde_tdelibdir}/tdeio_digikamdates.la
-%{tde_tdelibdir}/tdeio_digikamdates.so
-%{tde_tdelibdir}/digikamimageplugin_adjustcurves.la
-%{tde_tdelibdir}/digikamimageplugin_adjustcurves.so
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.la
-%{tde_tdelibdir}/digikamimageplugin_adjustlevels.so
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.la
-%{tde_tdelibdir}/digikamimageplugin_antivignetting.so
-%{tde_tdelibdir}/digikamimageplugin_blurfx.la
-%{tde_tdelibdir}/digikamimageplugin_blurfx.so
-%{tde_tdelibdir}/digikamimageplugin_border.la
-%{tde_tdelibdir}/digikamimageplugin_border.so
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.la
-%{tde_tdelibdir}/digikamimageplugin_channelmixer.so
-%{tde_tdelibdir}/digikamimageplugin_charcoal.la
-%{tde_tdelibdir}/digikamimageplugin_charcoal.so
-%{tde_tdelibdir}/digikamimageplugin_colorfx.la
-%{tde_tdelibdir}/digikamimageplugin_colorfx.so
-%{tde_tdelibdir}/digikamimageplugin_core.la
-%{tde_tdelibdir}/digikamimageplugin_core.so
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.la
-%{tde_tdelibdir}/digikamimageplugin_distortionfx.so
-%{tde_tdelibdir}/digikamimageplugin_emboss.la
-%{tde_tdelibdir}/digikamimageplugin_emboss.so
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.la
-%{tde_tdelibdir}/digikamimageplugin_filmgrain.so
-%{tde_tdelibdir}/digikamimageplugin_freerotation.la
-%{tde_tdelibdir}/digikamimageplugin_freerotation.so
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.la
-%{tde_tdelibdir}/digikamimageplugin_hotpixels.so
-%{tde_tdelibdir}/digikamimageplugin_infrared.la
-%{tde_tdelibdir}/digikamimageplugin_infrared.so
-%{tde_tdelibdir}/digikamimageplugin_inpainting.la
-%{tde_tdelibdir}/digikamimageplugin_inpainting.so
-%{tde_tdelibdir}/digikamimageplugin_inserttext.la
-%{tde_tdelibdir}/digikamimageplugin_inserttext.so
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.la
-%{tde_tdelibdir}/digikamimageplugin_lensdistortion.so
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.la
-%{tde_tdelibdir}/digikamimageplugin_noisereduction.so
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.la
-%{tde_tdelibdir}/digikamimageplugin_oilpaint.so
-%{tde_tdelibdir}/digikamimageplugin_perspective.la
-%{tde_tdelibdir}/digikamimageplugin_perspective.so
-%{tde_tdelibdir}/digikamimageplugin_raindrop.la
-%{tde_tdelibdir}/digikamimageplugin_raindrop.so
-%{tde_tdelibdir}/digikamimageplugin_restoration.la
-%{tde_tdelibdir}/digikamimageplugin_restoration.so
-%{tde_tdelibdir}/digikamimageplugin_sheartool.la
-%{tde_tdelibdir}/digikamimageplugin_sheartool.so
-%{tde_tdelibdir}/digikamimageplugin_superimpose.la
-%{tde_tdelibdir}/digikamimageplugin_superimpose.so
-%{tde_tdelibdir}/digikamimageplugin_texture.la
-%{tde_tdelibdir}/digikamimageplugin_texture.so
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.la
-%{tde_tdelibdir}/digikamimageplugin_whitebalance.so
-%{tde_tdelibdir}/tdeio_digikamsearch.la
-%{tde_tdelibdir}/tdeio_digikamsearch.so
-%{tde_tdelibdir}/tdeio_digikamtags.la
-%{tde_tdelibdir}/tdeio_digikamtags.so
-%{tde_tdelibdir}/tdeio_digikamthumbnail.la
-%{tde_tdelibdir}/tdeio_digikamthumbnail.so
-%{tde_tdeappdir}/digikam.desktop
-%{tde_tdeappdir}/showfoto.desktop
-%{tde_datadir}/apps/digikam/
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop
-%{tde_datadir}/apps/showfoto/
-%{tde_datadir}/icons/hicolor/*/apps/digikam.png
-%{tde_datadir}/icons/hicolor/*/apps/showfoto.png
-%{tde_datadir}/services/digikamalbums.protocol
-%{tde_datadir}/services/digikamdates.protocol
-%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop
-%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop
-%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop
-%{tde_datadir}/services/digikamimageplugin_blurfx.desktop
-%{tde_datadir}/services/digikamimageplugin_border.desktop
-%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop
-%{tde_datadir}/services/digikamimageplugin_charcoal.desktop
-%{tde_datadir}/services/digikamimageplugin_colorfx.desktop
-%{tde_datadir}/services/digikamimageplugin_core.desktop
-%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop
-%{tde_datadir}/services/digikamimageplugin_emboss.desktop
-%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop
-%{tde_datadir}/services/digikamimageplugin_freerotation.desktop
-%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop
-%{tde_datadir}/services/digikamimageplugin_infrared.desktop
-%{tde_datadir}/services/digikamimageplugin_inpainting.desktop
-%{tde_datadir}/services/digikamimageplugin_inserttext.desktop
-%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop
-%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop
-%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop
-%{tde_datadir}/services/digikamimageplugin_perspective.desktop
-%{tde_datadir}/services/digikamimageplugin_raindrop.desktop
-%{tde_datadir}/services/digikamimageplugin_restoration.desktop
-%{tde_datadir}/services/digikamimageplugin_sheartool.desktop
-%{tde_datadir}/services/digikamimageplugin_superimpose.desktop
-%{tde_datadir}/services/digikamimageplugin_texture.desktop
-%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop
-%{tde_datadir}/services/digikamsearch.protocol
-%{tde_datadir}/services/digikamtags.protocol
-%{tde_datadir}/services/digikamthumbnail.protocol
-%{tde_datadir}/servicetypes/digikamimageplugin.desktop
-%{tde_mandir}/man*/*
-%{tde_tdedocdir}/HTML/en/digikam/
-%{tde_tdedocdir}/HTML/en/showfoto/
-
-##########
-
-%package devel
-Group:			Development/Libraries
-Summary:		Development files for %{name}
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/digikam_export.h
-%{tde_tdeincludedir}/digikam/
-%{tde_libdir}/libdigikam.so
-%{tde_libdir}/libdigikam.la
-
-##########
-
-%package i18n
-Summary:		Translation files for %{tde_pkg}
-Group:			Applications/Utilities
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description i18n
-%{summary}
-
-%files i18n
-%defattr(-,root,root,-)
-%lang(da) %{tde_tdedocdir}/HTML/da/digikam/
-%lang(da) %{tde_tdedocdir}/HTML/da/showfoto/
-%lang(de) %{tde_tdedocdir}/HTML/de/digikam/
-%lang(de) %{tde_tdedocdir}/HTML/de/showfoto/
-%lang(es) %{tde_tdedocdir}/HTML/es/digikam/
-%lang(es) %{tde_tdedocdir}/HTML/es/showfoto/
-%lang(et) %{tde_tdedocdir}/HTML/et/digikam/
-%lang(et) %{tde_tdedocdir}/HTML/et/showfoto/
-%lang(it) %{tde_tdedocdir}/HTML/it/digikam/
-%lang(it) %{tde_tdedocdir}/HTML/it/showfoto/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/
-#lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/showfoto/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/
-#lang(ru) %{tde_tdedocdir}/HTML/ru/showfoto/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-%if 0%{?rhel} == 5
-  --with-included-sqlite3
-%else
-  --without-included-sqlite3
-%endif
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Hide 'showfoto'.
-echo "NoDisplay=true" >> "$RPM_BUILD_ROOT%{tde_tdeappdir}/showfoto.desktop"
-
-# Install the 'open in digikam' action for konqueror.
-install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file digikam  Graphics Photography
-%suse_update_desktop_file showfoto Graphics Viewer
-%suse_update_desktop_file "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop"
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/dolphin/dolphin.spec
deleted file mode 100644
index 49ff7cd6c..000000000
--- a/redhat/applications/dolphin/dolphin.spec
+++ /dev/null
@@ -1,182 +0,0 @@
-#
-# spec file for package dolphin (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg dolphin
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.9.2
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		File manager for TDE focusing on usability
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Dolphin focuses on being only a file manager.
-This approach allows to optimize the user
-interface for the task of file management.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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
-
-# Makes 'media_safelyremove.desktop' an alternative
-%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
-
-# Locales
-%find_lang d3lphin
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-update-alternatives --install \
-  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \
-  media_safelyremove.desktop_d3lphin \
-  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \
-  15
-
-%preun
-if [ $1 -eq 0 ]; then
-  update-alternatives --remove \
-    media_safelyremove.desktop_d3lphin \
-    %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || :
-fi
-
-
-%files -f d3lphin.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_bindir}/d3lphin
-%{tde_tdeappdir}/d3lphin.desktop
-%{tde_datadir}/apps/d3lphin/
-%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
-%{tde_mandir}/man1/*.1*
-%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/
-
-
-%changelog
diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/filelight/filelight.spec
deleted file mode 100644
index 99d2b466d..000000000
--- a/redhat/applications/filelight/filelight.spec
+++ /dev/null
@@ -1,189 +0,0 @@
-#
-# spec file for package filelight (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg filelight
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.0
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Graphical disk usage display
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# ATTR support
-BuildRequires:	libattr-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Obsoletes:	filelight-l10n < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	filelight-l10n = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-Filelight creates a complex, but data-rich graphical representation of the files and
-directories on your computer. 
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL="ON" \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/filelight.desktop FileManager
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/filelight
-%{tde_tdeappdir}/filelight.desktop
-%{tde_datadir}/apps/filelight/
-%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{tde_datadir}/icons/hicolor/*/apps/filelight.png
-%config(noreplace) %{tde_confdir}/filelightrc
-%{tde_datadir}/services/*.desktop
-%{tde_tdelibdir}/libfilelight.so
-%{tde_tdelibdir}/libfilelight.la
-%lang(da) %{tde_tdedocdir}/HTML/da/filelight/
-%lang(en) %{tde_tdedocdir}/HTML/en/filelight/
-%lang(es) %{tde_tdedocdir}/HTML/es/filelight/
-%lang(et) %{tde_tdedocdir}/HTML/et/filelight/
-%lang(it) %{tde_tdedocdir}/HTML/it/filelight/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
-%{tde_mandir}/man1/filelight.1*
-
-
-%changelog
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec
deleted file mode 100644
index e7e34ea46..000000000
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ /dev/null
@@ -1,110 +0,0 @@
-# Default version for this component
-%define tde_pkg fusion-icon
-%define tde_version 14.0.10
-
-%if "%{?python2_sitelib}" == ""
-%define python2_sitelib    %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-%endif
-
-
-# TDE specific building variables
-%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_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		tray icon to launch and manage Compiz Fusion [Trinity]
-Version:		0.0.0+git20071028
-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://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-# [fusion-icon] Allow python installation under /usr instead of tde_prefix
-Patch1:		fusion-icon-3.5.13-fix_python_sitelib.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	python
-Requires:		python
-Requires:		trinity-compizconfig-backend-kconfig
-
-%description
-The OpenCompositing Project brings 3D desktop visual effects that
-improve the usability and eye candy of the X Window System and provide
-increased productivity.
-
-This package contains a tray icon that can launch Compiz and its
-decorators.
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install \
-  DESTDIR=%{buildroot} \
-  PREFIX=%{tde_prefix} \
-  PYTHON_SITELIB=%{?python2_sitelib}
-
-# Removes 'egg-info'
-find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/fusion-icon
-%{python2_sitelib}/FusionIcon/
-%{tde_datadir}/applications/fusion-icon.desktop
-%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png
-%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg
-
-
-%changelog
diff --git a/redhat/applications/games/knights/knights.spec b/redhat/applications/games/knights/knights.spec
new file mode 100644
index 000000000..d5177c358
--- /dev/null
+++ b/redhat/applications/games/knights/knights.spec
@@ -0,0 +1,189 @@
+#
+# spec file for package knights (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg knights
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.6
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	A chess interface for the K Desktop Environment [Trinity]
+Group:		Amusements/Games
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# GNUCHESS support
+Requires:		gnuchess
+
+%description
+Knights aims to be the ultimate chess resource on your computer. 
+Written for the K Desktop Environment, it's designed to be both friendly 
+to new chess players and functional for Grand Masters.
+
+Here's a quick list of Knights' key features:
+* Play against yourself, against computer opponents, 
+  or against others over the Internet.
+* Customize your board and pieces with over 30 different themes, 
+  or make your own!
+* Audio cues help alert you to important events.
+* Novice players can preview potential moves.
+* Save your unfinished matches and play them again later.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Fix desktop icon location
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+  %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Games/Board/knights.desktop" "%{?buildroot}%{tde_tdeappdir}"
+  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/knights.desktop" Game BoardGame
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/knights
+%{tde_tdeappdir}/knights.desktop
+%{tde_datadir}/apps/knights
+%{tde_tdedocdir}/HTML/*/knights
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/mimelnk/application/pgn.desktop
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/games/tdepacman/tdepacman.spec b/redhat/applications/games/tdepacman/tdepacman.spec
new file mode 100644
index 000000000..59269b25a
--- /dev/null
+++ b/redhat/applications/games/tdepacman/tdepacman.spec
@@ -0,0 +1,150 @@
+#
+# spec file for package tdepacman (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
+%define tde_pkg tdepacman
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+
+# TDE specific building variables
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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 pacman game for the Trinity Desktop
+Version:		0.3.2
+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://www.trinitydesktop.org/
+
+Prefix:			%{_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:	trinity-tdegames-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+
+%description
+Pacman is a legendary game with an enthusiastic following from around 
+the world. Since its introduction in 1980, Pacman's image has been 
+splashed across magazine covers, television screens, T-shirts, and 
+bumper stickers. Created by Japan's Namco, and distributed in the 
+United States by Bally, Pacman is an icon of 1980's popular culture
+
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%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,-)
+%doc AUTHORS ChangeLog COPYING README.md TODO
+%{tde_bindir}/tdepacman
+%{tde_tdeappdir}/tdepacman.desktop
+%{tde_datadir}/apps/tdepacman/
+%dir %{tde_datadir}/config
+%{tde_datadir}/config/tdepacmanrc
+%lang(de) %{tde_tdedocdir}/HTML/de/tdepacman/
+%{tde_tdedocdir}/HTML/en/tdepacman/
+%{tde_datadir}/icons/hicolor/16x16/apps/tdepacman.png
+%{tde_datadir}/icons/hicolor/32x32/apps/tdepacman.png
+%{tde_datadir}/icons/locolor/16x16/apps/tdepacman.png
+%{tde_datadir}/icons/locolor/32x32/apps/tdepacman.png
+%{tde_mandir}/man1/tdepacman.1*
+
+
+%changelog
diff --git a/redhat/applications/digikam/digikam-open_in_digikam.desktop b/redhat/applications/graphics/digikam/digikam-open_in_digikam.desktop
index ddf7f93b4..ddf7f93b4 100644
--- a/redhat/applications/digikam/digikam-open_in_digikam.desktop
+++ b/redhat/applications/graphics/digikam/digikam-open_in_digikam.desktop
diff --git a/redhat/applications/graphics/digikam/digikam.spec b/redhat/applications/graphics/digikam/digikam.spec
new file mode 100644
index 000000000..d24f6e1af
--- /dev/null
+++ b/redhat/applications/graphics/digikam/digikam.spec
@@ -0,0 +1,386 @@
+#
+# spec file for package digikam (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg digikam
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.9.6
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Digital photo management application for TDE
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		digikam-open_in_digikam.desktop
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-libkexiv2-devel
+BuildRequires:	trinity-libkdcraw-devel
+BuildRequires:	trinity-libkipi-devel
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+BuildRequires:	libtiff-devel
+BuildRequires:	gettext
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# LCMS support
+%if 0%{?suse_version} || 0%{?rhel} >= 7
+BuildRequires: liblcms-devel
+%else
+BuildRequires: lcms-devel
+%endif
+
+# GPHOTO2 support
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	gphoto2-devel
+%else
+BuildRequires:	libgphoto2-devel
+%endif
+
+# JASPER support
+%if 0%{?suse_version}
+BuildRequires:	libjasper-devel
+%else
+BuildRequires:	jasper-devel
+%endif
+
+# EXIV2 support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}exiv2-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libexiv2-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	exiv2-devel
+%endif
+
+# SQLITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	sqlite3-devel
+%else
+BuildRequires:	sqlite-devel
+%endif
+
+Requires:		trinity-libkexiv2
+Requires:		trinity-libkdcraw
+Requires:		trinity-libkipi
+
+%description
+An easy to use and powerful digital photo management
+application, which makes importing, organizing and manipulating
+digital photos a "snap".  An interface is provided to connect to
+your digital camera, preview the images and download and/or
+delete them.
+
+The digiKam built-in image editor makes the common photo correction
+a simple task. The image editor is extensible via plugins and,
+the digikamimageplugins project has been merged to digiKam core
+since release 0.9.2, all useful image editor plugins are available
+in the base installation.
+
+digiKam can also make use of the KIPI image handling plugins to
+extend its capabilities even further for photo manipulations,
+import and export, etc. The kipi-plugins package contains many
+very useful extentions.
+
+digiKam is based in part on the work of the Independent JPEG Group.
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/digikam
+%{tde_bindir}/digikamthemedesigner
+%{tde_bindir}/digitaglinktree
+%{tde_bindir}/showfoto
+%{tde_libdir}/libdigikam.so.0
+%{tde_libdir}/libdigikam.so.0.0.0
+%{tde_tdelibdir}/tdeio_digikamalbums.la
+%{tde_tdelibdir}/tdeio_digikamalbums.so
+%{tde_tdelibdir}/tdeio_digikamdates.la
+%{tde_tdelibdir}/tdeio_digikamdates.so
+%{tde_tdelibdir}/digikamimageplugin_adjustcurves.la
+%{tde_tdelibdir}/digikamimageplugin_adjustcurves.so
+%{tde_tdelibdir}/digikamimageplugin_adjustlevels.la
+%{tde_tdelibdir}/digikamimageplugin_adjustlevels.so
+%{tde_tdelibdir}/digikamimageplugin_antivignetting.la
+%{tde_tdelibdir}/digikamimageplugin_antivignetting.so
+%{tde_tdelibdir}/digikamimageplugin_blurfx.la
+%{tde_tdelibdir}/digikamimageplugin_blurfx.so
+%{tde_tdelibdir}/digikamimageplugin_border.la
+%{tde_tdelibdir}/digikamimageplugin_border.so
+%{tde_tdelibdir}/digikamimageplugin_channelmixer.la
+%{tde_tdelibdir}/digikamimageplugin_channelmixer.so
+%{tde_tdelibdir}/digikamimageplugin_charcoal.la
+%{tde_tdelibdir}/digikamimageplugin_charcoal.so
+%{tde_tdelibdir}/digikamimageplugin_colorfx.la
+%{tde_tdelibdir}/digikamimageplugin_colorfx.so
+%{tde_tdelibdir}/digikamimageplugin_core.la
+%{tde_tdelibdir}/digikamimageplugin_core.so
+%{tde_tdelibdir}/digikamimageplugin_distortionfx.la
+%{tde_tdelibdir}/digikamimageplugin_distortionfx.so
+%{tde_tdelibdir}/digikamimageplugin_emboss.la
+%{tde_tdelibdir}/digikamimageplugin_emboss.so
+%{tde_tdelibdir}/digikamimageplugin_filmgrain.la
+%{tde_tdelibdir}/digikamimageplugin_filmgrain.so
+%{tde_tdelibdir}/digikamimageplugin_freerotation.la
+%{tde_tdelibdir}/digikamimageplugin_freerotation.so
+%{tde_tdelibdir}/digikamimageplugin_hotpixels.la
+%{tde_tdelibdir}/digikamimageplugin_hotpixels.so
+%{tde_tdelibdir}/digikamimageplugin_infrared.la
+%{tde_tdelibdir}/digikamimageplugin_infrared.so
+%{tde_tdelibdir}/digikamimageplugin_inpainting.la
+%{tde_tdelibdir}/digikamimageplugin_inpainting.so
+%{tde_tdelibdir}/digikamimageplugin_inserttext.la
+%{tde_tdelibdir}/digikamimageplugin_inserttext.so
+%{tde_tdelibdir}/digikamimageplugin_lensdistortion.la
+%{tde_tdelibdir}/digikamimageplugin_lensdistortion.so
+%{tde_tdelibdir}/digikamimageplugin_noisereduction.la
+%{tde_tdelibdir}/digikamimageplugin_noisereduction.so
+%{tde_tdelibdir}/digikamimageplugin_oilpaint.la
+%{tde_tdelibdir}/digikamimageplugin_oilpaint.so
+%{tde_tdelibdir}/digikamimageplugin_perspective.la
+%{tde_tdelibdir}/digikamimageplugin_perspective.so
+%{tde_tdelibdir}/digikamimageplugin_raindrop.la
+%{tde_tdelibdir}/digikamimageplugin_raindrop.so
+%{tde_tdelibdir}/digikamimageplugin_restoration.la
+%{tde_tdelibdir}/digikamimageplugin_restoration.so
+%{tde_tdelibdir}/digikamimageplugin_sheartool.la
+%{tde_tdelibdir}/digikamimageplugin_sheartool.so
+%{tde_tdelibdir}/digikamimageplugin_superimpose.la
+%{tde_tdelibdir}/digikamimageplugin_superimpose.so
+%{tde_tdelibdir}/digikamimageplugin_texture.la
+%{tde_tdelibdir}/digikamimageplugin_texture.so
+%{tde_tdelibdir}/digikamimageplugin_whitebalance.la
+%{tde_tdelibdir}/digikamimageplugin_whitebalance.so
+%{tde_tdelibdir}/tdeio_digikamsearch.la
+%{tde_tdelibdir}/tdeio_digikamsearch.so
+%{tde_tdelibdir}/tdeio_digikamtags.la
+%{tde_tdelibdir}/tdeio_digikamtags.so
+%{tde_tdelibdir}/tdeio_digikamthumbnail.la
+%{tde_tdelibdir}/tdeio_digikamthumbnail.so
+%{tde_tdeappdir}/digikam.desktop
+%{tde_tdeappdir}/showfoto.desktop
+%{tde_datadir}/apps/digikam/
+%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop
+%{tde_datadir}/apps/showfoto/
+%{tde_datadir}/icons/hicolor/*/apps/digikam.png
+%{tde_datadir}/icons/hicolor/*/apps/showfoto.png
+%{tde_datadir}/services/digikamalbums.protocol
+%{tde_datadir}/services/digikamdates.protocol
+%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop
+%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop
+%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop
+%{tde_datadir}/services/digikamimageplugin_blurfx.desktop
+%{tde_datadir}/services/digikamimageplugin_border.desktop
+%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop
+%{tde_datadir}/services/digikamimageplugin_charcoal.desktop
+%{tde_datadir}/services/digikamimageplugin_colorfx.desktop
+%{tde_datadir}/services/digikamimageplugin_core.desktop
+%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop
+%{tde_datadir}/services/digikamimageplugin_emboss.desktop
+%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop
+%{tde_datadir}/services/digikamimageplugin_freerotation.desktop
+%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop
+%{tde_datadir}/services/digikamimageplugin_infrared.desktop
+%{tde_datadir}/services/digikamimageplugin_inpainting.desktop
+%{tde_datadir}/services/digikamimageplugin_inserttext.desktop
+%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop
+%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop
+%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop
+%{tde_datadir}/services/digikamimageplugin_perspective.desktop
+%{tde_datadir}/services/digikamimageplugin_raindrop.desktop
+%{tde_datadir}/services/digikamimageplugin_restoration.desktop
+%{tde_datadir}/services/digikamimageplugin_sheartool.desktop
+%{tde_datadir}/services/digikamimageplugin_superimpose.desktop
+%{tde_datadir}/services/digikamimageplugin_texture.desktop
+%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop
+%{tde_datadir}/services/digikamsearch.protocol
+%{tde_datadir}/services/digikamtags.protocol
+%{tde_datadir}/services/digikamthumbnail.protocol
+%{tde_datadir}/servicetypes/digikamimageplugin.desktop
+%{tde_mandir}/man*/*
+%{tde_tdedocdir}/HTML/en/digikam/
+%{tde_tdedocdir}/HTML/en/showfoto/
+
+##########
+
+%package devel
+Group:			Development/Libraries
+Summary:		Development files for %{name}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+%{summary}
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/digikam_export.h
+%{tde_tdeincludedir}/digikam/
+%{tde_libdir}/libdigikam.so
+%{tde_libdir}/libdigikam.la
+
+##########
+
+%package i18n
+Summary:		Translation files for %{tde_pkg}
+Group:			Applications/Utilities
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description i18n
+%{summary}
+
+%files i18n
+%defattr(-,root,root,-)
+%lang(da) %{tde_tdedocdir}/HTML/da/digikam/
+%lang(da) %{tde_tdedocdir}/HTML/da/showfoto/
+%lang(de) %{tde_tdedocdir}/HTML/de/digikam/
+%lang(de) %{tde_tdedocdir}/HTML/de/showfoto/
+%lang(es) %{tde_tdedocdir}/HTML/es/digikam/
+%lang(es) %{tde_tdedocdir}/HTML/es/showfoto/
+%lang(et) %{tde_tdedocdir}/HTML/et/digikam/
+%lang(et) %{tde_tdedocdir}/HTML/et/showfoto/
+%lang(it) %{tde_tdedocdir}/HTML/it/digikam/
+%lang(it) %{tde_tdedocdir}/HTML/it/showfoto/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/digikam/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/showfoto/
+%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/digikam/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/digikam/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/digikam/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/showfoto/
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --datadir=%{tde_datadir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+%if 0%{?rhel} == 5
+  --with-included-sqlite3
+%else
+  --without-included-sqlite3
+%endif
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+# Hide 'showfoto'.
+echo "NoDisplay=true" >> "$RPM_BUILD_ROOT%{tde_tdeappdir}/showfoto.desktop"
+
+# Install the 'open in digikam' action for konqueror.
+install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file digikam  Graphics Photography
+%suse_update_desktop_file showfoto Graphics Viewer
+%suse_update_desktop_file "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/servicemenus/digikam-open_in_digikam.desktop"
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
new file mode 100644
index 000000000..a44800bfe
--- /dev/null
+++ b/redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec
@@ -0,0 +1,168 @@
+#
+# spec file for package gwenview-i18n (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg gwenview-i18n
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.4.2
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Internationalization support for Gwenview [Trinity]
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:	noarch
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Gwenview is a fast and easy to use image viewer/browser for TDE.
+All common image formats are supported, such as PNG(including transparency),
+JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
+image format), BMP, XPM and others. Standard features include slideshow,
+fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
+transparency using the KIO framework, including basic file operations and
+browsing in compressed archives, non-blocking GUI with adjustable views.
+Gwenview also provides image and directory KParts components for use e.g. in
+Konqueror. Additional features, such as image renaming, comparing,
+converting, and batch processing, HTML gallery and others are provided by the
+KIPI image framework.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+## File lists
+%find_lang gwenview
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f gwenview.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING TODO
+%lang(da) %{tde_tdedocdir}/HTML/da/gwenview/
+%lang(de) %{tde_tdedocdir}/HTML/de/gwenview/
+%lang(et) %{tde_tdedocdir}/HTML/et/gwenview/
+%lang(fr) %{tde_tdedocdir}/HTML/fr/gwenview/
+%lang(it) %{tde_tdedocdir}/HTML/it/gwenview/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/gwenview/
+%lang(pl) %{tde_tdedocdir}/HTML/pl/gwenview/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/gwenview/
+%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/gwenview/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/gwenview/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/gwenview/
+
+
+%changelog
diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec
new file mode 100644
index 000000000..d821cf0ae
--- /dev/null
+++ b/redhat/applications/graphics/gwenview/gwenview.spec
@@ -0,0 +1,214 @@
+#
+# spec file for package gwenview (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg gwenview
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.4.2
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Gwenview is an image viewer for TDE.
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# EXIV2 support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}exiv2-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libexiv2-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	exiv2-devel
+%endif
+
+%if "%{?tde_prefix}" == "/usr"
+Conflicts: kdegraphics
+%endif
+
+
+%description
+Gwenview is a fast and easy to use image viewer/browser for TDE.
+All common image formats are supported, such as PNG(including transparency),
+JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
+image format), BMP, XPM and others. Standard features include slideshow,
+fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
+transparency using the KIO framework, including basic file operations and
+browsing in compressed archives, non-blocking GUI with adjustable views.
+Gwenview also provides image and directory KParts components for use e.g. in
+Konqueror. Additional features, such as image renaming, comparing,
+converting, and batch processing, HTML gallery and others are provided by the
+KIPI image framework.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_tdedocdir} \
+  --includedir=%{tde_tdeincludedir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Removes useless files (-devel ?)
+%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file gwenview RasterGraphics Viewer
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/gwenview
+%{tde_libdir}/libgwenviewcore.la
+%{tde_libdir}/libgwenviewcore.so.1
+%{tde_libdir}/libgwenviewcore.so.1.0.0
+%{tde_libdir}/libtdeinit_gwenview.la
+%{tde_libdir}/libtdeinit_gwenview.so
+%{tde_tdelibdir}/gwenview.la
+%{tde_tdelibdir}/gwenview.so
+%{tde_tdelibdir}/libgvdirpart.la
+%{tde_tdelibdir}/libgvdirpart.so
+%{tde_tdelibdir}/libgvimagepart.la
+%{tde_tdelibdir}/libgvimagepart.so
+%{tde_tdeappdir}/gwenview.desktop
+%{tde_datadir}/apps/gwenview/
+%dir %{tde_datadir}/apps/gvdirpart
+%{tde_datadir}/apps/gvdirpart/gvdirpart.rc
+%dir %{tde_datadir}/apps/gvimagepart
+%{tde_datadir}/apps/gvimagepart/gvimagepart.rc
+%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
+%{tde_datadir}/apps/tdeconf_update/gwenview_1.4_osdformat.sh
+%{tde_datadir}/apps/tdeconf_update/gwenview_1.4_osdformat.upd
+%{tde_datadir}/apps/tdeconf_update/gwenview_thumbnail_size.sh
+%{tde_datadir}/apps/tdeconf_update/gwenview_thumbnail_size.upd
+%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop
+%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg
+%{tde_datadir}/config.kcfg/fileviewconfig.kcfg
+%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg
+%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg
+%{tde_datadir}/config.kcfg/imageviewconfig.kcfg
+%{tde_datadir}/config.kcfg/miscconfig.kcfg
+%{tde_datadir}/config.kcfg/slideshowconfig.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png
+%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg
+%{tde_datadir}/icons/hicolor/*/apps/gwenview.png
+%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png
+%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
+%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
+%{tde_datadir}/man/man1/gwenview.1*
+%{tde_datadir}/services/gvdirpart.desktop
+%{tde_datadir}/services/gvimagepart.desktop
+%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
+
+%changelog
diff --git a/redhat/applications/graphics/ksquirrel/ksquirrel.spec b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
new file mode 100644
index 000000000..858682933
--- /dev/null
+++ b/redhat/applications/graphics/ksquirrel/ksquirrel.spec
@@ -0,0 +1,195 @@
+#
+# spec file for package ksquirrel (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg ksquirrel
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.8.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Powerful Trinity image viewer
+Group:		Amusements/Games
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	trinity-libkipi-devel
+BuildRequires:	trinity-libksquirrel-devel
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-Mesa-libGLU
+%endif
+
+
+%description
+KSquirrel is an image viewer for TDE with disk navigator, file tree,
+multiple directory view, thumbnails, extended thumbnails, dynamic
+format support, DCOP interface, KEXIF and KIPI plugins support.
+
+KSquirrel is a fast and convenient image viewer for TDE featuring
+OpenGL and dynamic format support.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
+
+# Specific path for RHEL4
+if [ -d /usr/X11R6 ]; then
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+# Warning: --enable-final causes FTBFS
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --disable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
+%{tde_bindir}/ksquirrel
+%{tde_bindir}/ksquirrel-libs-configurator
+%{tde_bindir}/ksquirrel-libs-configurator-real
+%{tde_tdelibdir}/libksquirrelpart.la
+%{tde_tdelibdir}/libksquirrelpart.so
+%{tde_tdeappdir}/ksquirrel.desktop
+%dir %{tde_datadir}/apps/dolphin
+%dir %{tde_datadir}/apps/dolphin/servicemenus
+%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
+%{tde_datadir}/apps/ksquirrel/
+%{tde_datadir}/apps/ksquirrelpart/
+%config(noreplace) %{tde_confdir}/magic/x-ras.magic
+%config(noreplace) %{tde_confdir}/magic/x-sun.magic
+%config(noreplace) %{tde_confdir}/magic/x-utah.magic
+%{tde_tdedocdir}/HTML/*/ksquirrel
+%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
+%{tde_datadir}/mimelnk/image/*.desktop
+%{tde_datadir}/services/ksquirrelpart.desktop
+%{tde_mandir}/man1/ksquirrel.1
+%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc
+
+
+%changelog
diff --git a/redhat/applications/graphics/kuickshow/kuickshow.spec b/redhat/applications/graphics/kuickshow/kuickshow.spec
new file mode 100644
index 000000000..ec3d708ab
--- /dev/null
+++ b/redhat/applications/graphics/kuickshow/kuickshow.spec
@@ -0,0 +1,168 @@
+#
+# spec file for package kuickshow (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kuickshow
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.8.13
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Quick picture viewer for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# IMLIB1 support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
+BuildRequires:	imlib-devel
+%endif
+%if 0%{?mgaversion}
+BuildRequires:	imlib1-devel
+%endif
+
+# GIF support
+%if 0%{?suse_version} || 0%{?fedora} >= 28
+BuildRequires:	giflib-devel 
+%else
+BuildRequires:	libungif-devel 
+%endif
+
+
+%description
+Kuickshow is a picture viewer for TDE. It displays the directory structure,
+displaying images as thumbnails.
+Clicking on an image shows the image in its normal size. 
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{?buildroot}
+
+# Missing category will make this fail.
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/kuickshow
+%{tde_datadir}/applications/*/*.desktop
+%{tde_datadir}/apps/kuickshow/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_libdir}/libtdeinit_%{tde_pkg}.so
+%{tde_libdir}/*.la
+%{tde_tdelibdir}/*.so
+%{tde_tdelibdir}/*.la
+%{tde_tdedocdir}/HTML/en/kuickshow/
+
+
+%changelog
diff --git a/redhat/applications/graphics/potracegui/potracegui.spec b/redhat/applications/graphics/potracegui/potracegui.spec
new file mode 100644
index 000000000..6350a6d5e
--- /dev/null
+++ b/redhat/applications/graphics/potracegui/potracegui.spec
@@ -0,0 +1,171 @@
+#
+# spec file for package potracegui (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg potracegui
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE frontend for potrace [Trinity]
+Group:		Applications/Multimedia
+URL:		http://potracegui.sourceforge.net
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+A TDE interface for the commandline tracing tools potrace and/or autotrace. It
+supports drag and drop as well as all image types recognized by TDE, which are
+a lot more than the 4 recognized by the potrace commandline tool. Loading of
+remote files (web, ftp, ...) is also supported.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file potracegui -G "Potrace GUI" Graphics VectorGraphics
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.md
+%{tde_bindir}/potracegui
+%{tde_tdeappdir}/potracegui.desktop
+%{tde_datadir}/apps/potracegui/
+%{tde_tdedocdir}/HTML/en/potracegui/
+%{tde_datadir}/icons/hicolor/*/apps/potracegui.png
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
deleted file mode 120000
index 0c82b8b5f..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
deleted file mode 100644
index 32956431c..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec
+++ /dev/null
@@ -1,193 +0,0 @@
-#
-# spec file for package gtk-qt-engine (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg gtk-qt-engine
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.8
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Theme engine using Qt for GTK+ 2.x and Trinity
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		gtk-qt-engine.rc.sh
-Source2:		gtkrc-2.0-kde4
-Source3:		gtkrc-2.0-kde-kde4
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# GTK2 support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires:	gtk2-devel
-%endif
-%if 0%{?mgaversion} >= 5
-BuildRequires:	%{_lib}gtk+2.0-devel
-%endif
-%if 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	%{_lib}gtk+2.0_0-devel
-%else
-BuildRequires:	gtk+2.0-devel
-%endif
-%endif
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
-that calls Qt to do the actual drawing. This makes your GTK 2 applications
-look almost like real Qt applications and gives you a more unified desktop
-experience.
-
-Please note that this package is targeted at Trinity users and therefore provides
-a way to configure it from within KControl.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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:${PKG_CONFIG_PATH}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-# Warning: GCC visibility causes the KCM not to work at all !
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang gtkqtengine
-
-# Adds TDE's specific GTKRC
-%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh"
-%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4"
-%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f gtkqtengine.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_tdelibdir}/kcm_kcmgtk.la
-%{tde_tdelibdir}/kcm_kcmgtk.so
-%{tde_appdir}/kcmgtk.desktop
-%dir %{tde_datadir}/apps/kgtk
-%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4
-%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4
-%{tde_tdedocdir}/HTML/en/kcmgtk/
-
-# The following files are outside TDE's directory
-%dir %{_libdir}/gtk-2.0
-%dir %{_libdir}/gtk-2.0/2.10.0
-%dir %{_libdir}/gtk-2.0/2.10.0/engines
-%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.la
-%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so
-%dir %{_datadir}/themes
-%dir %{_datadir}/themes/Qt
-%dir %{_datadir}/themes/Qt/gtk-2.0
-%{_datadir}/themes/Qt/gtk-2.0/gtkrc
-
-
-%changelog
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
deleted file mode 120000
index f71a6795b..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file
diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
deleted file mode 120000
index 8e006a46b..000000000
--- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec
deleted file mode 100644
index b68274d17..000000000
--- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-#
-# spec file for package gtk3-tqt-engine (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg gtk3-tqt-engine
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.5
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		GTK3 theme engine for TDE
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7
-BuildRequires:	gtk3-devel
-%else
-BuildRequires:	gtk+3.0-devel
-%endif
-
-%description
-GTK3 style engine which uses the active TDE style to draw its widgets
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if "%_lib" == "lib64"
-%__sed -i "tdegtk/Makefile.am" -e "s|/lib/|/lib64/|g"
-%endif
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-if [ -d "/usr/include/atk-1.0" ]; then
-  extra_includes="%{_includedir}/atk-1.0:${extra_includes}"
-fi
-if [ -d "/usr/include/gdk-pixbuf-2.0" ]; then
-  extra_includes="%{_includedir}/gdk-pixbuf-2.0:${extra_includes}"
-fi
-if [ -d "/usr/include/gtk-3.0" ]; then
-  extra_includes="%{_includedir}/gtk-3.0:${extra_includes}"
-fi
-if [ -d "/usr/include/pango-1.0" ]; then
-  extra_includes="%{_includedir}/pango-1.0:${extra_includes}"
-fi
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --with-extra-includes=${extra_includes}
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_libdir}/libtqtcairo.la
-%{tde_libdir}/libtqtcairo.so
-%{tde_libdir}/libtqtcairo.so.0
-%{tde_libdir}/libtqtcairo.so.0.0.0
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0
-%dir %{_datadir}/themes/tdegtk
-%dir %{_datadir}/themes/tdegtk/gtk-3.0
-%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css
-
-
-%changelog
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/gwenview-i18n/gwenview-i18n.spec
deleted file mode 100644
index e0ca29a94..000000000
--- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# spec file for package gwenview-i18n (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg gwenview-i18n
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.4.2
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Internationalization support for Gwenview [Trinity]
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-## File lists
-%find_lang gwenview
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f gwenview.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%lang(da) %{tde_tdedocdir}/HTML/da/gwenview/
-%lang(de) %{tde_tdedocdir}/HTML/de/gwenview/
-%lang(et) %{tde_tdedocdir}/HTML/et/gwenview/
-%lang(fr) %{tde_tdedocdir}/HTML/fr/gwenview/
-%lang(it) %{tde_tdedocdir}/HTML/it/gwenview/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/gwenview/
-%lang(pl) %{tde_tdedocdir}/HTML/pl/gwenview/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/gwenview/
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/gwenview/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/gwenview/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/gwenview/
-
-
-%changelog
diff --git a/redhat/applications/gwenview/gwenview.spec b/redhat/applications/gwenview/gwenview.spec
deleted file mode 100644
index d53729255..000000000
--- a/redhat/applications/gwenview/gwenview.spec
+++ /dev/null
@@ -1,214 +0,0 @@
-#
-# spec file for package gwenview (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg gwenview
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.4.2
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Gwenview is an image viewer for TDE.
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# EXIV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libexiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	exiv2-devel
-%endif
-
-%if "%{?tde_prefix}" == "/usr"
-Conflicts: kdegraphics
-%endif
-
-
-%description
-Gwenview is a fast and easy to use image viewer/browser for TDE.
-All common image formats are supported, such as PNG(including transparency),
-JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp
-image format), BMP, XPM and others. Standard features include slideshow,
-fullscreen view, image thumbnails, drag'n'drop, image zoom, full network
-transparency using the KIO framework, including basic file operations and
-browsing in compressed archives, non-blocking GUI with adjustable views.
-Gwenview also provides image and directory KParts components for use e.g. in
-Konqueror. Additional features, such as image renaming, comparing,
-converting, and batch processing, HTML gallery and others are provided by the
-KIPI image framework.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file gwenview RasterGraphics Viewer
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/gwenview
-%{tde_libdir}/libgwenviewcore.la
-%{tde_libdir}/libgwenviewcore.so.1
-%{tde_libdir}/libgwenviewcore.so.1.0.0
-%{tde_libdir}/libtdeinit_gwenview.la
-%{tde_libdir}/libtdeinit_gwenview.so
-%{tde_tdelibdir}/gwenview.la
-%{tde_tdelibdir}/gwenview.so
-%{tde_tdelibdir}/libgvdirpart.la
-%{tde_tdelibdir}/libgvdirpart.so
-%{tde_tdelibdir}/libgvimagepart.la
-%{tde_tdelibdir}/libgvimagepart.so
-%{tde_tdeappdir}/gwenview.desktop
-%{tde_datadir}/apps/gwenview/
-%dir %{tde_datadir}/apps/gvdirpart
-%{tde_datadir}/apps/gvdirpart/gvdirpart.rc
-%dir %{tde_datadir}/apps/gvimagepart
-%{tde_datadir}/apps/gvimagepart/gvimagepart.rc
-%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
-%{tde_datadir}/apps/tdeconf_update/gwenview_1.4_osdformat.sh
-%{tde_datadir}/apps/tdeconf_update/gwenview_1.4_osdformat.upd
-%{tde_datadir}/apps/tdeconf_update/gwenview_thumbnail_size.sh
-%{tde_datadir}/apps/tdeconf_update/gwenview_thumbnail_size.upd
-%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop
-%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg
-%{tde_datadir}/config.kcfg/fileviewconfig.kcfg
-%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg
-%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg
-%{tde_datadir}/config.kcfg/imageviewconfig.kcfg
-%{tde_datadir}/config.kcfg/miscconfig.kcfg
-%{tde_datadir}/config.kcfg/slideshowconfig.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/*/apps/gwenview.png
-%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png
-%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg
-%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz
-%{tde_datadir}/man/man1/gwenview.1*
-%{tde_datadir}/services/gvdirpart.desktop
-%{tde_datadir}/services/gvimagepart.desktop
-%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
-
-%changelog
diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec
new file mode 100644
index 000000000..bd2eeef62
--- /dev/null
+++ b/redhat/applications/internet/kasablanca/kasablanca.spec
@@ -0,0 +1,191 @@
+#
+# spec file for package kasablanca (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kasablanca
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.4.0.2
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Graphical FTP client for Trinity
+Group:			Applications/Internet 
+Url:			http://kasablanca.berlios.de/ 
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext 
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# UTEMPTER support
+%if 0%{?suse_version}
+BuildRequires:	utempter-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}utempter-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} == 4
+%else
+BuildRequires:	libutempter-devel
+%endif
+%endif
+
+%description
+Kasablanca is an ftp client, among its features are currently: 
+* ftps encryption via AUTH TLS
+* fxp (direct server to server transfer), supporting alternative mode.
+* advanced bookmarking system.
+* fast responsive multithreaded engine.
+* concurrent connections to multiple hosts.
+* interactive transfer queue, movable by drag and drop.
+* small nifty features, like a skiplist.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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 $RPM_BUILD_ROOT 
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+# locale's
+%find_lang %{tde_pkg}
+
+# Fix desktop files (openSUSE only)
+%if 0%{?suse_version}
+%suse_update_desktop_file kasablanca Network FileTransfer
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT 
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.md
+%{tde_bindir}/kasablanca
+%{tde_datadir}/apps/kasablanca/
+%{tde_datadir}/config.kcfg/kbconfig.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kasablanca.png
+%{tde_tdedocdir}/HTML/en/kasablanca/
+%{tde_tdeappdir}/kasablanca.desktop
+%{tde_mandir}/man1/kasablanca.*
+
+
+%changelog
diff --git a/redhat/applications/internet/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec
new file mode 100644
index 000000000..2e858f385
--- /dev/null
+++ b/redhat/applications/internet/kbiff/kbiff.spec
@@ -0,0 +1,181 @@
+#
+# spec file for package kbiff (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kbiff
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:        3.9
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:        TDE mail notification utility
+Group:          Applications/Internet
+URL:            http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	tqt3-compat-headers >= 3.5.0
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Kbiff is a "xbiff"-like mail notification utility. It has  multiple pixmaps,
+session management, and GUI configuration.  It can "dock" into the TDE panel.
+It can display animated gifs, play system sounds, or run arbitrary shell
+command when new mail arrives. It supports mbox, maildir, mh, POP3, IMAP4, and
+NNTP mailboxes.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" Applet
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md ChangeLog
+%{tde_bindir}/kbiff
+%{tde_libdir}/libtdeinit_kbiff.la
+%{tde_libdir}/libtdeinit_kbiff.so
+%{tde_tdelibdir}/kbiff.la
+%{tde_tdelibdir}/kbiff.so
+%{tde_tdeappdir}/kbiff.desktop
+%{tde_datadir}/apps/kbiff/
+%{tde_datadir}/icons/hicolor/*/apps/kbiff.png
+%{tde_datadir}/icons/locolor/*/apps/kbiff.png
+%{tde_mandir}/man1/kbiff.1*
+%lang(de) %{tde_tdedocdir}/HTML/de/kbiff/
+%lang(en) %{tde_tdedocdir}/HTML/en/kbiff/
+%lang(es) %{tde_tdedocdir}/HTML/es/kbiff/
+%lang(fr) %{tde_tdedocdir}/HTML/fr/kbiff/
+
+
+%changelog
diff --git a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
new file mode 100644
index 000000000..c3bd78a21
--- /dev/null
+++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec
@@ -0,0 +1,204 @@
+#
+# spec file for package kftprgrabber (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kftpgrabber
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:        0.8.1
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:        A FTP client for TDE
+Group:          Applications/Internet
+URL:            http://www.kftp.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+KFTPgrabber is a graphical FTP client for the Trinity Desktop Environment. It
+implements many features required for usable FTP interaction.
+
+Feature list:
+- Multiple simultaneous FTP sessions in separate tabs
+- A tree-oriented transfer queue
+- TLS/SSL support for the control connection and the data channel
+- X509 certificate support for authentication
+- FXP site-to-site transfer support
+- One-time password (OTP) support using S/KEY, MD5, RMD160 or SHA1
+- Site bookmarks with many options configurable per-site
+- Distributed FTP daemon support (implementing the PRET command)
+- Can use Zeroconf for local site discovery
+- Bookmark import plugins from other FTP clients
+- Support for the SFTP protocol
+- A nice traffic graph
+- Ability to limit upload and download speed
+- Priority and skip lists
+- Integrated SFV checksum verifier
+- Direct viewing/editing of remote files
+- Advanced default "on file exists" action configuration
+- Filter displayed files/directories as you type
+
+
+%package devel
+Summary:  	Development files for %{name}
+Group: 		Development/Libraries
+Requires: 	%{name} = %{version}-%{release}
+
+%description devel
+%{summary}
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTDIR
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md ChangeLog
+%{tde_bindir}/kftpgrabber
+%{tde_libdir}/libkftpinterfaces.so.0
+%{tde_libdir}/libkftpinterfaces.so.0.0.0
+%{tde_tdelibdir}/kftpimportplugin_filezilla3.la
+%{tde_tdelibdir}/kftpimportplugin_filezilla3.so
+%{tde_tdelibdir}/kftpimportplugin_gftp.la
+%{tde_tdelibdir}/kftpimportplugin_gftp.so
+%{tde_tdelibdir}/kftpimportplugin_kftp.la
+%{tde_tdelibdir}/kftpimportplugin_kftp.so
+%{tde_tdelibdir}/kftpimportplugin_ncftp.la
+%{tde_tdelibdir}/kftpimportplugin_ncftp.so
+%{tde_tdeappdir}/kftpgrabber.desktop
+%{tde_datadir}/apps/kftpgrabber/
+%{tde_datadir}/config.kcfg/kftpgrabber.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kftpgrabber.png
+%{tde_datadir}/services/kftpimportplugin_filezilla3.desktop
+%{tde_datadir}/services/kftpimportplugin_gftp.desktop
+%{tde_datadir}/services/kftpimportplugin_kftp.desktop
+%{tde_datadir}/services/kftpimportplugin_ncftp.desktop
+%{tde_datadir}/servicetypes/kftpbookmarkimportplugin.desktop
+%{tde_tdedocdir}/HTML/en/kftpgrabber/
+%{tde_mandir}/man1/kftpgrabber.1*
+
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kftpgrabber/
+%{tde_libdir}/libkftpinterfaces.la
+%{tde_libdir}/libkftpinterfaces.so
+
+
+%changelog
diff --git a/redhat/applications/internet/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec
new file mode 100644
index 000000000..b8ae3d2ec
--- /dev/null
+++ b/redhat/applications/internet/knmap/knmap.spec
@@ -0,0 +1,207 @@
+#
+# spec file for package knmap (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg knmap
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	An NMAP frontend for TDE
+Group:		Applications/Internet
+URL:		http://sourceforge.net/projects/knmap/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# NMAP support
+Requires:		nmap
+
+
+%description
+Knmap is a TDE-based interface to the 'nmap' facility.
+
+The main Knmap window provides for the entry of nmap options and the
+display of nmap-generated output.
+
+This program is a complete re-write of one by the same name written by
+Alexandre Sagala. The last version of that program was 0.9 which was
+released on 2003-03-09 and targeted the KDE 2.2 and QT 2.3 environments.
+
+Not to mention that it did not cater for the full set of 'nmap' options.
+Or, perhaps, 'nmap' progressed whilst that version of Knmap languished.
+
+http://www.kde-apps.org/content/show.php?content=31108
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+# Move desktop icon to XDG directory
+if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
+  %__mkdir_p %{buildroot}%{tde_tdeappdir}
+  %__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{tde_pkg} TDE System Network
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md ChangeLog
+%{tde_bindir}/knmap
+%{tde_tdeappdir}/knmap.desktop
+%{tde_datadir}/apps/knmap/
+%{tde_tdedocdir}/HTML/en/knmap/
+%{tde_datadir}/icons/hicolor/*/apps/knmap.png
+%{tde_datadir}/icons/hicolor/*/apps/knmapman.png
+%{tde_datadir}/icons/hicolor/*/apps/localman.png
+%{tde_datadir}/icons/hicolor/*/apps/manpage.png
+%{tde_datadir}/icons/hicolor/*/apps/manstylesheet.png
+%{tde_datadir}/icons/hicolor/*/apps/profilecopy.png
+%{tde_datadir}/icons/hicolor/*/apps/profiledelete.png
+%{tde_datadir}/icons/hicolor/*/apps/profileload.png
+%{tde_datadir}/icons/hicolor/*/apps/profilerename.png
+%{tde_datadir}/icons/hicolor/*/apps/profilesave.png
+%{tde_datadir}/icons/hicolor/*/apps/profilesaveas.png
+%{tde_datadir}/icons/hicolor/*/apps/scanclose.png
+%{tde_datadir}/icons/hicolor/*/apps/scanduplicate.png
+%{tde_datadir}/icons/hicolor/*/apps/scannew.png
+%{tde_datadir}/icons/hicolor/*/apps/scanrename.png
+%{tde_datadir}/icons/hicolor/*/apps/zoomcustom.png
+%{tde_datadir}/icons/hicolor/*/apps/zoomin.png
+%{tde_datadir}/icons/hicolor/*/apps/zoomout.png
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec
new file mode 100644
index 000000000..c5ba96312
--- /dev/null
+++ b/redhat/applications/internet/konversation/konversation.spec
@@ -0,0 +1,286 @@
+#
+# spec file for package konversation (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg konversation
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	User friendly Internet Relay Chat (IRC) client for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# XSLT support
+BuildRequires:	libxslt-devel
+%if 0%{?suse_version}
+BuildRequires:	docbook-xsl-stylesheets
+%else
+BuildRequires:	docbook-style-xsl
+%endif
+
+# LIBXI support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xi-devel
+%endif
+%if 0%{?rhel} >= 5|| 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXi-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	libXi6-devel
+%endif
+
+# XSCREENSAVER support
+#  RHEL 4: disabled
+#  RHEL 5: available in centos-extras
+#  RHEL 6: available in EPEL
+#  RHEL 7: available in NUX
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+BuildRequires:	xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires:	xscreensaver-extras-base
+%endif
+BuildRequires:	xscreensaver-gl-base
+BuildRequires:	xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-data
+BuildRequires:	xscreensaver-data-extra
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xscrnsaver-devel
+%else
+BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
+BuildRequires:	xscreensaver-extrusion
+%endif
+BuildRequires:	xscreensaver-gl
+%endif
+%endif
+
+
+%description
+Konversation is a client for the Internet Relay Chat (IRC) protocol.
+It is easy to use and well-suited for novice IRC users, but novice
+and experienced users alike will appreciate its many features:
+
+ * Standard IRC features
+ * Easy to use graphical interface
+ * Multiple server and channel tabs in a single window
+ * IRC color support
+ * Pattern-based message highlighting and OnScreen Display
+ * Multiple identities for different servers
+ * Multi-language scripting support (with DCOP)
+ * Customizable command aliases
+ * NickServ-aware log-on (for registered nicknames)
+ * Smart logging
+ * Traditional or enhanced-shell-style nick completion
+ * DCC file transfer with resume support
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
+%__sed -i "konversation/scripts/media" \
+          "konversation/scripts/weather" \
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
+%endif
+
+
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/konversation
+%{tde_tdeappdir}/konversation.desktop
+%{tde_datadir}/apps/tdeconf_update/konversation-0.19-appearance.pl
+%{tde_datadir}/apps/tdeconf_update/konversation-0.19-colorcodes.pl
+%{tde_datadir}/apps/tdeconf_update/konversation-0.19-colors.pl
+%{tde_datadir}/apps/tdeconf_update/konversation-0.19-custombrowser.pl
+%{tde_datadir}/apps/tdeconf_update/konversation-0.19-notifylists.pl
+%{tde_datadir}/apps/tdeconf_update/konversation-0.19-sortorder.pl
+%{tde_datadir}/apps/tdeconf_update/konversation-0.19-tabplacement.pl
+%{tde_datadir}/apps/tdeconf_update/konversation-0.20-customfonts.pl
+%{tde_datadir}/apps/tdeconf_update/konversation-0.20-quickbuttons.pl
+%{tde_datadir}/apps/tdeconf_update/konversation.upd
+%{tde_datadir}/apps/konversation/
+%{tde_datadir}/config.kcfg/konversation.kcfg
+%{tde_datadir}/services/konvirc.protocol
+%{tde_datadir}/services/konvirc6.protocol
+%{tde_tdedocdir}/HTML/*/konversation/
+%{tde_datadir}/icons/crystalsvg/*/actions/tdeimproxyaway.png
+%{tde_datadir}/icons/crystalsvg/*/actions/tdeimproxyoffline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/tdeimproxyonline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/char.png
+%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/tdeimproxyaway.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/tdeimproxyoffline.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/tdeimproxyonline.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz
+%{tde_datadir}/icons/hicolor/*/apps/konversation.png
+%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz
+
+
+%changelog
diff --git a/redhat/applications/internet/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec
new file mode 100644
index 000000000..aa019adc3
--- /dev/null
+++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec
@@ -0,0 +1,177 @@
+#
+# spec file for package kopete-otr (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kopete-otr
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Required for Mageia 6: removes the ldflag '--no-undefined'
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
+%define _disable_ld_no_undefined 1
+%endif
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.7
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Off-The-Record encryption for Kopete [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-tdenetwork-devel >= %{tde_version}
+
+# Kopete is provided by tdenetwork
+Requires:		trinity-kopete >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# OTR support
+BuildRequires:	libotr-devel
+
+
+%description
+This plugin enables Off-The-Record encryption for the TDE instant
+messenger Kopete. Using this plugin you can encrypt chatsessions to other
+users with IM-Cients supporting the OTR encryption method.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_LIBRARY_PATH=%{tde_libdir} \
+  -DKOPETE_INCLUDE_DIR=%{tde_tdeincludedir}/kopete \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
+
+%find_lang kopete_otr
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f kopete_otr.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_libdir}/libkotr.la
+%{tde_libdir}/libkotr.so.0
+%{tde_libdir}/libkotr.so.0.0.0
+%{tde_tdelibdir}/kcm_kopete_otr.la
+%{tde_tdelibdir}/kcm_kopete_otr.so
+%{tde_tdelibdir}/kopete_otr.la
+%{tde_tdelibdir}/kopete_otr.so
+%{tde_datadir}/apps/kopete_otr
+%{tde_datadir}/config.kcfg/kopete_otr.kcfg
+%{tde_tdedocdir}/HTML/en/kopete_otr/
+%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
+%{tde_datadir}/services/tdeconfiguredialog/kopete_otr_config.desktop
+%{tde_datadir}/services/kopete_otr.desktop
+
+
+%changelog
diff --git a/redhat/applications/internet/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec
new file mode 100644
index 000000000..3f22687a7
--- /dev/null
+++ b/redhat/applications/internet/kshowmail/kshowmail.spec
@@ -0,0 +1,203 @@
+#
+# spec file for package kshowmail (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kshowmail
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	3.3.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Look messages into your mail server
+Group:		Applications/Internet
+URL:		http://sourceforge.net/projects/kshowmail/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+Very simply kshowmail is a program that allows you to look in on your mail server,
+see what is waiting, decide if it is legitimate, and delete it right off of the server if it is not.
+All without dragging any messages into your computer.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+# Install missing icons
+install -D -m 644 "pics/cr16-app-kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/16x16/apps/kshowmail.png"
+install -D -m 644 "pics/kshowmail.png"          "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/48x48/apps/kshowmail.png"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kshowmail Network Email
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md ChangeLog
+%{tde_bindir}/kshowmail
+%{tde_tdelibdir}/kcm_kshowmailconfigaccounts.la
+%{tde_tdelibdir}/kcm_kshowmailconfigaccounts.so
+%{tde_tdelibdir}/kcm_kshowmailconfigactions.la
+%{tde_tdelibdir}/kcm_kshowmailconfigactions.so
+%{tde_tdelibdir}/kcm_kshowmailconfigdisplay.la
+%{tde_tdelibdir}/kcm_kshowmailconfigdisplay.so
+%{tde_tdelibdir}/kcm_kshowmailconfigfilter.la
+%{tde_tdelibdir}/kcm_kshowmailconfigfilter.so
+%{tde_tdelibdir}/kcm_kshowmailconfiggeneral.la
+%{tde_tdelibdir}/kcm_kshowmailconfiggeneral.so
+%{tde_tdelibdir}/kcm_kshowmailconfiglog.la
+%{tde_tdelibdir}/kcm_kshowmailconfiglog.so
+%{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.la
+%{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.so
+%{tde_tdeappdir}/kshowmail.desktop
+%{tde_datadir}/apps/kshowmail/
+%{tde_datadir}/icons/crystalsvg/16x16/apps/kshowmail.png
+%{tde_datadir}/icons/hicolor/*/apps/kshowmail.png
+%{tde_datadir}/services/kshowmailconfigaccounts.desktop
+%{tde_datadir}/services/kshowmailconfigactions.desktop
+%{tde_datadir}/services/kshowmailconfigdisplay.desktop
+%{tde_datadir}/services/kshowmailconfigfilter.desktop
+%{tde_datadir}/services/kshowmailconfiggeneral.desktop
+%{tde_datadir}/services/kshowmailconfiglog.desktop
+%{tde_datadir}/services/kshowmailconfigspamcheck.desktop
+%lang(cs) %{tde_tdedocdir}/HTML/cs/kshowmail/
+%lang(de) %{tde_tdedocdir}/HTML/de/kshowmail/
+%lang(en) %{tde_tdedocdir}/HTML/en/kshowmail/
+%lang(es) %{tde_tdedocdir}/HTML/es/kshowmail/
+%lang(fr) %{tde_tdedocdir}/HTML/fr/kshowmail/
+%lang(hu) %{tde_tdedocdir}/HTML/hu/kshowmail/
+%lang(it) %{tde_tdedocdir}/HTML/it/kshowmail/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/kshowmail/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/kshowmail/
+%{tde_mandir}/man1/kshowmail.*
+
+
+%changelog
diff --git a/redhat/applications/internet/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec
new file mode 100644
index 000000000..e56b828b7
--- /dev/null
+++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec
@@ -0,0 +1,168 @@
+#
+# spec file for package kstreamripper (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kstreamripper
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.3.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE frontend for streamripper
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+
+
+%description
+KStreamRipper is a small frontend for the streamripper command
+line utility. Streamripper captures internet shoutcast radio streams
+on your harddisk and splits them up in mp3 files. KStreamRipper helps
+you with managing/ripping your preferred streams.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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 \
+  -DWITH_NVCONTROL=OFF \
+  \
+  -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
+
+# Missing icon file will make this fail.
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kstreamripper Audio Recorder
+%endif
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/kstreamripper
+%{tde_tdeappdir}/kstreamripper.desktop
+%{tde_datadir}/apps/kstreamripper/
+%{tde_datadir}/icons/hicolor/*/apps/kstreamripper.png
+%{tde_tdedocdir}/HTML/en/kstreamripper/
+%{tde_mandir}/man*/kstreamripper.*
+
+
+%changelog
diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec
new file mode 100644
index 000000000..c48835a15
--- /dev/null
+++ b/redhat/applications/internet/ktorrent/ktorrent.spec
@@ -0,0 +1,220 @@
+#
+# spec file for package ktorrent (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg ktorrent
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.2.8
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	BitTorrent client for Trinity
+Group:		Applications/Utilities
+URL:		http://ktorrent.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# GMP support
+BuildRequires:	gmp-devel
+
+# AVAHI support
+#  Disabled on RHEL4 and RHEL5
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%define with_avahi 1
+BuildRequires:	trinity-avahi-tqt-devel
+Requires:		trinity-avahi-tqt
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}avahi-client-devel
+Requires:		%{_lib}avahi-client3
+%else
+BuildRequires:	avahi-devel
+Requires:		avahi
+%endif
+%endif
+
+# GEOIP
+%if 0%{?suse_version}
+%if 0%{?suse_version} < 1550
+BuildRequires:	libGeoIP-devel
+%endif
+%else
+BuildRequires:	geoip-devel
+%endif
+
+%description
+KTorrent is a BitTorrent program for Trinity. Its features include speed capping
+(both down and up), integrated searching, UDP tracker support, preview of
+certain file types (video and audio) and integration into the TDE Panel
+enabling background downloading.
+ 
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix="%{tde_prefix}" \
+  --exec-prefix="%{tde_prefix}" \
+  --bindir="%{tde_bindir}" \
+  --datadir="%{tde_datadir}" \
+  --libdir="%{tde_libdir}" \
+  --mandir="%{tde_mandir}" \
+  --includedir="%{tde_tdeincludedir}" \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  %{?!with_avahi:--without-avahi}
+
+
+# Not SMP safe !
+%__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf "%{buildroot}"
+%__make install DESTDIR="%{buildroot}"
+
+%find_lang %{tde_pkg}
+
+# Unwanted files
+%__rm -f "%{?buildroot}%{tde_libdir}/libktorrent.so"
+
+
+%clean
+%__rm -rf "%{buildroot}"
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/ktcachecheck
+%{tde_bindir}/ktorrent
+%{tde_bindir}/ktshell
+%{tde_bindir}/kttorinfo
+%{tde_bindir}/ktupnptest
+%{tde_libdir}/libktorrent-%{version}.so
+%{tde_libdir}/libktorrent.la
+%{tde_tdelibdir}/ktinfowidgetplugin.la
+%{tde_tdelibdir}/ktinfowidgetplugin.so
+%{tde_tdelibdir}/ktipfilterplugin.la
+%{tde_tdelibdir}/ktipfilterplugin.so
+%{tde_tdelibdir}/ktlogviewerplugin.la
+%{tde_tdelibdir}/ktlogviewerplugin.so
+%{tde_tdelibdir}/ktpartfileimportplugin.la
+%{tde_tdelibdir}/ktpartfileimportplugin.so
+%{tde_tdelibdir}/ktrssfeedplugin.la
+%{tde_tdelibdir}/ktrssfeedplugin.so
+%{tde_tdelibdir}/ktscanfolderplugin.la
+%{tde_tdelibdir}/ktscanfolderplugin.so
+%{tde_tdelibdir}/ktschedulerplugin.la
+%{tde_tdelibdir}/ktschedulerplugin.so
+%{tde_tdelibdir}/ktsearchplugin.la
+%{tde_tdelibdir}/ktsearchplugin.so
+%{tde_tdelibdir}/ktstatsplugin.la
+%{tde_tdelibdir}/ktstatsplugin.so
+%{tde_tdelibdir}/ktupnpplugin.la
+%{tde_tdelibdir}/ktupnpplugin.so
+%{tde_tdelibdir}/ktwebinterfaceplugin.la
+%{tde_tdelibdir}/ktwebinterfaceplugin.so
+%{tde_tdeappdir}/ktorrent.desktop
+%{tde_datadir}/apps/ktorrent/
+%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.svgz
+%{tde_datadir}/services/*.desktop
+%{tde_datadir}/servicetypes/ktorrentplugin.desktop
+%{tde_tdedocdir}/HTML/en/ktorrent/
+
+%if 0%{?with_avahi}
+%{tde_tdelibdir}/ktzeroconfplugin.la
+%{tde_tdelibdir}/ktzeroconfplugin.so
+%endif
+%{tde_mandir}/man1/ktorrent.1*
+
+
+%changelog
diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec
new file mode 100644
index 000000000..3df715e34
--- /dev/null
+++ b/redhat/applications/internet/kvirc/kvirc.spec
@@ -0,0 +1,247 @@
+%if 0%{?fedora} >= 23
+%define _hardened_ldflags %nil
+%endif
+
+#
+# spec file for package kvirc (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kvirc
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	3.4.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Trinity based next generation IRC client with module support
+Group:		Applications/Utilities
+URL:		http://kvirc.net/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+A highly configurable graphical IRC client with an MDI interface,
+built-in scripting language, support for IRC DCC, drag & drop file
+browsing, and much more. KVIrc uses the TDE widget set, can be extended
+using its own scripting language, integrates with TDE, and supports
+custom plugins.
+
+If you are a developer and you want to write a custom module for KVIrc,
+you need to install the kvirc-dev package.
+
+%package data
+Group:			Applications/Utilities
+Summary:		Data files for KVIrc
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description data
+This package contains the architecture-independent data needed by KVIrc in
+order to run, such as icons and images, language files, and shell scripts.
+It also contains complete reference guides on scripting and functions
+within KVIrc in its internal help format. Unless you want to use KVIrc only
+as a very simple IRC client you are likely to want to write scripts to
+tailor KVIrc to your needs.
+
+KVIrc is a graphical IRC client based on the TDE widget set which integrates
+with the Trinity Desktop Environment version 3.
+
+%package devel
+Group:			Development/Libraries
+Summary:		Development files for KVIrc
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This package contains KVIrc libraries and include files you need if you
+want to develop plugins for KVIrc.
+
+KVIrc is a graphical IRC client based on the TDE widget set which integrates
+with the K Desktop Environment version 3.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+# FTBFS on RHEL 5
+%if 0%{?rhel} == 5
+%__sed -i "admin/acinclude.m4.in" \
+       -i "src/kvilib/tal/kvi_tal_application.cpp" \
+       -e "/TDEApplication/ s|\")|\", true, true, true)|";
+%endif
+
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+./autogen.sh
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-wall \
+  \
+  --with-pic \
+  \
+  --with-big-channels \
+  --enable-perl \
+  --with-ix86-asm \
+  --with-kde-services-dir=%{tde_datadir}/services \
+  --with-kde-library-dir=%{tde_libdir} \
+  --with-kde-include-dir=%{tde_tdeincludedir} \
+  --with-qt-name=tqt \
+  --with-qt-library-dir=%{_libdir} \
+  --with-qt-include-dir=%{_includedir}/tqt3 \
+  --with-qt-moc=%{_bindir}/tmoc
+
+# Symbolic links must exist prior to parallel building
+%__make symlinks -C src/kvilib/build
+%__make symlinks -C src/kvirc/build
+
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
+%__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||"
+%endif
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
+%__mv \
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
+
+# Move desktop file to XDG location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kvirc Network IRCClient
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog FAQ README TODO
+%{tde_bindir}/kvirc
+%{tde_libdir}/*.so.*
+%{tde_libdir}/kvirc/*/modules/*.so
+
+%files data
+%defattr(-,root,root,-)
+%{tde_bindir}/kvi_run_netscape
+%{tde_bindir}/kvi_search_help
+%exclude %{tde_libdir}/kvirc/*/modules/*.la
+%exclude %{tde_libdir}/kvirc/*/modules/*.so
+%{tde_libdir}/kvirc/
+%{tde_tdeappdir}/kvirc.desktop
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.svgz
+%{tde_datadir}/icons/hicolor/*/*/*.xpm
+%{tde_datadir}/kvirc
+%{tde_datadir}/mimelnk/text/*.desktop
+%{tde_datadir}/services/*.protocol
+%{tde_mandir}/man1/kvirc.1
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_bindir}/kvirc-config
+%{tde_includedir}/kvirc/
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/kvirc/*/modules/*.la
+
+
+%changelog
diff --git a/redhat/applications/internet/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec
new file mode 100644
index 000000000..e38a97b74
--- /dev/null
+++ b/redhat/applications/internet/kvpnc/kvpnc.spec
@@ -0,0 +1,179 @@
+#
+# spec file for package kvpnc (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kvpnc
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.9.6a
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Vpn clients frontend for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	libgcrypt-devel >= 1.2.0
+
+
+%description
+KVpnc is a TDE frontend for various vpn clients.
+
+It supports :
+* Cisco-compatible VPN client (vpnc)
+* IPSec (freeswan, openswan, racoon)
+* Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux)
+* Virtual Private Network daemon (openvpn)
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{_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,-)
+%doc AUTHORS ChangeLog COPYING README.md TODO
+%{tde_bindir}/kvpnc
+%{tde_tdeappdir}/kvpnc.desktop
+%{tde_datadir}/apps/kvpnc/
+%lang(de) %{tde_datadir}/doc/tde/HTML/de/kvpnc/
+%lang(en) %{tde_datadir}/doc/tde/HTML/en/kvpnc/
+%lang(fr) %{tde_datadir}/doc/tde/HTML/fr/kvpnc/
+%lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/
+%{tde_datadir}/icons/hicolor/*/apps/kvpnc.png
+%{tde_datadir}/icons/locolor/*/apps/kvpnc.png
+%{tde_docdir}/kvpnc/
+%{tde_tdedocdir}/HTML/en/tdeioslave/pcf/
+%{tde_datadir}/services/pcf.protocol
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec
new file mode 100644
index 000000000..449801a12
--- /dev/null
+++ b/redhat/applications/internet/smb4k/smb4k.spec
@@ -0,0 +1,198 @@
+#
+# spec file for package smb4k (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg smb4k
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.9.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	A Samba (SMB) share advanced browser for Trinity
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Smb4K is a SMB (Windows) share browser for TDE. It uses the Samba software 
+suite to access the SMB shares of the local network neighborhood. Its purpose
+is to provide a program that's easy to use and has as many features as 
+possible.
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/smb4k
+%{tde_bindir}/smb4k_cat
+%{tde_bindir}/smb4k_kill
+%{tde_bindir}/smb4k_mount
+%{tde_bindir}/smb4k_mv
+%{tde_bindir}/smb4k_umount
+%{tde_libdir}/libsmb4kcore.so.2
+%{tde_libdir}/libsmb4kcore.so.2.0.0
+%{tde_libdir}/libsmb4kdialogs.la
+%{tde_libdir}/libsmb4kdialogs.so
+%{tde_tdelibdir}/konqsidebar_smb4k.la
+%{tde_tdelibdir}/konqsidebar_smb4k.so
+%{tde_tdelibdir}/libsmb4tdeconfigdialog.la
+%{tde_tdelibdir}/libsmb4tdeconfigdialog.so
+%{tde_tdelibdir}/libsmb4knetworkbrowser.la
+%{tde_tdelibdir}/libsmb4knetworkbrowser.so
+%{tde_tdelibdir}/libsmb4ksearchdialog.la
+%{tde_tdelibdir}/libsmb4ksearchdialog.so
+%{tde_tdelibdir}/libsmb4ksharesiconview.la
+%{tde_tdelibdir}/libsmb4ksharesiconview.so
+%{tde_tdelibdir}/libsmb4kshareslistview.la
+%{tde_tdelibdir}/libsmb4kshareslistview.so
+%{tde_tdeappdir}/smb4k.desktop
+%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
+%{tde_datadir}/apps/smb4k/
+%{tde_datadir}/apps/smb4knetworkbrowserpart/
+%{tde_datadir}/apps/smb4ksharesiconviewpart/
+%{tde_datadir}/apps/smb4kshareslistviewpart/
+%{tde_datadir}/config.kcfg/smb4k.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
+%{tde_tdedocdir}/HTML/en/smb4k/
+
+##########
+
+%package devel
+Summary:		Development files for %{name}
+Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
+
+%description devel
+%{summary}
+
+%files devel
+%{tde_tdeincludedir}/*.h
+%{tde_libdir}/libsmb4kcore.la
+%{tde_libdir}/libsmb4kcore.so
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --program-prefix="" \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+# SMP safe !
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%suse_update_desktop_file -r %{tde_pkg} System Network
+%endif
+
+# Removes duplicate files
+%fdupes -s %buildroot
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec
new file mode 100644
index 000000000..04207d15a
--- /dev/null
+++ b/redhat/applications/internet/tork/tork.spec
@@ -0,0 +1,187 @@
+#
+# spec file for package tork (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tork
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.33
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Anonymity Manager for TDE
+Group:		Applications/Internet
+URL:		sourceforge.net/projects/tolrk/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# TORSOCKS support
+BuildRequires:	torsocks
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# GEOIP
+%if 0%{?suse_version}
+%if 0%{?suse_version} < 1550
+BuildRequires:	libGeoIP-devel
+%endif
+%else
+BuildRequires:	geoip-devel
+%endif
+
+
+%description
+TorK is an Anonymity Manager for the TDE Desktop. Browse anonymously on 
+Konqueror/Firefox/Opera. Send anonymous email via the MixMinion network.
+Use ssh/irc/IM anonymously. Control and monitor your anonymous traffic 
+on the Tor network.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.md TODO USINGTORK
+%{tde_bindir}/tork
+%{tde_bindir}/torkarkollon
+%{tde_bindir}/usewithtor
+%{tde_tdelibdir}/kickermenu_tork.la
+%{tde_tdelibdir}/kickermenu_tork.so
+%{tde_tdelibdir}/tdehtml_tork.la
+%{tde_tdelibdir}/tdehtml_tork.so
+%{tde_tdelibdir}/tdeio_torioslave.la
+%{tde_tdelibdir}/tdeio_torioslave.so
+%{tde_tdeappdir}/tork_plug_in.desktop
+%{tde_datadir}/apps/kicker/menuext/torkmenu.desktop
+%{tde_datadir}/apps/tdehtml/kpartplugins/tork_plug_in.rc
+%{tde_datadir}/services/torioslave.protocol
+%{tde_tdeappdir}/tork.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithopera.desktop
+%{tde_datadir}/apps/tork/
+%{tde_datadir}/config.kcfg/torkconfig.kcfg
+%{tde_tdedocdir}/HTML/en/tork/
+%{tde_datadir}/icons/hicolor/*/apps/tork.png
+%dir %{tde_datadir}/menu
+%{tde_datadir}/menu/tork
+%dir %{tde_datadir}/pixmaps
+%{tde_datadir}/pixmaps/tork.xpm
+%{tde_mandir}/man1/tork.1*
+%{tde_mandir}/man1/torkarkollon.1*
+
+
+%changelog
diff --git a/redhat/applications/k3b-i18n/k3b-i18n.spec b/redhat/applications/k3b-i18n/k3b-i18n.spec
deleted file mode 100644
index 8ec39a27b..000000000
--- a/redhat/applications/k3b-i18n/k3b-i18n.spec
+++ /dev/null
@@ -1,432 +0,0 @@
-#
-# spec file for package k3b-i18n (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg k3b-i18n
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.0.5
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Internationalization support for TDE [Trinity]
-Group:			Applications/Archiving
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires:		trinity-k3b
-
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-##########
-
-%package Danish
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Danish (da) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-da = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Danish
-This package contains the Danish translations for K3B.
-
-%files Danish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/da/k3b
-%{tde_datadir}/locale/da/LC_MESSAGES/*.mo
-
-##########
-
-%package German
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		German (de) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-de = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description German
-This package contains the German translations for K3B.
-
-%files German
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/de/k3b
-%{tde_datadir}/locale/de/LC_MESSAGES/*.mo
-
-##########
-
-%package Greek
-Group:			Applications/Archiving
-Requires:		trinity-k3b >= %{version}
-Summary:		Greek (el) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-el = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Greek
-This package contains the greek translations for K3B.
-
-%files Greek
-%defattr(-,root,root,-)
-#%{tde_tdedocdir}/HTML/el/k3b
-%{tde_datadir}/locale/el/LC_MESSAGES/*.mo
-
-##########
-
-%package Spanish
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Spanish (es) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-es = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Spanish
-This package contains the Spanish translations for K3B.
-
-%files Spanish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/es/k3b
-%{tde_datadir}/locale/es/LC_MESSAGES/*.mo
-
-##########
-
-%package Estonian
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Estonian (et) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-et = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Estonian
-This package contains the Estonian translations for K3B.
-
-%files Estonian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/et/k3b
-%{tde_datadir}/locale/et/LC_MESSAGES/*.mo
-
-##########
-
-%package French
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		French (fr) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-fr = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description French
-This package contains the French translations for K3B.
-
-%files French
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/fr/k3b
-%{tde_datadir}/locale/fr/LC_MESSAGES/*.mo
-
-##########
-
-%package Italian
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Italian (it) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-it = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Italian
-This package contains the Italian translations for K3B.
-
-%files Italian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/it/k3b
-%{tde_datadir}/locale/it/LC_MESSAGES/*.mo
-
-##########
-
-%package Dutch
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Dutch (nl) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-nl = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Dutch
-This package contains the Dutch translations for K3B.
-
-%files Dutch
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/nl/k3b
-%{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
-
-##########
-
-%package Polish
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Polish (pl) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-pl = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Polish
-This package contains the Polish translations for K3B.
-
-%files Polish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/pl/k3b
-%{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
-
-##########
-
-%package Portuguese
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Portuguese (pt) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-pt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Portuguese
-This package contains the Portuguese translations for K3B.
-
-%files Portuguese
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/pt/k3b
-%{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
-
-##########
-
-%package Brazil
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Brazilian Portuguese (pt_BR) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-pt_BR < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-k3b-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-ptbr = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Brazil
-This package contains the Brazilian Portuguese translations for K3B.
-
-%files Brazil
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/pt_BR/k3b
-%{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo
-
-##########
-
-%package Russian
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Russian (ru) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-ru = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Russian
-This package contains the Russian translations for K3B.
-
-%files Russian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/ru/k3b
-%{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
-
-##########
-
-%package Swedish
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Swedish (sv) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-sv = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Swedish
-This package contains the Swedish translations for K3B.
-
-%files Swedish
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/sv/k3b
-%{tde_datadir}/locale/sv/LC_MESSAGES/*.mo
-
-##########
-
-%package Ukrainian
-Group:			Applications/Archiving
-Requires:		trinity-k3b
-Summary:		Ukrainian (uk) translations for K3B [Trinity]
-
-Obsoletes:		trinity-k3b-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-k3b-i18n-uk = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Ukrainian
-This package contains the Ukrainian translations for K3B.
-
-%files Ukrainian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/uk/k3b
-%{tde_datadir}/locale/uk/LC_MESSAGES/*.mo
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%__rm -rf %{buildroot}%{tde_datadir}/locale/af
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ar
-%__rm -rf %{buildroot}%{tde_datadir}/locale/bg
-%__rm -rf %{buildroot}%{tde_datadir}/locale/br
-%__rm -rf %{buildroot}%{tde_datadir}/locale/bs
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ca
-%__rm -rf %{buildroot}%{tde_datadir}/locale/cs
-%__rm -rf %{buildroot}%{tde_datadir}/locale/cy
-%__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB
-%__rm -rf %{buildroot}%{tde_datadir}/locale/eu
-%__rm -rf %{buildroot}%{tde_datadir}/locale/fa
-%__rm -rf %{buildroot}%{tde_datadir}/locale/fi
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ga
-%__rm -rf %{buildroot}%{tde_datadir}/locale/gl
-%__rm -rf %{buildroot}%{tde_datadir}/locale/he
-%__rm -rf %{buildroot}%{tde_datadir}/locale/hi
-%__rm -rf %{buildroot}%{tde_datadir}/locale/hu
-%__rm -rf %{buildroot}%{tde_datadir}/locale/is
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ja
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ka
-%__rm -rf %{buildroot}%{tde_datadir}/locale/km
-%__rm -rf %{buildroot}%{tde_datadir}/locale/lt
-%__rm -rf %{buildroot}%{tde_datadir}/locale/mk
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ms
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nb
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nds
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ne
-%__rm -rf %{buildroot}%{tde_datadir}/locale/nn
-%__rm -rf %{buildroot}%{tde_datadir}/locale/pa
-%__rm -rf %{buildroot}%{tde_datadir}/locale/rw
-%__rm -rf %{buildroot}%{tde_datadir}/locale/se
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sk
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sr
-%__rm -rf %{buildroot}%{tde_datadir}/locale/sr@Latn
-%__rm -rf %{buildroot}%{tde_datadir}/locale/ta
-%__rm -rf %{buildroot}%{tde_datadir}/locale/tr
-%__rm -rf %{buildroot}%{tde_datadir}/locale/uz
-%__rm -rf %{buildroot}%{tde_datadir}/locale/uz@cyrillic
-%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_CN
-%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_TW
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/k3b/k3b.spec b/redhat/applications/k3b/k3b.spec
deleted file mode 100644
index 7d2da140f..000000000
--- a/redhat/applications/k3b/k3b.spec
+++ /dev/null
@@ -1,475 +0,0 @@
-#
-# spec file for package k3b (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg k3b
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.0.5
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		CD/DVD burning application
-Group:			Applications/Archiving
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	alsa-lib-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	gettext
-BuildRequires:	libmpcdec-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	taglib-devel
-BuildRequires:	zlib-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# ATTR support
-BuildRequires:	libattr-devel
-
-Requires(post): coreutils
-Requires(postun): coreutils
-
-Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29
-Requires:		wodim
-REquires:		genisoimage
-%else
-Requires:		cdrecord
-REquires:		mkisofs
-%endif
-Requires:		dvd+rw-tools
-
-# CDRDAO support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5
-Requires:		cdrdao
-%endif
-
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires:	libudev-devel
-%endif
-
-# HAL support
-%if 0%{?rhel} == 5
-%define with_hal 0
-BuildRequires:	hal-devel
-%endif
-
-# DBUS support
-#  TQT bindings not available for RHEL4
-%if 0%{?rhel} == 4
-# Dbus bindings were rebuilt with Qt support
-BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
-Requires:		dbus-qt >= 0.22-12.EL.9p1
-%else
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-Requires:		trinity-dbus-tqt >= 1:0.63
-%endif
-
-# SNDFILE support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
-%define with_sndfile 1
-BuildRequires:	libsndfile-devel
-%endif
-
-# SAMPLERATE support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
-%define with_samplerate 1
-BuildRequires:	libsamplerate-devel
-%endif
-
-# DVDREAD support
-%define with_dvdread 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}dvdread-devel
-%else
-BuildRequires:	libdvdread-devel
-%endif
-
-# FLAC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libflac-devel
-BuildRequires:	libflac++-devel
-%else
-BuildRequires:	%{_lib}flac-devel
-BuildRequires:	%{_lib}flac++-devel
-%endif
-%else
-BuildRequires:	flac-devel
-%endif
-
-# MAD support
-%ifarch %{ix86} x86_64
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_libmad 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires:	libmad-devel
-%endif
-%endif
-%endif
-
-# LAME support
-%if 0%{?opensuse_bs} == 0
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_lame 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	liblame-devel
-%else
-%if 0%{?mgaversion} >= 6
-BuildRequires:		%{_lib}mp3lame-devel
-%else
-BuildRequires:		%{_lib}lame-devel
-%endif
-%endif
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libmp3lame-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:	lame-devel
-%endif
-%endif
-%endif
-
-# FFMPEG support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_ffmpeg 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}ffmpeg-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires:	ffmpeg-devel
-%endif
-%endif
-
-
-%description
-K3b provides a comfortable user interface to perform most CD/DVD
-burning tasks. While the experienced user can take influence in all
-steps of the burning process the beginner may find comfort in the
-automatic settings and the reasonable k3b defaults which allow a quick
-start.
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS README COPYING TODO ChangeLog
-%{tde_bindir}/k3b
-%{tde_tdelibdir}/tdefile_k3b.la
-%{tde_tdelibdir}/tdefile_k3b.so
-%{tde_tdelibdir}/tdeio_videodvd.la
-%{tde_tdelibdir}/tdeio_videodvd.so
-%{tde_tdelibdir}/libk3balsaoutputplugin.la
-%{tde_tdelibdir}/libk3balsaoutputplugin.so
-%{tde_tdelibdir}/libk3bartsoutputplugin.la
-%{tde_tdelibdir}/libk3bartsoutputplugin.so
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la
-%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la
-%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so
-%{tde_tdelibdir}/libk3bexternalencoder.la
-%{tde_tdelibdir}/libk3bexternalencoder.so
-%{tde_tdelibdir}/libk3bflacdecoder.la
-%{tde_tdelibdir}/libk3bflacdecoder.so
-%if 0%{?with_sndfile}
-%{tde_tdelibdir}/libk3blibsndfiledecoder.la
-%{tde_tdelibdir}/libk3blibsndfiledecoder.so
-%endif
-%{tde_tdelibdir}/libk3bmpcdecoder.la
-%{tde_tdelibdir}/libk3bmpcdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisdecoder.la
-%{tde_tdelibdir}/libk3boggvorbisdecoder.so
-%{tde_tdelibdir}/libk3boggvorbisencoder.la
-%{tde_tdelibdir}/libk3boggvorbisencoder.so
-%{tde_tdelibdir}/libk3bsoxencoder.la
-%{tde_tdelibdir}/libk3bsoxencoder.so
-%{tde_tdelibdir}/libk3bwavedecoder.la
-%{tde_tdelibdir}/libk3bwavedecoder.so
-%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
-
-
-##########
-
-%package common
-Summary:		Common files of %{name}
-Group:			Applications/Archiving
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-BuildArch: noarch
-%endif
-
-%description common
-%{summary}.
-
-%files common
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/k3b.desktop
-%{tde_datadir}/applnk/.hidden/k3b-cue.desktop
-%{tde_datadir}/apps/k3b/
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_datadir}/mimelnk/application/x-k3b.desktop
-%{tde_datadir}/icons/hicolor/*/apps/k3b.png
-%{tde_datadir}/services/tdefile_k3b.desktop
-%{tde_datadir}/services/videodvd.protocol
-%{tde_datadir}/sounds/k3b_error1.wav
-%{tde_datadir}/sounds/k3b_success1.wav
-%{tde_datadir}/sounds/k3b_wait_media1.wav
-%{tde_tdedocdir}/HTML/en/tdeioslave/videodvd/
-
-##########
-
-%package libs
-Summary:		Runtime libraries for %{name}
-Group:			System Environment/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/libk3b.so.3
-%{tde_libdir}/libk3b.so.3.0.0
-%{tde_libdir}/libk3bdevice.so.5
-%{tde_libdir}/libk3bdevice.so.5.0.0
-
-##########
-
-%package devel
-Summary:		Files for the development of applications which will use %{name} 
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libk3b.so
-%{tde_libdir}/libk3bdevice.so
-
-##########
-
-%if 0%{?with_libmad}
-%package plugin-mad
-Summary:		The MAD plugin for K3B
-Group:			System Environment/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-mad
-%{summary}.
-
-MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
-and the MPEG-2  extension to Lower Sampling Frequencies, as well as the
-so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
-and Layer III a.k.a. MP3) are fully implemented.
-
-%files plugin-mad
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bmaddecoder.la
-%{tde_tdelibdir}/libk3bmaddecoder.so
-%endif
-
-##########
-
-%if 0%{?with_lame}
-%package plugin-lame
-Summary:		The LAME plugin for K3B
-Group:			System Environment/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-lame
-%{summary}.
-
-Personal and commercial use of compiled versions of LAME (or any other mp3
-encoder) requires a patent license in some countries.
-
-This package is in tainted, as MP3 encoding is covered by software patents.
-
-%files plugin-lame
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3blameencoder.la
-%{tde_tdelibdir}/libk3blameencoder.so
-%endif
-
-##########
-
-%if 0%{?with_ffmpeg}
-%package plugin-ffmpeg
-Summary:		The FFMPEG plugin for K3B
-Group:			System Environment/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description plugin-ffmpeg
-%{summary}.
-
-ffmpeg is a hyper fast realtime audio/video encoder, a streaming server
-and a generic audio and video file converter.
-
-%files plugin-ffmpeg
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libk3bffmpegdecoder.la
-%{tde_tdelibdir}/libk3bffmpegdecoder.so
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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:${PKG_CONFIG_PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_ALL_OPTIONS="ON" \
-  -DWITH_MUSICBRAINZ="OFF" \
-  -DWITH_FFMPEG_ALL_CODECS="ON" \
-  -DWITH_MUSEPACK="ON" \
-  -DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \
-  -DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \
-%if 0%{?rhel} == 5
-  -DWITH_HAL="ON" \
-%endif
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# remove the .la files
-%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/k9copy/k9copy.spec b/redhat/applications/k9copy/k9copy.spec
deleted file mode 100644
index 2cd121c84..000000000
--- a/redhat/applications/k9copy/k9copy.spec
+++ /dev/null
@@ -1,190 +0,0 @@
-#
-# spec file for package k9copy (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg k9copy
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.2.3
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		DVD backup tool for Trinity
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-k3b-devel
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# Warning: the target distribution must have ffmpeg !
-BuildRequires:	ffmpeg-devel
-Requires:		ffmpeg
-
-# DVDREAD support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}dvdread-devel
-%else
-BuildRequires:	libdvdread-devel
-%endif
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-Mesa-libGLU
-%endif
-
-
-%description
-k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
-to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
-This is the Trinity version.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Removes internal dvdread headers
-%__rm -rf "dvdread"
-
-# Fix permissions on doc files
-chmod -x AUTHORS COPYING
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# FFMPEG ...
-if [ -d /usr/include/ffmpeg ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
-fi
- 
-# NOTICE: --enable-final causes FTBFS !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --enable-k3bdevices
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/k9copy
-%{tde_tdeappdir}/k9copy.desktop
-%{tde_datadir}/apps/k9copy/
-%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
-%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
-%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
-
-
-%changelog
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
deleted file mode 100644
index 0d687e4da..000000000
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-# spec file for package kaffeine-mozilla (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
-%define tde_pkg kaffeine-mozilla
-%define tde_prefix /opt/trinity
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-
-# TDE specific building variables
-%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}
-
-%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
-%define debug_package %{nil}
-%endif
-
-Name:			trinity-%{tde_pkg}
-Summary:		mozilla plugin that lanches kaffeine for supported media types [Trinity]
-Version:		0.4.3.1
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Multimedia
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-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
-
-%if 0%{?suse_version}
-BuildRequires:	mozilla-nspr-devel
-%else
-BuildRequires:	nspr-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xaw-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXaw-devel
-%endif
-
-Requires:		trinity-kaffeine
-
-%description
-This mozilla plugin launches kaffeine, the xine-based media player for TDE,
-when a page containing a supported media format is loaded.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{_libdir}/mozilla \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Remove useless filess
-%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-# These files are installed outside TDE prefix
-%dir %{_libdir}/mozilla
-%dir %{_libdir}/mozilla/plugins
-%{_libdir}/mozilla/plugins/kaffeineplugin.la
-%{_libdir}/mozilla/plugins/kaffeineplugin.so
-
-
-%changelog
diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/kaffeine/kaffeine.spec
deleted file mode 100644
index 58e9424b3..000000000
--- a/redhat/applications/kaffeine/kaffeine.spec
+++ /dev/null
@@ -1,333 +0,0 @@
-#
-# spec file for package kaffeine (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kaffeine
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.8.8
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Xine-based media player
-Group:			Applications/Multimedia
-URL:			http://kaffeine.sourceforge.net/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# VORBIS support
-BuildRequires:	libvorbis-devel
-
-# CDDA support
-BuildRequires:	libcdio-devel
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libcdda-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	cdparanoia
-BuildRequires:	cdparanoia-devel
-%endif
-%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-BuildRequires:	libcdio-paranoia-devel
-%endif
-
-# X11 stuff
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xext-devel
-BuildRequires:	%{_lib}xtst-devel
-BuildRequires:	%{_lib}xinerama-devel
-%else
-BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
-BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel 
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXext-devel 
-BuildRequires:	libXtst-devel
-BuildRequires:	libXinerama-devel
-%endif
-
-# XCB support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} || 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-%define with_xcb 1
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
-BuildRequires:	libxcb-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-BuildRequires:	%{_lib}xcb-devel
-%endif
-%endif
-%endif
-
-# GSTREAMER support
-%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gstreamer 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer1.0-devel
-BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-%endif
-%if 0%{?rhel} >= 7 || 0%{?fedora}
-BuildRequires:	gstreamer1-devel >= 1.0
-BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
-%endif
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
-%define with_xine 1
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# LAME support
-%if 0%{?opensuse_bs} == 0
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel}
-%define with_lame 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:		liblame-devel
-%else
-%if 0%{?mgaversion} >= 6
-BuildRequires:		%{_lib}mp3lame-devel
-%else
-BuildRequires:		%{_lib}lame-devel
-%endif
-%endif
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libmp3lame-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:	lame-devel
-%endif
-%endif
-%endif
-
-# DVB support
-%if 0%{?rhel} != 5
-%define with_dvb 1
-%endif
-
-# WTF support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-BuildRequires:	kernel-headers
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	glibc-kernheaders 
-%endif
-
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-Kaffeine is a xine-based media player for TDE.  It plays back CDs,
-and VCDs, and can decode all (local or streamed) multimedia formats 
-supported by xine-lib.
-Additionally, Kaffeine is fully integrated in TDE, it supports drag
-and drop and provides an editable playlist, a bookmark system, a
-Konqueror plugin, OSD and much more.
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kaffeine
-%{tde_libdir}/libkaffeinepart.so
-%{tde_tdelibdir}/lib*.*
-%{tde_datadir}/appl*/*/*.desktop
-%if 0%{?with_gstreamer}
-%{tde_datadir}/apps/gstreamerpart/
-%endif
-%{tde_datadir}/apps/kaffeine/
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_datadir}/apps/profiles/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/service*/*.desktop
-%{tde_tdedocdir}/HTML/en/kaffeine/
-%{tde_mandir}/man1/kaffeine.1*
-
-##########
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-tdelibs-devel
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kaffeine/
-%{tde_libdir}/lib*.so
-%exclude %{tde_libdir}/libkaffeinepart.so
-
-##########
-
-%package libs
-Summary:		%{name} runtime libraries
-Group:			System Environment/Libraries
-
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/lib*.so.*
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  %{?!with_dvb:-DWITH_DVB=OFF} \
-  %{?!with_lame:-DWITH_LAME=OFF} \
-  %{?!with_xcb:-DWITH_XCB=OFF} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{buildroot} -C build
-
-## File lists
-# locale's
-%find_lang %{tde_pkg}
-
-# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/kasablanca/kasablanca.spec b/redhat/applications/kasablanca/kasablanca.spec
deleted file mode 100644
index c3d96fd74..000000000
--- a/redhat/applications/kasablanca/kasablanca.spec
+++ /dev/null
@@ -1,190 +0,0 @@
-#
-# spec file for package kasablanca (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kasablanca
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.4.0.2
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Graphical FTP client for Trinity
-Group:			Applications/Internet 
-Url:			http://kasablanca.berlios.de/ 
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext 
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# UTEMPTER support
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}utempter-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-%if 0%{?rhel} == 4
-%else
-BuildRequires:	libutempter-devel
-%endif
-%endif
-
-%description
-Kasablanca is an ftp client, among its features are currently: 
-* ftps encryption via AUTH TLS
-* fxp (direct server to server transfer), supporting alternative mode.
-* advanced bookmarking system.
-* fast responsive multithreaded engine.
-* concurrent connections to multiple hosts.
-* interactive transfer queue, movable by drag and drop.
-* small nifty features, like a skiplist.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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 $RPM_BUILD_ROOT 
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-# locale's
-%find_lang %{tde_pkg}
-
-# Fix desktop files (openSUSE only)
-%if 0%{?suse_version}
-%suse_update_desktop_file kasablanca Network FileTransfer
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT 
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/kasablanca
-%{tde_datadir}/apps/kasablanca/
-%{tde_datadir}/config.kcfg/kbconfig.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kasablanca.png
-%{tde_tdedocdir}/HTML/en/kasablanca/
-%{tde_tdeappdir}/kasablanca.desktop
-%{tde_mandir}/man1/kasablanca.*
-
-
-%changelog
diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/katapult/katapult.spec
deleted file mode 100644
index 0a64cf767..000000000
--- a/redhat/applications/katapult/katapult.spec
+++ /dev/null
@@ -1,217 +0,0 @@
-#
-# spec file for package katapult (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg katapult
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.3.2.1
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Faster access to applications, bookmarks, and other items.
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-%description
-Katapult is an application for TDE, designed to allow faster access to
-applications, bookmarks, and other items. It is plugin-based, so it can
-launch anything that is has a plugin for. Its display is driven by
-plugins as well, so its appearance is completely customizable. It was
-inspired by Quicksilver for OS X. 
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Removes useless files (-devel ?)
-%__rm -f %{?buildroot}%{tde_libdir}/*.so
-%__rm -f %{?buildroot}%{tde_libdir}/*.la
-
-# Fix desktop files (openSUSE only)
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "Application Launcher" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/katapult
-%{tde_libdir}/libkatapult.so.2
-%{tde_libdir}/libkatapult.so.2.0.0
-%{tde_tdelibdir}/katapult_amarokcatalog.la
-%{tde_tdelibdir}/katapult_amarokcatalog.so
-%{tde_tdelibdir}/katapult_bookmarkcatalog.la
-%{tde_tdelibdir}/katapult_bookmarkcatalog.so
-%{tde_tdelibdir}/katapult_calculatorcatalog.la
-%{tde_tdelibdir}/katapult_calculatorcatalog.so
-%{tde_tdelibdir}/katapult_documentcatalog.la
-%{tde_tdelibdir}/katapult_documentcatalog.so
-%{tde_tdelibdir}/katapult_execcatalog.la
-%{tde_tdelibdir}/katapult_execcatalog.so
-%{tde_tdelibdir}/katapult_glassdisplay.la
-%{tde_tdelibdir}/katapult_glassdisplay.so
-%{tde_tdelibdir}/katapult_googlecatalog.la
-%{tde_tdelibdir}/katapult_googlecatalog.so
-%{tde_tdelibdir}/katapult_o2display.la
-%{tde_tdelibdir}/katapult_o2display.so
-%{tde_tdelibdir}/katapult_programcatalog.la
-%{tde_tdelibdir}/katapult_programcatalog.so
-%{tde_tdelibdir}/katapult_puredisplay.la
-%{tde_tdelibdir}/katapult_puredisplay.so
-%{tde_tdelibdir}/katapult_spellcatalog.la
-%{tde_tdelibdir}/katapult_spellcatalog.so
-%{tde_tdeappdir}/katapult.desktop
-%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz
-%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png
-%{tde_datadir}/icons/hicolor/128x128/actions/no.png
-%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png
-%{tde_datadir}/icons/hicolor/*/apps/katapult.png
-%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz
-%{tde_datadir}/services/katapult_amarokcatalog.desktop
-%{tde_datadir}/services/katapult_bookmarkcatalog.desktop
-%{tde_datadir}/services/katapult_calculatorcatalog.desktop
-%{tde_datadir}/services/katapult_documentcatalog.desktop
-%{tde_datadir}/services/katapult_execcatalog.desktop
-%{tde_datadir}/services/katapult_glassdisplay.desktop
-%{tde_datadir}/services/katapult_googlecatalog.desktop
-%{tde_datadir}/services/katapult_o2display.desktop
-%{tde_datadir}/services/katapult_programcatalog.desktop
-%{tde_datadir}/services/katapult_puredisplay.desktop
-%{tde_datadir}/services/katapult_spellcatalog.desktop
-%{tde_datadir}/servicetypes/katapultcatalog.desktop
-%{tde_datadir}/servicetypes/katapultdisplay.desktop
-%{tde_mandir}/man1/*.1*
-%{tde_tdedocdir}/HTML/en/katapult/
-
-
-%changelog
diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/kbarcode/kbarcode.spec
deleted file mode 100644
index 19e4e666c..000000000
--- a/redhat/applications/kbarcode/kbarcode.spec
+++ /dev/null
@@ -1,220 +0,0 @@
-#
-# spec file for package kbarcode (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kbarcode
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		2.0.7
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		barcode and label printing application for Trinity
-Group:			Applications/Utilities
-URL:			http://www.kbarcode.net
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Requires:		%{name}-tdefile-plugin = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-KBarcode is a barcode and label printing application for Trinity. It can be used
-to print everything from simple business cards up to complex labels with
-several barcodes (e.g. article descriptions).
-
-KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard,
-batch import of data for batch printing labels (directly from the delivery
-note), thousands of predefined labels, database management tools and
-translations in many languages. Even printing more than 10.000 labels in one
-go is no problem for KBarcode. Data for printing can be imported from several
-different data sources, including SQL databases, CSV files and the TDE address
-book.
-
-Additionally it is a simple barcode generator (similar to the old xbarcode you
-might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are
-supported. Even complex 2D barcodes are supported using third party tools. The
-generated barcodes can be directly printed or you can export them into images
-to use them in another application.
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kbarcode
-%{tde_tdeappdir}/kbarcode-batch.desktop
-%{tde_tdeappdir}/kbarcode-editor.desktop
-%{tde_tdeappdir}/kbarcode-single.desktop
-%{tde_tdeappdir}/kbarcode.desktop
-%{tde_datadir}/mimelnk/application/kbarcode-label.desktop
-%{tde_datadir}/apps/kbarcode/
-%{tde_datadir}/icons/hicolor/*/actions/barcode.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
-%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
-%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
-%{tde_mandir}/man1/*.1*
-%{tde_tdedocdir}/HTML/en/kbarcode/
-
-##########
-
-%package tdefile-plugin
-Summary:		tdefile-plugin for %{name}
-Group:			Applications/Utilities
-
-%description tdefile-plugin
-%{summary}.
-
-%files tdefile-plugin
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdefile_kbarcode.la
-%{tde_tdelibdir}/tdefile_kbarcode.so
-%{tde_datadir}/services/tdefile_kbarcode.desktop
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  -DWITH_NATIVE_GNU_BARCODE=OFF \
-  -DWITH_JAVASCRIPT=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}
-
-# Fix invalid icon path
-%__sed -i "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" -e "s|Icon=.*|Icon=kbarcode|"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop"        Utility PrintingUtility
-%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-batch.desktop"  Utility PrintingUtility
-%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-editor.desktop" Utility PrintingUtility
-%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-single.desktop" Utility PrintingUtility
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec
deleted file mode 100644
index fc896db83..000000000
--- a/redhat/applications/kbfx/kbfx.spec
+++ /dev/null
@@ -1,232 +0,0 @@
-#
-# spec file for package kbfx (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kbfx
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.4.9.3.1
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		An alternative to K-Menu for TDE
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-KBFX is an alternative to the classical K-Menu button and its menu.
-It improves the user experience by enabling him to set a bigger (and thus more
-visible) start button and by finally replacing the Win95-like K-Menu.
-If you still want the old menu, because you're used to it, it is still
-available as an option in kbfx. We recommend, however, that you give the Spinx
-bar a try.
-
-Homepage: http://www.kbfx.org
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Fix TDE executable path in 'CMakeLists.txt' ...
-%__sed -i "CMakeLists.txt" \
-  -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \
-  -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \
-  -e "s|/usr/include/tqt||"
-  
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
-  -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\
-  -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  \
-  -DUSE_STRIGI=OFF \
-  -DUSE_MENUDRAKE=OFF \
-  -DBUILD_DOC=ON \
-  -DBUILD_ALL=ON \
-  ..
-
-# Not SMP safe !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build VERBOSE=1
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "KBFX Configuration Utility" kbfxconfigapp -r KDE Utility DesktopUtility
-%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
-%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
-%suse_update_desktop_file %{buildroot}%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
-%suse_update_desktop_file %{buildroot}%{tde_datadir}/applications/tde/kbfx_theme.desktop
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kbfxconfigapp
-%{tde_tdeincludedir}/kbfx/
-%dir %{tde_libdir}/kbfx
-%dir %{tde_libdir}/kbfx/plugins
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la
-%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so
-%{tde_libdir}/libkbfxcommon.la
-%{tde_libdir}/libkbfxcommon.so
-%{tde_libdir}/libkbfxdata.la
-%{tde_libdir}/libkbfxdata.so
-%{tde_tdelibdir}/kbfxspinx.la
-%{tde_tdelibdir}/kbfxspinx.so
-%{tde_tdeappdir}/kbfx_theme.desktop
-%{tde_tdeappdir}/kbfxconfigapp.desktop
-%{tde_datadir}/apps/kbfx/
-%dir %{tde_datadir}/apps/kbfxconfigapp
-%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
-%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-%{tde_tdedocdir}/HTML/en/kbfxconfigapp/
-%{tde_docdir}/kbfx/
-%{tde_datadir}/icons/hicolor/*/apps/kbfx.png
-%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
-%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/kbfxconfigapp.mo
-%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo
-%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo
-%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo
-%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
-
-
-%changelog
diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec
deleted file mode 100644
index 8bba82e11..000000000
--- a/redhat/applications/kbibtex/kbibtex.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# spec file for package kbibtex (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kbibtex
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:        0.2.3
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:        A BibTeX editor for TDE
-Group:          Applications/Internet
-URL:            http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download.html
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# XSLT support
-BuildRequires:	libxslt-devel
-
-# YAZ support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?suse_version}
-BuildRequires:	libyaz-devel
-%endif
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-%description
-KBibTeX is a BibTeX editor for TDE to edit bibliographies used with LaTeX.
-KBibTeX is released under the GNU Public License (GPL) version 2 or any later version.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "Bibliography Manager" "%{?buildroot}%{tde_tdeappdir}/kbibtex.desktop" TDE Office Database
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README TODO ChangeLog
-%{tde_bindir}/kbibtex
-%{tde_tdelibdir}/libkbibtexpart.la
-%{tde_tdelibdir}/libkbibtexpart.so
-%{tde_tdeappdir}/kbibtex.desktop
-%{tde_datadir}/apps/kbibtex/
-%dir %{tde_datadir}/apps/kbibtexpart
-%{tde_datadir}/apps/kbibtexpart/kbibtex_part.rc
-%dir %{tde_datadir}/apps/kbibtexpart/xslt
-%{tde_datadir}/apps/kbibtexpart/xslt/MARC21slim2MODS3.xsl
-%{tde_datadir}/apps/kbibtexpart/xslt/MARC21slimUtils.xsl
-%{tde_datadir}/apps/kbibtexpart/xslt/UNIMARC2MODS3.xsl
-%{tde_datadir}/apps/kbibtexpart/xslt/html.xsl
-%{tde_datadir}/icons/hicolor/*/apps/kbibtex.png
-%{tde_datadir}/services/kbibtex_part.desktop
-%{tde_mandir}/man1/kbibtex.1*
-%{tde_tdedocdir}/HTML/en/kbibtex/
-
-
-%changelog
diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec
deleted file mode 100644
index 5ef5b0bb6..000000000
--- a/redhat/applications/kbiff/kbiff.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# spec file for package kbiff (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kbiff
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:        3.9
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:        TDE mail notification utility
-Group:          Applications/Internet
-URL:            http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	tqt3-compat-headers >= 3.5.0
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Kbiff is a "xbiff"-like mail notification utility. It has  multiple pixmaps,
-session management, and GUI configuration.  It can "dock" into the TDE panel.
-It can display animated gifs, play system sounds, or run arbitrary shell
-command when new mail arrives. It supports mbox, maildir, mh, POP3, IMAP4, and
-NNTP mailboxes.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop"
-%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" Applet
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
-%{tde_bindir}/kbiff
-%{tde_libdir}/libtdeinit_kbiff.la
-%{tde_libdir}/libtdeinit_kbiff.so
-%{tde_tdelibdir}/kbiff.la
-%{tde_tdelibdir}/kbiff.so
-%{tde_tdeappdir}/kbiff.desktop
-%{tde_datadir}/apps/kbiff/
-%{tde_datadir}/icons/hicolor/*/apps/kbiff.png
-%{tde_datadir}/icons/locolor/*/apps/kbiff.png
-%{tde_mandir}/man1/kbiff.1*
-%lang(de) %{tde_tdedocdir}/HTML/de/kbiff/
-%lang(en) %{tde_tdedocdir}/HTML/en/kbiff/
-%lang(es) %{tde_tdedocdir}/HTML/es/kbiff/
-%lang(fr) %{tde_tdedocdir}/HTML/fr/kbiff/
-
-
-%changelog
diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec
deleted file mode 100644
index 908aa2db7..000000000
--- a/redhat/applications/kbookreader/kbookreader.spec
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-# spec file for package kbookreader (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kbookreader
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.2.0
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		eBook reader for Trinity
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-kbookreader is an application which allows you to view eBooks
-within the Trinity Desktop Environment.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer
-%endif
-
-%find_lang %{tde_pkg} || touch %{tde_pkg}.lang
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/bookreader
-%{tde_bindir}/bookreader_client
-%{tde_tdeappdir}/bookreader.desktop
-%{tde_datadir}/apps/bookreader/
-%{tde_datadir}/config.kcfg/bookreader.kcfg
-%{tde_tdedocdir}/HTML/en/bookreader/
-%{tde_datadir}/icons/hicolor/*/apps/bookreader.png
-
-
-%changelog
diff --git a/redhat/applications/kchmviewer/kchmviewer.spec b/redhat/applications/kchmviewer/kchmviewer.spec
deleted file mode 100644
index 89fde0344..000000000
--- a/redhat/applications/kchmviewer/kchmviewer.spec
+++ /dev/null
@@ -1,207 +0,0 @@
-#
-# spec file for package kchmviewer (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kchmviewer
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		3.1.2
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		CHM viewer for Trinity
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# CHMLIB support
-%if 0%{?rhel} == 8
-%define with_chmlib 0
-%else
-%define with_chmlib 1
-BuildRequires:	chmlib-devel
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-%description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
-Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
-library, and does not depend on TDE or GNOME. However, it may be compiled
-with full Trinity support, including Trinity widgets and KIO/KHTML. 
-
-The main advantage of KchmViewer is non-English language support. Unlike
-others, KchmViewer in most cases correctly detects help file encoding,
-correctly shows tables of context of Russian, Korean, Chinese and Japanese
-help files, and correctly searches in non-English help files (search for
-MBCS languages - ja/ko/ch is still in progress).
-
-Completely safe and harmless. Does not support JavaScript in any way,
-optionally warns you before opening an external web page, or switching to
-another help file. Shows an appropriate image for every TOC entry. 
-
-KchmViewer Has complete chm index support, including multiple index entries,
-cross-links and parent/child entries in index as well as Persistent bookmarks
-support. Correctly detects and shows encoding of any valid chm file.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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 \
-  -DWITH_CHMLIB=%{?with_chmlib} \
-  \
-  -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}
-
-# Removes useless files
-%__rm -f %{?buildroot}%{tde_libdir}/*.a
-
-# Fix desktop icon location
-if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
-  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-  %__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
-  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
-fi
-
-# Updates applications categories for openSUSE
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "Compressed HTML Viewer" kchmviewer  Office Viewer
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING FAQ README
-%{tde_bindir}/kchmviewer
-%{tde_tdelibdir}/tdeio_msits.la
-%{tde_tdelibdir}/tdeio_msits.so
-%{tde_tdeappdir}/kchmviewer.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
-%{tde_datadir}/services/msits.protocol
-%{tde_tdedocdir}/HTML/en/kchmviewer/
-%{tde_tdedocdir}/HTML/en/tdeioslave/msits/
-%{tde_mandir}/man1/kchmviewer.*
-
-
-%changelog
diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/kcmautostart/kcmautostart.spec
deleted file mode 100644
index 62cb4c53f..000000000
--- a/redhat/applications/kcmautostart/kcmautostart.spec
+++ /dev/null
@@ -1,162 +0,0 @@
-#
-# spec file for package kcmautostart (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kcmautostart
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.0
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Manage applications automatic startup
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Requires:		trinity-tdebase >= %{tde_version}
-
-
-%description
-%{summary}
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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 autostart
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f autostart.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README
-%{tde_tdelibdir}/kcm_autostart.la
-%{tde_tdelibdir}/kcm_autostart.so
-%{tde_tdeappdir}/autostart.desktop
-%{tde_tdedocdir}/HTML/en/autostart/
-
-
-%changelog
diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec
deleted file mode 100644
index a39c7e3de..000000000
--- a/redhat/applications/kcmldap/kcmldap.spec
+++ /dev/null
@@ -1,221 +0,0 @@
-#
-# spec file for package kcmldap (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kcmldap
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.5
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Kerberos control module for the TDE control center
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	trinity-libtdeldap-devel >= 0.5
-
-Requires:		trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# OPENLDAP support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	openldap-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires:	openldap24-libs-devel
-%endif
-
-# KRB5 support
-BuildRequires:	krb5-devel
-
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-%define with_tdehwlib 1
-BuildRequires:	libudev-devel
-%endif
-
-# LIBCOM_ERR support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires:	libcom_err-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}ext2fs-devel
-%endif
-
-
-%description
-This is a meta-package that installs all kcmldap related packages.
-
-%files
-
-##########
-
-%package -n trinity-kcontrol-ldap-bonding
-Summary:		Kerberos control module for the TDE control center
-Group:			Applications/Utilities
-Requires:		trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kcontrol-ldap-bonding
-This is a TDE control center module to manage TDE connections to Kerberos realms.
-
-%files -n trinity-kcontrol-ldap-bonding
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/tdeldapbonding
-%{tde_tdelibdir}/kcm_ldapbonding.la
-%{tde_tdelibdir}/kcm_ldapbonding.so
-%{tde_tdeappdir}/ldapbonding.desktop
-%dir %{tde_datadir}/pixmaps
-%{tde_datadir}/pixmaps/kcmldapbonding_step1.png
-%{tde_datadir}/pixmaps/kcmldapbonding_step3.png
-
-##########
-
-%package -n trinity-tde-ldap-cert-updater
-Summary:		Service to keep LDAP certificates up-to-date
-Group:			Applications/Utilities
-Requires:		trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tde-ldap-cert-updater
-This is a small daemon which keeps the LDAP root certificate up to date with the LDAP server
-
-%files -n trinity-tde-ldap-cert-updater
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/tdeldapcertupdater
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
deleted file mode 100644
index 243f2bf8b..000000000
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
+++ /dev/null
@@ -1,216 +0,0 @@
-#
-# spec file for package kcmldapcontroller (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kcmldapcontroller
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.5
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Kerberos control module for the TDE control center
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	trinity-libtdeldap-devel >= 0.5
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# OPENLDAP support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	openldap-devel
-%endif
-%if 0%{?mgaversion} >= 6
-BuildRequires:  openldap-servers-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires:	openldap24-libs-devel
-%endif
-
-# KRB5 support
-BuildRequires:	krb5-devel
-
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-%define with_tdehwlib 1
-BuildRequires:	libudev-devel
-%endif
-
-# LIBCOM_ERR support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires:	libcom_err-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}ext2fs-devel
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-Requires:		trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-This is a meta-package that installs all kcmldap related packages.
-
-%files
-
-##########
-
-%package -n trinity-kcontrol-ldap-controller
-Summary:		Kerberos realm management module for the TDE control center
-Group:			Applications/Utilities
-
-%description -n trinity-kcontrol-ldap-controller
-This is a TDE control center module to manage users, groups, and machines in Kerberos realms.
-
-%files -n trinity-kcontrol-ldap-controller
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/primaryrccertupdater
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7
-%{tde_libdir}/slapi-acl-manager.la
-%{tde_libdir}/slapi-acl-manager.so
-%endif
-%{tde_tdelibdir}/kcm_ldapcontroller.la
-%{tde_tdelibdir}/kcm_ldapcontroller.so
-%{tde_tdeappdir}/ldapcontroller.desktop
-%{tde_datadir}/apps/kcmldapcontroller/
-%dir %{tde_datadir}/pixmaps
-%{tde_datadir}/pixmaps/kcmldapcontroller_step1.png
-%{tde_datadir}/pixmaps/kcmldapcontroller_step4.png
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%if 0%{?pclinuxos}
-%__rm -rf acl-updater
-%endif
-
-
-
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec
deleted file mode 100644
index 9e517c357..000000000
--- a/redhat/applications/kcmldapmanager/kcmldapmanager.spec
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# spec file for package kcmldapmanager (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kcmldapmanager
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.5
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Kerberos control module for the TDE control center
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	trinity-libtdeldap-devel >= 0.5
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# OPENLDAP support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	openldap-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires:	openldap24-libs-devel
-%endif
-
-# KRB5 support
-BuildRequires:	krb5-devel
-
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-%define with_tdehwlib 1
-BuildRequires:	libudev-devel
-%endif
-
-# LIBCOM_ERR support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires:	libcom_err-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}ext2fs-devel
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-Requires:		trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-This is a meta-package that installs all kcmldap related packages.
-
-%files
-
-##########
-
-%package -n trinity-kcontrol-ldap-manager
-Summary:		Kerberos realm management module for the TDE control center
-Group:			Applications/Utilities
-
-%description -n trinity-kcontrol-ldap-manager
-This is a TDE control center module to manage users, groups, and machines in Kerberos realms.
-
-%files -n trinity-kcontrol-ldap-manager -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/tdeldapmanager
-%{tde_tdelibdir}/kcm_ldapmanager.la
-%{tde_tdelibdir}/kcm_ldapmanager.so
-%{tde_tdeappdir}/ldapmanager.desktop
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} || touch %{tde_pkg}.lang
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec
deleted file mode 100644
index d6837accd..000000000
--- a/redhat/applications/kcpuload/kcpuload.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# spec file for package kcpuload (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kcpuload
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		2.00
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		CPU meter for Kicker [Trinity]
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KCPULoad is a small program for Kicker (the TDE panel).  It shows a
-recent history of CPU usage in the form of one or two configurable
-diagrams in the system tray.  These diagrams have settings for colours
-and various different styles.
-
-KCPULoad has support for SMP and separate user/system loads.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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} || touch %{tde_pkg}.lang
-
-# Fix desktop files (openSUSE only)
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-%if 0%{?suse_version}
-%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kcpuload
-%{tde_tdeappdir}/kcpuload.desktop
-%{tde_datadir}/apps/kcpuload/
-%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png
-%{tde_datadir}/icons/locolor/*/apps/kcpuload.png
-%{tde_mandir}/man1/*.1*
-%{tde_tdedocdir}/HTML/en/kcpuload/
-
-
-%changelog
diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/kdbg/kdbg.spec
deleted file mode 100644
index bec1628a6..000000000
--- a/redhat/applications/kdbg/kdbg.spec
+++ /dev/null
@@ -1,172 +0,0 @@
-#
-# spec file for package kdbg (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kdbg
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		2.2.2
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Graphical debugger interface [Trinity]
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KDbg is a graphical user interface to gdb, the GNU debugger.  It provides
-an intuitive interface for setting breakpoints, inspecting variables,
-stepping through code and much more.  KDbg requires TDE but you can of
-course debug any program.
-
-KDbg can also debug XSLT (XML stylesheet translation) scripts by
-interfacing with xsldbg.  For this the package kxsldbg must be installed.
-
-Features include the following:
-* Inspection of variable values in a tree structure.
-* Direct member: For certain compound data types the most important
-  member values are displayed next to the variable name, so that it is
-  not necessary to expand the subtree of that variable in order to see
-  the member value.  KDbg can also display Qt's QString values, which
-  are Unicode strings.
-* Debugger at your finger tips: The basic debugger functions (step,
-  next, run, finish, until, set/clear/enable/disable breakpoint) are
-  bound to function keys F5 through F10.  Quick and easy.
-* View source code, search text, set program arguments and environment
-  variables, display arbitrary expressions.
-* Debugging of core dumps, attaching to running processes is possible.
-* Conditional breakpoints.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kdbg
-%{tde_tdeappdir}/kdbg.desktop
-%{tde_datadir}/apps/kdbg/
-%config(noreplace) %{tde_confdir}/kdbgrc
-%lang(de) %{tde_tdedocdir}/HTML/de/kdbg/
-%lang(en) %{tde_tdedocdir}/HTML/en/kdbg/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
-%{tde_datadir}/icons/hicolor/*/apps/kdbg.png
-%{tde_datadir}/icons/locolor/*/apps/kdbg.png
-
-
-%changelog
diff --git a/redhat/applications/kdbusnotification/kdbusnotification.spec b/redhat/applications/kdbusnotification/kdbusnotification.spec
deleted file mode 100644
index 0d6b7b216..000000000
--- a/redhat/applications/kdbusnotification/kdbusnotification.spec
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# spec file for package kdbusnotification (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kdbusnotification
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:		0.1
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		a DBUS notification service [Trinity]
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# GTK2 stuff
-BuildRequires:	gtk2-devel
-
-# DBUS stuff
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-glib-devel
-%else
-BuildRequires:	dbus-glib-devel
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-kdbusnotification is a small program for Trinity that displays
-DBUS notifications via unobtrusive, easily dismissed passive popups.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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"
-
-# Fix for Fedora 31
-if [ -r "/usr/include/harfbuzz/hb.h" ]; then
-  #export CMAKE_INCLUDE_PATH="/usr/include/harfbuzz"
-  RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz"
-fi
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/notification-daemon-tde
-%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
-
-
-
-%changelog
diff --git a/redhat/applications/kdiff3/kdiff3.spec b/redhat/applications/kdiff3/kdiff3.spec
deleted file mode 100644
index b4ad8b0c3..000000000
--- a/redhat/applications/kdiff3/kdiff3.spec
+++ /dev/null
@@ -1,183 +0,0 @@
-#
-# spec file for package kdiff3 (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kdiff3
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.9.91
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	KDiff3 is a utility for comparing and/or merging two or three text files or directories.
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-Shows the differences line by line and character by character (!).
-Provides an automatic merge-facility and
-an integrated editor for comfortable solving of merge-conflicts.
-Supports TDEIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
-Unicode & UTF-8 support
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kdiff3.desktop" Development RevisionControl
-%endif
-
-# Unwanted files
-# These are not HTML files but weird files in wrong place ??
-%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/
-
-%find_lang %{tde_pkg}
-%find_lang %{tde_pkg}_plugin
-cat "%{tde_pkg}_plugin.lang" >>"%{tde_pkg}.lang"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/kdiff3
-%{tde_datadir}/apps/kdiff3/
-%{tde_datadir}/apps/kdiff3part/
-%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png
-%{tde_datadir}/icons/locolor/*/apps/kdiff3.png
-%{tde_docdir}/kdiff3/
-%{tde_tdedocdir}/HTML/*/kdiff3/
-%{tde_datadir}/services/kdiff3_plugin.desktop
-%{tde_datadir}/services/kdiff3part.desktop
-%{tde_tdeappdir}/kdiff3.desktop
-%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
-%{tde_mandir}/man*/*
-%{tde_tdelibdir}/libkdiff3part.la
-%{tde_tdelibdir}/libkdiff3part.so
-%{tde_tdelibdir}/libkdiff3plugin.la
-%{tde_tdelibdir}/libkdiff3plugin.so
-
-%changelog
diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/kdirstat/kdirstat.spec
deleted file mode 100644
index 81804d4d6..000000000
--- a/redhat/applications/kdirstat/kdirstat.spec
+++ /dev/null
@@ -1,177 +0,0 @@
-#
-# spec file for package kdirstat (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kdirstat
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	2.4.4
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Graphical disk usage display with cleanup facilities [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KDirStat (TDE Directory Statistics) is a small utility program that sums
-up disk usage for directory trees, very much like the Unix 'du' command.
-It displays the disk space used up by a directory tree, both numerically
-and graphically.  It is network transparent (i.e., you can use it to sum
-up FTP servers), and comes with predefined and user configurable cleanup
-actions.  You can directly open a directory branch in Konqueror or the
-shell of your choice, compress it to a .tar.bz2 archive, or define your
-own cleanup actions. 
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" Filesystem
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kdirstat
-%{tde_tdeappdir}/kdirstat.desktop
-%{tde_datadir}/apps/tdeconf_update/fix_move_to_trash_bin.pl
-%{tde_datadir}/apps/tdeconf_update/kdirstat.upd
-%{tde_datadir}/apps/kdirstat/
-%{tde_tdedocdir}/HTML/en/kdirstat/
-%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png
-%{tde_datadir}/icons/locolor/*/apps/kdirstat.png
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/keep/keep.spec b/redhat/applications/keep/keep.spec
deleted file mode 100644
index 26c493ede..000000000
--- a/redhat/applications/keep/keep.spec
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# spec file for package keep (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg keep
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.4.0
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Backup system for TDE [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-Requires:		rdiff-backup
-
-
-%description
-Keep is an automatic backup program that allows users to set the parameters of
-the backup, including the frequency and the number of backups.
-
-Homepage: http://jr.falleri.free.fr/keep
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/keep.desktop" System Backup
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/keep
-%{tde_tdelibdir}/kded_keep.la
-%{tde_tdelibdir}/kded_keep.so
-%{tde_tdeappdir}/keep.desktop
-%{tde_datadir}/icons/hicolor/scalable/apps/keep.svgz
-%{tde_datadir}/apps/keep/
-%{tde_datadir}/config.kcfg/keepsettings.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/keep.png
-%{tde_datadir}/services/kded/keep.desktop
-%{tde_mandir}/man1/keep.*
-
-
-%changelog
diff --git a/redhat/applications/kerberostray/kerberostray.spec b/redhat/applications/kerberostray/kerberostray.spec
deleted file mode 100644
index cd0ce6215..000000000
--- a/redhat/applications/kerberostray/kerberostray.spec
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-# spec file for package kerberostray (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kerberostray
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.5
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Kerberos ticket manager
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	trinity-libtdeldap-devel >= 0.5
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# OPENLDAP support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	openldap-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires:	openldap24-libs-devel
-%endif
-
-# KRB5 support
-BuildRequires:	krb5-devel
-
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-%define with_tdehwlib 1
-BuildRequires:	libudev-devel
-%endif
-
-# LIBCOM_ERR support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires:	libcom_err-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}ext2fs-devel
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}
-
-# Apps that should stay in TDE
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%{tde_bindir}/kerberostray
-%{tde_tdeappdir}/kerberostray.desktop
-%{tde_datadir}/apps/kerberostray/
-%{tde_datadir}/autostart/kerberostray.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kerberostray.png
-
-
-%changelog
diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec
deleted file mode 100644
index 99876a70d..000000000
--- a/redhat/applications/keximdb/keximdb.spec
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-# spec file for package keximdb (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg keximdb
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.1.0
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	MS Access (MDB) driver for Kexi [Trinity]
-Group:		Applications/Multimedia
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-koffice-devel
-BuildRequires:	trinity-koffice-kexi
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-MDB migration driver for converting MS Access databases in MDB files
-into KexiDB databases.
-
-This driver allows Kexi, the KOffice database program, to convert MDB
-database files to Kexi databases via the Tools->Migration->Import Database
-menu option.  Note that this package does not allow MDB files to be opened
-directly - they must be converted to a Kexi database first.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/keximigrate_mdb.la
-%{tde_tdelibdir}/keximigrate_mdb.so
-%{tde_datadir}/services/keximigrate_mdb.desktop
-
-
-%post
-
-
-%postun
-
-
-%changelog
diff --git a/redhat/applications/kftpgrabber/kftpgrabber.spec b/redhat/applications/kftpgrabber/kftpgrabber.spec
deleted file mode 100644
index 5ac74acd7..000000000
--- a/redhat/applications/kftpgrabber/kftpgrabber.spec
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# spec file for package kftprgrabber (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kftpgrabber
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:        0.8.1
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:        A FTP client for TDE
-Group:          Applications/Internet
-URL:            http://www.kftp.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-KFTPgrabber is a graphical FTP client for the Trinity Desktop Environment. It
-implements many features required for usable FTP interaction.
-
-Feature list:
-- Multiple simultaneous FTP sessions in separate tabs
-- A tree-oriented transfer queue
-- TLS/SSL support for the control connection and the data channel
-- X509 certificate support for authentication
-- FXP site-to-site transfer support
-- One-time password (OTP) support using S/KEY, MD5, RMD160 or SHA1
-- Site bookmarks with many options configurable per-site
-- Distributed FTP daemon support (implementing the PRET command)
-- Can use Zeroconf for local site discovery
-- Bookmark import plugins from other FTP clients
-- Support for the SFTP protocol
-- A nice traffic graph
-- Ability to limit upload and download speed
-- Priority and skip lists
-- Integrated SFV checksum verifier
-- Direct viewing/editing of remote files
-- Advanced default "on file exists" action configuration
-- Filter displayed files/directories as you type
-
-
-%package devel
-Summary:  	Development files for %{name}
-Group: 		Development/Libraries
-Requires: 	%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTDIR
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-  
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
-%{tde_bindir}/kftpgrabber
-%{tde_libdir}/libkftpinterfaces.so.0
-%{tde_libdir}/libkftpinterfaces.so.0.0.0
-%{tde_tdelibdir}/kftpimportplugin_filezilla3.la
-%{tde_tdelibdir}/kftpimportplugin_filezilla3.so
-%{tde_tdelibdir}/kftpimportplugin_gftp.la
-%{tde_tdelibdir}/kftpimportplugin_gftp.so
-%{tde_tdelibdir}/kftpimportplugin_kftp.la
-%{tde_tdelibdir}/kftpimportplugin_kftp.so
-%{tde_tdelibdir}/kftpimportplugin_ncftp.la
-%{tde_tdelibdir}/kftpimportplugin_ncftp.so
-%{tde_tdeappdir}/kftpgrabber.desktop
-%{tde_datadir}/apps/kftpgrabber/
-%{tde_datadir}/config.kcfg/kftpgrabber.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kftpgrabber.png
-%{tde_datadir}/services/kftpimportplugin_filezilla3.desktop
-%{tde_datadir}/services/kftpimportplugin_gftp.desktop
-%{tde_datadir}/services/kftpimportplugin_kftp.desktop
-%{tde_datadir}/services/kftpimportplugin_ncftp.desktop
-%{tde_datadir}/servicetypes/kftpbookmarkimportplugin.desktop
-%{tde_tdedocdir}/HTML/en/kftpgrabber/
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kftpgrabber/
-%{tde_libdir}/libkftpinterfaces.la
-%{tde_libdir}/libkftpinterfaces.so
-
-
-%changelog
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec
deleted file mode 100644
index ef0bd22db..000000000
--- a/redhat/applications/kgtk-qt3/kgtk-qt3.spec
+++ /dev/null
@@ -1,190 +0,0 @@
-#
-# spec file for package kgtk-qt3 (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kgtk-qt3
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.10.2
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Use TDE dialogs in Gtk apps
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GTK2 support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-BuildRequires:	gtk2-devel
-%else
-BuildRequires:	gtk+2.0-devel
-%endif
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-This is an LD_PRELOAD hack that allows most GTK
-applications to use Trinity's file dialogs when run under Trinity.
-
-The Gtk file chooser functions have been overridden to communicate
-with this TDE module/application.
-
-This package includes the kqt3-wrapper
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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:${PKG_CONFIG_PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# The "preload" file is used by "startkde" script
-%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
-echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
-
-%find_lang kgtk
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kgtk.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kdialogd-wrapper
-%{tde_bindir}/kdialogd3
-%{tde_bindir}/kgtk-wrapper
-%{tde_bindir}/kgtk2-wrapper
-%{tde_bindir}/kqt3-wrapper
-%dir %{tde_datadir}/kgtk
-%dir %{tde_libdir}/kgtk
-%{tde_libdir}/kgtk/libkgtk2.so
-%{tde_libdir}/kgtk/libkqt3.so
-%{tde_datadir}/kgtk/preload
-
-
-%changelog
diff --git a/redhat/applications/kile/kile.spec b/redhat/applications/kile/kile.spec
deleted file mode 100644
index 9562bb630..000000000
--- a/redhat/applications/kile/kile.spec
+++ /dev/null
@@ -1,226 +0,0 @@
-#
-# spec file for package kile (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kile
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		2.0.3
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		TDE Integrated LaTeX Environment [Trinity]
-Group:			Applications/Publishing
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Obsoletes: %{name}-i18n-ar < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-bg < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-br < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-ca < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-cs < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-cy < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-engb < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-eu < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-fi < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-ga < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-gl < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-hi < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-hu < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-is < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-ja < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-lt < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-ms < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-mt < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-nb < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-nds < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-nn < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-pa < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-ro < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-rw < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-sk < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-sr < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-srlatin < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-ta < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-th < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-tr < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-i18n-zhcn < %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-Kile is a user-friendly LaTeX source editor and TeX shell for TDE.
-
-The source editor is a multi-document editor designed for .tex and .bib
-files.  Menus, wizards and auto-completion are provided to assist with
-tag insertion and code generation.  A structural view of the document
-assists with navigation within source files.
-
-The TeX shell integrates the various tools required for TeX processing.
-It assists with LaTeX compilation, DVI and postscript document viewing,
-generation of bibliographies and indices and other common tasks.
-
-Kile can support large projects consisting of several smaller files.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh
-
-# Unwanted files ...
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml
-%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file kile Office WordProcessor
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kile
-%{tde_tdeappdir}/kile.desktop
-%{tde_datadir}/apps/tdeconf_update
-%{tde_datadir}/apps/kile
-%{tde_datadir}/config.kcfg/kile.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kile.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kile.svgz
-%{tde_tdedocdir}/HTML/en/kile
-%{tde_datadir}/mimelnk/text/x-kilepr.desktop
-
-%lang(da) %{tde_tdedocdir}/HTML/da/kile/
-%lang(es) %{tde_tdedocdir}/HTML/es/kile/
-%lang(et) %{tde_tdedocdir}/HTML/et/kile/
-%lang(it) %{tde_tdedocdir}/HTML/it/kile/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/kile/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/kile/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/kile/
-
-
-
-%changelog
diff --git a/redhat/applications/kima/kima.spec b/redhat/applications/kima/kima.spec
deleted file mode 100644
index ce4fa0706..000000000
--- a/redhat/applications/kima/kima.spec
+++ /dev/null
@@ -1,172 +0,0 @@
-#
-# spec file for package kima (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kima
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.7.3.2
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Kicker monitoring applet [Trinity]
-Group:			Applications/Utilities
-URL:			http://www.elliptique.net/~ken/kima/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-%define with_tdehwlib 1
-BuildRequires:	libudev-devel
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-This applet monitors various temperature,
-frequency and fan sources in your kicker
-panel.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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 \
-  -DWITH_NVCONTROL=OFF \
-  \
-  -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,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_tdelibdir}/libkima.la
-%{tde_tdelibdir}/libkima.so
-%{tde_datadir}/apps/kicker/applets/kima.desktop
-%{tde_tdedocdir}/HTML/en/kima/
-
-
-%changelog
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec
deleted file mode 100644
index 29ccc5984..000000000
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ /dev/null
@@ -1,186 +0,0 @@
-#
-# spec file for package kiosktool (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kiosktool
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.0
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Tool to configure the TDE kiosk framework
-Group:			Applications/Multimedia
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-A Point&Click tool for system administrators to enable 
-TDE's KIOSK features or otherwise preconfigure TDE for 
-groups of users.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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 $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-%find_lang %{tde_pkg}
-
-%__mkdir_p "%{?buildroot}%{tde_confdir}"
-cat <<EOF >"%{?buildroot}%{tde_confdir}/kiosktoolrc"
-[General]
-GroupBlacklist=bin,daemon,sys,tty,disk,lp,www,kmem,wheel,mail,news,uucp,shadow,utmp,at,xok,named,ftp,postfix,maildrop,man,sshd,distcc,nobody,nogroup
-EOF
-
-# Updates applications categories for openSUSE
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-%if 0%{?suse_version}
-%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System SystemSetup
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-%{tde_bindir}/kiosktool
-%{tde_bindir}/kiosktool-tdedirs
-%{tde_tdeappdir}/kiosktool.desktop
-%{tde_datadir}/apps/kiosktool/
-%lang(da) %{tde_tdedocdir}/HTML/da/kiosktool/
-%lang(en) %{tde_tdedocdir}/HTML/en/kiosktool/
-%lang(it) %{tde_tdedocdir}/HTML/it/kiosktool/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/kiosktool/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/kiosktool/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/kiosktool/
-%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%config(noreplace) %{tde_confdir}/kiosktoolrc
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec
deleted file mode 100644
index 6ad81c866..000000000
--- a/redhat/applications/kkbswitch/kkbswitch.spec
+++ /dev/null
@@ -1,191 +0,0 @@
-#
-# spec file for package kkbswitch (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kkbswitch
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.4.3
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Keyboard layout indicator for TDE
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# XKBFILES support
-BuildRequires:	libxkbfile-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KKBSwitch displays an icon in the system tray that indicates which layout is 
-currently active and enables you to switch layouts by clicking the icon or by 
-selecting from the menu. It works with all desktop environments.
-
-Features include:
-- Configurable icons for the keyboard layouts.
-- The "toggle mode" to toggle between the two most recently-used keyboard 
-  layouts.
-- Choose to use a global layout or per-application or per-window layouts.
-- Configurable keyboard shortcuts.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Fix desktop icon location
-if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
-  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-  %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
-fi
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System TrayIcon
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README TODO
-%{tde_bindir}/kkbswitch
-%{tde_tdeappdir}/kkbswitch.desktop
-%{tde_datadir}/apps/kkbswitch/
-%{tde_datadir}/apps/tdeconf_update/kkbswitch.upd
-%{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_icons
-%{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_options
-%{tde_datadir}/autostart/kkbswitch.desktop
-%{tde_datadir}/X11/xkb/symbols/ru_ua
-%{tde_tdedocdir}/HTML/en/kkbswitch/
-%{tde_mandir}/man1/kkbswitch.1
-%{tde_datadir}/icons/hicolor/*/apps/kkbswitch.png
-
-
-%changelog
diff --git a/redhat/applications/klamav/klamav.spec b/redhat/applications/klamav/klamav.spec
deleted file mode 100644
index 45a506ee6..000000000
--- a/redhat/applications/klamav/klamav.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# spec file for package klamav (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg klamav
-%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
-
-
-Name:			trinity-%{tde_pkg}
-Summary:        Frontend for clamav
-Version:		0.46
-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://www.trinitydesktop.org/
-Url:            http://klamav.sourceforge.net/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	cmake
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-BuildRequires:	curl-devel
-BuildRequires:	gmp-devel
-BuildRequires:	sqlite-devel
-#BuildRequires:	unsermake
-
-# CLAMAV support
-BuildRequires:  clamav
-BuildRequires:  clamav-devel
-Requires:		clamav
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-A TDE front-end for the Clam AntiVirus antivirus toolkit.
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-chmod u+r %{buildroot}%{tde_bindir}/ScanWithKlamAV
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-	
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%attr(111,root,root) %{tde_bindir}/ScanWithKlamAV
-%{tde_bindir}/klamav
-%{tde_bindir}/klammail
-%{tde_tdeappdir}/klamav.desktop
-%{tde_datadir}/apps/klamav/
-%{tde_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
-%{tde_tdedocdir}/HTML/en/klamav/
-%{tde_datadir}/icons/hicolor/32x32/apps/klamav.png
-%{tde_datadir}/icons/hicolor/48x48/apps/klamav.png
-
-
-%changelog
diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec
deleted file mode 100644
index 615686627..000000000
--- a/redhat/applications/klcddimmer/klcddimmer.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# spec file for package klcddimmer (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg klcddimmer
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		0.3
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Applet to adjust LCD brightness for TDE
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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} || touch %{tde_pkg}.lang
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE NEWS README
-%{tde_libdir}/klcddimmer_panelapplet.la
-%{tde_libdir}/klcddimmer_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/klcddimmer.desktop
-%{tde_tdedocdir}/HTML/en/klcddimmer/
-%{tde_datadir}/icons/hicolor/*/apps/klcddimmer.png
-
-
-%changelog
diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/kmplayer/kmplayer.spec
deleted file mode 100644
index e5c109d5a..000000000
--- a/redhat/applications/kmplayer/kmplayer.spec
+++ /dev/null
@@ -1,318 +0,0 @@
-#
-# spec file for package kmplayer (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kmplayer
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.10.0c
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Media player for Trinity
-Group:		Applications/Multimedia
-URL:		http://www.trinitydesktop.org/
-#URL:		http://kmplayer.kde.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# DBUS support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
-%endif
-
-# GSTREAMER support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer1.0-devel
-BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-%endif
-%if 0%{?rhel} >= 7 || 0%{?fedora}
-BuildRequires:	gstreamer1-devel >= 1.0
-BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
-%define with_xine 1
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# X11 stuff
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libxt-devel
-BuildRequires:	libxv-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires:	libXv-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel 
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXv-devel
-%endif
-
-# GTK2 stuff
-BuildRequires:	gtk2-devel
-
-# DBUS stuff
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-glib-devel
-%else
-BuildRequires:	dbus-glib-devel
-%endif
-
-# NSPR support
-%if 0%{?suse_version}
-BuildRequires:	mozilla-nspr-devel
-%else
-BuildRequires:	nspr-devel
-%endif
-
-# Koffice support
-BuildRequires:	trinity-koffice-devel
-
-Requires:		%{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-A basic audio/video viewer application for Trinity.
-
-KMPlayer can:
-* play DVD (DVDNav only with the Xine player)
-* play VCD
-* let the backend players play from a pipe (read from stdin)
-* play from a TV device (experimental)
-* show backend player's console output
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
-* DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
-  shortcut configure window
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
-  (if you have VDR) and volume increase/decrease
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO
-%{tde_bindir}/kmplayer
-%{tde_bindir}/knpplayer
-%{tde_bindir}/kxvplayer
-%{tde_datadir}/services/kmplayer_koffice.desktop
-%{tde_libdir}/libkmplayercommon.so.1
-%{tde_libdir}/libkmplayercommon.so.1.0.0
-%{tde_libdir}/libtdeinit_kmplayer.la
-%{tde_libdir}/libtdeinit_kmplayer.so
-%{tde_tdelibdir}/kmplayer.la
-%{tde_tdelibdir}/kmplayer.so
-%{tde_tdelibdir}/libkmplayerkofficepart.la
-%{tde_tdelibdir}/libkmplayerkofficepart.so
-%{tde_tdeappdir}/kmplayer.desktop
-
-%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
-%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%exclude %{tde_datadir}/apps/kmplayer/noise.gif
-%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/apps/kmplayer/
-
-##########
-
-%package base
-Group:			Applications/Multimedia
-Summary:		Base files for KMPlayer [Trinity]
-
-%description base
-Core files needed for KMPlayer.
-
-%files base
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
-%{tde_bindir}/kgstplayer
-%{tde_bindir}/kxineplayer
-%dir %{tde_datadir}/config
-%config(noreplace) %{tde_datadir}/config/kmplayerrc
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
-%{tde_datadir}/apps/kmplayer/noise.gif
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-%{tde_mandir}/man1/kmplayer.1*
-
-##########
-
-%package konq-plugins
-Group:			Applications/Multimedia
-Requires:		%{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-konqueror >= %{tde_version}
-Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
-
-%description konq-plugins
-This plugin enables audio/video playback inside konqueror, using Xine (with
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
-browser plugins.
-
-%files konq-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkmplayerpart.la
-%{tde_tdelibdir}/libkmplayerpart.so
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/services/kmplayer_part.desktop
-
-##########
-
-%package doc
-Group:			Applications/Multimedia
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Summary:		Handbook for KMPlayer [Trinity]
-
-%description doc
-Documention for KMPlayer, a basic audio/video viewer application for TDE.
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/*/kmplayer
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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:${PKG_CONFIG_PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-# Removes unwanted files
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/kmyfirewall/kmyfirewall.spec b/redhat/applications/kmyfirewall/kmyfirewall.spec
deleted file mode 100644
index ee538496f..000000000
--- a/redhat/applications/kmyfirewall/kmyfirewall.spec
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-# spec file for package kmyfirewall (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kmyfirewall
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.1.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Iptables based firewall configuration tool for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
-Linux systems. It will be the right tool if you like to have a so called
-"Personal Firewall" running on your Linux box, but don't have the time and/or
-the interest to spend hours in front of the iptables manual just to setup a 
-Firewall that keeps the "bad" people out.
-
-There is also the possibility to save entire rule sets, so you only have to
-configure your rule set one time and then you can use it on several computers
-giving each of them a similar configuration (p.e. school networks, office,
-university etc.)
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
-%{tde_bindir}/kmyfirewall
-%{tde_libdir}/libkmfcore.so.*
-%{tde_libdir}/libkmfwidgets.so.*
-%{tde_tdelibdir}/libkmfcompiler_ipt.la
-%{tde_tdelibdir}/libkmfcompiler_ipt.so
-%{tde_tdelibdir}/libkmfgenericinterfacepart.la
-%{tde_tdelibdir}/libkmfgenericinterfacepart.so
-%{tde_tdelibdir}/libkmfinstaller_linux.la
-%{tde_tdelibdir}/libkmfinstaller_linux.so
-%{tde_tdelibdir}/libkmfinstallerplugin.la
-%{tde_tdelibdir}/libkmfinstallerplugin.so
-%{tde_tdelibdir}/libkmfipteditorpart.la
-%{tde_tdelibdir}/libkmfipteditorpart.so
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
-%{tde_tdelibdir}/libkmfruleoptionedit_state.la
-%{tde_tdelibdir}/libkmfruleoptionedit_state.so
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
-%{tde_tdeappdir}/kmyfirewall.desktop
-%{tde_datadir}/apps/kmfgenericinterfacepart/
-%{tde_datadir}/apps/kmfipteditorpart/
-%{tde_datadir}/apps/kmfsystray/
-%{tde_datadir}/apps/kmyfirewall/
-%{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%config(noreplace) %{tde_confdir}/kmyfirewallrc
-%{tde_tdedocdir}/HTML/en/kmyfirewall/
-%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
-%{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
-%{tde_datadir}/mimelnk/application/kmfgrs.desktop
-%{tde_datadir}/mimelnk/application/kmfnet.desktop
-%{tde_datadir}/mimelnk/application/kmfpkg.desktop
-%{tde_datadir}/mimelnk/application/kmfrs.desktop
-%{tde_datadir}/services/kmf*.desktop
-%{tde_datadir}/servicetypes/kmf*.desktop
-
-##########
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-%{tde_tdeincludedir}/kmyfirewall
-%{tde_libdir}/libkmfcore.la
-%{tde_libdir}/libkmfcore.so
-%{tde_libdir}/libkmfwidgets.la
-%{tde_libdir}/libkmfwidgets.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r "%{tde_pkg}" System Network
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/kmymoney/kmymoney.spec b/redhat/applications/kmymoney/kmymoney.spec
deleted file mode 100644
index a43c79e47..000000000
--- a/redhat/applications/kmymoney/kmymoney.spec
+++ /dev/null
@@ -1,259 +0,0 @@
-%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8
-%define _configure_libtool_hardening_hack 0
-%endif
-
-#
-# spec file for package kmymoney (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kmymoney
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Required for Mageia >= 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0.5
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Personal finance manager for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		kmymoneytitlelabel.png
-Source2:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	recode
-BuildRequires:	libofx-devel
-
-# OPENSP support
-%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion}
-%if 0%{?mgaversion} || 0%{?pclinuxos}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}osp-devel
-%else
-BuildRequires:	%{_lib}OpenSP5-devel
-%endif
-%else
-BuildRequires:	opensp-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	opensp-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	openjade-devel
-%endif
-
-# TQT3-sqlite3
-BuildRequires:	libtqt3-mt-sqlite3
-Requires:		libtqt3-mt-sqlite3
-
-Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-KMyMoney is the Personal Finance Manager for TDE. It operates similar to
-MS-Money and Quicken, supports different account types, categorisation of
-expenses, QIF import/export, multiple currencies and initial online banking
-support.
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kmymoney
-%{tde_bindir}/kmymoney2
-%{tde_tdeappdir}/kmymoney2.desktop
-%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
-%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
-%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
-%{tde_libdir}/*.so.*
-%{tde_tdelibdir}/kmm_ofximport.la
-%{tde_tdelibdir}/kmm_ofximport.so
-
-##########
-
-%package common
-Summary:		KMyMoney architecture independent files
-Group:			Applications/Utilities
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description common
-This package contains architecture independent files needed for KMyMoney to
-run properly. It also provides KMyMoney documentation. Therefore, unless you
-have '%{name}' package installed, you will hardly find this package useful.
-
-%files common -f kmymoney2.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmymoney2/
-%{tde_datadir}/config.kcfg/kmymoney2.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%dir %{tde_datadir}/icons/Tango/
-%dir %{tde_datadir}/icons/Tango/*/
-%dir %{tde_datadir}/icons/Tango/*/*/
-%{tde_datadir}/icons/Tango/*/*/*.png
-%{tde_datadir}/icons/Tango/scalable/*.svgz
-%{tde_datadir}/icons/locolor/*/*/*.png
-%dir %{tde_datadir}/icons/oxygen/
-%dir %{tde_datadir}/icons/oxygen/*/
-%dir %{tde_datadir}/icons/oxygen/*/*/
-%{tde_datadir}/icons/oxygen/*/*/*.png
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
-%{tde_tdedocdir}/HTML/en/kmymoney2/
-%{tde_mandir}/man1/kmymoney2.*
-%{tde_datadir}/apps/kmm_ofximport/
-%{tde_datadir}/services/kmm_ofximport.desktop
-
-##########
-
-%package devel
-Summary:		KMyMoney development files
-Group:			Development/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains development files needed for KMyMoney plugins.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmymoney/
-%{tde_libdir}/libkmm_kdchart.la
-%{tde_libdir}/libkmm_mymoney.la
-%{tde_libdir}/libkmm_plugin.la
-%{tde_libdir}/*.so
-%{_libdir}/tqt3/plugins/designer/libkmymoney.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__install -m644 %{SOURCE1} kmymoney2/widgets/
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
-LDFLAGS="-Wl,--allow-shlib-undefined"
-%endif
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --with-qmake=%{_bindir}/tqmake \
-  --with-qt-dir=%{_libdir}/tqt3 \
-  \
-  --disable-pdf-docs \
-  --enable-ofxplugin \
-  --enable-ofxbanking \
-  --enable-qtdesigner \
-  --disable-sqlite3
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang kmymoney2
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/knemo/knemo.spec b/redhat/applications/knemo/knemo.spec
deleted file mode 100644
index 100dc5a3b..000000000
--- a/redhat/applications/knemo/knemo.spec
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# spec file for package knemo (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg knemo
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.4.8
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Network interfaces monitor for the Trinity systray
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-#URL:		http://beta.smileaf.org/projects
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	gettext
-
-%if 0%{?fedora} >= 18 || 0%{?suse_version} || 0%{?mgaversion}
-BuildRequires:	net-tools
-Requires:		net-tools
-%endif
-
-%if 0%{?suse_version} > 1320
-BuildRequires:	net-tools-deprecated
-Requires:		net-tools-deprecated
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# Wireless support
-%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
-%endif
-%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires:	%{_lib}iw29-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
-%endif
-%if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires:	libiw-devel
-%endif
-
-
-%description
-KNemo displays an icon in the systray for every network interface.
-Tooltips and an info dialog provide further information about the
-interface.  Passive popups inform about interface changes.
-A traffic plotter is also integrated.
-
-knemo polls the network interface status every second using the
-ifconfig, route and iwconfig tools. 
-
-Homepage: http://extragear.kde.org/apps/knemo/
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_knemo.la
-%{tde_tdelibdir}/kcm_knemo.so
-%{tde_tdelibdir}/kded_knemod.la
-%{tde_tdelibdir}/kded_knemod.so
-%{tde_tdeappdir}/kcm_knemo.desktop
-%{tde_datadir}/apps/knemo/
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
-%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
-%{tde_datadir}/services/kded/knemod.desktop
-%{tde_tdedocdir}/HTML/en/kcontrol/knemo/
-
-
-%changelog
diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/knetload/knetload.spec
deleted file mode 100644
index 433644126..000000000
--- a/redhat/applications/knetload/knetload.spec
+++ /dev/null
@@ -1,181 +0,0 @@
-#
-# spec file for package knetload (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg knetload
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	2.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	A network meter for Kicker [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KNetLoad is a small network meter for Kicker (the TDE panel).  It shows
-a recent history of network usage in the form of two configurable
-diagrams in the system tray, one for incoming and one for outgoing
-data.  These diagrams have settings for colours and various different
-styles.
-
-KNetLoad can monitor just about any network device.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file %{tde_pkg} System Monitor
-%endif
-
-# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
-%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,32x32,48x48}"/apps/"
-pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,32,48}; do %__cp crystalsvg/"$i"x"$i"/apps/knetload.png  hicolor/"$i"x"$i"/apps/knetload.png  ;done
-popd
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetload
-%{tde_tdeappdir}/knetload.desktop
-%{tde_datadir}/apps/knetload
-%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
-%{tde_datadir}/icons/hicolor/*/apps/knetload.png
-%{tde_datadir}/icons/locolor/*/apps/knetload.png
-%{tde_tdedocdir}/HTML/en/knetload/
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/knetstats/knetstats.spec
deleted file mode 100644
index 77fcbb092..000000000
--- a/redhat/applications/knetstats/knetstats.spec
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# spec file for package knetstats (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg knetstats
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.6.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Network interfaces monitor for the Trinity systray
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-A simple TDE network monitor that show rx/tx LEDs of any
-network interface on a system tray icon
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file %{tde_pkg} System Monitor
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetstats
-%{tde_tdeappdir}/knetstats.desktop
-%{tde_datadir}/apps/knetstats/
-%{tde_tdedocdir}/HTML/en/knetstats/
-%{tde_datadir}/icons/hicolor/*/apps/knetstats.png
-%{tde_mandir}/man*/knetstats.*
-
-
-%changelog
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec
deleted file mode 100644
index f86b018a6..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager8.spec
+++ /dev/null
@@ -1,193 +0,0 @@
-#
-# spec file for package knetworkmanager8 (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg knetworkmanager
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.8
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Trinity applet for Network Manager
-Group:		Applications/Internet
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}8-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-%if 0%{?rhel} || 0%{?fedora}
-Requires:		NetworkManager-gnome
-%else
-Requires:		networkmanager
-%endif
-
-# NetworkManager support
-BuildRequires:	NetworkManager-glib-devel
-
-# HAL support
-BuildRequires:	hal-devel
-
-Obsoletes:		trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-%files -f knetworkmanager.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_tdelibdir}/knetworkmanager_openvpn.so.*
-%{tde_tdelibdir}/knetworkmanager_pptp.so.*
-%{tde_tdelibdir}/knetworkmanager_vpnc.so.*
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-%{tde_datadir}/services/knetworkmanager_openvpn.desktop
-%{tde_datadir}/services/knetworkmanager_pptp.desktop
-%{tde_datadir}/services/knetworkmanager_vpnc.desktop
-
-##########
-
-%package devel
-Summary:		Common data shared among the MySQL GUI Suites
-Group:			Development/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:		trinity-knetworkmanager-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-knetworkmanager-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep 
-%setup -q -n %{name}8-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --with-openvpn \
-  --with-vpnc \
-  --with-pptp
-
-# Does not support parallel build
-%__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot}
-%find_lang knetworkmanager
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/knights/knights.spec
deleted file mode 100644
index 02734fff5..000000000
--- a/redhat/applications/knights/knights.spec
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# spec file for package knights (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg knights
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.6
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	A chess interface for the K Desktop Environment [Trinity]
-Group:		Amusements/Games
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# GNUCHESS support
-Requires:		gnuchess
-
-%description
-Knights aims to be the ultimate chess resource on your computer. 
-Written for the K Desktop Environment, it's designed to be both friendly 
-to new chess players and functional for Grand Masters.
-
-Here's a quick list of Knights' key features:
-* Play against yourself, against computer opponents, 
-  or against others over the Internet.
-* Customize your board and pieces with over 30 different themes, 
-  or make your own!
-* Audio cues help alert you to important events.
-* Novice players can preview potential moves.
-* Save your unfinished matches and play them again later.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Fix desktop icon location
-if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
-  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-  %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Games/Board/knights.desktop" "%{?buildroot}%{tde_tdeappdir}"
-  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
-fi
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/knights.desktop" Game BoardGame
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knights
-%{tde_tdeappdir}/knights.desktop
-%{tde_datadir}/apps/knights
-%{tde_tdedocdir}/HTML/*/knights
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/pgn.desktop
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec
deleted file mode 100644
index fe6e58e05..000000000
--- a/redhat/applications/knmap/knmap.spec
+++ /dev/null
@@ -1,206 +0,0 @@
-#
-# spec file for package knmap (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg knmap
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	2.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	An NMAP frontend for TDE
-Group:		Applications/Internet
-URL:		http://sourceforge.net/projects/knmap/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# NMAP support
-Requires:		nmap
-
-
-%description
-Knmap is a TDE-based interface to the 'nmap' facility.
-
-The main Knmap window provides for the entry of nmap options and the
-display of nmap-generated output.
-
-This program is a complete re-write of one by the same name written by
-Alexandre Sagala. The last version of that program was 0.9 which was
-released on 2003-03-09 and targeted the KDE 2.2 and QT 2.3 environments.
-
-Not to mention that it did not cater for the full set of 'nmap' options.
-Or, perhaps, 'nmap' progressed whilst that version of Knmap languished.
-
-http://www.kde-apps.org/content/show.php?content=31108
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-%find_lang %{tde_pkg}
-
-# Move desktop icon to XDG directory
-if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
-  %__mkdir_p %{buildroot}%{tde_tdeappdir}
-  %__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
-fi
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r %{tde_pkg} TDE System Network
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
-%{tde_bindir}/knmap
-%{tde_tdeappdir}/knmap.desktop
-%{tde_datadir}/apps/knmap/
-%{tde_tdedocdir}/HTML/en/knmap/
-%{tde_datadir}/icons/hicolor/*/apps/knmap.png
-%{tde_datadir}/icons/hicolor/*/apps/knmapman.png
-%{tde_datadir}/icons/hicolor/*/apps/localman.png
-%{tde_datadir}/icons/hicolor/*/apps/manpage.png
-%{tde_datadir}/icons/hicolor/*/apps/manstylesheet.png
-%{tde_datadir}/icons/hicolor/*/apps/profilecopy.png
-%{tde_datadir}/icons/hicolor/*/apps/profiledelete.png
-%{tde_datadir}/icons/hicolor/*/apps/profileload.png
-%{tde_datadir}/icons/hicolor/*/apps/profilerename.png
-%{tde_datadir}/icons/hicolor/*/apps/profilesave.png
-%{tde_datadir}/icons/hicolor/*/apps/profilesaveas.png
-%{tde_datadir}/icons/hicolor/*/apps/scanclose.png
-%{tde_datadir}/icons/hicolor/*/apps/scanduplicate.png
-%{tde_datadir}/icons/hicolor/*/apps/scannew.png
-%{tde_datadir}/icons/hicolor/*/apps/scanrename.png
-%{tde_datadir}/icons/hicolor/*/apps/zoomcustom.png
-%{tde_datadir}/icons/hicolor/*/apps/zoomin.png
-%{tde_datadir}/icons/hicolor/*/apps/zoomout.png
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/knowit/knowit.spec
deleted file mode 100644
index ad66cbae7..000000000
--- a/redhat/applications/knowit/knowit.spec
+++ /dev/null
@@ -1,161 +0,0 @@
-#
-# spec file for package knowit (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg knowit
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.10
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Tool for managing notes [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KnowIt is a tool for managing notes which are organized in
-tree-like hierarchy. It is similar to TuxCards,
-but TDE-based, and requires Trinity.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r %{tde_pkg} Utility Applet X-SuSE-DesktopUtility
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knowit
-%{tde_tdeappdir}/knowit.desktop
-%{tde_datadir}/apps/knowit/
-%{tde_datadir}/icons/hicolor/*/apps/knowit.png
-%{tde_datadir}/mimelnk/application/x-knowit.desktop
-%{tde_tdedocdir}/HTML/en/knowit/
-%{tde_mandir}/man*/knowit.*
-
-%changelog
diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec
deleted file mode 100644
index 826aa5b8a..000000000
--- a/redhat/applications/knutclient/knutclient.spec
+++ /dev/null
@@ -1,182 +0,0 @@
-#
-# spec file for package knutclient (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg knutclient
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.9.5
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.knut.noveradsl.cz/knutclient/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
-http://www.networkupstools.org/) framework on Linux and other systems. This
-information, presented in a nice visual format, can be invaluable on
-stations using an UPS.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Fix permissions
-chmod 644 AUTHORS README COPYING ChangeLog
-
-
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Move desktop icon to XDG directory
-if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
-  %__mkdir_p %{buildroot}%{tde_tdeappdir}
-  %__mv "%{buildroot}%{tde_datadir}/applnk/Utilities/knutclient.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
-fi
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/knutclient
-%{tde_tdeappdir}/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
-%{tde_tdedocdir}/HTML/cs/knutclient
-%{tde_tdedocdir}/HTML/en/knutclient
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/koffice-i18n/koffice-i18n.spec b/redhat/applications/koffice-i18n/koffice-i18n.spec
deleted file mode 100644
index ba81a774f..000000000
--- a/redhat/applications/koffice-i18n/koffice-i18n.spec
+++ /dev/null
@@ -1,1092 +0,0 @@
-#
-# spec file for package koffice-i18n (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg koffice-i18n
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?TDE_LANGS}" == ""
-%define TDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW
-%endif
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.6.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Internationalization support for Koffice [Trinity]
-Group:		User Interface/Desktops
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	findutils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-%{summary}.
-
-%package Bulgarian
-Summary:		Bulgarian(bg) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-bg = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Bulgarian
-%{summary}.
-
-%package Bengali
-Summary:		Bengali(bn) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-bn = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Bengali
-%{summary}.
-
-%package Tibetan
-Summary:		Tibetan(bo) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-bo = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Tibetan
-%{summary}.
-
-%package Breton
-Summary:		Breton(br) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-br = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Breton
-%{summary}.
-
-%package Bosnian
-Summary:		Bosnian(bs) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-bs = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Bosnian
-%{summary}.
-
-%package Catalan
-Summary:		Catalan(ca) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ca = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Catalan
-%{summary}.
-
-%package Czech
-Summary:		Czech(cs) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-cs = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Czech
-%{summary}.
-
-%package Cymraeg
-Summary:		Cymraeg language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-%description Cymraeg
-%{summary}.
-
-%package Welsh
-Summary:		Welsh(cy) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-cy = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Welsh
-%{summary}.
-
-%package Danish
-Summary:		Danish(da) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-da = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Danish
-%{summary}.
-
-%package German
-Summary:		German(de) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-de = %{?epoch:%{epoch}:}%{version}-%{release}
-%description German
-%{summary}.
-
-%package Greek
-Summary:		Greek(el) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-el = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Greek
-%{summary}.
-
-%package British
-Summary:		British(en_GB) English support for TDE
-Group:			User Interface/Desktops
-Provides: %{name}-en_GB = %{?epoch:%{epoch}:}%{version}-%{release}
-%description British
-%{summary}.
-
-%package Esperanto
-Summary:		Esperanto(eo) support for TDE
-Group:			User Interface/Desktops
-Provides: %{name}-eo = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Esperanto
-%{summary}.
-
-%package Spanish
-Summary:		Spanish(es) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-es = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Spanish
-%{summary}.
-
-%package Estonian
-Summary:		Estonian(et) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-et = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Estonian
-%{summary}.
-
-%package Basque
-Summary:		Basque(eu) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-eu = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Basque
-%{summary}.
-
-%package Finnish
-Summary:		Finnish(fi) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-fi = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Finnish
-%{summary}.
-
-%package Faroese
-Summary:		Faroese(fo) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-fo = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Faroese
-%{summary}.
-
-%package French
-Summary:		French(fr) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-fr = %{?epoch:%{epoch}:}%{version}-%{release}
-%description French
-%{summary}.
-
-%package Frisian
-Summary:		Frisian(fy) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-fy = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Frisian
-%{summary}.
-
-%package Irish
-Summary:		Irish(ga) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Obsoletes: kde-i18n-Gaeilge < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: %{name}-ga = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Irish
-%{summary}.
-
-%package Galician
-Summary:		Galician(gl) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-gl = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Galician
-%{summary}.
-
-%package Hebrew
-Summary:		Hebrew(he) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-he = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Hebrew
-%{summary}.
-
-%package Hindi
-Summary:		Hindi(hi) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-hi = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Hindi
-%{summary}.
-
-%package Croatian
-Summary:		Croatian(hr) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-hr = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Croatian
-%{summary}.
-
-%package Hungarian
-Summary:		Hungarian(hu) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-hu = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Hungarian
-%{summary}.
-
-%package Indonesian
-Summary:		Indonesian(id) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-id = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Indonesian
-%{summary}.
-
-%package Icelandic
-Summary:		Icelandic(is) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-is = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Icelandic
-%{summary}.
-
-%package Italian
-Summary:		Italian(it) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-it = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Italian
-%{summary}.
-
-%package Japanese
-Summary:		Japanese(ja) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ja = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Japanese
-%{summary}.
-
-%package Khmer
-Summary:		Khmer(km) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-km = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Khmer
-%{summary}.
-
-%package Korean
-Summary:		Korean(ko) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Korean
-%{summary}.
-
-%package Kurdish
-Summary:		Kurdish(ku) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ku = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Kurdish
-%{summary}.
-
-%package Lao
-Summary:		Lao(lo) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-lo = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Lao
-%{summary}.
-
-%package Lithuanian
-Summary:		Lithuanian(lt) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-lt = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Lithuanian
-%{summary}.
-
-%package Latvian
-Summary:		Latvian(lv) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-lv = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Latvian
-%{summary}.
-
-%package Maori
-Summary:		Maori(mi) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-mi = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Maori
-%{summary}.
-
-%package Macedonian
-Summary:		Macedonian(mk) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-mk = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Macedonian
-%{summary}.
-
-%package Malay
-Summary:		Malay(ms) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ms = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Malay
-%{summary}.
-
-%package Maltese
-Summary:		Maltese(mt) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-mt = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Maltese
-%{summary}.
-
-%package LowSaxon
-Summary:		Low Saxon (nds) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-nds = %{?epoch:%{epoch}:}%{version}-%{release}
-%description LowSaxon
-%{summary}.
-
-%package Nepali
-Summary:		Nepali(ne) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ne = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Nepali
-%{summary}.
-
-%package Dutch
-Summary:		Dutch(nl) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-nl = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Dutch
-%{summary}.
-
-%package Norwegian
-Summary:		Norwegian(no) (Bokmaal) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-no = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Norwegian
-%{summary}.
-
-%package Norwegian-Nynorsk
-Summary:		Norwegian(nn) (Nynorsk) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-nn = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Norwegian-Nynorsk
-%{summary}.
-
-%package Occitan
-Summary:		Occitan(oc) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-oc = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Occitan
-%{summary}.
-
-%package Polish
-Summary:		Polish(pl) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-pl = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Polish
-%{summary}.
-
-%package Portuguese
-Summary:		Portuguese(pt) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-pt = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Portuguese
-%{summary}.
-
-%package Punjabi
-Summary:		Punjabi(pa) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-pa = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Punjabi
-%{summary}.
-
-%package Brazil
-Summary:		Brazil(pt_BR) Portuguese language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Brazil
-%{summary}.
-
-%package Romanian
-Summary:		Romanian(ro) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ro = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Romanian
-%{summary}.
-
-%package Russian
-Summary:		Russian(ru) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ru = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Russian
-%{summary}.
-
-%package Slovak
-Summary:		Slovak(sk) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-sk = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Slovak
-%{summary}.
-
-%package Slovenian
-Summary:		Slovenian(sl) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-sl = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Slovenian
-%{summary}.
-
-%package Serbian
-Summary:		Serbian(sr) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-sr = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Serbian
-%{summary}.
-
-%package Swedish
-Summary:		Swedish(sv) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-sv = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Swedish
-%{summary}.
-
-%package Tamil
-Summary:		Tamil(ta) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ta = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Tamil
-%{summary}.
-
-%package Tajik
-Summary:		Tajik(tg) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-tg = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Tajik
-%{summary}.
-
-%package Thai
-Summary:		Thai(th) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-th = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Thai
-%{summary}.
-
-%package Turkish
-Summary:		Turkish(tr) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-tr = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Turkish
-%{summary}.
-
-%package Ukrainian
-Summary:		Ukrainian(uk) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-uk = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Ukrainian
-%{summary}.
-
-%package Venda
-Summary:		Venda(ven) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-ven = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Venda
-%{summary}.
-
-%package Vietnamese
-Summary:		Vietnamese(vi) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-vi = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Vietnamese
-%{summary}.
-
-%package Walloon
-Summary:		Walloon(wa) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-wa = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Walloon
-%{summary}.
-
-%package Xhosa
-Summary:		Xhosa(xh) (a Bantu language) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-xh = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Xhosa
-%{summary}.
-
-%package Chinese
-Summary:		Chinese(zh_CN) (Simplified Chinese) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-zh_CN = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Chinese
-%{summary}.
-
-%package Chinese-Big5
-Summary:		Chinese(zh_TW) (Big5) language support for Koffice [Trinity]
-Group:			User Interface/Desktops
-Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release}
-%description Chinese-Big5
-%{summary}.
-
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-
-export kde_htmldir="%{tde_tdedocdir}/HTML"
-
-for l in %{TDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ]; then 
-      pushd ${f}
-      %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|"
-      %__make -f "admin/Makefile.common"
-      %configure \
-        --prefix=%{tde_prefix} \
-        --datadir=%{tde_datadir} \
-        --docdir=%{tde_tdedocdir}
-      %__make %{?_smp_mflags}
-      popd
-    fi
-  done
-done
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{tde_bindir}:${PATH}"
-
-for l in %{TDE_LANGS}; do
-  for f in koffice-i18n-${l}/; do
-    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
-      %__make install DESTDIR="%{?buildroot}" -C "${f}"
-    fi
-  done
-done
-
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
-
-%clean
-%__rm -rf %{buildroot}
-
-%if "%( grep -w af <<< '%{TDE_LANGS}' )" != ""
-%files Afrikaans
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/af/*
-%endif
-
-%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != ""
-%files Arabic 
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ar/*
-%endif
-
-%if "%( grep -w az <<< '%{TDE_LANGS}' )" != ""
-%files Azerbaijani
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/az/*
-%endif
-
-%if "%( grep -w be <<< '%{TDE_LANGS}' )" != ""
-%files Belarusian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/be/*
-%endif
-
-%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != ""
-%files Bulgarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bg/*
-%endif
-
-%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != ""
-%files Bengali
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bn/*
-%endif
-
-%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != ""
-%files Tibetan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bo/*
-%endif
-
-%if "%( grep -w br <<< '%{TDE_LANGS}' )" != ""
-%files Breton
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/br/*
-%endif
-
-%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != ""
-%files Bosnian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bs/*
-%endif
-
-%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != ""
-%files Catalan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ca/*
-%{tde_tdedocdir}/HTML/ca/
-%dir %{tde_datadir}/apps/koffice
-%dir %{tde_datadir}/apps/koffice/autocorrect
-%{tde_datadir}/apps/koffice/autocorrect/ca.xml
-%endif
-
-%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != ""
-%files Czech
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cs/*
-%dir %{tde_datadir}/apps/koffice
-%dir %{tde_datadir}/apps/koffice/autocorrect
-%{tde_datadir}/apps/koffice/autocorrect/cs.xml
-%endif
-
-%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != ""
-%files Welsh
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cy/*
-%endif
-
-%if "%( grep -w da <<< '%{TDE_LANGS}' )" != ""
-%files Danish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/da/*
-%{tde_tdedocdir}/HTML/da/
-%endif
-
-%if "%( grep -w de <<< '%{TDE_LANGS}' )" != ""
-%files German
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/de/*
-%{tde_tdedocdir}/HTML/de/
-%dir %{tde_datadir}/apps/koffice
-%dir %{tde_datadir}/apps/koffice/autocorrect
-%{tde_datadir}/apps/koffice/autocorrect/de.xml
-%endif
-
-%if "%( grep -w el <<< '%{TDE_LANGS}' )" != ""
-%files Greek
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/el/*
-%endif
-
-%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != ""
-%files British
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/en_GB/*
-%{tde_tdedocdir}/HTML/en_GB/
-%endif
-
-%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != ""
-%files Esperanto
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eo/*
-%endif
-
-%if "%( grep -w es <<< '%{TDE_LANGS}' )" != ""
-%files Spanish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/es/*
-%{tde_tdedocdir}/HTML/es/
-%dir %{tde_datadir}/apps/koffice
-%dir %{tde_datadir}/apps/koffice/autocorrect
-%{tde_datadir}/apps/koffice/autocorrect/es.xml
-%endif
-
-%if "%( grep -w et <<< '%{TDE_LANGS}' )" != ""
-%files Estonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/et/*
-%{tde_tdedocdir}/HTML/et/
-%endif
-
-%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != ""
-%files Basque
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eu/*
-%endif
-
-%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != ""
-%files Farsi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fa/*
-%endif
-
-%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != ""
-%files Finnish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fi/*
-%endif
-
-%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != ""
-%files Faroese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fo/*
-%endif
-
-%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != ""
-%files French
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fr/*
-%{tde_tdedocdir}/HTML/fr/
-%dir %{tde_datadir}/apps/koffice
-%dir %{tde_datadir}/apps/koffice/autocorrect
-%{tde_datadir}/apps/koffice/autocorrect/fr.xml
-%endif
-
-%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != ""
-%files Frisian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fy/*
-%endif
-
-%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != ""
-%files Irish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ga/*
-%endif
-
-%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != ""
-%files Galician
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/gl/*
-%endif
-
-%if "%( grep -w he <<< '%{TDE_LANGS}' )" != ""
-%files Hebrew
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/he/*
-%endif
-
-%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != ""
-%files Hindi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hi/*
-%endif
-
-%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != ""
-%files Croatian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hr/*
-%endif
-
-%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != ""
-%files Hungarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hu/*
-%dir %{tde_datadir}/apps/koffice
-%dir %{tde_datadir}/apps/koffice/autocorrect
-%{tde_datadir}/apps/koffice/autocorrect/hu.xml
-%endif
-
-%if "%( grep -w id <<< '%{TDE_LANGS}' )" != ""
-%files Indonesian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/id/*
-%endif
-
-%if "%( grep -w is <<< '%{TDE_LANGS}' )" != ""
-%files Icelandic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/is/*
-%endif
-
-%if "%( grep -w it <<< '%{TDE_LANGS}' )" != ""
-%files Italian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/it/*
-%{tde_tdedocdir}/HTML/it/
-%dir %{tde_datadir}/apps/koffice
-%dir %{tde_datadir}/apps/koffice/autocorrect
-%{tde_datadir}/apps/koffice/autocorrect/it.xml
-%endif
-
-%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != ""
-%files Japanese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ja/*
-%endif
-
-%if "%( grep -w km <<< '%{TDE_LANGS}' )" != ""
-%files Khmer
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/km/*
-%endif
-
-%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != ""
-%files Korean
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ko/*
-%endif
-
-%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != ""
-%files Kurdish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ku/*
-%endif
-
-%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != ""
-%files Lao
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lo/*
-%endif
-
-%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != ""
-%files Lithuanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lt/*
-%endif
-
-%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != ""
-%files Latvian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lv
-%{tde_datadir}/locale/lv/*
-%endif
-
-%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != ""
-%files Maori
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mi/*
-%endif
-
-%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != ""
-%files Macedonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mk/*
-%endif
-
-%if "%( grep -w ms <<< '%{TDE_LANGS}' )" != ""
-%files Malay
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ms/*
-%endif
-
-%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != ""
-%files Maltese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mt/*
-%endif
-
-%if "%( grep -w nds <<< '%{TDE_LANGS}' )" != ""
-%files LowSaxon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nds/*
-%endif
-
-%if "%( grep -w ne <<< '%{TDE_LANGS}' )" != ""
-%files Nepali
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ne/*
-%endif
-
-%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != ""
-%files Dutch
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nl/*
-%{tde_tdedocdir}/HTML/nl/
-%endif
-
-%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != ""
-%files Norwegian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nb/*
-%endif
-
-%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != ""
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nn/*
-%endif
-
-%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != ""
-%files Occitan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/oc/*
-%endif
-
-%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != ""
-%files Punjabi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pa/*
-%endif
-
-%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != ""
-%files Polish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pl/*
-%endif
-
-%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != ""
-%files Portuguese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt/*
-%{tde_tdedocdir}/HTML/pt/
-%endif
-
-%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != ""
-%files Brazil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt_BR/*
-%{tde_tdedocdir}/HTML/pt_BR/
-%endif
-
-%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != ""
-%files Romanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ro/*
-%endif
-
-%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != ""
-%files Russian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ru/*
-%{tde_tdedocdir}/HTML/ru/
-%endif
-
-%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != ""
-%files Slovak
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sk/*
-%{tde_tdedocdir}/HTML/sk/
-%dir %{tde_datadir}/apps/koffice
-%dir %{tde_datadir}/apps/koffice/autocorrect
-%{tde_datadir}/apps/koffice/autocorrect/sk.xml
-%endif
-
-%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != ""
-%files Slovenian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sl/*
-%{tde_tdedocdir}/HTML/sl/
-%endif
-
-%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != ""
-%files Serbian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sr/*
-%endif
-
-%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != ""
-%files Swedish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sv/*
-%{tde_tdedocdir}/HTML/sv/
-%endif
-
-%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != ""
-%files Tamil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ta/*
-%endif
-
-%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != ""
-%files Tajik
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tg/*
-%endif
-
-%if "%( grep -w th <<< '%{TDE_LANGS}' )" != ""
-%files Thai
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/th/*
-%endif
-
-%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != ""
-%files Turkish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tr/*
-%endif
-
-%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != ""
-%files Ukrainian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/uk/*
-%endif
-
-%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != ""
-%files Venda
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ven/*
-%endif
-
-%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != ""
-%files Vietnamese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/vi/*
-%endif
-
-%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != ""
-%files Walloon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/wa/*
-%endif
-
-%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != ""
-%files Xhosa
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/xh/*
-%endif
-
-%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != ""
-%files Chinese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_CN/*
-%endif
-
-%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != ""
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_TW/*
-%endif
-
-
-%changelog
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec
deleted file mode 100644
index 340f9639b..000000000
--- a/redhat/applications/koffice/koffice.spec
+++ /dev/null
@@ -1,1160 +0,0 @@
-#
-# spec file for package koffice (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg koffice
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_kross 1
-%endif
-
-# Ruby support
-%define with_ruby 1
-
-# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
-%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.6.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	An integrated office suite
-Group:		Applications/Productivity
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	trinity-koffice-rpmlintrc
-
-# BuildRequires: world-devel ;)
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-tdegraphics-devel >= %{tde_version}
-BuildRequires:	trinity-libpoppler-tqt-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	fontconfig-devel
-BuildRequires:	libart_lgpl-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	ImageMagick-devel
-BuildRequires:	zlib-devel
-BuildRequires:	openssl-devel
-BuildRequires:	pcre-devel
-BuildRequires:	gettext-devel
-BuildRequires:	mysql-devel
-BuildRequires:	perl
-BuildRequires:	doxygen
-BuildRequires:	aspell-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	OpenEXR-devel
-BuildRequires:	libexif-devel
-BuildRequires:	readline-devel
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-# LCMS support
-%if 0%{?suse_version} || 0%{?rhel} >= 7
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-
-# LCMS2 support
-%if 0%{?suse_version}
-BuildRequires:	liblcms2-devel
-%endif
-
-# BZIP2 support
-%if 0%{?suse_version}
-BuildRequires:	libbz2-devel
-%else
-BuildRequires:	bzip2-devel
-%endif
-
-# PAPER support
-BuildRequires:	libpaper-devel
-
-# RUBY support
-%if 0%{?with_ruby}
-BuildRequires:	ruby ruby-devel >= 1.8.1
-%if 0%{?fedora} >= 19
-BuildRequires:	rubypick
-%endif
-%endif
-
-# FREETYPE support
-%if 0%{?suse_version} == 1140
-BuildRequires:	freetype2-devel
-%else
-BuildRequires:	freetype-devel
-%endif
-
-# LIBPNG support
-%if 0%{?mgaversion}
-BuildRequires:	%{_lib}png-devel
-%endif
-%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
-BuildRequires:	%{_lib}png15-devel
-%endif
-%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
-BuildRequires:	libpng-devel
-%endif
-
-# GRAPHICSMAGICK support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
-%define with_graphicsmagick 1
-%if 0%{?suse_version}
-BuildRequires:	GraphicsMagick >= 1.1.0
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
-BuildRequires:	GraphicsMagick-devel >= 1.1.0
-%endif
-%endif
-
-# UTEMPTER support
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	utempter
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}utempter-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	libutempter-devel
-%endif
-
-# POPPLER support
-%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%if 0%{?suse_version} >= 1500
-BuildRequires: libpoppler-devel >= 0.12
-%else
-BuildRequires: poppler-devel >= 0.12
-%endif
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}poppler-devel
-%endif
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
-BuildRequires:	trinity-poppler-devel >= 0.12
-%endif
-
-# POSTGRESQL support
-#  Requires 'libpqxx', for kexi-driver-pgqsl
-%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550
-%define with_postgresql 1
-BuildRequires:	postgresql-devel
-BuildRequires:	libpqxx-devel
-%endif
-%endif
-Obsoletes:		trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release}
-
-# WPD support
-#  For chalk and filters
-BuildRequires:	libwpd-devel
-Obsoletes:		trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
-
-# WV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}wv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	wv2-devel
-%endif
-
-# MESA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}mesagl1-devel
-BuildRequires:	%{_lib}mesaglu1-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:	libGL-devel
-BuildRequires:	libGLU-devel
-%endif
-%if 0%{?suse_version} >= 1220
-BuildRequires:	Mesa-libGL-devel
-BuildRequires:	Mesa-libGLU-devel
-%endif
-
-# OPENJPEG
-%if 0%{?mgaversion} || 0%{?mdkversion}
-#BuildRequires:	%{_lib}openjpeg-devel
-%endif
-
-# LIBXI support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	libXi-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	libXi6-devel
-%endif
-%if 0%{?suse_version} >= 1220
-BuildRequires:	libXi-devel
-%endif
-
-# SQLITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	sqlite3-devel
-%else
-BuildRequires:	sqlite-devel
-%endif
-
-
-%description
-KOffice is an integrated office suite.
-
-##########
-
-%package suite
-Summary:		An integrated office suite
-Group:			Applications/Productivity
-Obsoletes:      %{name} <= %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} 
-Requires:		%{name}-kword = %{?epoch:%{epoch}:}%{version}-%{release} 
-Requires:		%{name}-kspread = %{?epoch:%{epoch}:}%{version}-%{release} 
-Requires:		%{name}-kpresenter = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-kivio = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-karbon = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-kugar = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-kexi-driver-mysql = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?with_postgresql:Requires:       %{name}-kexi-driver-pgsql = %{?epoch:%{epoch}:}%{version}-%{release}}
-Requires:		%{name}-kchart = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-kformula = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-kplato = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-chalk = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description suite
-KOffice is an integrated office suite.
-
-%files suite
-#empty => virtual package
-
-##########
-
-%package core
-Summary:		Core support files for %{name} 
-Group:			Applications/Productivity
-Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		perl
-
-%description core
-%{summary}.
-
-%files core
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/koshell
-%{tde_bindir}/kthesaurus
-%{tde_bindir}/koconverter
-%{tde_libdir}/libtdeinit_koshell.so
-%{tde_libdir}/libtdeinit_kthesaurus.so
-%{tde_tdelibdir}/tdefile_koffice.*
-%{tde_tdelibdir}/tdefile_ooo.*
-%{tde_tdelibdir}/tdefile_abiword.*
-%{tde_tdelibdir}/tdefile_gnumeric.*
-%{tde_tdelibdir}/kodocinfopropspage.*
-%{tde_tdelibdir}/kofficescan.*
-%{tde_tdelibdir}/kofficethumbnail.*
-%{tde_tdelibdir}/koshell.*
-%{tde_tdelibdir}/kthesaurus.*
-%{tde_tdelibdir}/kwmailmerge_classic.*
-%{tde_tdelibdir}/kwmailmerge_tdeabc.*
-%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.*
-%{tde_tdelibdir}/kwmailmerge_qtsqldb.*
-%{tde_tdelibdir}/libkounavailpart.*
-%{tde_tdelibdir}/libkprkword.*
-%{tde_tdelibdir}/libthesaurustool.*
-%{tde_tdelibdir}/clipartthumbnail.*
-%{tde_datadir}/apps/koffice/
-%{tde_datadir}/apps/konqueror/servicemenus/*
-%{tde_datadir}/apps/koshell/
-%{tde_datadir}/apps/thesaurus/
-%{tde_datadir}/config.kcfg/koshell.kcfg
-%{tde_tdedocdir}/HTML/en/koffice/
-%{tde_tdedocdir}/HTML/en/koshell/
-%{tde_tdedocdir}/HTML/en/thesaurus/
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/services/clipartthumbnail.desktop
-%{tde_datadir}/services/tdefile_abiword.desktop
-%{tde_datadir}/services/tdefile_gnumeric.desktop
-%{tde_datadir}/services/tdefile_koffice.desktop
-%{tde_datadir}/services/tdefile_ooo.desktop
-%{tde_datadir}/services/kwmailmerge*.desktop
-%{tde_datadir}/services/kodocinfopropspage.desktop
-%{tde_datadir}/services/kofficethumbnail.desktop
-%{tde_datadir}/services/kounavail.desktop
-%{tde_datadir}/services/kprkword.desktop
-%{tde_datadir}/services/thesaurustool.desktop
-%{tde_datadir}/servicetypes/kochart.desktop
-%{tde_datadir}/servicetypes/kofficepart.desktop
-%{tde_datadir}/servicetypes/koplugin.desktop
-%{tde_datadir}/servicetypes/kwmailmerge.desktop
-%{tde_datadir}/servicetypes/widgetfactory.desktop
-%{tde_tdeappdir}/*koffice.desktop
-%{tde_tdeappdir}/KThesaurus.desktop
-%{tde_tdeappdir}/*koshell.desktop
-%{tde_datadir}/apps/kofficewidgets/
-%if 0%{?with_kross}
-%{tde_datadir}/apps/kross/
-%{tde_tdelibdir}/krosspython.*
-%if 0%{?with_ruby}
-%{tde_tdelibdir}/krossruby.*
-%endif
-%endif
-
-##########
-
-%package libs
-Summary:		Runtime libraries for %{name} 
-Group:			System Environment/Libraries
-Conflicts:      %{name} <= %{version}-%{release}
-Requires:		trinity-tdelibs
-License:		LGPLv2+
-
-%description libs
-%{summary}.
-
-%files libs
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-#_libdir/libk*common.so.*
-%{tde_libdir}/libkarboncommon.so.*
-%{tde_libdir}/libkspreadcommon.so.*
-%{tde_libdir}/libkdchart.so.*
-%{tde_libdir}/libkochart.so.*
-%{tde_libdir}/libkofficecore.so.*
-%{tde_libdir}/libkofficeui.so.*
-%{tde_libdir}/libkotext.so.*
-%{tde_libdir}/libkowmf.so.*
-%{tde_libdir}/libkopainter.so.*
-%{tde_libdir}/libkstore.so.*
-%{tde_libdir}/libkwmailmerge_interface.so.*
-%{tde_libdir}/libkwmf.so.*
-%{tde_libdir}/libkformulalib.so.*
-%{tde_libdir}/libkopalette.so.*
-%{tde_libdir}/libkoproperty.so.*
-%if 0%{?with_kross}
-%{tde_libdir}/libkrossapi.so.*
-%{tde_libdir}/libkrossmain.so.*
-%endif
-
-##########
-
-%package devel
-Summary:		Development files for %{name} 
-Group:			Development/Libraries
-Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-License:		LGPLv2+
-
-%description devel
-%{summary}.
-
-%files devel
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/
-%{tde_includedir}/*
-# FIXME: include only shlib symlinks we know/want to export
-%{tde_libdir}/lib*.so
-%exclude %{tde_libdir}/libtdeinit_*.so
-%exclude %{tde_libdir}/libkudesignercore.so
-
-##########
-
-%package kword
-Summary:		A frame-based word processor capable of professional standard documents
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kword
-%{summary}.
-
-%files kword
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kword/
-%{tde_bindir}/kword
-%{tde_libdir}/libtdeinit_kword.so
-%{tde_libdir}/libkwordprivate.so.*
-%{tde_tdelibdir}/libkwordpart.*
-%{tde_tdelibdir}/kword.*
-%{tde_datadir}/apps/kword/
-%{tde_datadir}/services/kword*.desktop
-%{tde_datadir}/services/kwserial*.desktop
-%{tde_datadir}/templates/TextDocument.desktop
-%{tde_datadir}/templates/.source/TextDocument.kwt
-%{tde_tdeappdir}/*kword.desktop
-
-##########
-
-%package kspread
-Summary:		A powerful spreadsheet application
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kspread
-%{summary}.
-
-%files kspread
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kspread/
-%{tde_bindir}/kspread
-%{tde_libdir}/libtdeinit_kspread.so
-%{tde_tdelibdir}/kspread.*
-%{tde_tdelibdir}/libkspreadpart.*
-%{tde_tdelibdir}/kwmailmerge_kspread.*
-%{tde_tdelibdir}/libcsvexport.*
-%{tde_tdelibdir}/libcsvimport.*
-%{tde_tdelibdir}/libgnumericexport.*
-%{tde_tdelibdir}/libgnumericimport.*
-%{tde_tdelibdir}/libkspreadhtmlexport.*
-%{tde_tdelibdir}/libkspreadinsertcalendar.*
-%{tde_tdelibdir}/libopencalcexport.*
-%{tde_tdelibdir}/libopencalcimport.*
-%{tde_tdelibdir}/libqproimport.*
-%{tde_datadir}/apps/kspread/
-%{tde_datadir}/services/kspread*.desktop
-%{tde_datadir}/templates/SpreadSheet.desktop
-%{tde_datadir}/templates/.source/SpreadSheet.kst
-%{tde_tdeappdir}/*kspread.desktop
-%if 0%{?with_kross}
-%{tde_tdelibdir}/kspreadscripting.*
-%{tde_tdelibdir}/krosskspreadcore.*
-%endif
-
-##########
-
-%package kpresenter
-Summary:		A full-featured presentation program
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kpresenter
-%{summary}.
-
-%files kpresenter
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/
-%{tde_bindir}/kpresenter
-%{tde_bindir}/kprconverter.pl
-%{tde_libdir}/libtdeinit_kpresenter.so
-%{tde_libdir}/libkpresenterimageexport.so.*
-%{tde_libdir}/libkpresenterprivate.so.*
-%{tde_tdelibdir}/*kpresenter*.*
-%{tde_datadir}/apps/kpresenter/
-%{tde_datadir}/services/kpresenter*.desktop
-%{tde_datadir}/templates/Presentation.desktop
-%{tde_datadir}/templates/.source/Presentation.kpt
-%{tde_tdeappdir}/*kpresenter.desktop
-
-##########
-
-%package kivio
-Summary:		A flowcharting application
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:      kivio < %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kivio
-%{summary}.
-
-%files kivio
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kivio/
-%{tde_bindir}/kivio
-%{tde_libdir}/libtdeinit_kivio.so
-%{tde_libdir}/libkiviocommon.so.*
-%{tde_tdelibdir}/*kivio*.*
-%{tde_tdelibdir}/straight_connector.*
-%{tde_datadir}/apps/kivio/
-%{tde_datadir}/config.kcfg/kivio.kcfg
-%{tde_datadir}/services/kivio*.desktop
-%{tde_tdeappdir}/*kivio.desktop
-
-##########
-
-%package karbon
-Summary:		A vector drawing application
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description karbon
-%{summary}.
-
-%files karbon
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/karbon/
-%{tde_bindir}/karbon
-%{tde_libdir}/libtdeinit_karbon.so
-%exclude %{tde_tdelibdir}/libkarbonepsimport.*
-%{tde_tdelibdir}/*karbon*.*
-%{tde_tdelibdir}/libwmfexport.*
-%{tde_tdelibdir}/libwmfimport.*
-%{tde_datadir}/apps/karbon/
-%{tde_datadir}/services/karbon*
-%{tde_datadir}/servicetypes/karbon_module.desktop
-%{tde_datadir}/templates/Illustration.desktop
-%{tde_datadir}/templates/.source/Illustration.karbon
-%{tde_tdeappdir}/*karbon.desktop
-
-##########
-
-%package kugar
-Summary:		A tool for generating business quality reports
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kugar
-%{summary}.
-
-%files kugar
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kugar/
-%{tde_bindir}/kugar
-%{tde_bindir}/kudesigner
-%{tde_libdir}/libtdeinit_kugar.so
-%{tde_libdir}/libtdeinit_kudesigner.so
-%{tde_libdir}/libkugarlib.so.*
-%{tde_libdir}/libkudesignercore.so
-%{tde_tdelibdir}/kudesigner.*
-%{tde_tdelibdir}/kugar.*
-%{tde_tdelibdir}/libkudesignerpart.*
-%{tde_tdelibdir}/libkugarpart.*
-%{tde_datadir}/apps/kudesigner/
-%{tde_datadir}/apps/kugar/
-%{tde_datadir}/services/kugar*.desktop
-%{tde_tdeappdir}/*kugar.desktop
-%{tde_tdeappdir}/*kudesigner.desktop
-
-##########
-
-%package kexi
-Summary:		An integrated environment for managing data
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if 0%{?with_postgresql} == 0
-Obsoletes:		%{name}-kexi-driver-pgsql < %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%description kexi
-%{summary}.
-For additional database drivers take a look at %{name}-kexi-driver-*
-
-%files kexi
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kexi/
-%{tde_bindir}/kexi*
-%{tde_bindir}/ksqlite*
-%{tde_libdir}/libtdeinit_kexi.so
-%{tde_libdir}/libkexi*.so.*
-%{tde_libdir}/libkformdesigner.so.*
-%{tde_tdelibdir}/kformdesigner_*.*
-%{tde_tdelibdir}/kexidb_sqlite2driver.*
-%{tde_tdelibdir}/kexidb_sqlite3driver.*
-%{tde_tdelibdir}/kexihandler_*.*
-%{tde_tdelibdir}/kexi.*
-# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
-%{tde_tdelibdir}/libkspreadkexiimport.*
-%config(noreplace) %{tde_confdir}/kexirc
-%config(noreplace) %{tde_confdir}/magic/kexi.magic
-%{tde_datadir}/mimelnk/application/*
-%{tde_datadir}/servicetypes/kexi*.desktop
-%{tde_datadir}/services/kexi/
-%{tde_datadir}/apps/kexi/
-%{tde_datadir}/services/kformdesigner/
-%{tde_tdeappdir}/*kexi.desktop
-%{tde_datadir}/services/kexidb_sqlite*driver.desktop
-%if 0%{?with_kross}
-%{tde_bindir}/krossrunner
-%{tde_tdelibdir}/krosskexiapp.*
-%{tde_tdelibdir}/krosskexidb.*
-%endif
-%config(noreplace) %{tde_confdir}/magic/kexi.magic.mgc
-
-##########
-
-%package kexi-driver-mysql
-Summary:		Mysql-driver for kexi
-Group:			Applications/Productivity
-Requires:		%{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kexi-driver-mysql
-%{summary}.
-
-%files kexi-driver-mysql
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kexidb_mysqldriver.*
-%{tde_tdelibdir}/keximigrate_mysql.*
-%{tde_datadir}/services/keximigrate_mysql.desktop
-%{tde_datadir}/services/kexidb_mysqldriver.desktop
-
-##########
-
-%if 0%{?with_postgresql}
-
-%package kexi-driver-pgsql
-Summary:		Postgresql driver for kexi
-Group:			Applications/Productivity
-Requires:		%{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kexi-driver-pgsql
-%{summary}.
-
-%files kexi-driver-pgsql
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kexidb_pqxxsqldriver.*
-%{tde_tdelibdir}/keximigrate_pqxx.*
-%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop
-%{tde_datadir}/services/keximigrate_pqxx.desktop
-
-%endif
-
-##########
-
-%package kchart
-Summary:		An integrated graph and chart drawing tool
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kchart
-%{summary}.
-
-%files kchart
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kchart/
-%{tde_bindir}/kchart
-%{tde_libdir}/libkchart*.so.*
-%{tde_libdir}/libtdeinit_kchart.so
-%{tde_tdelibdir}/*kchart*.*
-%{tde_datadir}/apps/kchart/
-%{tde_datadir}/services/kchart*.desktop
-%{tde_tdeappdir}/*kchart.desktop
-
-##########
-
-%package kformula
-Summary:		A powerful formula editor
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		fonts-ttf-dejavu
-%else
-%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7
-Requires:		dejavu-lgc-sans-fonts
-%endif
-%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7
-Requires:		lyx-cmex10-fonts
-%endif
-%if 0%{?rhel} == 5
-Requires:		dejavu-lgc-fonts 
-%endif
-%if 0%{?suse_version} >= 1220
-Requires:		dejavu-fonts 
-%endif
-%if 0%{?suse_version} == 1140
-Requires:		dejavu
-%endif
-%endif
-
-%description kformula
-%{summary}.
-
-%files kformula
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kformula/
-%{tde_bindir}/kformula
-%{tde_libdir}/libtdeinit_kformula.so
-%{tde_tdelibdir}/*kformula*.*
-%{tde_datadir}/apps/kformula/
-%{tde_datadir}/services/kformula*.desktop
-%{tde_tdeappdir}/*kformula.desktop
-
-##########
-
-%package filters
-Summary:		Import and Export Filters for KOffice
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description filters
-%{summary}.
-
-%files filters
-%defattr(-,root,root,-)
-%{tde_libdir}/libkwordexportfilters.so.*
-%{tde_tdelibdir}/libabiwordexport.*
-%{tde_tdelibdir}/libabiwordimport.*
-%{tde_tdelibdir}/libamiproexport.*
-%{tde_tdelibdir}/libamiproimport.*
-%{tde_tdelibdir}/libapplixspreadimport.*
-%{tde_tdelibdir}/libapplixwordimport.*
-%{tde_tdelibdir}/libasciiexport.*
-%{tde_tdelibdir}/libasciiimport.*
-%{tde_tdelibdir}/libdbaseimport.*
-%{tde_tdelibdir}/libdocbookexport.*
-%{tde_tdelibdir}/libexcelimport.*
-%{tde_tdelibdir}/libgenerickofilter.*
-%{tde_tdelibdir}/libhtmlexport.*
-%{tde_tdelibdir}/libhtmlimport.*
-%{tde_tdelibdir}/libkarbonepsimport.*
-%{tde_tdelibdir}/libkfolatexexport.*
-%{tde_tdelibdir}/libkfomathmlexport.*
-%{tde_tdelibdir}/libkfomathmlimport.*
-%{tde_tdelibdir}/libkfopngexport.*
-%{tde_tdelibdir}/libkspreadlatexexport.*
-%{tde_tdelibdir}/libkugarnopimport.*
-%{tde_tdelibdir}/libkwordkword1dot3import.*
-%{tde_tdelibdir}/libkwordlatexexport.*
-%{tde_tdelibdir}/libmswriteexport.*
-%{tde_tdelibdir}/libmswriteimport.*
-%{tde_tdelibdir}/libooimpressexport.*
-%{tde_tdelibdir}/libooimpressimport.*
-%{tde_tdelibdir}/liboowriterexport.*
-%{tde_tdelibdir}/liboowriterimport.*
-%{tde_tdelibdir}/libpalmdocexport.*
-%{tde_tdelibdir}/libpalmdocimport.*
-%{tde_tdelibdir}/libpdfimport.*
-%{tde_tdelibdir}/librtfexport.*
-%{tde_tdelibdir}/librtfimport.*
-%{tde_tdelibdir}/libwmlexport.*
-%{tde_tdelibdir}/libwmlimport.*
-%{tde_tdelibdir}/libwpexport.*
-%{tde_tdelibdir}/libwpimport.*
-%{tde_tdelibdir}/libmswordimport.*
-%{tde_tdelibdir}/libxsltimport.*
-%{tde_tdelibdir}/libxsltexport.*
-%{tde_tdelibdir}/libhancomwordimport.*
-%{tde_tdelibdir}/libkfosvgexport.*
-%{tde_tdelibdir}/liboodrawimport.*
-%{tde_tdelibdir}/libolefilter.*
-%{tde_datadir}/apps/xsltfilter/
-%{tde_datadir}/services/generic_filter.desktop
-%{tde_datadir}/services/ole_powerpoint97_import.desktop
-%{tde_datadir}/services/xslt*.desktop
-%{tde_datadir}/servicetypes/kofilter*.desktop
-
-##########
-
-%package kplato
-Summary:		An integrated project management and planning tool
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kplato
-%{summary}.
-
-%files kplato
-%defattr(-,root,root,-)
-%lang(en) %{tde_tdedocdir}/HTML/en/kplato/
-%{tde_bindir}/kplato
-%{tde_libdir}/libtdeinit_kplato.so
-%{tde_tdelibdir}/kplato.*
-%{tde_tdelibdir}/libkplatopart.*
-%{tde_datadir}/apps/kplato/
-%{tde_datadir}/services/kplatopart.desktop
-%{tde_tdeappdir}/*kplato.desktop
-
-##########
-
-%package chalk
-Summary:		pixel-based image manipulation program for the TDE Office Suite [Trinity]
-Group:			Applications/Productivity
-Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-chalk-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description chalk
-Chalk is a painting and image editing application for KOffice. Chalk contains
-both ease-of-use and fun features like guided painting.
-
-This package is part of the TDE Office Suite.
-
-%files chalk
-%defattr(-,root,root,-)
-%{tde_bindir}/chalk
-%{tde_tdelibdir}/chalkblurfilter.la
-%{tde_tdelibdir}/chalkblurfilter.so
-%{tde_tdelibdir}/chalkbumpmap.la
-%{tde_tdelibdir}/chalkbumpmap.so
-%{tde_tdelibdir}/chalkcimg.la
-%{tde_tdelibdir}/chalkcimg.so
-%{tde_tdelibdir}/chalk_cmyk_*
-%{tde_tdelibdir}/chalkcmykplugin.la
-%{tde_tdelibdir}/chalkcmykplugin.so
-%{tde_tdelibdir}/chalkcolorify.la
-%{tde_tdelibdir}/chalkcolorify.so
-%{tde_tdelibdir}/chalkcolorrange.la
-%{tde_tdelibdir}/chalkcolorrange.so
-%{tde_tdelibdir}/chalkcolorsfilters.la
-%{tde_tdelibdir}/chalkcolorsfilters.so
-%{tde_tdelibdir}/chalkcolorspaceconversion.la
-%{tde_tdelibdir}/chalkcolorspaceconversion.so
-%{tde_tdelibdir}/chalkconvolutionfilters.la
-%{tde_tdelibdir}/chalkconvolutionfilters.so
-%{tde_tdelibdir}/chalkdefaultpaintops.la
-%{tde_tdelibdir}/chalkdefaultpaintops.so
-%{tde_tdelibdir}/chalkdefaulttools.la
-%{tde_tdelibdir}/chalkdefaulttools.so
-%{tde_tdelibdir}/chalkdropshadow.la
-%{tde_tdelibdir}/chalkdropshadow.so
-%{tde_tdelibdir}/chalkembossfilter.la
-%{tde_tdelibdir}/chalkembossfilter.so
-%{tde_tdelibdir}/chalkexample.la
-%{tde_tdelibdir}/chalkexample.so
-%{tde_tdelibdir}/chalkextensioncolorsfilters.la
-%{tde_tdelibdir}/chalkextensioncolorsfilters.so
-%{tde_tdelibdir}/chalkfastcolortransfer.la
-%{tde_tdelibdir}/chalkfastcolortransfer.so
-%{tde_tdelibdir}/chalkfiltersgallery.la
-%{tde_tdelibdir}/chalkfiltersgallery.so
-%{tde_tdelibdir}/chalk_gray_*
-%{tde_tdelibdir}/chalkgrayplugin.la
-%{tde_tdelibdir}/chalkgrayplugin.so
-%{tde_tdelibdir}/chalkhistogramdocker.la
-%{tde_tdelibdir}/chalkhistogramdocker.so
-%{tde_tdelibdir}/chalkhistogram.la
-%{tde_tdelibdir}/chalkhistogram.so
-%{tde_tdelibdir}/chalkimageenhancement.la
-%{tde_tdelibdir}/chalkimageenhancement.so
-%{tde_tdelibdir}/chalkimagesize.la
-%{tde_tdelibdir}/chalkimagesize.so
-%{tde_tdelibdir}/chalk.la
-%{tde_tdelibdir}/chalklenscorrectionfilter.la
-%{tde_tdelibdir}/chalklenscorrectionfilter.so
-%{tde_tdelibdir}/chalklevelfilter.la
-%{tde_tdelibdir}/chalklevelfilter.so
-%{tde_tdelibdir}/chalk_lms_*
-%{tde_tdelibdir}/chalkmodifyselection.la
-%{tde_tdelibdir}/chalkmodifyselection.so
-%{tde_tdelibdir}/chalknoisefilter.la
-%{tde_tdelibdir}/chalknoisefilter.so
-%{tde_tdelibdir}/chalkoilpaintfilter.la
-%{tde_tdelibdir}/chalkoilpaintfilter.so
-%{tde_tdelibdir}/chalkpixelizefilter.la
-%{tde_tdelibdir}/chalkpixelizefilter.so
-%{tde_tdelibdir}/chalkraindropsfilter.la
-%{tde_tdelibdir}/chalkraindropsfilter.so
-%{tde_tdelibdir}/chalkrandompickfilter.la
-%{tde_tdelibdir}/chalkrandompickfilter.so
-%{tde_tdelibdir}/chalk_rgb_*
-%{tde_tdelibdir}/chalkrgbplugin.la
-%{tde_tdelibdir}/chalkrgbplugin.so
-%{tde_tdelibdir}/chalkrotateimage.la
-%{tde_tdelibdir}/chalkrotateimage.so
-%{tde_tdelibdir}/chalkroundcornersfilter.la
-%{tde_tdelibdir}/chalkroundcornersfilter.so
-%{tde_tdelibdir}/chalkselectiontools.la
-%{tde_tdelibdir}/chalkselectiontools.so
-%{tde_tdelibdir}/chalkselectopaque.la
-%{tde_tdelibdir}/chalkselectopaque.so
-%{tde_tdelibdir}/chalkseparatechannels.la
-%{tde_tdelibdir}/chalkseparatechannels.so
-%{tde_tdelibdir}/chalkshearimage.la
-%{tde_tdelibdir}/chalkshearimage.so
-%{tde_tdelibdir}/chalksmalltilesfilter.la
-%{tde_tdelibdir}/chalksmalltilesfilter.so
-%{tde_tdelibdir}/chalk.so
-%{tde_tdelibdir}/chalkscreenshot.la
-%{tde_tdelibdir}/chalkscreenshot.so
-%{tde_tdelibdir}/chalksobelfilter.la
-%{tde_tdelibdir}/chalksobelfilter.so
-%{tde_tdelibdir}/chalksubstrate.la
-%{tde_tdelibdir}/chalksubstrate.so
-%{tde_tdelibdir}/chalktoolcrop.la
-%{tde_tdelibdir}/chalktoolcrop.so
-%{tde_tdelibdir}/chalktoolcurves.la
-%{tde_tdelibdir}/chalktoolcurves.so
-%{tde_tdelibdir}/chalktoolfilter.la
-%{tde_tdelibdir}/chalktoolfilter.so
-%{tde_tdelibdir}/chalktoolperspectivegrid.la
-%{tde_tdelibdir}/chalktoolperspectivegrid.so
-%{tde_tdelibdir}/chalktoolperspectivetransform.la
-%{tde_tdelibdir}/chalktoolperspectivetransform.so
-%{tde_tdelibdir}/chalktoolpolygon.la
-%{tde_tdelibdir}/chalktoolpolygon.so
-%{tde_tdelibdir}/chalktoolpolyline.la
-%{tde_tdelibdir}/chalktoolpolyline.so
-%{tde_tdelibdir}/chalktoolselectsimilar.la
-%{tde_tdelibdir}/chalktoolselectsimilar.so
-%{tde_tdelibdir}/chalktoolstar.la
-%{tde_tdelibdir}/chalktoolstar.so
-%{tde_tdelibdir}/chalktooltransform.la
-%{tde_tdelibdir}/chalktooltransform.so
-%{tde_tdelibdir}/chalkunsharpfilter.la
-%{tde_tdelibdir}/chalkunsharpfilter.so
-%{tde_tdelibdir}/chalkwavefilter.la
-%{tde_tdelibdir}/chalkwavefilter.so
-%{tde_tdelibdir}/chalkwetplugin.la
-%{tde_tdelibdir}/chalkwetplugin.so
-%{tde_tdelibdir}/chalk_ycbcr_*
-%if 0%{?with_graphicsmagick}
-%{tde_tdelibdir}/libchalkgmagickexport.la
-%{tde_tdelibdir}/libchalkgmagickexport.so
-%{tde_tdelibdir}/libchalkgmagickimport.la
-%{tde_tdelibdir}/libchalkgmagickimport.so
-%{tde_tdelibdir}/libchalkjpegexport.la
-%{tde_tdelibdir}/libchalkjpegexport.so
-%{tde_tdelibdir}/libchalkjpegimport.la
-%{tde_tdelibdir}/libchalkjpegimport.so
-%endif
-%{tde_tdelibdir}/libchalk_openexr_export.la
-%{tde_tdelibdir}/libchalk_openexr_export.so
-%{tde_tdelibdir}/libchalk_openexr_import.la
-%{tde_tdelibdir}/libchalk_openexr_import.so
-%{tde_tdelibdir}/libchalkpart.la
-%{tde_tdelibdir}/libchalkpart.so
-%{tde_tdelibdir}/libchalkpdfimport.la
-%{tde_tdelibdir}/libchalkpdfimport.so
-%{tde_tdelibdir}/libchalkpngexport.la
-%{tde_tdelibdir}/libchalkpngexport.so
-%{tde_tdelibdir}/libchalkpngimport.la
-%{tde_tdelibdir}/libchalkpngimport.so
-%{tde_tdelibdir}/libchalk_raw_import.la
-%{tde_tdelibdir}/libchalk_raw_import.so
-%if 0%{?with_graphicsmagick}
-%{tde_tdelibdir}/libchalktiffexport.la
-%{tde_tdelibdir}/libchalktiffexport.so
-%{tde_tdelibdir}/libchalktiffimport.la
-%{tde_tdelibdir}/libchalktiffimport.so
-%endif
-%{tde_libdir}/libtdeinit_chalk.so
-%{tde_libdir}/libchalk_cmyk_*.so.*
-%{tde_libdir}/libchalkcolor.so.*
-%{tde_libdir}/libchalkcommon.so.*
-%{tde_libdir}/libchalkgrayscale.so.*
-%{tde_libdir}/libchalk_gray_*.so.*
-%{tde_libdir}/libchalkimage.so.*
-%{tde_libdir}/libchalk_lms_*.so.*
-%{tde_libdir}/libchalk_rgb_*.so.*
-%{tde_libdir}/libchalkrgb.so.*
-%{tde_libdir}/libchalkui.so.*
-%{tde_libdir}/libchalk_ycbcr_*.so.*
-%if 0%{?with_kross}
-%{tde_tdelibdir}/krosschalkcore.la
-%{tde_tdelibdir}/krosschalkcore.so
-%{tde_tdelibdir}/chalkscripting.la
-%{tde_tdelibdir}/chalkscripting.so
-%{tde_libdir}/libchalkscripting.so.*
-%endif
-
-##########
-
-%package chalk-data
-Summary:		data files for Chalk painting program [Trinity]
-Group:			Applications/Productivity
-
-%description chalk-data
-This package contains architecture-independent data files for Chalk,
-the painting program shipped with the TDE Office Suite.
-
-See the chalk package for further information.
-
-This package is part of the TDE Office Suite.
-
-%files chalk-data
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/chalk.desktop
-%{tde_datadir}/applnk/.hidden/chalk_*.desktop
-%{tde_datadir}/apps/chalk/
-%{tde_datadir}/apps/chalkplugins/
-%lang(en) %{tde_tdedocdir}/HTML/en/chalk/
-%{tde_datadir}/services/chalk*.desktop
-%{tde_datadir}/servicetypes/chalk*.desktop
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export kde_confdir="%{tde_confdir}"
-
-%if 0%{?suse_version} == 1220
-RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])')
-CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
-%endif
-
-%if 0%{?suse_version} >= 1550
-CXXFLAGS="${CXXFLAGS} -std=c++11"
-%endif
-
-# FTBFS on RHEL 5
-%if 0%{?rhel} == 5
-%__sed -i "kexi/migration/keximigratetest.cpp" \
-       -e "/TDEApplication/ s|\");|\", true, true, true);|"
-%endif
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --with-extra-libs=%{tde_libdir} \
-  --with-extra-includes=%{tde_includedir}/arts \
-  \
-  --disable-kexi-macros \
-  %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
-  %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
-#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do
-#  mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/;
-#done
-
-# Fix desktop icon location
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file kudesigner    Office FlowChart
-%suse_update_desktop_file kivio		Office FlowChart
-%suse_update_desktop_file kchart	Office FlowChart
-%suse_update_desktop_file kexi		Office Database
-%suse_update_desktop_file -r chalk	Graphics RasterGraphics
-%suse_update_desktop_file -r karbon     Graphics VectorGraphics
-%suse_update_desktop_file kpresenter	Office Presentation
-%suse_update_desktop_file kspread	Office Spreadsheet
-%suse_update_desktop_file -u KThesaurus Office
-%suse_update_desktop_file -r kformula   Science Math
-%suse_update_desktop_file kword		Office WordProcessor
-%suse_update_desktop_file koshell    Office Core-Office
-%suse_update_desktop_file kplato        Office ProjectManagement
-%endif
-
-# Apps that should stay in TDE
-for i in kivio kplato; do
-  echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
-done
-
-# Links duplicate files
-%fdupes %{buildroot}
-
-## unpackaged files
-# fonts
-rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/
-# libtool archives
-rm -f %{buildroot}%{tde_libdir}/lib*.la
-# shouldn't these be in koffice-l10n? 
-rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/kompose/kompose.spec b/redhat/applications/kompose/kompose.spec
deleted file mode 100644
index 6ee812864..000000000
--- a/redhat/applications/kompose/kompose.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-# spec file for package kompose (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kompose
-%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
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Full-Screen Task Manager for TDE
-Version:		0.5.3
-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://www.trinitydesktop.org/
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	cmake
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-# IMLIB2 support
-BuildRequires:	imlib2-devel
-
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-%define xcomposite_devel %{_lib}xcomposite-devel
-%else
-%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-%define xcomposite_devel libXcomposite-devel
-%endif
-%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
-
-# XDAMAGE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xdamage-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXdamage-devel
-%endif
-
-
-%description
-Kompose creates a full-screen view in which every window is represented
-by a scaled screen shot of it. It appears as a panel applet.
-
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DBUILD_ALL=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,-)
-%doc README AUTHORS ChangeLog COPYING
-%{tde_bindir}/kompose
-%{tde_tdeappdir}/kompose.desktop
-%{tde_datadir}/apps/kompose/
-%{tde_tdedocdir}/HTML/en/kompose/
-%{tde_datadir}/icons/hicolor/16x16/apps/kompose.png
-%{tde_datadir}/icons/hicolor/32x32/apps/kompose.png
-
-
-%changelog
diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec
deleted file mode 100644
index a7f587117..000000000
--- a/redhat/applications/konversation/konversation.spec
+++ /dev/null
@@ -1,268 +0,0 @@
-#
-# spec file for package konversation (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg konversation
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	User friendly Internet Relay Chat (IRC) client for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# XSLT support
-BuildRequires:	libxslt-devel
-%if 0%{?suse_version}
-BuildRequires:	docbook-xsl-stylesheets
-%else
-BuildRequires:	docbook-style-xsl
-%endif
-
-# LIBXI support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xi-devel
-%endif
-%if 0%{?rhel} >= 5|| 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXi-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	libXi6-devel
-%endif
-
-# XSCREENSAVER support
-#  RHEL 4: disabled
-#  RHEL 5: available in centos-extras
-#  RHEL 6: available in EPEL
-#  RHEL 7: available in NUX
-#  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-BuildRequires:	xscreensaver-extras
-%if 0%{?fedora}
-BuildRequires:	xscreensaver-extras-base
-%endif
-BuildRequires:	xscreensaver-gl-base
-BuildRequires:	xscreensaver-gl-extras
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-data
-BuildRequires:	xscreensaver-data-extra
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-%if 0%{?pclinuxos} == 0
-BuildRequires:	xscreensaver-extrusion
-%endif
-BuildRequires:	xscreensaver-gl
-%endif
-%endif
-
-
-%description
-Konversation is a client for the Internet Relay Chat (IRC) protocol.
-It is easy to use and well-suited for novice IRC users, but novice
-and experienced users alike will appreciate its many features:
-
- * Standard IRC features
- * Easy to use graphical interface
- * Multiple server and channel tabs in a single window
- * IRC color support
- * Pattern-based message highlighting and OnScreen Display
- * Multiple identities for different servers
- * Multi-language scripting support (with DCOP)
- * Customizable command aliases
- * NickServ-aware log-on (for registered nicknames)
- * Smart logging
- * Traditional or enhanced-shell-style nick completion
- * DCC file transfer with resume support
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-%__sed -i "konversation/scripts/media" \
-          "konversation/scripts/weather" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
-%endif
-
-
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/konversation
-%{tde_tdeappdir}/konversation.desktop
-%{tde_datadir}/apps/tdeconf_update/konversation-0.19-appearance.pl
-%{tde_datadir}/apps/tdeconf_update/konversation-0.19-colorcodes.pl
-%{tde_datadir}/apps/tdeconf_update/konversation-0.19-colors.pl
-%{tde_datadir}/apps/tdeconf_update/konversation-0.19-custombrowser.pl
-%{tde_datadir}/apps/tdeconf_update/konversation-0.19-notifylists.pl
-%{tde_datadir}/apps/tdeconf_update/konversation-0.19-sortorder.pl
-%{tde_datadir}/apps/tdeconf_update/konversation-0.19-tabplacement.pl
-%{tde_datadir}/apps/tdeconf_update/konversation-0.20-customfonts.pl
-%{tde_datadir}/apps/tdeconf_update/konversation-0.20-quickbuttons.pl
-%{tde_datadir}/apps/tdeconf_update/konversation.upd
-%{tde_datadir}/apps/konversation/
-%{tde_datadir}/config.kcfg/konversation.kcfg
-%{tde_datadir}/services/konvirc.protocol
-%{tde_datadir}/services/konvirc6.protocol
-%{tde_tdedocdir}/HTML/*/konversation/
-%{tde_datadir}/icons/crystalsvg/*/actions/tdeimproxyaway.png
-%{tde_datadir}/icons/crystalsvg/*/actions/tdeimproxyoffline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/tdeimproxyonline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/char.png
-%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/tdeimproxyaway.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/tdeimproxyoffline.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/tdeimproxyonline.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz
-%{tde_datadir}/icons/hicolor/*/apps/konversation.png
-%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz
-
-
-%changelog
diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec
deleted file mode 100644
index c2925fc72..000000000
--- a/redhat/applications/kooldock/kooldock.spec
+++ /dev/null
@@ -1,173 +0,0 @@
-#
-# spec file for package kooldock (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kooldock
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.4.7
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Dock for TDE with cool visual enhancements
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KoolDock is a fork of the original work of Dang Viet Dung,.
-KSmoothDock 2.1. KoolDock is a dock for TDE with cool.
-visual enhancements and effects.
-
-Some of it features are:
-* Display quick launchers to your favourite apps
-* A builtin task bar
-* Pager and clock. (Not done yet)
-* Smooth zooming effect (like Apple's OS X dock)
-* Transparent Background
-
-Homepage: http://sourceforge.net/projects/kooldock/
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kooldock
-%{tde_datadir}/apps/kooldock/
-%{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png
-%{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png
-%{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png
-%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png
-
-
-%changelog
diff --git a/redhat/applications/kopete-otr/kopete-otr.spec b/redhat/applications/kopete-otr/kopete-otr.spec
deleted file mode 100644
index 2f93912d0..000000000
--- a/redhat/applications/kopete-otr/kopete-otr.spec
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-# spec file for package kopete-otr (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kopete-otr
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Required for Mageia 6: removes the ldflag '--no-undefined'
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-%define _disable_ld_no_undefined 1
-%endif
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.7
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Off-The-Record encryption for Kopete [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-tdenetwork-devel >= %{tde_version}
-
-# Kopete is provided by tdenetwork
-Requires:		trinity-kopete >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# OTR support
-BuildRequires:	libotr-devel
-
-
-%description
-This plugin enables Off-The-Record encryption for the TDE instant
-messenger Kopete. Using this plugin you can encrypt chatsessions to other
-users with IM-Cients supporting the OTR encryption method.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
-
-%find_lang kopete_otr
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kopete_otr.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_libdir}/libkotr.la
-%{tde_libdir}/libkotr.so.0
-%{tde_libdir}/libkotr.so.0.0.0
-%{tde_tdelibdir}/kcm_kopete_otr.la
-%{tde_tdelibdir}/kcm_kopete_otr.so
-%{tde_tdelibdir}/kopete_otr.la
-%{tde_tdelibdir}/kopete_otr.so
-%{tde_datadir}/apps/kopete_otr
-%{tde_datadir}/config.kcfg/kopete_otr.kcfg
-%{tde_tdedocdir}/HTML/en/kopete_otr/
-%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
-%{tde_datadir}/services/tdeconfiguredialog/kopete_otr_config.desktop
-%{tde_datadir}/services/kopete_otr.desktop
-
-
-%changelog
diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec
deleted file mode 100644
index d7a5574a9..000000000
--- a/redhat/applications/kpicosim/kpicosim.spec
+++ /dev/null
@@ -1,172 +0,0 @@
-#
-# spec file for package kpicosim (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kpicosim
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.6a
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-kpicosim is a development environment for the Xilinx
-PicoBlaze-3 soft-core processor for the TDE Desktop (Linux).
-The environment has an editor with syntax highlighting, compiler,
-simulator and export functions to VHDL, HEX and MEM files.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-# Move desktop icon to XDG directory
-if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
-  %__mkdir_p %{buildroot}%{tde_tdeappdir}
-  %__mv "%{buildroot}%{tde_datadir}/applnk/Development/kpicosim.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
-fi
-
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -D kpicosim -C "%summary" kpicosim Development IDE
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/kpicosim
-%{tde_tdeappdir}/kpicosim.desktop
-%{tde_datadir}/apps/katepart/syntax/psm.xml
-%{tde_datadir}/apps/kpicosim
-%{tde_tdedocdir}/HTML/en/kpicosim
-%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
-%{tde_mandir}/man*/kpicosim.*
-
-
-%changelog
diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/kpilot/kpilot.spec
deleted file mode 100644
index a87fc41d9..000000000
--- a/redhat/applications/kpilot/kpilot.spec
+++ /dev/null
@@ -1,229 +0,0 @@
-#
-# spec file for package kpilot (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kpilot
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.7
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	TDE Palm Pilot hot-sync tool
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# ICAL support
-BuildRequires:	libical-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# FLEX
-%if 0%{?suse_version} || 0%{?mgaversion}
-BuildRequires:	flex
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	flex
-%if 0%{?rhel} != 5
-BuildRequires:	flex-devel
-%endif
-%endif
-
-# PILOT support
-BuildRequires:	pilot-link-devel >= 0.12
-
-
-%description
-KPilot is an application that synchronizes your Palm Pilot or similar device
-(like the Handspring Visor) with your TDE desktop, much like the Palm HotSync
-software does for Windows.  KPilot can back-up and restore your Palm Pilot
-and synchronize the built-in applications with their TDE counterparts.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kpilot.desktop          Utility  PDA SyncUtility X-KDE-Utilities-Peripherals
-%suse_update_desktop_file -u -r %{?buildroot}%{tde_tdeappdir}/kpalmdoc.desktop        Utility  PDA X-TDE-Utilities-File
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kpalmdoc
-%{tde_bindir}/kpilot
-%{tde_bindir}/kpilotDaemon
-%{tde_libdir}/libkpilot.la
-%{tde_libdir}/libkpilot.so.0
-%{tde_libdir}/libkpilot.so.0.0.0
-%{tde_tdelibdir}/conduit_address.la
-%{tde_tdelibdir}/conduit_address.so
-%{tde_tdelibdir}/conduit_doc.la
-%{tde_tdelibdir}/conduit_doc.so
-%{tde_tdelibdir}/conduit_knotes.la
-%{tde_tdelibdir}/conduit_knotes.so
-%{tde_tdelibdir}/conduit_memofile.la
-%{tde_tdelibdir}/conduit_memofile.so
-%{tde_tdelibdir}/conduit_notepad.la
-%{tde_tdelibdir}/conduit_notepad.so
-%{tde_tdelibdir}/conduit_popmail.la
-%{tde_tdelibdir}/conduit_popmail.so
-%{tde_tdelibdir}/conduit_sysinfo.la
-%{tde_tdelibdir}/conduit_sysinfo.so
-%{tde_tdelibdir}/conduit_time.la
-%{tde_tdelibdir}/conduit_time.so
-%{tde_tdelibdir}/conduit_todo.la
-%{tde_tdelibdir}/conduit_todo.so
-%{tde_tdelibdir}/conduit_vcal.la
-%{tde_tdelibdir}/conduit_vcal.so
-%{tde_tdelibdir}/kcm_kpilot.la
-%{tde_tdelibdir}/kcm_kpilot.so
-%{tde_tdeappdir}/kpalmdoc.desktop
-%{tde_tdeappdir}/kpilot.desktop
-%{tde_tdeappdir}/kpilotdaemon.desktop
-%{tde_datadir}/apps/kaddressbook/contacteditorpages/
-%{tde_datadir}/apps/tdeconf_update/kpalmdoc.upd
-%{tde_datadir}/apps/tdeconf_update/kpilot.upd
-%{tde_datadir}/apps/kpilot
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/hicolor/*/apps/*.png
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/kpilotconduit.desktop
-%{tde_tdedocdir}/HTML/en/kpilot/
-
-
-%changelog
diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/kplayer/kplayer.spec
deleted file mode 100644
index 43a20c43b..000000000
--- a/redhat/applications/kplayer/kplayer.spec
+++ /dev/null
@@ -1,187 +0,0 @@
-#
-# spec file for package kplayer (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kplayer
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.6.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	KPlayer is a TDE multimedia player
-Group:		Applications/Multimedia
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Requires:		mplayer
-
-
-%description
-KPlayer is a TDE multimedia player.
-With KPlayer you can easily play a wide variety of video and audio  files and
-streams using a rich and friendly interface that follows KDE standards.
-This version was derived from the KDE3 branch 0.6.3 for the Trinity Desktop Environment
-
-Features include
-
-video, audio and subtitle playback from file, URL, DVD, VCD, audio CD, TV, DVB, and KDE I/O Slaves;
-volume, contrast, brightness, hue and saturation controls;
-zooming, full screen and fixed aspect options;
-status and progress display and seeking;
-multimedia library to organize your media files and streams;
-configuration dialog;
-file properties for setting file specific options.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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:${PKG_CONFIG_PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  -DPLUGIN_INSTALL_DIR=%{tde_tdelibdir} \
-  -DBUILD_ALL=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_bindir}/kplayer
-%{tde_datadir}/apps/kplayer/
-%{tde_datadir}/icons/hicolor/*/apps/kplayer.png
-%{tde_datadir}/icons/locolor/*/apps/kplayer.png
-%{tde_datadir}/services/kplayerpart.desktop
-%{tde_tdelibdir}/libkplayerpart.la
-%{tde_tdelibdir}/libkplayerpart.so
-%{tde_tdeappdir}/kplayer.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kplayer-actions.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kplayer-directory.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kplayer-next.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/kplayer-play-queue.desktop
-%lang(da) %{tde_tdedocdir}/HTML/da/kplayer/
-%lang(en) %{tde_tdedocdir}/HTML/en/kplayer/
-%lang(es) %{tde_tdedocdir}/HTML/es/kplayer/
-%lang(it) %{tde_tdedocdir}/HTML/it/kplayer/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/kplayer/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/kplayer/
-
-
-%post
-
-
-%postun
-
-
-%changelog
diff --git a/redhat/applications/kpowersave/kpowersave.spec b/redhat/applications/kpowersave/kpowersave.spec
deleted file mode 100644
index f0d72dcea..000000000
--- a/redhat/applications/kpowersave/kpowersave.spec
+++ /dev/null
@@ -1,209 +0,0 @@
-#
-# spec file for package kpowersave (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kpowersave
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.7.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	HAL based power management applet for Trinityfiles or directories.
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	hal-devel
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-
-BuildRequires:	cmake libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# XSCREENSAVER support
-#  RHEL 4: disabled
-#  RHEL 6: available in EPEL
-#  RHEL 7: available in NUX
-#  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-BuildRequires:	xscreensaver-extras
-%if 0%{?fedora}
-BuildRequires:	xscreensaver-extras-base
-%endif
-BuildRequires:	xscreensaver-gl-base
-BuildRequires:	xscreensaver-gl-extras
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-data
-BuildRequires:	xscreensaver-data-extra
-%endif
-
-%endif
-
-
-%description
-KPowersave is a TDE systray applet which allows to control the power 
-management settings and policies of your computer.
-It relies on HAL to do the heavy lifting.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
-   (warning) states
- * applet tooltip with information about battery fill and remaining battery 
-   time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a 
-   defined time)
- * a global configurable blacklist with programs which prevent autosuspend
-   (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- 
-KPowersave supports schemes with following configurable specific 
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libtdeinit_kpowersave.la
-%{tde_libdir}/libtdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
-
-%changelog
diff --git a/redhat/applications/krecipes/krecipes.spec b/redhat/applications/krecipes/krecipes.spec
deleted file mode 100644
index 720ce908d..000000000
--- a/redhat/applications/krecipes/krecipes.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# spec file for package krecipes (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg krecipes
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0beta2
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Recipes manager for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# MYSQL support
-BuildRequires:	mysql-devel
-
-# POSTGRESQL support
-BuildRequires:	postgresql-devel
-
-# SQLITE support
-BuildRequires:	sqlite-devel
-
-
-%description
-Krecipes is a TDE application designed to manage recipes. It can help you to
-do your shopping list, search through your recipes to find what you can do
-with available ingredients and a diet helper. It can also import or export
-recipes from files in various format (eg RecipeML or Meal-Master) or from
-databases.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --docdir=%{tde_tdedocdir} \
-  --libdir=%{tde_libdir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --with-sqlite \
-  --with-mysql \
-  --with-postgresql
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Fix desktop file location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/krecipes.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r krecipes Education Chemistry
-%endif
-
-# Removes duplicate files
-%fdupes "%{buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/krecipes
-%{tde_tdeappdir}/krecipes.desktop
-%{tde_datadir}/apps/krecipes/
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png
-%{tde_datadir}/icons/hicolor/*/apps/krecipes.png
-%{tde_datadir}/mimelnk/application/x-krecipes-backup.desktop
-%{tde_datadir}/mimelnk/application/x-krecipes-recipes.desktop
-%lang(da) %{tde_tdedocdir}/HTML/da/
-%lang(en) %{tde_tdedocdir}/HTML/en/
-%lang(es) %{tde_tdedocdir}/HTML/es/
-%lang(et) %{tde_tdedocdir}/HTML/et/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/
-
-
-%changelog
diff --git a/redhat/applications/krename/krename.spec b/redhat/applications/krename/krename.spec
deleted file mode 100644
index b5edfb807..000000000
--- a/redhat/applications/krename/krename.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# spec file for package krename (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg krename
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	3.0.14
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	A TDE batch file renaming utility
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
-even more files in one go. The filenames can be created by parts of the original filename,
-numbering the files or accessing hundreds of informations about the file, like creation date
-or Exif informations of an image. 
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file krename System FileManager
-%suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
-%suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/krename
-%{tde_tdeappdir}/krename.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
-%{tde_datadir}/apps/krename/
-%{tde_tdedocdir}/HTML/en/krename/
-%{tde_datadir}/icons/hicolor/*/apps/krename.png
-%{tde_datadir}/icons/locolor/*/apps/krename.png
-%{tde_mandir}/man*/krename.*
-
-
-%changelog
diff --git a/redhat/applications/krusader/krusader.spec b/redhat/applications/krusader/krusader.spec
deleted file mode 100644
index 81cedb427..000000000
--- a/redhat/applications/krusader/krusader.spec
+++ /dev/null
@@ -1,183 +0,0 @@
-#
-# spec file for package krusader (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg krusader
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.90.0
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Twin-panel (commander-style) file manager for TDE (and other desktops)
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-tdebindings-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Krusader is a simple, easy, powerful, twin-panel (commander-style) file
-manager for TDE and other desktops, similar to Midnight Commander (C) or Total
-Commander (C).
-
-It provides all the file management features you could possibly want.
-
-Plus: extensive archive handling, mounted filesystem support, FTP,
-advanced search module, viewer/editor, directory synchronisation,
-file content comparisons, powerful batch renaming and much much more.
-
-It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar,
-zip and 7-zip.
-
-It handles KIOSlaves such as smb:// or fish://.
-
-Almost completely customizable, Krusader is very user friendly, fast and looks
-great on your desktop.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --disable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-%suse_update_desktop_file krusader            System FileManager
-%suse_update_desktop_file krusader_root-mode  System FileManager
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING FAQ README TODO
-%{tde_bindir}/krusader
-%{tde_tdelibdir}/tdeio_krarc.la
-%{tde_tdelibdir}/tdeio_krarc.so
-%{tde_tdelibdir}/tdeio_virt.la
-%{tde_tdelibdir}/tdeio_virt.so
-%{tde_tdeappdir}/krusader.desktop
-%{tde_tdeappdir}/krusader_root-mode.desktop
-%{tde_datadir}/apps/krusader
-%{tde_datadir}/icons/crystalsvg/*/apps/*.png
-%{tde_datadir}/icons/locolor/*/apps/*.png
-%{tde_datadir}/services/krarc.protocol
-%{tde_datadir}/services/virt.protocol
-%{tde_mandir}/man1/krusader.1
-%{tde_tdedocdir}/HTML/en/krusader/
-%{tde_tdedocdir}/HTML/en/tdeioslave/krarc/
-%{tde_tdedocdir}/HTML/en/tdeioslave/virt/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
-
-
-%changelog
diff --git a/redhat/applications/kscope/kscope.spec b/redhat/applications/kscope/kscope.spec
deleted file mode 100644
index 9338c9880..000000000
--- a/redhat/applications/kscope/kscope.spec
+++ /dev/null
@@ -1,186 +0,0 @@
-#
-# spec file for package kscope (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kscope
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.6.2
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Source editing environment for TDE
-Group:		Applications/Internet
-URL:		http://kscope.sourceforge.net
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-Requires:		cscope
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	flex
-BuildRequires:	bison
-
-
-%description
-KScope is a TDE front-end to Cscope. It provides a source-editing environment
-for large C projects. KScope is focused on source editing and analysis.
-
-KScope is built around an efficient mechanism for code-navigation, which
-allows the user to run queries on the code.
-
-The types of queries KScope can run include:
-* Get all references to a symbol
-* Find the definition of a symbol
-* Find all functions called by or calling to a function
-* Find an EGrep pattern
-* Find all files #including some file
-
-These queries are handled by an underlying Cscope process. KScope simply
-serves as a front-end to this process, feeding it with queries, and parsing
-its output into result lists. The items in those lists can later be selected
-to open an editor at the matching line.
-
-Main Features:
-* Multiple editor windows (using your favourite TDE editor)
-* Project management
-* Front-end to most Cscope queries
-* Tag list for every open editor
-* Call-tree window
-* Session management, including saving and restoring queries
-* Works with externally-built cscope.out files
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-  
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
-
-%find_lang %{tde_pkg}
-
-# Move desktop icon to correct location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file %{tde_pkg} Development IDE
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
-%{tde_bindir}/kscope
-%{tde_tdeappdir}/kscope.desktop
-%{tde_datadir}/apps/kscope/
-%{tde_tdedocdir}/HTML/en/kscope/
-%{tde_datadir}/icons/hicolor/*/apps/kscope.png
-%{tde_datadir}/icons/locolor/*/apps/kscope.png
-
-
-%changelog
diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/ksensors/ksensors.spec
deleted file mode 100644
index 17e41a818..000000000
--- a/redhat/applications/ksensors/ksensors.spec
+++ /dev/null
@@ -1,178 +0,0 @@
-#
-# spec file for package ksensors (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg ksensors
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.7.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Trinity Frontend to lm_sensors
-Group:		Applications/System
-URL:		http://ksensors.sourceforge.net/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:	libsensors4-devel
-%else
-BuildRequires:	lm_sensors-devel
-%endif
-
-# Keep archs in sync with lm_sensors
-ExcludeArch:    s390 s390x
-
-
-%description
-KSensors is a nice lm-sensors frontend for the K Desktop Environment.
-Install the hddtemp package if you wish to monitor hard disk
-temperatures with KSensors.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "Sensors Frontend" %{tde_pkg} System Monitor
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ README TODO
-%{tde_bindir}/ksensors
-%{tde_tdeappdir}/ksensors.desktop
-%{tde_datadir}/apps/ksensors/
-%{tde_datadir}/autostart/ksensors.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
-%{tde_datadir}/icons/locolor/*/apps/ksensors.png
-%{tde_datadir}/sounds/ksensors_alert.wav
-%{tde_tdedocdir}/HTML/en/ksensors/
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/kshowmail/kshowmail.spec b/redhat/applications/kshowmail/kshowmail.spec
deleted file mode 100644
index cb55a8b18..000000000
--- a/redhat/applications/kshowmail/kshowmail.spec
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# spec file for package kshowmail (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kshowmail
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	3.3.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Look messages into your mail server
-Group:		Applications/Internet
-URL:		http://sourceforge.net/projects/kshowmail/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-Very simply kshowmail is a program that allows you to look in on your mail server,
-see what is waiting, decide if it is legitimate, and delete it right off of the server if it is not.
-All without dragging any messages into your computer.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-%find_lang %{tde_pkg}
-
-# Install missing icons
-install -D -m 644 "pics/cr16-app-kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/16x16/apps/kshowmail.png"
-install -D -m 644 "pics/kshowmail.png"          "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/48x48/apps/kshowmail.png"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file kshowmail Network Email
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
-%{tde_bindir}/kshowmail
-%{tde_tdelibdir}/kcm_kshowmailconfigaccounts.la
-%{tde_tdelibdir}/kcm_kshowmailconfigaccounts.so
-%{tde_tdelibdir}/kcm_kshowmailconfigactions.la
-%{tde_tdelibdir}/kcm_kshowmailconfigactions.so
-%{tde_tdelibdir}/kcm_kshowmailconfigdisplay.la
-%{tde_tdelibdir}/kcm_kshowmailconfigdisplay.so
-%{tde_tdelibdir}/kcm_kshowmailconfigfilter.la
-%{tde_tdelibdir}/kcm_kshowmailconfigfilter.so
-%{tde_tdelibdir}/kcm_kshowmailconfiggeneral.la
-%{tde_tdelibdir}/kcm_kshowmailconfiggeneral.so
-%{tde_tdelibdir}/kcm_kshowmailconfiglog.la
-%{tde_tdelibdir}/kcm_kshowmailconfiglog.so
-%{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.la
-%{tde_tdelibdir}/kcm_kshowmailconfigspamcheck.so
-%{tde_tdeappdir}/kshowmail.desktop
-%{tde_datadir}/apps/kshowmail/
-%{tde_datadir}/icons/crystalsvg/16x16/apps/kshowmail.png
-%{tde_datadir}/icons/hicolor/*/apps/kshowmail.png
-%{tde_datadir}/services/kshowmailconfigaccounts.desktop
-%{tde_datadir}/services/kshowmailconfigactions.desktop
-%{tde_datadir}/services/kshowmailconfigdisplay.desktop
-%{tde_datadir}/services/kshowmailconfigfilter.desktop
-%{tde_datadir}/services/kshowmailconfiggeneral.desktop
-%{tde_datadir}/services/kshowmailconfiglog.desktop
-%{tde_datadir}/services/kshowmailconfigspamcheck.desktop
-%lang(cs) %{tde_tdedocdir}/HTML/cs/kshowmail/
-%lang(de) %{tde_tdedocdir}/HTML/de/kshowmail/
-%lang(en) %{tde_tdedocdir}/HTML/en/kshowmail/
-%lang(es) %{tde_tdedocdir}/HTML/es/kshowmail/
-%lang(fr) %{tde_tdedocdir}/HTML/fr/kshowmail/
-%lang(hu) %{tde_tdedocdir}/HTML/hu/kshowmail/
-%lang(it) %{tde_tdedocdir}/HTML/it/kshowmail/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/kshowmail/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/kshowmail/
-%{tde_mandir}/man1/kshowmail.*
-
-
-%changelog
diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/kshutdown/kshutdown.spec
deleted file mode 100644
index b81349225..000000000
--- a/redhat/applications/kshutdown/kshutdown.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# spec file for package kshutdown (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kshutdown
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0.4
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	An advanced shut down utility for TDE
-Group:		Applications/Multimedia
-URL:		http://kde-apps.org/content/show.php?content=41180
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-It has 4 main commands:
-
-- Shut Down (logout and halt the system),
-- Reboot (logout and reboot the system),
-- Lock Screen (lock the screen using a screen saver),
-- Logout (end the session and logout the user).
-
-It features time and delay options, command line support, wizard,
-and sounds.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop"
-%suse_update_desktop_file %{tde_pkg} Utility DesktopUtility
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/kshutdown
-%{tde_tdelibdir}/kshutdownlockout_panelapplet.la
-%{tde_tdelibdir}/kshutdownlockout_panelapplet.so
-%{tde_tdeappdir}/kshutdown.desktop
-%{tde_datadir}/apps/kicker/applets/kshutdownlockout.desktop
-%{tde_datadir}/apps/kshutdown/
-%{tde_datadir}/apps/tdeconf_update/kshutdown.upd
-%{tde_datadir}/icons/hicolor/*/apps/kshutdown.png
-%lang(de) %{tde_datadir}/doc/tde/HTML/de/kshutdown/
-%lang(en) %{tde_datadir}/doc/tde/HTML/en/kshutdown/
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
deleted file mode 100644
index e7da4411c..000000000
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec
+++ /dev/null
@@ -1,175 +0,0 @@
-#
-# spec file for package ksplash-engine-moodin (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg ksplash-engine-moodin
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.4.2
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Fading splash screen engine for Trinity
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Heavily customizable engine for various types of themes.
-
-Features:
-* scale cache
-* fading images
-* use current icon set or custom images
-* unlimited Custom text labels
-* set fading delay and length
-* custom image arrangement
-* resolution independent themes
-
-This TDE splash screen engine is based upon Linspire's
-engine by Sean Meiners <Sean.Meiners@LinspireInc.com>
-
-Homepage: http://moodwrod.com
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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_tdelibdir}/ksplashmoodin.la
-%{tde_tdelibdir}/ksplashmoodin.so
-%if "%{?tde_version}" == "14.1.0"
-%{tde_datadir}/apps/ksplash/Themes/Architecture/
-%endif
-%{tde_datadir}/apps/ksplash/Themes/FingerPrint/
-%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/
-%{tde_datadir}/services/ksplashmoodin.desktop
-
-
-%changelog
diff --git a/redhat/applications/ksquirrel/ksquirrel.spec b/redhat/applications/ksquirrel/ksquirrel.spec
deleted file mode 100644
index f51af7ec2..000000000
--- a/redhat/applications/ksquirrel/ksquirrel.spec
+++ /dev/null
@@ -1,195 +0,0 @@
-#
-# spec file for package ksquirrel (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg ksquirrel
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.8.0
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Powerful Trinity image viewer
-Group:		Amusements/Games
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-BuildRequires:	trinity-libkipi-devel
-BuildRequires:	trinity-libksquirrel-devel
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-Mesa-libGLU
-%endif
-
-
-%description
-KSquirrel is an image viewer for TDE with disk navigator, file tree,
-multiple directory view, thumbnails, extended thumbnails, dynamic
-format support, DCOP interface, KEXIF and KIPI plugins support.
-
-KSquirrel is a fast and convenient image viewer for TDE featuring
-OpenGL and dynamic format support.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
-%{tde_bindir}/ksquirrel
-%{tde_bindir}/ksquirrel-libs-configurator
-%{tde_bindir}/ksquirrel-libs-configurator-real
-%{tde_tdelibdir}/libksquirrelpart.la
-%{tde_tdelibdir}/libksquirrelpart.so
-%{tde_tdeappdir}/ksquirrel.desktop
-%dir %{tde_datadir}/apps/dolphin
-%dir %{tde_datadir}/apps/dolphin/servicemenus
-%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
-%{tde_datadir}/apps/ksquirrel/
-%{tde_datadir}/apps/ksquirrelpart/
-%config(noreplace) %{tde_confdir}/magic/x-ras.magic
-%config(noreplace) %{tde_confdir}/magic/x-sun.magic
-%config(noreplace) %{tde_confdir}/magic/x-utah.magic
-%{tde_tdedocdir}/HTML/*/ksquirrel
-%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
-%{tde_datadir}/mimelnk/image/*.desktop
-%{tde_datadir}/services/ksquirrelpart.desktop
-%{tde_mandir}/man1/ksquirrel.1
-%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc
-%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc
-%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc
-
-
-%changelog
diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/kstreamripper/kstreamripper.spec
deleted file mode 100644
index a0eb00907..000000000
--- a/redhat/applications/kstreamripper/kstreamripper.spec
+++ /dev/null
@@ -1,167 +0,0 @@
-#
-# spec file for package kstreamripper (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kstreamripper
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.3.4
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	TDE frontend for streamripper
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	cmake
-
-
-%description
-KStreamRipper is a small frontend for the streamripper command
-line utility. Streamripper captures internet shoutcast radio streams
-on your harddisk and splits them up in mp3 files. KStreamRipper helps
-you with managing/ripping your preferred streams.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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 \
-  -DWITH_NVCONTROL=OFF \
-  \
-  -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
-
-# Missing icon file will make this fail.
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file kstreamripper Audio Recorder
-%endif
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kstreamripper
-%{tde_tdeappdir}/kstreamripper.desktop
-%{tde_datadir}/apps/kstreamripper/
-%{tde_datadir}/icons/hicolor/*/apps/kstreamripper.png
-%{tde_tdedocdir}/HTML/en/kstreamripper/
-%{tde_mandir}/man*/kstreamripper.*
-
-
-%changelog
diff --git a/redhat/applications/ksystemlog/ksystemlog.spec b/redhat/applications/ksystemlog/ksystemlog.spec
deleted file mode 100644
index 509eb289a..000000000
--- a/redhat/applications/ksystemlog/ksystemlog.spec
+++ /dev/null
@@ -1,155 +0,0 @@
-#
-# spec file for package ksystemlog (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg ksystemlog
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.3.2
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	System log viewer tool for Trinity
-Group:		Applications/System
-URL:		http://ksystemlog.forum-software.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-ksystemlog is a system log viewer tool for Trinity.
-
-This program is developed for being used by beginner users, which don't know
-how to find information about their Linux system, and how the log files are in
-their computer. But it is also designed for advanced users, who want to
-quickly see problems occuring on their server.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Missing category will make this fail.
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/ksystemlog
-%{tde_tdeappdir}/ksystemlog.desktop
-%{tde_datadir}/apps/ksystemlog/
-%{tde_datadir}/config.kcfg/ksystemlog.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png
-%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
-%{tde_tdedocdir}/HTML/en/ksystemlog/
-
-%changelog
diff --git a/redhat/applications/ktechlab/ktechlab.spec b/redhat/applications/ktechlab/ktechlab.spec
deleted file mode 100644
index 61aab6c6e..000000000
--- a/redhat/applications/ktechlab/ktechlab.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# spec file for package ktechlab (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg ktechlab
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Circuit simulator for microcontrollers and electronics [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-%if 0%{?fedora}
-#BuildRequires:	gpsim-devel
-%endif
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-KTechlab is a circuit simulator with a nice, clickable and discoverable
-interface. It supports many discrete components, logic circuits as well
-as PIC programming in its own Basic dialect and some form of assembler. 
-
-Homepage: http://ktechlab.org/
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Development/ktechlab.desktop" "%{?buildroot}%{tde_tdeappdir}"
-%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r -n ktechlab Science Math
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/ktechlab
-%{tde_bindir}/microbe
-%{tde_tdeappdir}/ktechlab.desktop
-%{tde_datadir}/apps/katepart/syntax/microbe.xml
-%{tde_datadir}/apps/ktechlab
-%{tde_datadir}/config.kcfg/ktechlab.kcfg
-%{tde_tdedocdir}/HTML/en/ktechlab/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/x-circuit.desktop
-%{tde_datadir}/mimelnk/application/x-flowcode.desktop
-%{tde_datadir}/mimelnk/application/x-ktechlab.desktop
-%{tde_datadir}/mimelnk/application/x-microbe.desktop
-
-
-%changelog
diff --git a/redhat/applications/ktorrent/ktorrent.spec b/redhat/applications/ktorrent/ktorrent.spec
deleted file mode 100644
index a4b5ea1e0..000000000
--- a/redhat/applications/ktorrent/ktorrent.spec
+++ /dev/null
@@ -1,219 +0,0 @@
-#
-# spec file for package ktorrent (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg ktorrent
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	2.2.8
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	BitTorrent client for Trinity
-Group:		Applications/Utilities
-URL:		http://ktorrent.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# GMP support
-BuildRequires:	gmp-devel
-
-# AVAHI support
-#  Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_avahi 1
-BuildRequires:	trinity-avahi-tqt-devel
-Requires:		trinity-avahi-tqt
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%else
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# GEOIP
-%if 0%{?suse_version}
-%if 0%{?suse_version} < 1550
-BuildRequires:	libGeoIP-devel
-%endif
-%else
-BuildRequires:	geoip-devel
-%endif
-
-%description
-KTorrent is a BitTorrent program for Trinity. Its features include speed capping
-(both down and up), integrated searching, UDP tracker support, preview of
-certain file types (video and audio) and integration into the TDE Panel
-enabling background downloading.
- 
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix="%{tde_prefix}" \
-  --exec-prefix="%{tde_prefix}" \
-  --bindir="%{tde_bindir}" \
-  --datadir="%{tde_datadir}" \
-  --libdir="%{tde_libdir}" \
-  --mandir="%{tde_mandir}" \
-  --includedir="%{tde_tdeincludedir}" \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  %{?!with_avahi:--without-avahi}
-
-
-# Not SMP safe !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf "%{buildroot}"
-%__make install DESTDIR="%{buildroot}"
-
-%find_lang %{tde_pkg}
-
-# Unwanted files
-%__rm -f "%{?buildroot}%{tde_libdir}/libktorrent.so"
-
-
-%clean
-%__rm -rf "%{buildroot}"
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/ktcachecheck
-%{tde_bindir}/ktorrent
-%{tde_bindir}/ktshell
-%{tde_bindir}/kttorinfo
-%{tde_bindir}/ktupnptest
-%{tde_libdir}/libktorrent-%{version}.so
-%{tde_libdir}/libktorrent.la
-%{tde_tdelibdir}/ktinfowidgetplugin.la
-%{tde_tdelibdir}/ktinfowidgetplugin.so
-%{tde_tdelibdir}/ktipfilterplugin.la
-%{tde_tdelibdir}/ktipfilterplugin.so
-%{tde_tdelibdir}/ktlogviewerplugin.la
-%{tde_tdelibdir}/ktlogviewerplugin.so
-%{tde_tdelibdir}/ktpartfileimportplugin.la
-%{tde_tdelibdir}/ktpartfileimportplugin.so
-%{tde_tdelibdir}/ktrssfeedplugin.la
-%{tde_tdelibdir}/ktrssfeedplugin.so
-%{tde_tdelibdir}/ktscanfolderplugin.la
-%{tde_tdelibdir}/ktscanfolderplugin.so
-%{tde_tdelibdir}/ktschedulerplugin.la
-%{tde_tdelibdir}/ktschedulerplugin.so
-%{tde_tdelibdir}/ktsearchplugin.la
-%{tde_tdelibdir}/ktsearchplugin.so
-%{tde_tdelibdir}/ktstatsplugin.la
-%{tde_tdelibdir}/ktstatsplugin.so
-%{tde_tdelibdir}/ktupnpplugin.la
-%{tde_tdelibdir}/ktupnpplugin.so
-%{tde_tdelibdir}/ktwebinterfaceplugin.la
-%{tde_tdelibdir}/ktwebinterfaceplugin.so
-%{tde_tdeappdir}/ktorrent.desktop
-%{tde_datadir}/apps/ktorrent/
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_datadir}/services/*.desktop
-%{tde_datadir}/servicetypes/ktorrentplugin.desktop
-%{tde_tdedocdir}/HTML/en/ktorrent/
-
-%if 0%{?with_avahi}
-%{tde_tdelibdir}/ktzeroconfplugin.la
-%{tde_tdelibdir}/ktzeroconfplugin.so
-%endif
-
-
-%changelog
diff --git a/redhat/applications/kuickshow/kuickshow.spec b/redhat/applications/kuickshow/kuickshow.spec
deleted file mode 100644
index a0190c2e9..000000000
--- a/redhat/applications/kuickshow/kuickshow.spec
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# spec file for package kuickshow (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kuickshow
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.8.13
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Quick picture viewer for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# IMLIB1 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires:	imlib-devel
-%endif
-%if 0%{?mgaversion}
-BuildRequires:	imlib1-devel
-%endif
-
-# GIF support
-%if 0%{?suse_version} || 0%{?fedora} >= 28
-BuildRequires:	giflib-devel 
-%else
-BuildRequires:	libungif-devel 
-%endif
-
-
-%description
-Kuickshow is a picture viewer for TDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size. 
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Missing category will make this fail.
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/kuickshow
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/kuickshow/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/libtdeinit_%{tde_pkg}.so
-%{tde_libdir}/*.la
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/kuickshow/
-
-
-%changelog
diff --git a/redhat/applications/kvirc/kvirc.spec b/redhat/applications/kvirc/kvirc.spec
deleted file mode 100644
index f49b6df33..000000000
--- a/redhat/applications/kvirc/kvirc.spec
+++ /dev/null
@@ -1,247 +0,0 @@
-%if 0%{?fedora} >= 23
-%define _hardened_ldflags %nil
-%endif
-
-#
-# spec file for package kvirc (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kvirc
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	3.4.0
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Trinity based next generation IRC client with module support
-Group:		Applications/Utilities
-URL:		http://kvirc.net/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-A highly configurable graphical IRC client with an MDI interface,
-built-in scripting language, support for IRC DCC, drag & drop file
-browsing, and much more. KVIrc uses the TDE widget set, can be extended
-using its own scripting language, integrates with TDE, and supports
-custom plugins.
-
-If you are a developer and you want to write a custom module for KVIrc,
-you need to install the kvirc-dev package.
-
-%package data
-Group:			Applications/Utilities
-Summary:		Data files for KVIrc
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description data
-This package contains the architecture-independent data needed by KVIrc in
-order to run, such as icons and images, language files, and shell scripts.
-It also contains complete reference guides on scripting and functions
-within KVIrc in its internal help format. Unless you want to use KVIrc only
-as a very simple IRC client you are likely to want to write scripts to
-tailor KVIrc to your needs.
-
-KVIrc is a graphical IRC client based on the TDE widget set which integrates
-with the Trinity Desktop Environment version 3.
-
-%package devel
-Group:			Development/Libraries
-Summary:		Development files for KVIrc
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains KVIrc libraries and include files you need if you
-want to develop plugins for KVIrc.
-
-KVIrc is a graphical IRC client based on the TDE widget set which integrates
-with the K Desktop Environment version 3.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# FTBFS on RHEL 5
-%if 0%{?rhel} == 5
-%__sed -i "admin/acinclude.m4.in" \
-       -i "src/kvilib/tal/kvi_tal_application.cpp" \
-       -e "/TDEApplication/ s|\")|\", true, true, true)|";
-%endif
-
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-./autogen.sh
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-wall \
-  \
-  --with-pic \
-  \
-  --with-big-channels \
-  --enable-perl \
-  --with-ix86-asm \
-  --with-kde-services-dir=%{tde_datadir}/services \
-  --with-kde-library-dir=%{tde_libdir} \
-  --with-kde-include-dir=%{tde_tdeincludedir} \
-  --with-qt-name=tqt \
-  --with-qt-library-dir=%{_libdir} \
-  --with-qt-include-dir=%{_includedir}/tqt3 \
-  --with-qt-moc=%{_bindir}/tmoc
-
-# Symbolic links must exist prior to parallel building
-%__make symlinks -C src/kvilib/build
-%__make symlinks -C src/kvirc/build
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-%__sed -i "src/modules/"*"/Makefile" -e "s|-Wl,--no-undefined||"
-%endif
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
-%__mv \
-  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
-  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
-
-# Move desktop file to XDG location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file kvirc Network IRCClient
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog FAQ README TODO
-%{tde_bindir}/kvirc
-%{tde_libdir}/*.so.*
-%{tde_libdir}/kvirc/*/modules/*.so
-
-%files data
-%defattr(-,root,root,-)
-%{tde_bindir}/kvi_run_netscape
-%{tde_bindir}/kvi_search_help
-%exclude %{tde_libdir}/kvirc/*/modules/*.la
-%exclude %{tde_libdir}/kvirc/*/modules/*.so
-%{tde_libdir}/kvirc/
-%{tde_tdeappdir}/kvirc.desktop
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_datadir}/icons/hicolor/*/*/*.xpm
-%{tde_datadir}/kvirc
-%{tde_datadir}/mimelnk/text/*.desktop
-%{tde_datadir}/services/*.protocol
-%{tde_mandir}/man1/kvirc.1
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/kvirc-config
-%{tde_includedir}/kvirc/
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/kvirc/*/modules/*.la
-
-
-%changelog
diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/kvkbd/kvkbd.spec
deleted file mode 100644
index 510949a05..000000000
--- a/redhat/applications/kvkbd/kvkbd.spec
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# spec file for package kvkbd (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kvkbd
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.4.8
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Virtual keyboard for TDE
-Group:		Applications/System
-URL:		http://pan4os.info/main/index.php
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Virtual keyboard for TDE for use with accessibility. Application contains
-a systray widget as well as a dockwidget.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r kvkbd Utility Accessibility
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/kvkbd
-%{tde_tdeappdir}/kvkbd.desktop
-%{tde_datadir}/apps/kvkbd/
-%{tde_datadir}/icons/hicolor/*/apps/kvkbd.png
-%{tde_tdedocdir}/HTML/en/kvkbd/
-
-
-%changelog
diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec
deleted file mode 100644
index b42fe1ab2..000000000
--- a/redhat/applications/kvpnc/kvpnc.spec
+++ /dev/null
@@ -1,177 +0,0 @@
-#
-# spec file for package kvpnc (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kvpnc
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.9.6a
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Vpn clients frontend for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	libgcrypt-devel >= 1.2.0
-
-
-%description
-KVpnc is a TDE frontend for various vpn clients.
-
-It supports :
-* Cisco-compatible VPN client (vpnc)
-* IPSec (freeswan, openswan, racoon)
-* Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux)
-* Virtual Private Network daemon (openvpn)
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{_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,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/kvpnc
-%{tde_tdeappdir}/kvpnc.desktop
-%{tde_datadir}/apps/kvpnc/
-%lang(de) %{tde_datadir}/doc/tde/HTML/de/kvpnc/
-%lang(en) %{tde_datadir}/doc/tde/HTML/en/kvpnc/
-%lang(fr) %{tde_datadir}/doc/tde/HTML/fr/kvpnc/
-%lang(sv) %{tde_datadir}/doc/tde/HTML/sv/kvpnc/
-%{tde_datadir}/icons/hicolor/*/apps/kvpnc.png
-%{tde_datadir}/icons/locolor/*/apps/kvpnc.png
-%{tde_tdedocdir}/HTML/en/tdeioslave/pcf/
-%{tde_datadir}/services/pcf.protocol
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec
deleted file mode 100644
index 78414d303..000000000
--- a/redhat/applications/kxmleditor/kxmleditor.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# spec file for package kxmleditor (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg kxmleditor
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.1.4
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	XML Editor for TDE
-Group:		Applications/Multimedia
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Requires:		mplayer
-
-
-%description
-KXML Editor is a simple program, that displays and edits the contents of an
-XML file. It can be embedded in Quanta, and used with DCOP.
-
-The left side contains a tree representing the XML document structure. The
-right side contains a list of attributes for the selected XML element and its
-contents.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-# Move desktop icon to correct location
-%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/kxmleditor
-%{tde_libdir}/libkxmleditorpart.la
-%{tde_libdir}/libkxmleditorpart.so
-%{tde_libdir}/libkxmleditorpart.so.1
-%{tde_libdir}/libkxmleditorpart.so.1.0.0
-%{tde_tdeappdir}/kxmleditor.desktop
-%{tde_datadir}/apps/kxmleditor/
-%{tde_tdedocdir}/HTML/en/kxmleditor/
-%{tde_datadir}/icons/hicolor/*/apps/kxmleditor.png
-%{tde_datadir}/icons/locolor/*/apps/kxmleditor.png
-%{tde_datadir}/services/kxmleditorpart.desktop
-%{tde_mandir}/man1/kxmleditor.1*
-
-
-%post
-
-
-%postun
-
-
-%changelog
diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec
deleted file mode 100644
index 9c1ae13d8..000000000
--- a/redhat/applications/mathemagics/mathemagics.spec
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# spec file for package mathemagics (version R14.0.0)
-#
-# 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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg mathemagics
-%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_mandir %{tde_datadir}/man
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Mathemagics is a RPN Calculator.
-Version:		1.1
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:		GPL-2.0+
-%else
-License:		GPLv2+
-%endif
-
-#Vendor:			Trinity Desktop
-#Packager:		Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-
-%description
-Mathemagics is a RPN Calculator.
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/mathemagics
-%{tde_tdeappdir}/mathemagics.desktop
-%{tde_datadir}/apps/mathemagics/mathemagicsui.rc
-%{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png
-%{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png
-%{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png
-%{tde_datadir}/icons/locolor/16x16/apps/mathemagics.png
-%{tde_datadir}/icons/locolor/32x32/apps/mathemagics.png
-%{tde_tdedocdir}/HTML/en/mathemagics/
-%{tde_mandir}/man1/mathemagics.1*
-
-
-%changelog
diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec
new file mode 100644
index 000000000..56d940aa8
--- /dev/null
+++ b/redhat/applications/misc/bibletime/bibletime.spec
@@ -0,0 +1,180 @@
+#
+# spec file for package bibletime (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/
+#
+
+# Required for PCLinuxOS: removes the ldflag '--no-undefined'
+%if 0%{?pclinuxos}
+%define _disable_ld_no_undefined 1
+%endif
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg bibletime
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.6.6.0
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		A bible study tool for Trinity
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# BOOST support
+BuildRequires:   boost-devel
+
+# Requires: clucene
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires:	clucene-core-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}clucene-devel
+%endif
+
+# Requires: sword
+BuildRequires:	sword-devel
+Requires:		sword
+
+%description
+BibleTime is a free and easy to use bible study tool for UNIX systems.
+It requires a working TDE environment and the SWORD library.
+BibleTime provides easy handling of digitized texts (Bibles, commentaries
+and lexicons) and powerful features to work with these texts (search in
+texts, write own notes, save, print etc.).
+ 
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
+CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11"
+%endif
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+# Not SMP safe !
+%__make -C bibletime/frontend
+
+# SMP safe !
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
+%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
+%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
+
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/bibletime
+%{tde_tdeincludedir}/bibletimeinterface.h
+%{tde_datadir}/applications/bibletime.desktop
+%{tde_datadir}/apps/bibletime/
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_tdedocdir}/HTML/en/bibletime/
+
+
+%changelog
diff --git a/redhat/applications/misc/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec
new file mode 100644
index 000000000..41d2e2184
--- /dev/null
+++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec
@@ -0,0 +1,110 @@
+# Default version for this component
+%define tde_pkg fusion-icon
+%define tde_version 14.0.13
+
+%if "%{?python2_sitelib}" == ""
+%define python2_sitelib    %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
+%endif
+
+
+# TDE specific building variables
+%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_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		tray icon to launch and manage Compiz Fusion [Trinity]
+Version:		0.0.0+git20071028
+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://www.trinitydesktop.org/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+# [fusion-icon] Allow python installation under /usr instead of tde_prefix
+Patch1:		fusion-icon-3.5.13-fix_python_sitelib.patch
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	python
+Requires:		python
+Requires:		trinity-compizconfig-backend-kconfig
+
+%description
+The OpenCompositing Project brings 3D desktop visual effects that
+improve the usability and eye candy of the X Window System and provide
+increased productivity.
+
+This package contains a tray icon that can launch Compiz and its
+decorators.
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install \
+  DESTDIR=%{buildroot} \
+  PREFIX=%{tde_prefix} \
+  PYTHON_SITELIB=%{?python2_sitelib}
+
+# Removes 'egg-info'
+find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/fusion-icon
+%{python2_sitelib}/FusionIcon/
+%{tde_datadir}/applications/fusion-icon.desktop
+%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png
+%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg
+
+
+%changelog
diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
new file mode 100644
index 000000000..387e42e98
--- /dev/null
+++ b/redhat/applications/misc/kcmldap/kcmldap.spec
@@ -0,0 +1,222 @@
+#
+# spec file for package kcmldap (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kcmldap
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.5
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Kerberos control module for the TDE control center
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+BuildRequires:	trinity-libtdeldap-devel >= 0.5
+
+Requires:		trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	openldap-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	openldap2-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires:	openldap24-libs-devel
+%endif
+
+# KRB5 support
+BuildRequires:	krb5-devel
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
+BuildRequires:	libudev-devel
+%endif
+
+# LIBCOM_ERR support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires:	libcom_err-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}ext2fs-devel
+%endif
+
+
+%description
+This is a meta-package that installs all kcmldap related packages.
+
+%files
+
+##########
+
+%package -n trinity-kcontrol-ldap-bonding
+Summary:		Kerberos control module for the TDE control center
+Group:			Applications/Utilities
+Requires:		trinity-tde-ldap-cert-updater = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kcontrol-ldap-bonding
+This is a TDE control center module to manage TDE connections to Kerberos realms.
+
+%files -n trinity-kcontrol-ldap-bonding
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/tdeldapbonding
+%{tde_tdelibdir}/kcm_ldapbonding.la
+%{tde_tdelibdir}/kcm_ldapbonding.so
+%{tde_tdeappdir}/ldapbonding.desktop
+%dir %{tde_datadir}/pixmaps
+%{tde_datadir}/pixmaps/kcmldapbonding_step1.png
+%{tde_datadir}/pixmaps/kcmldapbonding_step3.png
+
+##########
+
+%package -n trinity-tde-ldap-cert-updater
+Summary:		Service to keep LDAP certificates up-to-date
+Group:			Applications/Utilities
+Requires:		trinity-kcontrol-ldap-bonding = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tde-ldap-cert-updater
+This is a small daemon which keeps the LDAP root certificate up to date with the LDAP server
+
+%files -n trinity-tde-ldap-cert-updater
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/tdeldapcertupdater
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
new file mode 100644
index 000000000..c5bca20d0
--- /dev/null
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
@@ -0,0 +1,217 @@
+#
+# spec file for package kcmldapcontroller (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kcmldapcontroller
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.5
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Kerberos control module for the TDE control center
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+BuildRequires:	trinity-libtdeldap-devel >= 0.5
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	openldap-devel
+%endif
+%if 0%{?mgaversion} >= 6
+BuildRequires:  openldap-servers-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	openldap2-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires:	openldap24-libs-devel
+%endif
+
+# KRB5 support
+BuildRequires:	krb5-devel
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
+BuildRequires:	libudev-devel
+%endif
+
+# LIBCOM_ERR support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires:	libcom_err-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}ext2fs-devel
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+Requires:		trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+This is a meta-package that installs all kcmldap related packages.
+
+%files
+
+##########
+
+%package -n trinity-kcontrol-ldap-controller
+Summary:		Kerberos realm management module for the TDE control center
+Group:			Applications/Utilities
+
+%description -n trinity-kcontrol-ldap-controller
+This is a TDE control center module to manage users, groups, and machines in Kerberos realms.
+
+%files -n trinity-kcontrol-ldap-controller
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/primaryrccertupdater
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7
+%{tde_libdir}/slapi-acl-manager.la
+%{tde_libdir}/slapi-acl-manager.so
+%endif
+%{tde_tdelibdir}/kcm_ldapcontroller.la
+%{tde_tdelibdir}/kcm_ldapcontroller.so
+%{tde_tdeappdir}/ldapcontroller.desktop
+%{tde_datadir}/apps/kcmldapcontroller/
+%dir %{tde_datadir}/pixmaps
+%{tde_datadir}/pixmaps/kcmldapcontroller_step1.png
+%{tde_datadir}/pixmaps/kcmldapcontroller_step4.png
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%if 0%{?pclinuxos}
+%__rm -rf acl-updater
+%endif
+
+
+
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
new file mode 100644
index 000000000..542a3ce3c
--- /dev/null
+++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
@@ -0,0 +1,203 @@
+#
+# spec file for package kcmldapmanager (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kcmldapmanager
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.5
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Kerberos control module for the TDE control center
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+BuildRequires:	trinity-libtdeldap-devel >= 0.5
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	openldap-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	openldap2-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires:	openldap24-libs-devel
+%endif
+
+# KRB5 support
+BuildRequires:	krb5-devel
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
+BuildRequires:	libudev-devel
+%endif
+
+# LIBCOM_ERR support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires:	libcom_err-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}ext2fs-devel
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+Requires:		trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+This is a meta-package that installs all kcmldap related packages.
+
+%files
+
+##########
+
+%package -n trinity-kcontrol-ldap-manager
+Summary:		Kerberos realm management module for the TDE control center
+Group:			Applications/Utilities
+
+%description -n trinity-kcontrol-ldap-manager
+This is a TDE control center module to manage users, groups, and machines in Kerberos realms.
+
+%files -n trinity-kcontrol-ldap-manager -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/tdeldapmanager
+%{tde_tdelibdir}/kcm_ldapmanager.la
+%{tde_tdelibdir}/kcm_ldapmanager.so
+%{tde_tdeappdir}/ldapmanager.desktop
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} || touch %{tde_pkg}.lang
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec
new file mode 100644
index 000000000..be49ed367
--- /dev/null
+++ b/redhat/applications/misc/kerberostray/kerberostray.spec
@@ -0,0 +1,193 @@
+#
+# spec file for package kerberostray (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kerberostray
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.5
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Kerberos ticket manager
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+BuildRequires:	trinity-libtdeldap-devel >= 0.5
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	openldap-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	openldap2-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires:	openldap24-libs-devel
+%endif
+
+# KRB5 support
+BuildRequires:	krb5-devel
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
+BuildRequires:	libudev-devel
+%endif
+
+# LIBCOM_ERR support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires:	libcom_err-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}ext2fs-devel
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}
+
+# Apps that should stay in TDE
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%{tde_bindir}/kerberostray
+%{tde_tdeappdir}/kerberostray.desktop
+%{tde_datadir}/apps/kerberostray/
+%{tde_datadir}/autostart/kerberostray.desktop
+%{tde_datadir}/icons/crystalsvg/*/apps/kerberostray.png
+
+
+%changelog
diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec
new file mode 100644
index 000000000..f7112b8fe
--- /dev/null
+++ b/redhat/applications/misc/krecipes/krecipes.spec
@@ -0,0 +1,191 @@
+#
+# spec file for package krecipes (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg krecipes
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0beta2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Recipes manager for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# MYSQL support
+BuildRequires:	mysql-devel
+
+# POSTGRESQL support
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires:	postgresql10
+BuildRequires:	postgresql10-devel
+%else
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql-server-devel
+%else
+BuildRequires: postgresql-devel
+%endif
+%endif
+
+# SQLITE support
+BuildRequires:	sqlite-devel
+
+
+%description
+Krecipes is a TDE application designed to manage recipes. It can help you to
+do your shopping list, search through your recipes to find what you can do
+with available ingredients and a diet helper. It can also import or export
+recipes from files in various format (eg RecipeML or Meal-Master) or from
+databases.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
+  --docdir=%{tde_tdedocdir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  --with-sqlite \
+  --with-mysql \
+  --with-postgresql
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+# Fix desktop file location
+%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/krecipes.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r krecipes Education Chemistry
+%endif
+
+# Removes duplicate files
+%fdupes "%{buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/krecipes
+%{tde_tdeappdir}/krecipes.desktop
+%{tde_datadir}/apps/krecipes/
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/krecipes_file.png
+%{tde_datadir}/icons/hicolor/*/apps/krecipes.png
+%{tde_datadir}/mimelnk/application/x-krecipes-backup.desktop
+%{tde_datadir}/mimelnk/application/x-krecipes-recipes.desktop
+%lang(da) %{tde_tdedocdir}/HTML/da/
+%lang(en) %{tde_tdedocdir}/HTML/en/
+%lang(es) %{tde_tdedocdir}/HTML/es/
+%lang(et) %{tde_tdedocdir}/HTML/et/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/
+%{tde_mandir}/man1/krecipes.1*
+
+%changelog
diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/mplayerthumbs/mplayerthumbs.spec
deleted file mode 100644
index 6e4739b9e..000000000
--- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-# spec file for package mplayerthumbs (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg mplayerthumbs
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.5b
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	A video thumbnail generator for TDE file managers
-Group:		Applications/Multimedia
-URL:		http://kde-apps.org/content/show.php?content=41180
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# MPLAYER support
-Requires:		mplayer
-
-
-%description
-MPlayerThumbs is a video thumbnail generator for TDE file managers 
-(Konqueror, Dolphin, ...).
-It needs mplayer (of course) to generate thumbnails, and it contains no 
-linking to any library, so in a x86_64 system you can freely use the 
-32bit mplayer binary with win32codecs by configuring the application 
-launching the mplayerthumbsconfig helper application.
-It catches a random frame from 15% to 70%, checking also how contrasted 
-is the image, and dropping bad frames.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/mplayerthumbsconfig
-%{tde_tdelibdir}/videopreview.la
-%{tde_tdelibdir}/videopreview.so
-%{tde_datadir}/apps/videopreview/
-%{tde_datadir}/config.kcfg/mplayerthumbs.kcfg
-%{tde_datadir}/services/videopreview.desktop
-%{tde_tdedocdir}/HTML/en/videopreview/
-
-
-%changelog
diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
new file mode 100644
index 000000000..9de59f8ad
--- /dev/null
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -0,0 +1,559 @@
+#
+# spec file for package amarok (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg amarok
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.4.10
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Media player for TDE
+Group:		Applications/Multimedia
+URL:		http://www.trinitydesktop.org/
+#Url:		http://amarok.kde.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-konqueror-devel >= %{tde_version}
+
+BuildRequires:	trinity-filesystem >= %{tde_version}
+Requires:		trinity-filesystem >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	gettext
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# ALSA support
+BuildRequires:	alsa-lib-devel
+
+# ESOUND support
+BuildRequires:	esound-devel
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# LIBTOOL
+BuildRequires:	libtool
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires:	libtool-ltdl-devel
+%endif
+
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
+BuildRequires:	libusb-devel
+%endif
+BuildRequires:	mysql-devel
+BuildRequires:	SDL-devel
+BuildRequires:	taglib-devel
+BuildRequires:	sqlite-devel
+
+# POSTGRESQL support
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires:	postgresql10
+BuildRequires:	postgresql10-devel
+%else
+BuildRequires: postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires: postgresql-server-devel
+%else
+BuildRequires: postgresql-devel
+%endif
+%endif
+
+# not used anymore, in favor of libvisual ? -- Rex
+#{?fedora:BuildRequires:  xmms-devel}
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# DBUS support
+%if 0%{?suse_version}
+BuildRequires:	dbus-1-devel
+%else
+BuildRequires:	dbus-devel
+%endif
+
+# DBUS-(T)QT support
+%if 0%{?rhel} == 4
+BuildRequires:	dbus-qt
+%else
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+%endif
+
+# DAAP support
+%define with_daap 0
+
+# IFP support
+#  IFP package is broken under PCLinuxOS.
+%if 0%{?pclinuxos} == 0
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_ifp 1
+BuildRequires:	libifp-devel
+%endif
+%endif
+
+# KARMA support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+%define with_karma 1
+BuildRequires:	libkarma-devel
+BuildRequires:	karma-sharp
+%endif
+%endif
+
+# GPOD (ipod) support
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_gpod 1
+BuildRequires:	libgpod-devel >= 0.4.2
+%endif
+
+# MTP players
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_mtp 1
+BuildRequires:	libmtp-devel
+%endif
+
+# Creative Nomad Jukebox
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
+%define with_njb 1
+BuildRequires:	libnjb-devel
+%endif
+
+# VISUAL support
+%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_libvisual 1
+BuildRequires:	libvisual-devel
+%endif
+
+# MUSICBRAINZ support
+%if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?fedora} >= 24
+BuildRequires:	libmusicbrainz5-devel
+%else
+BuildRequires:	libmusicbrainz-devel
+%endif
+%endif
+
+# TUNEPIMP support
+%if 0%{?pclinuxos}
+BuildRequires:	libofa-devel
+%endif
+%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
+BuildRequires:	libtunepimp-devel
+%endif
+%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} < 1500
+BuildRequires:	libtunepimp-devel
+%endif
+%if 0%{?fedora} && 0%{?fedora} <= 23
+BuildRequires:	libtunepimp-devel
+%endif
+
+# INOTIFY support
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_inotify 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}inotifytools-devel
+%endif
+%endif
+
+# XINE support
+%if 0%{?fedora} && 0%{?fedora} <= 31
+%define with_xine 1
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?rhel} && 0%{?rhel} <= 7
+#define with_xine 1
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define with_xine 1
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?sle_version} && 0%{?sle_version} <= 150000
+%define with_xine 1
+BuildRequires: libxine-devel
+%endif
+
+# YAUAP support
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_yauap 1
+%endif
+
+# AKODE support
+%define with_akode 0
+%if 0 && 0%{?with_akode}
+BuildRequires:	trinity-akode-devel
+%endif
+
+# MP4V2 support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_mp4v2 1
+BuildRequires:	libmp4v2-devel
+%endif
+
+# ruby
+BuildRequires:	ruby
+BuildRequires:	ruby-devel
+%if 0%{?fedora} >= 19
+BuildRequires:	rubypick
+%endif
+
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 8
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
+# To open the selected browser, works with Patch2
+Requires:		xdg-utils
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+
+
+%description
+Amarok is a multimedia player with:
+ - fresh playlist concept, very fast to use, with drag and drop
+ - plays all formats supported by the various engines
+ - audio effects, like reverb and compressor
+ - compatible with the .m3u and .pls formats for playlists
+ - nice GUI, integrates into the TDE look, but with a unique touch
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc COPYING AUTHORS ChangeLog README.md
+%{tde_bindir}/amarok
+%{tde_bindir}/amarokapp
+%{tde_bindir}/amarokcollectionscanner
+%{tde_bindir}/amarok_proxy.rb
+%{tde_datadir}/apps/amarok/
+%{tde_datadir}/icons/crystalsvg/*/actions/covermanager.png
+%{tde_datadir}/icons/crystalsvg/*/actions/dynamic.png
+%{tde_datadir}/icons/crystalsvg/*/actions/equalizer.png
+%{tde_datadir}/icons/crystalsvg/*/actions/mini_dock.png
+%{tde_datadir}/icons/crystalsvg/*/actions/player_playlist_2.png
+%{tde_datadir}/icons/crystalsvg/*/actions/podcast.png
+%{tde_datadir}/icons/crystalsvg/*/actions/podcast_new.png
+%{tde_datadir}/icons/crystalsvg/*/actions/random.png
+%{tde_datadir}/icons/crystalsvg/*/actions/repeat_playlist.png
+%{tde_datadir}/icons/crystalsvg/*/actions/repeat_track.png
+%{tde_datadir}/icons/crystalsvg/*/actions/visualizations.png
+%{tde_datadir}/icons/crystalsvg/*/actions/wiki.png
+%{tde_datadir}/icons/crystalsvg/*/actions/amarok_podcast.png
+%{tde_datadir}/icons/crystalsvg/*/actions/amarok_podcast_new.png
+%{tde_datadir}/icons/crystalsvg/*/actions/amazon_locale.png
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_tdeappdir}/*.desktop
+%{tde_datadir}/servicetypes/*.desktop
+%{tde_datadir}/apps/profiles/amarok.profile.xml
+%config(noreplace) %{tde_confdir}/amarokrc
+%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_datadir}/services/amarokitpc.protocol
+%{tde_datadir}/services/amaroklastfm.protocol
+%{tde_datadir}/services/amarokpcast.protocol
+%{tde_mandir}/man1/amarok.1*
+%{tde_mandir}/man1/amarokapp.1*
+%{tde_mandir}/man1/amarokcollectionscanner.1*
+# -libs ?  -- Rex
+%{tde_libdir}/libamarok.so.0
+%{tde_libdir}/libamarok.so.0.0.0
+# DAAP
+%if 0%{?with_daap}
+%{tde_bindir}/amarok_daapserver.rb
+%{tde_tdelibdir}/libamarok_daap-mediadevice.*
+%{tde_datadir}/services/amarok_daap-mediadevice.desktop
+%endif
+# Mass-storage
+%{tde_datadir}/services/amarok_massstorage-device.desktop
+%{tde_tdelibdir}/libamarok_massstorage-device.*
+# NFS
+%{tde_datadir}/services/amarok_nfs-device.desktop
+%{tde_tdelibdir}/libamarok_nfs-device.*
+# SMB
+%{tde_datadir}/services/amarok_smb-device.desktop
+%{tde_tdelibdir}/libamarok_smb-device.*
+# IPod
+%if 0%{?with_gpod}
+%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
+%endif
+# VFAT
+%{tde_datadir}/services/amarok_generic-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_generic-mediadevice.*
+# iRiver
+%if 0%{?with_ifp}
+%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
+%endif
+# Creative Zen
+%if 0%{?with_njb}
+%{tde_datadir}/services/amarok_njb-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_njb-mediadevice.*
+%endif
+# MTP players
+%if 0%{?with_mtp}
+%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
+%endif
+# Rio Karma
+%if 0%{?with_karma}
+%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
+%endif
+# Void engine (noop)
+%{tde_datadir}/services/amarok_void-engine_plugin.desktop
+%{tde_tdelibdir}/libamarok_void-engine_plugin.*
+# Xine engine
+%if 0%{?with_xine}
+%{tde_datadir}/services/amarok_xine-engine.desktop
+%{tde_tdelibdir}/libamarok_xine-engine.*
+%endif
+## Gstreamer engine
+#{tde_datadir}/services/amarok_gst10engine_plugin.desktop
+#{tde_tdelibdir}/libamarok_gst10engine_plugin.*
+# YAUAP
+%if 0%{?with_yauap}
+%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
+%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
+%endif
+# AKODE
+%if 0 && 0%{?with_akode}
+%{tde_datadir}/services/amarok_aKode-engine.desktop
+%{tde_tdelibdir}/libamarok_aKode-engine.*
+%endif
+
+##########
+
+%package konqueror
+Summary:		Amarok konqueror (service menus, sidebar) support
+Group:			Applications/Multimedia
+
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-konqueror
+
+%description konqueror
+%{summary}.
+
+%files konqueror
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%{tde_tdelibdir}/konqsidebar_universalamarok.*
+%{tde_datadir}/apps/konqsidebartng/*/amarok_konquisidebar.desktop
+
+
+##########
+
+%if 0%{?with_libvisual}
+
+%package visualisation
+Summary:		Visualisation plugins for Amarok
+Group:			Applications/Multimedia
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+# No plugins by default, we need libvisual-plugins
+#Requires:   libvisual-plugins
+
+%description visualisation
+Amarok can use visualisation plugins from different origins.
+Right now, only xmms is supported, which means that you can
+use any of xmms' visualisation plugins with Amarok.
+
+%files visualisation
+%defattr(-,root,root,-)
+%{tde_bindir}/amarok_libvisual
+%{tde_mandir}/man1/amarok_libvisual.1*
+
+%endif
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+# Fix some Ruby stuff
+if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" &>/dev/null; then
+  %__sed -i "amarok/src/mediadevice/daap/ConfigureChecks.cmake" \
+         -e "s|Config::|RbConfig::|g" \
+         -e "s|Config\.|RbConfig\.|g"
+fi
+
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
+%__sed -i "amarok/src/scripts/common/Publisher.py" \
+          "amarok/src/scripts/common/Zeroconf.py" \
+          "amarok/src/scripts/playlist2html/Playlist.py" \
+          "amarok/src/scripts/playlist2html/playlist2html.py" \
+          "amarok/src/scripts/playlist2html/PlaylistServer.py" \
+          "amarok/src/scripts/webcontrol/Playlist.py" \
+          "amarok/src/scripts/webcontrol/RequestHandler.py" \
+          "amarok/src/scripts/webcontrol/WebControl.py" \
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
+%endif
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Specific path for RHEL4
+if [ -d /usr/X11R6 ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  %{?with_libvisual:-DWITH_LIBVISUAL=ON} \
+  -DWITH_KONQSIDEBAR=ON \
+  %{?with_xine:-DWITH_XINE=ON} %{?!with_xine:-DWITH_XINE=OFF}\
+  %{?with_yauap:-DWITH_YAUAP=ON} \
+  -DWITH_AKODE=OFF \
+  %{?with_gpod:-DWITH_IPOD=ON} \
+  %{?with_ifp:-DWITH_IFP=ON} \
+  %{?with_njb:-DWITH_NJB=ON} \
+  %{?with_mtp:-DWITH_MTP=ON} \
+  %{?with_karma:-DWITH_RIOKARMA=ON} \
+  %{!?with_daap:-DWITH_DAAP=OFF} \
+  %{?with_mp4v2:-DWITH_MP4V2=ON} \
+  %{?with_inotify:-DWITH_INOTIFY=ON} \
+  -DWITH_SYSTEM_SQLITE=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+
+# unpackaged files
+%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
+# Removes '.so' to avoid automatic -devel dependency
+%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
+
+# Locales
+%find_lang %{tde_pkg}
+
+# HTML
+for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    [ "$lang" == "en" ] && d=en/amarok || d=$lang
+    echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> amarok.lang
+  fi
+done
+
+
+
+%clean
+%__rm -fr $RPM_BUILD_ROOT
+
+
+%changelog
diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec
new file mode 100644
index 000000000..c1bd4b0d3
--- /dev/null
+++ b/redhat/applications/multimedia/codeine/codeine.spec
@@ -0,0 +1,169 @@
+#
+# spec file for package kaffeine (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg codeine
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.0.1
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Simple TDE video player
+Group:			Applications/Multimedia
+URL:			http://kaffeine.sourceforge.net/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# XINE support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
+%define with_xine 1
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
+%endif
+%endif
+
+
+%description
+A video player with a different philosophy: simple, uncluttered interface
+
+Features:
+- Plays DVDs, VCDs, all video formats supported by Xine
+- Bundled with a simple web-page KPart
+- Starts quickly
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING FAQ README.md TODO
+%{tde_bindir}/codeine
+%{tde_tdeappdir}/codeine.desktop
+%{tde_datadir}/apps/codeine/
+%{tde_datadir}/apps/konqueror/servicemenus/codeine_play_dvd.desktop
+%{tde_tdedocdir}/HTML/en/codeine/
+%{tde_datadir}/icons/hicolor/*/apps/codeine.png
+%{tde_mandir}/man1/codeine.1*
+%{tde_datadir}/services/codeine_part.desktop
+%{tde_tdelibdir}/libcodeine.la
+%{tde_tdelibdir}/libcodeine.so
+
+
+%changelog
diff --git a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
new file mode 100644
index 000000000..70bb9c4ce
--- /dev/null
+++ b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
@@ -0,0 +1,433 @@
+#
+# spec file for package k3b-i18n (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg k3b-i18n
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.0.5
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Internationalization support for TDE [Trinity]
+Group:			Applications/Archiving
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:	noarch
+
+# Speed build options
+%define debug_package %{nil}
+%define __spec_install_post %{nil}
+AutoReq: no
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+Requires(post): coreutils
+Requires(postun): coreutils
+
+Requires:		trinity-k3b
+
+
+%description
+K3b provides a comfortable user interface to perform most CD/DVD
+burning tasks. While the experienced user can take influence in all
+steps of the burning process the beginner may find comfort in the
+automatic settings and the reasonable k3b defaults which allow a quick
+start.
+
+##########
+
+%package Danish
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Danish (da) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-da = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Danish
+This package contains the Danish translations for K3B.
+
+%files Danish
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/da/k3b
+%{tde_datadir}/locale/da/LC_MESSAGES/*.mo
+
+##########
+
+%package German
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		German (de) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-de = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description German
+This package contains the German translations for K3B.
+
+%files German
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/de/k3b
+%{tde_datadir}/locale/de/LC_MESSAGES/*.mo
+
+##########
+
+%package Greek
+Group:			Applications/Archiving
+Requires:		trinity-k3b >= %{version}
+Summary:		Greek (el) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-el = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Greek
+This package contains the greek translations for K3B.
+
+%files Greek
+%defattr(-,root,root,-)
+#%{tde_tdedocdir}/HTML/el/k3b
+%{tde_datadir}/locale/el/LC_MESSAGES/*.mo
+
+##########
+
+%package Spanish
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Spanish (es) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-es = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Spanish
+This package contains the Spanish translations for K3B.
+
+%files Spanish
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/es/k3b
+%{tde_datadir}/locale/es/LC_MESSAGES/*.mo
+
+##########
+
+%package Estonian
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Estonian (et) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-et = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Estonian
+This package contains the Estonian translations for K3B.
+
+%files Estonian
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/et/k3b
+%{tde_datadir}/locale/et/LC_MESSAGES/*.mo
+
+##########
+
+%package French
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		French (fr) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-fr = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description French
+This package contains the French translations for K3B.
+
+%files French
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/fr/k3b
+%{tde_datadir}/locale/fr/LC_MESSAGES/*.mo
+
+##########
+
+%package Italian
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Italian (it) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-it = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Italian
+This package contains the Italian translations for K3B.
+
+%files Italian
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/it/k3b
+%{tde_datadir}/locale/it/LC_MESSAGES/*.mo
+
+##########
+
+%package Dutch
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Dutch (nl) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-nl = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Dutch
+This package contains the Dutch translations for K3B.
+
+%files Dutch
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/nl/k3b
+%{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
+
+##########
+
+%package Polish
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Polish (pl) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-pl = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Polish
+This package contains the Polish translations for K3B.
+
+%files Polish
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/pl/k3b
+%{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
+
+##########
+
+%package Portuguese
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Portuguese (pt) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-pt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Portuguese
+This package contains the Portuguese translations for K3B.
+
+%files Portuguese
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/pt/k3b
+%{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
+
+##########
+
+%package Brazil
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Brazilian Portuguese (pt_BR) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-pt_BR < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-k3b-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-ptbr = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Brazil
+This package contains the Brazilian Portuguese translations for K3B.
+
+%files Brazil
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/pt_BR/k3b
+%{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo
+
+##########
+
+%package Russian
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Russian (ru) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-ru = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Russian
+This package contains the Russian translations for K3B.
+
+%files Russian
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/ru/k3b
+%{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
+
+##########
+
+%package Swedish
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Swedish (sv) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-sv = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Swedish
+This package contains the Swedish translations for K3B.
+
+%files Swedish
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/sv/k3b
+%{tde_datadir}/locale/sv/LC_MESSAGES/*.mo
+
+##########
+
+%package Ukrainian
+Group:			Applications/Archiving
+Requires:		trinity-k3b
+Summary:		Ukrainian (uk) translations for K3B [Trinity]
+
+Obsoletes:		trinity-k3b-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-k3b-i18n-uk = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Ukrainian
+This package contains the Ukrainian translations for K3B.
+
+%files Ukrainian
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/uk/k3b
+%{tde_datadir}/locale/uk/LC_MESSAGES/*.mo
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%__rm -rf %{buildroot}%{tde_datadir}/locale/af
+%__rm -rf %{buildroot}%{tde_datadir}/locale/ar
+%__rm -rf %{buildroot}%{tde_datadir}/locale/bg
+%__rm -rf %{buildroot}%{tde_datadir}/locale/br
+%__rm -rf %{buildroot}%{tde_datadir}/locale/bs
+%__rm -rf %{buildroot}%{tde_datadir}/locale/ca
+%__rm -rf %{buildroot}%{tde_datadir}/locale/cs
+%__rm -rf %{buildroot}%{tde_datadir}/locale/cy
+%__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB
+%__rm -rf %{buildroot}%{tde_datadir}/locale/eu
+%__rm -rf %{buildroot}%{tde_datadir}/locale/fa
+%__rm -rf %{buildroot}%{tde_datadir}/locale/fi
+%__rm -rf %{buildroot}%{tde_datadir}/locale/ga
+%__rm -rf %{buildroot}%{tde_datadir}/locale/gl
+%__rm -rf %{buildroot}%{tde_datadir}/locale/he
+%__rm -rf %{buildroot}%{tde_datadir}/locale/hi
+%__rm -rf %{buildroot}%{tde_datadir}/locale/hu
+%__rm -rf %{buildroot}%{tde_datadir}/locale/is
+%__rm -rf %{buildroot}%{tde_datadir}/locale/ja
+%__rm -rf %{buildroot}%{tde_datadir}/locale/ka
+%__rm -rf %{buildroot}%{tde_datadir}/locale/km
+%__rm -rf %{buildroot}%{tde_datadir}/locale/lt
+%__rm -rf %{buildroot}%{tde_datadir}/locale/mk
+%__rm -rf %{buildroot}%{tde_datadir}/locale/ms
+%__rm -rf %{buildroot}%{tde_datadir}/locale/nb
+%__rm -rf %{buildroot}%{tde_datadir}/locale/nds
+%__rm -rf %{buildroot}%{tde_datadir}/locale/ne
+%__rm -rf %{buildroot}%{tde_datadir}/locale/nn
+%__rm -rf %{buildroot}%{tde_datadir}/locale/pa
+%__rm -rf %{buildroot}%{tde_datadir}/locale/rw
+%__rm -rf %{buildroot}%{tde_datadir}/locale/se
+%__rm -rf %{buildroot}%{tde_datadir}/locale/sk
+%__rm -rf %{buildroot}%{tde_datadir}/locale/sr
+%__rm -rf %{buildroot}%{tde_datadir}/locale/sr@Latn
+%__rm -rf %{buildroot}%{tde_datadir}/locale/ta
+%__rm -rf %{buildroot}%{tde_datadir}/locale/tr
+%__rm -rf %{buildroot}%{tde_datadir}/locale/uz
+%__rm -rf %{buildroot}%{tde_datadir}/locale/uz@cyrillic
+%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_CN
+%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_TW
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec
new file mode 100644
index 000000000..7500a19ca
--- /dev/null
+++ b/redhat/applications/multimedia/k3b/k3b.spec
@@ -0,0 +1,480 @@
+#
+# spec file for package k3b (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg k3b
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.0.5
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		CD/DVD burning application
+Group:			Applications/Archiving
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	alsa-lib-devel
+BuildRequires:	audiofile-devel
+BuildRequires:	gettext
+BuildRequires:	libmpcdec-devel
+BuildRequires:	libvorbis-devel
+BuildRequires:	taglib-devel
+BuildRequires:	zlib-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# ATTR support
+BuildRequires:	libattr-devel
+
+Requires(post): coreutils
+Requires(postun): coreutils
+
+Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29
+Requires:		wodim
+REquires:		genisoimage
+%else
+Requires:		cdrecord
+REquires:		mkisofs
+%endif
+Requires:		dvd+rw-tools
+
+# CDRDAO support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5
+Requires:		cdrdao
+%endif
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires:	libudev-devel
+%endif
+
+# HAL support
+%if 0%{?rhel} == 5
+%define with_hal 0
+BuildRequires:	hal-devel
+%endif
+
+# DBUS support
+#  TQT bindings not available for RHEL4
+%if 0%{?rhel} == 4
+# Dbus bindings were rebuilt with Qt support
+BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
+Requires:		dbus-qt >= 0.22-12.EL.9p1
+%else
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+Requires:		trinity-dbus-tqt >= 1:0.63
+%endif
+
+# SNDFILE support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
+%define with_sndfile 1
+BuildRequires:	libsndfile-devel
+%endif
+
+# SAMPLERATE support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
+%define with_samplerate 1
+BuildRequires:	libsamplerate-devel
+%endif
+
+# DVDREAD support
+%define with_dvdread 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}dvdread-devel
+%else
+BuildRequires:	libdvdread-devel
+%endif
+
+# FLAC support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:	libflac-devel
+BuildRequires:	libflac++-devel
+%else
+BuildRequires:	%{_lib}flac-devel
+BuildRequires:	%{_lib}flac++-devel
+%endif
+%else
+BuildRequires:	flac-devel
+%endif
+
+# MAD support
+%ifarch %{ix86} x86_64
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%define with_libmad 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}mad-devel
+%endif
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+BuildRequires:	libmad-devel
+%endif
+%endif
+%endif
+
+# LAME support
+%if 0%{?opensuse_bs} == 0
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%define with_lame 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:	liblame-devel
+%else
+%if 0%{?mgaversion} >= 6
+BuildRequires:		%{_lib}mp3lame-devel
+%else
+BuildRequires:		%{_lib}lame-devel
+%endif
+%endif
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libmp3lame-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:	lame-devel
+%endif
+%endif
+%endif
+
+# FFMPEG support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%define with_ffmpeg 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}ffmpeg-devel
+%endif
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+BuildRequires:	ffmpeg-devel
+%endif
+%endif
+
+
+%description
+K3b provides a comfortable user interface to perform most CD/DVD
+burning tasks. While the experienced user can take influence in all
+steps of the burning process the beginner may find comfort in the
+automatic settings and the reasonable k3b defaults which allow a quick
+start.
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS README COPYING TODO ChangeLog
+%{tde_bindir}/k3b
+%{tde_tdelibdir}/tdefile_k3b.la
+%{tde_tdelibdir}/tdefile_k3b.so
+%{tde_tdelibdir}/tdeio_videodvd.la
+%{tde_tdelibdir}/tdeio_videodvd.so
+%{tde_tdelibdir}/libk3balsaoutputplugin.la
+%{tde_tdelibdir}/libk3balsaoutputplugin.so
+%{tde_tdelibdir}/libk3bartsoutputplugin.la
+%{tde_tdelibdir}/libk3bartsoutputplugin.so
+%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la
+%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so
+%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la
+%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so
+%{tde_tdelibdir}/libk3bexternalencoder.la
+%{tde_tdelibdir}/libk3bexternalencoder.so
+%{tde_tdelibdir}/libk3bflacdecoder.la
+%{tde_tdelibdir}/libk3bflacdecoder.so
+%if 0%{?with_sndfile}
+%{tde_tdelibdir}/libk3blibsndfiledecoder.la
+%{tde_tdelibdir}/libk3blibsndfiledecoder.so
+%endif
+%{tde_tdelibdir}/libk3bmpcdecoder.la
+%{tde_tdelibdir}/libk3bmpcdecoder.so
+%{tde_tdelibdir}/libk3boggvorbisdecoder.la
+%{tde_tdelibdir}/libk3boggvorbisdecoder.so
+%{tde_tdelibdir}/libk3boggvorbisencoder.la
+%{tde_tdelibdir}/libk3boggvorbisencoder.so
+%{tde_tdelibdir}/libk3bsoxencoder.la
+%{tde_tdelibdir}/libk3bsoxencoder.so
+%{tde_tdelibdir}/libk3bwavedecoder.la
+%{tde_tdelibdir}/libk3bwavedecoder.so
+%lang(en) %{tde_tdedocdir}/HTML/en/k3b/
+%{tde_mandir}/man1/k3b.1*
+
+##########
+
+%package common
+Summary:		Common files of %{name}
+Group:			Applications/Archiving
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
+BuildArch: noarch
+%endif
+
+%description common
+%{summary}.
+
+%files common
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/k3b.desktop
+%{tde_datadir}/applnk/.hidden/k3b-cue.desktop
+%{tde_datadir}/apps/k3b/
+%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
+%{tde_datadir}/mimelnk/application/x-k3b.desktop
+%{tde_datadir}/icons/hicolor/*/apps/k3b.png
+%{tde_datadir}/services/tdefile_k3b.desktop
+%{tde_datadir}/services/videodvd.protocol
+%{tde_datadir}/sounds/k3b_error1.wav
+%{tde_datadir}/sounds/k3b_success1.wav
+%{tde_datadir}/sounds/k3b_wait_media1.wav
+%{tde_tdedocdir}/HTML/en/tdeioslave/videodvd/
+
+##########
+
+%package libs
+Summary:		Runtime libraries for %{name}
+Group:			System Environment/Libraries
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libs
+%{summary}.
+
+%files libs
+%defattr(-,root,root,-)
+%{tde_libdir}/libk3b.so.3
+%{tde_libdir}/libk3b.so.3.0.0
+%{tde_libdir}/libk3bdevice.so.5
+%{tde_libdir}/libk3bdevice.so.5.0.0
+
+##########
+
+%package devel
+Summary:		Files for the development of applications which will use %{name} 
+Group:			Development/Libraries
+Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+%{summary}.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*.h
+%{tde_libdir}/libk3b.so
+%{tde_libdir}/libk3bdevice.so
+
+##########
+
+%if 0%{?with_libmad}
+%package plugin-mad
+Summary:		The MAD plugin for K3B
+Group:			System Environment/Libraries
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-mad
+%{summary}.
+
+MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
+and the MPEG-2  extension to Lower Sampling Frequencies, as well as the
+so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
+and Layer III a.k.a. MP3) are fully implemented.
+
+%files plugin-mad
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/libk3bmaddecoder.la
+%{tde_tdelibdir}/libk3bmaddecoder.so
+%endif
+
+##########
+
+%if 0%{?with_lame}
+%package plugin-lame
+Summary:		The LAME plugin for K3B
+Group:			System Environment/Libraries
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-lame
+%{summary}.
+
+Personal and commercial use of compiled versions of LAME (or any other mp3
+encoder) requires a patent license in some countries.
+
+This package is in tainted, as MP3 encoding is covered by software patents.
+
+%files plugin-lame
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/libk3blameencoder.la
+%{tde_tdelibdir}/libk3blameencoder.so
+%endif
+
+##########
+
+%if 0%{?with_ffmpeg}
+%package plugin-ffmpeg
+Summary:		The FFMPEG plugin for K3B
+Group:			System Environment/Libraries
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugin-ffmpeg
+%{summary}.
+
+ffmpeg is a hyper fast realtime audio/video encoder, a streaming server
+and a generic audio and video file converter.
+
+%files plugin-ffmpeg
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/libk3bffmpegdecoder.la
+%{tde_tdelibdir}/libk3bffmpegdecoder.so
+%endif
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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:${PKG_CONFIG_PATH}"
+
+%if 0%{?rhel} == 7
+RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11"
+%endif
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS="ON" \
+  -DWITH_MUSICBRAINZ="OFF" \
+  -DWITH_FFMPEG_ALL_CODECS="ON" \
+  -DWITH_MUSEPACK="ON" \
+  -DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \
+  -DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \
+%if 0%{?rhel} == 5
+  -DWITH_HAL="ON" \
+%endif
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+# remove the .la files
+%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/multimedia/k3b/k3brc
index 5d967f599..5d967f599 100644
--- a/redhat/applications/k3b/k3brc
+++ b/redhat/applications/multimedia/k3b/k3brc
diff --git a/redhat/applications/k3b/trinity-k3b-rpmlintrc b/redhat/applications/multimedia/k3b/trinity-k3b-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/k3b/trinity-k3b-rpmlintrc
+++ b/redhat/applications/multimedia/k3b/trinity-k3b-rpmlintrc
diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec
new file mode 100644
index 000000000..20a351632
--- /dev/null
+++ b/redhat/applications/multimedia/k9copy/k9copy.spec
@@ -0,0 +1,192 @@
+#
+# spec file for package k9copy (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg k9copy
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.2.3
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		DVD backup tool for Trinity
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-k3b-devel
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# Warning: the target distribution must have ffmpeg !
+BuildRequires:	ffmpeg-devel
+Requires:		ffmpeg
+
+# DVDREAD support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}dvdread-devel
+%else
+BuildRequires:	libdvdread-devel
+%endif
+
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-Mesa-libGLU
+%endif
+
+
+%description
+k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
+to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
+This is the Trinity version.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+# Removes internal dvdread headers
+%__rm -rf "dvdread"
+
+# Fix permissions on doc files
+chmod -x AUTHORS COPYING
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+# FFMPEG ...
+if [ -d /usr/include/ffmpeg ]; then
+  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
+fi
+ 
+# NOTICE: --enable-final causes FTBFS !
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
+  --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --disable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  --enable-k3bdevices
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/k9copy
+%{tde_tdeappdir}/k9copy.desktop
+%{tde_datadir}/apps/k9copy/
+%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop
+%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/
+%{tde_datadir}/icons/hicolor/*/apps/k9copy.png
+%{tde_mandir}/man1/k9copy.1*
+
+
+%changelog
diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
new file mode 100644
index 000000000..f17d087bb
--- /dev/null
+++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
@@ -0,0 +1,161 @@
+#
+# spec file for package kaffeine-mozilla (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
+%define tde_pkg kaffeine-mozilla
+%define tde_prefix /opt/trinity
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+
+# TDE specific building variables
+%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}
+
+%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
+%define debug_package %{nil}
+%endif
+
+Name:			trinity-%{tde_pkg}
+Summary:		mozilla plugin that lanches kaffeine for supported media types [Trinity]
+Version:		0.4.3.1
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+
+License:		GPLv2+
+Group:			Applications/Multimedia
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org/
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+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
+
+%if 0%{?suse_version}
+BuildRequires:	mozilla-nspr-devel
+%else
+BuildRequires:	nspr-devel
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xaw-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXaw-devel
+%endif
+
+Requires:		trinity-kaffeine
+
+%description
+This mozilla plugin launches kaffeine, the xine-based media player for TDE,
+when a page containing a supported media format is loaded.
+
+
+%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}"
+
+if [ -d "%{_includedir}/nspr4" ]; then
+  RPM_OPT_FLAGS="-I%{_includedir}/nspr4 ${RPM_OPT_FLAGS}"
+fi
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Remove useless filess
+%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING
+# These files are installed outside TDE prefix
+%dir %{_libdir}/mozilla
+%dir %{_libdir}/mozilla/plugins
+%{_libdir}/mozilla/plugins/kaffeineplugin.la
+%{_libdir}/mozilla/plugins/kaffeineplugin.so
+
+
+%changelog
diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec
new file mode 100644
index 000000000..51d127d5a
--- /dev/null
+++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec
@@ -0,0 +1,334 @@
+#
+# spec file for package kaffeine (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kaffeine
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.8.8
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Xine-based media player
+Group:			Applications/Multimedia
+URL:			http://kaffeine.sourceforge.net/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# VORBIS support
+BuildRequires:	libvorbis-devel
+
+# CDDA support
+BuildRequires:	libcdio-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libcdda-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	cdparanoia
+BuildRequires:	cdparanoia-devel
+%endif
+%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildRequires:	libcdio-paranoia-devel
+%endif
+
+# X11 stuff
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xext-devel
+BuildRequires:	%{_lib}xtst-devel
+BuildRequires:	%{_lib}xinerama-devel
+%else
+BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
+BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
+BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel 
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXext-devel 
+BuildRequires:	libXtst-devel
+BuildRequires:	libXinerama-devel
+%endif
+
+# XCB support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+%define with_xcb 1
+%endif
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
+BuildRequires:	libxcb-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+BuildRequires:	%{_lib}xcb-devel
+%endif
+%endif
+%endif
+
+# GSTREAMER support
+%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gstreamer 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}gstreamer1.0-devel
+BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version}
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-base-devel
+%endif
+%if 0%{?rhel} >= 7 || 0%{?fedora}
+BuildRequires:	gstreamer1-devel >= 1.0
+BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
+%endif
+%endif
+
+# XINE support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
+%define with_xine 1
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
+%endif
+%endif
+
+# LAME support
+%if 0%{?opensuse_bs} == 0
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel}
+%define with_lame 1
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:		liblame-devel
+%else
+%if 0%{?mgaversion} >= 6
+BuildRequires:		%{_lib}mp3lame-devel
+%else
+BuildRequires:		%{_lib}lame-devel
+%endif
+%endif
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libmp3lame-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:	lame-devel
+%endif
+%endif
+%endif
+
+# DVB support
+%if 0%{?rhel} != 5
+%define with_dvb 1
+%endif
+
+# WTF support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+BuildRequires:	kernel-headers
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	glibc-kernheaders 
+%endif
+
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+Kaffeine is a xine-based media player for TDE.  It plays back CDs,
+and VCDs, and can decode all (local or streamed) multimedia formats 
+supported by xine-lib.
+Additionally, Kaffeine is fully integrated in TDE, it supports drag
+and drop and provides an editable playlist, a bookmark system, a
+Konqueror plugin, OSD and much more.
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.md TODO
+%{tde_bindir}/kaffeine
+%{tde_libdir}/libkaffeinepart.so
+%{tde_tdelibdir}/lib*.*
+%{tde_datadir}/appl*/*/*.desktop
+%if 0%{?with_gstreamer}
+%{tde_datadir}/apps/gstreamerpart/
+%endif
+%{tde_datadir}/apps/kaffeine/
+%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%{tde_datadir}/apps/profiles/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/mimelnk/*/*.desktop
+%{tde_datadir}/service*/*.desktop
+%{tde_tdedocdir}/HTML/en/kaffeine/
+%{tde_mandir}/man1/kaffeine.1*
+
+##########
+
+%package devel
+Summary:		Development files for %{name}
+Group:			Development/Libraries
+Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-tdelibs-devel
+
+%description devel
+%{summary}.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kaffeine/
+%{tde_libdir}/lib*.so
+%exclude %{tde_libdir}/libkaffeinepart.so
+
+##########
+
+%package libs
+Summary:		%{name} runtime libraries
+Group:			System Environment/Libraries
+
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libs
+%{summary}.
+
+%files libs
+%defattr(-,root,root,-)
+%{tde_libdir}/lib*.so.*
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  %{?!with_dvb:-DWITH_DVB=OFF} \
+  %{?!with_lame:-DWITH_LAME=OFF} \
+  %{?!with_xcb:-DWITH_XCB=OFF} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=%{buildroot} -C build
+
+## File lists
+# locale's
+%find_lang %{tde_pkg}
+
+# Unpackaged files
+rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
+rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
diff --git a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc b/redhat/applications/multimedia/kaffeine/trinity-kaffeine-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc
+++ b/redhat/applications/multimedia/kaffeine/trinity-kaffeine-rpmlintrc
diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec
new file mode 100644
index 000000000..bf956c1de
--- /dev/null
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec
@@ -0,0 +1,319 @@
+#
+# spec file for package kmplayer (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kmplayer
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.10.0c
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Media player for Trinity
+Group:		Applications/Multimedia
+URL:		http://www.trinitydesktop.org/
+#URL:		http://kmplayer.kde.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# DBUS support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
+%endif
+
+# GSTREAMER support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}gstreamer1.0-devel
+BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version}
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-base-devel
+%endif
+%if 0%{?rhel} >= 7 || 0%{?fedora}
+BuildRequires:	gstreamer1-devel >= 1.0
+BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
+%endif
+
+# XINE support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
+%define with_xine 1
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
+%endif
+%endif
+
+# X11 stuff
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libxt-devel
+BuildRequires:	libxv-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires:	libXv-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel 
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libXv-devel
+%endif
+
+# GTK2 stuff
+BuildRequires:	gtk2-devel
+
+# DBUS stuff
+%if 0%{?suse_version}
+BuildRequires:	dbus-1-glib-devel
+%else
+BuildRequires:	dbus-glib-devel
+%endif
+
+# NSPR support
+%if 0%{?suse_version}
+BuildRequires:	mozilla-nspr-devel
+%else
+BuildRequires:	nspr-devel
+%endif
+
+# Koffice support
+BuildRequires:	trinity-koffice-devel
+
+Requires:		%{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+A basic audio/video viewer application for Trinity.
+
+KMPlayer can:
+* play DVD (DVDNav only with the Xine player)
+* play VCD
+* let the backend players play from a pipe (read from stdin)
+* play from a TV device (experimental)
+* show backend player's console output
+* launch ffserver (only 0.4.8 works) when viewing from a v4l device
+* DCOP KMediaPlayer interface support
+* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
+  shortcut configure window
+* Lots of configurable shortcuts. Highly recommended for the VDR keys
+  (if you have VDR) and volume increase/decrease
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog INSTALL README.md TODO
+%{tde_bindir}/kmplayer
+%{tde_bindir}/knpplayer
+%{tde_bindir}/kxvplayer
+%{tde_datadir}/services/kmplayer_koffice.desktop
+%{tde_libdir}/libkmplayercommon.so.1
+%{tde_libdir}/libkmplayercommon.so.1.0.0
+%{tde_libdir}/libtdeinit_kmplayer.la
+%{tde_libdir}/libtdeinit_kmplayer.so
+%{tde_tdelibdir}/kmplayer.la
+%{tde_tdelibdir}/kmplayer.so
+%{tde_tdelibdir}/libkmplayerkofficepart.la
+%{tde_tdelibdir}/libkmplayerkofficepart.so
+%{tde_tdeappdir}/kmplayer.desktop
+
+%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
+%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
+%exclude %{tde_datadir}/apps/kmplayer/noise.gif
+%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo
+%{tde_datadir}/apps/kmplayer/
+
+##########
+
+%package base
+Group:			Applications/Multimedia
+Summary:		Base files for KMPlayer [Trinity]
+
+%description base
+Core files needed for KMPlayer.
+
+%files base
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmplayercommon.la
+%{tde_libdir}/libkmplayercommon.so
+%{tde_bindir}/kgstplayer
+%{tde_bindir}/kxineplayer
+%dir %{tde_datadir}/config
+%config(noreplace) %{tde_datadir}/config/kmplayerrc
+%{tde_datadir}/apps/kmplayer/bookmarks.xml
+%{tde_datadir}/apps/kmplayer/noise.gif
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
+%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
+%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
+%{tde_mandir}/man1/kmplayer.1*
+
+##########
+
+%package konq-plugins
+Group:			Applications/Multimedia
+Requires:		%{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-konqueror >= %{tde_version}
+Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
+
+%description konq-plugins
+This plugin enables audio/video playback inside konqueror, using Xine (with
+*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
+tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
+browser plugins.
+
+%files konq-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/libkmplayerpart.la
+%{tde_tdelibdir}/libkmplayerpart.so
+%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
+%{tde_datadir}/apps/kmplayer/pluginsinfo
+%{tde_datadir}/services/kmplayer_part.desktop
+
+##########
+
+%package doc
+Group:			Applications/Multimedia
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:		Handbook for KMPlayer [Trinity]
+
+%description doc
+Documention for KMPlayer, a basic audio/video viewer application for TDE.
+
+%files doc
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/*/kmplayer
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Removes unwanted files
+%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/multimedia/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec
new file mode 100644
index 000000000..8d6c4ff50
--- /dev/null
+++ b/redhat/applications/multimedia/kplayer/kplayer.spec
@@ -0,0 +1,188 @@
+#
+# spec file for package kplayer (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kplayer
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.6.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	KPlayer is a TDE multimedia player
+Group:		Applications/Multimedia
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Requires:		mplayer
+
+
+%description
+KPlayer is a TDE multimedia player.
+With KPlayer you can easily play a wide variety of video and audio  files and
+streams using a rich and friendly interface that follows KDE standards.
+This version was derived from the KDE3 branch 0.6.3 for the Trinity Desktop Environment
+
+Features include
+
+video, audio and subtitle playback from file, URL, DVD, VCD, audio CD, TV, DVB, and KDE I/O Slaves;
+volume, contrast, brightness, hue and saturation controls;
+zooming, full screen and fixed aspect options;
+status and progress display and seeking;
+multimedia library to organize your media files and streams;
+configuration dialog;
+file properties for setting file specific options.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  -DPLUGIN_INSTALL_DIR=%{tde_tdelibdir} \
+  -DBUILD_ALL=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_bindir}/kplayer
+%{tde_datadir}/apps/kplayer/
+%{tde_datadir}/icons/hicolor/*/apps/kplayer.png
+%{tde_datadir}/icons/locolor/*/apps/kplayer.png
+%{tde_datadir}/services/kplayerpart.desktop
+%{tde_tdelibdir}/libkplayerpart.la
+%{tde_tdelibdir}/libkplayerpart.so
+%{tde_tdeappdir}/kplayer.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/kplayer-actions.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/kplayer-directory.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/kplayer-next.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/kplayer-play-queue.desktop
+%lang(da) %{tde_tdedocdir}/HTML/da/kplayer/
+%lang(en) %{tde_tdedocdir}/HTML/en/kplayer/
+%lang(es) %{tde_tdedocdir}/HTML/es/kplayer/
+%lang(it) %{tde_tdedocdir}/HTML/it/kplayer/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/kplayer/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/kplayer/
+
+
+%post
+
+
+%postun
+
+
+%changelog
diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
new file mode 100644
index 000000000..a613b826b
--- /dev/null
+++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
@@ -0,0 +1,170 @@
+#
+# spec file for package mplayerthumbs (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg mplayerthumbs
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.5b
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	A video thumbnail generator for TDE file managers
+Group:		Applications/Multimedia
+URL:		http://kde-apps.org/content/show.php?content=41180
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# MPLAYER support
+Requires:		mplayer
+
+
+%description
+MPlayerThumbs is a video thumbnail generator for TDE file managers 
+(Konqueror, Dolphin, ...).
+It needs mplayer (of course) to generate thumbnails, and it contains no 
+linking to any library, so in a x86_64 system you can freely use the 
+32bit mplayer binary with win32codecs by configuring the application 
+launching the mplayerthumbsconfig helper application.
+It catches a random frame from 15% to 70%, checking also how contrasted 
+is the image, and dropping bad frames.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.md
+%{tde_bindir}/mplayer-thumbnailer-config
+%{tde_tdelibdir}/mplayer-thumbnailer.la
+%{tde_tdelibdir}/mplayer-thumbnailer.so
+%{tde_datadir}/apps/mplayer-thumbnailer/
+%{tde_datadir}/apps/tdeconf_update/mplayer-thumbnailer-cfg-rename.upd
+%{tde_datadir}/config.kcfg/mplayer-thumbnailer.kcfg
+%{tde_datadir}/services/mplayer-thumbnailer.desktop
+%{tde_tdedocdir}/HTML/en/mplayer-thumbnailer/
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/mplayer-thumbnailer.mo
+
+
+%changelog
diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec
new file mode 100644
index 000000000..b8cae72de
--- /dev/null
+++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec
@@ -0,0 +1,259 @@
+#
+# spec file for package rosegarden (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg rosegarden
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.7.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Music editor and MIDI/audio sequencer [Trinity]
+Group:		Applications/Multimedia
+URL:		http://www.rosegardenmusic.com/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	fftw-devel
+BuildRequires:	liblo-devel
+BuildRequires:	fontconfig-devel
+
+# DSSI support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	dssi-devel
+%endif
+
+# LRDF support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	liblrdf-devel
+%endif
+
+# JACK support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}jack-devel
+%else
+BuildRequires:	jack-audio-connection-kit-devel
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# LIRC support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
+%define with_lirc 1
+BuildRequires:	lirc-devel
+%endif
+
+# IDN support
+BuildRequires:  libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:  gamin-devel
+%endif
+
+Requires:		lilypond
+Requires:		perl-XML-Twig
+
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+Requires:		libsndfile-progs
+%else
+%if 0%{?rhel}
+Requires:		libsndfile
+%else
+Requires:		libsndfile-utils
+%endif
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+Rosegarden is a TDE application which provides a mixed Audio/MIDI
+sequencer (for playback and recording), a multi-track editor, music
+editing using both piano-roll and score notation, MIDI file IO,
+lilypond and Csound files export, etc.
+
+%package data
+Group:			Applications/Multimedia
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:		music editor and MIDI/audio sequencer data files [Trinity]
+
+%description data
+Rosegarden is a TDE application which provides a mixed Audio/MIDI
+sequencer (for playback and recording), a multi-track editor, music
+editing using both piano-roll and score notation, MIDI file IO,
+lilypond and Csound files export, etc.
+
+This package provides the data files necessary for running Rosegarden
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWANT_SOUND=ON \
+  -DWANT_JACK=ON \
+  -DWANT_DSSI=ON \
+  %{?with_lirc:-DWANT_LIRC=ON} %{?!with_lirc:-DWANT_LIRC=OFF} \
+  -DWANT_PCH=OFF \
+  -DWANT_TEST=OFF \
+  -DWANT_DEBUG=OFF \
+  -DWANT_FULLDBG=OFF \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/*.a
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/rosegarden
+%{tde_bindir}/rosegarden-audiofile-importer
+%{tde_bindir}/rosegarden-lilypondview
+%{tde_bindir}/rosegarden-project-package
+%{tde_bindir}/rosegardensequencer
+%{tde_mandir}/man1/rosegarden-audiofile-importer.1*
+%{tde_mandir}/man1/rosegarden-lilypondview.1*
+%{tde_mandir}/man1/rosegarden-project-package.1*
+%{tde_mandir}/man1/rosegarden.1*
+
+%files data -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/rosegarden.desktop
+%{tde_datadir}/apps/profiles/rosegarden.profile.xml
+%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden
+%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden
+%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden
+%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden
+%{tde_datadir}/apps/rosegarden
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/icons/locolor/*/*/*
+%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop
+%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop
+%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop
+%{tde_datadir}/mimelnk/audio/x-soundfont.desktop
+
+
+%changelog
diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
new file mode 100644
index 000000000..ee2c4eec2
--- /dev/null
+++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
@@ -0,0 +1,209 @@
+#
+# spec file for package soundkonverter (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg soundkonverter
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.3.8
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Audio converter frontend for Trinity
+Group:		Application/Multimedia
+URL:		http://potracegui.sourceforge.net
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# TAGLIB support
+BuildRequires:	taglib-devel
+
+# CDDA support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libcdda-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	cdparanoia-devel
+%endif
+
+
+%description
+soundKonverter is a frontend to various audio converters.
+
+The key features are:
+ - Audio conversion
+ - Replay Gain calculation
+ - CD ripping
+
+soundKonverter supports reading and writing tags for many formats, so the tags
+are preserved when converting files.
+
+It comes with an Amarok script.
+
+See 'soundkonverter-amarok' package for more informations.
+
+See README.Debian for more informations on supported formats.
+
+
+%package amarok
+Summary:		audio converter frontend for Trinity (Amarok script)
+Group:			Application/Multimedia
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-amarok
+
+%description amarok
+Amarok script for soundKonverter. It allows you to easily transcode files when
+transferring them to your media device.
+
+See the 'trinity-soundkonverter' package for more information.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --program-prefix="" \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+   
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{tde_bindir}/soundkonverter
+%{tde_bindir}/userscript.sh
+%{tde_tdeappdir}/soundkonverter.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
+%{tde_datadir}/apps/soundkonverter
+%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/
+%{tde_tdedocdir}/HTML/en/soundkonverter/
+%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
+%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
+%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
+%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
+%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
+%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
+%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
+%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
+
+%files amarok
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/soundkonverter/amarokscript/
+
+
+%changelog
diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec
new file mode 100644
index 000000000..048f24c87
--- /dev/null
+++ b/redhat/applications/multimedia/tderadio/tderadio.spec
@@ -0,0 +1,233 @@
+#
+# spec file for package tderadio (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/
+#
+
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_lirc 1
+%endif
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tderadio
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1.1.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Comfortable Radio Application for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	libsndfile-devel
+%{?with_lirc:BuildRequires:	lirc-devel}
+
+# LAME support
+%if 0%{?opensuse_bs} == 0
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel}
+%define with_lame 1
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:		liblame-devel
+%else
+%if 0%{?mgaversion} >= 6
+BuildRequires:		%{_lib}mp3lame-devel
+%else
+BuildRequires:		%{_lib}lame-devel
+%endif
+%endif
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libmp3lame-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:	lame-devel
+%endif
+%endif
+%endif
+
+Obsoletes:		trinity-kradio < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kradio = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+TDERadio is a comfortable radio application for Trinity with support for 
+V4L and V4L2 radio cards drivers.
+
+TDERadio currently provides
+
+ * V4L/V4L2 radio support
+%if 0%{?with_lirc}
+ * Remote control support (LIRC)
+%endif
+ * Alarms, sleep Countdown
+ * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display)
+ * Recording capabilities, including MP3 and Ogg/Vorbis encoding
+ * Timeshifter functionality
+ * Extendable plugin architecture
+
+This package also includes a growing collection of station preset
+files for many cities around the world contributed by TDERadio users.
+
+As TDERadio is based on an extendable plugin architecture, contributions
+of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
+%endif
+
+# Remove devel files
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.la
+%__rm -f %{?buildroot}%{tde_libdir}/libtderadio.so
+
+# Remove pixmas
+%__rm -fr %{?buildroot}%{tde_datadir}/pixmaps/
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/convert-presets
+%{tde_bindir}/tderadio
+%{tde_libdir}/libtderadio.so.0
+%{tde_libdir}/libtderadio.so.0.0.0
+%dir %{tde_libdir}/tderadio
+%dir %{tde_libdir}/tderadio/plugins
+%{tde_libdir}/tderadio/plugins/*.la
+%{tde_libdir}/tderadio/plugins/*.so
+%{tde_tdeappdir}/tderadio.desktop
+%{tde_datadir}/apps/tderadio/
+%dir %{tde_datadir}/icons/hicolor/256x256
+%dir %{tde_datadir}/icons/hicolor/256x256/actions
+%{tde_datadir}/icons/hicolor/*/*/tderadio*.png
+%{tde_datadir}/icons/locolor/*/*/tderadio*.png
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
+%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
+%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
+%{tde_tdedocdir}/HTML/en/tderadio/
+%{tde_mandir}/man1/convert-presets.1*
+%{tde_mandir}/man1/tderadio.1*
+
+
+%changelog
diff --git a/redhat/applications/office/basket/basket.spec b/redhat/applications/office/basket/basket.spec
new file mode 100644
index 000000000..42e1df681
--- /dev/null
+++ b/redhat/applications/office/basket/basket.spec
@@ -0,0 +1,193 @@
+#
+# spec file for package basket (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg basket
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.3.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Taking care of your ideas
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
+BuildRequires:	trinity-kontact-devel >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	gpgme-devel
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+This application is mainly an all-purpose notes taker. It provide several baskets where
+to drop every sort of items: text, rich text, links, images, sounds, files, colors,
+application launcher... Objects can be edited, copied, dragged... So, you can arrange
+them as you want ! This application can be used to quickly drop web objects (link, text,
+images...) or notes, as well as to free your clutered desktop (if any). It is also useful
+to collect informations for a report. Those data can be shared with co-workers by exporting
+baskets to HTML.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Extended Clipboard" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
+%endif
+
+# Apps that should stay in TDE
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/basket
+%{tde_tdeappdir}/basket.desktop
+%{tde_datadir}/apps/basket/
+%dir %{tde_datadir}/apps/kontact/ksettingsdialog
+%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
+%{tde_libdir}/libbasketcommon.la
+%{tde_libdir}/libbasketcommon.so
+%{tde_tdelibdir}/basketthumbcreator.la
+%{tde_tdelibdir}/basketthumbcreator.so
+%{tde_tdelibdir}/kcm_basket.la
+%{tde_tdelibdir}/kcm_basket.so
+%{tde_tdelibdir}/libbasketpart.la
+%{tde_tdelibdir}/libbasketpart.so
+%{tde_tdelibdir}/libkontact_basket.la
+%{tde_tdelibdir}/libkontact_basket.so
+%config(noreplace) %{tde_confdir}/magic/basket.magic
+%{tde_datadir}/icons/crystalsvg/*/*/*
+%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
+%{tde_datadir}/mimelnk/application/x-basket-template.desktop
+%{tde_datadir}/services/basket_config_apps.desktop
+%{tde_datadir}/services/basket_config_baskets.desktop
+%{tde_datadir}/services/basket_config_general.desktop
+%{tde_datadir}/services/basket_config_new_notes.desktop
+%{tde_datadir}/services/basket_config_notes_appearance.desktop
+%{tde_datadir}/services/basket_part.desktop
+%{tde_datadir}/services/basketthumbcreator.desktop
+%{tde_datadir}/services/kontact/basket.desktop
+%{tde_tdedocdir}/HTML/en/basket/
+%config(noreplace) %{tde_confdir}/magic/basket.magic.mgc
+%{tde_mandir}/man1/basket.*
+
+
+%changelog
diff --git a/redhat/applications/office/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec
new file mode 100644
index 000000000..901569d1a
--- /dev/null
+++ b/redhat/applications/office/kbibtex/kbibtex.spec
@@ -0,0 +1,185 @@
+#
+# spec file for package kbibtex (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kbibtex
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:        0.2.3
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:        A BibTeX editor for TDE
+Group:          Applications/Internet
+URL:            http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download.html
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# XSLT support
+BuildRequires:	libxslt-devel
+
+# YAZ support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?suse_version}
+BuildRequires:	libyaz-devel
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+%description
+KBibTeX is a BibTeX editor for TDE to edit bibliographies used with LaTeX.
+KBibTeX is released under the GNU Public License (GPL) version 2 or any later version.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Bibliography Manager" "%{?buildroot}%{tde_tdeappdir}/kbibtex.desktop" TDE Office Database
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README.md TODO ChangeLog
+%{tde_bindir}/kbibtex
+%{tde_tdelibdir}/libkbibtexpart.la
+%{tde_tdelibdir}/libkbibtexpart.so
+%{tde_tdeappdir}/kbibtex.desktop
+%{tde_datadir}/apps/kbibtex/
+%dir %{tde_datadir}/apps/kbibtexpart
+%{tde_datadir}/apps/kbibtexpart/kbibtex_part.rc
+%dir %{tde_datadir}/apps/kbibtexpart/xslt
+%{tde_datadir}/apps/kbibtexpart/xslt/MARC21slim2MODS3.xsl
+%{tde_datadir}/apps/kbibtexpart/xslt/MARC21slimUtils.xsl
+%{tde_datadir}/apps/kbibtexpart/xslt/UNIMARC2MODS3.xsl
+%{tde_datadir}/apps/kbibtexpart/xslt/html.xsl
+%{tde_datadir}/icons/hicolor/*/apps/kbibtex.png
+%{tde_datadir}/services/kbibtex_part.desktop
+%{tde_mandir}/man1/kbibtex.1*
+%{tde_tdedocdir}/HTML/en/kbibtex/
+
+
+%changelog
diff --git a/redhat/applications/office/kbookreader/kbookreader.spec b/redhat/applications/office/kbookreader/kbookreader.spec
new file mode 100644
index 000000000..2861cf231
--- /dev/null
+++ b/redhat/applications/office/kbookreader/kbookreader.spec
@@ -0,0 +1,170 @@
+#
+# spec file for package kbookreader (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kbookreader
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.2.0
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		eBook reader for Trinity
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+kbookreader is an application which allows you to view eBooks
+within the Trinity Desktop Environment.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbookreader.desktop" Office Viewer
+%endif
+
+%find_lang %{tde_pkg} || touch %{tde_pkg}.lang
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/kbookreader
+%{tde_bindir}/kbookreader_client
+%{tde_tdeappdir}/kbookreader.desktop
+%{tde_datadir}/apps/kbookreader/
+%{tde_datadir}/config.kcfg/kbookreader.kcfg
+%{tde_tdedocdir}/HTML/en/kbookreader/
+%{tde_datadir}/icons/hicolor/*/apps/kbookreader.png
+
+
+%changelog
diff --git a/redhat/applications/office/keximdb/keximdb.spec b/redhat/applications/office/keximdb/keximdb.spec
new file mode 100644
index 000000000..af8b3c0df
--- /dev/null
+++ b/redhat/applications/office/keximdb/keximdb.spec
@@ -0,0 +1,167 @@
+#
+# spec file for package keximdb (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg keximdb
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.1.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	MS Access (MDB) driver for Kexi [Trinity]
+Group:		Applications/Multimedia
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-koffice-devel
+BuildRequires:	trinity-koffice-kexi
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+MDB migration driver for converting MS Access databases in MDB files
+into KexiDB databases.
+
+This driver allows Kexi, the KOffice database program, to convert MDB
+database files to Kexi databases via the Tools->Migration->Import Database
+menu option.  Note that this package does not allow MDB files to be opened
+directly - they must be converted to a Kexi database first.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/keximigrate_mdb.la
+%{tde_tdelibdir}/keximigrate_mdb.so
+%{tde_datadir}/services/keximigrate_mdb.desktop
+
+
+%post
+
+
+%postun
+
+
+%changelog
diff --git a/redhat/applications/office/kile/kile.spec b/redhat/applications/office/kile/kile.spec
new file mode 100644
index 000000000..8fc9a86ae
--- /dev/null
+++ b/redhat/applications/office/kile/kile.spec
@@ -0,0 +1,224 @@
+#
+# spec file for package kile (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kile
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		2.0.3
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		TDE Integrated LaTeX Environment [Trinity]
+Group:			Applications/Publishing
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Obsoletes: %{name}-i18n-ar < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-bg < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-br < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ca < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-cs < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-cy < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-engb < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-eu < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-fi < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ga < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-gl < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-hi < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-hu < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-is < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ja < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-lt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ms < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-mt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nb < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nds < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-nn < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-pa < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ro < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-rw < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-sk < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-sr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-srlatin < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-ta < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-th < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-tr < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n-zhcn < %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+Kile is a user-friendly LaTeX source editor and TeX shell for TDE.
+
+The source editor is a multi-document editor designed for .tex and .bib
+files.  Menus, wizards and auto-completion are provided to assist with
+tag insertion and code generation.  A structural view of the document
+assists with navigation within source files.
+
+The TeX shell integrates the various tools required for TeX processing.
+It assists with LaTeX compilation, DVI and postscript document viewing,
+generation of bibliographies and indices and other common tasks.
+
+Kile can support large projects consisting of several smaller files.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes the KCM not to work at all !
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kile Office WordProcessor
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/kile
+%{tde_tdeappdir}/kile.desktop
+%{tde_datadir}/apps/tdeconf_update
+%{tde_datadir}/apps/kile
+%{tde_datadir}/config.kcfg/kile.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kile.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kile.svgz
+%{tde_tdedocdir}/HTML/en/kile
+%{tde_datadir}/mimelnk/text/x-kilepr.desktop
+
+%lang(da) %{tde_tdedocdir}/HTML/da/kile/
+%lang(es) %{tde_tdedocdir}/HTML/es/kile/
+%lang(et) %{tde_tdedocdir}/HTML/et/kile/
+%lang(it) %{tde_tdedocdir}/HTML/it/kile/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/kile/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/kile/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/kile/
+
+%{tde_mandir}/man1/kile.1*
+
+
+%changelog
diff --git a/redhat/applications/office/kmymoney/kmymoney.spec b/redhat/applications/office/kmymoney/kmymoney.spec
new file mode 100644
index 000000000..ed8d04fb8
--- /dev/null
+++ b/redhat/applications/office/kmymoney/kmymoney.spec
@@ -0,0 +1,255 @@
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8
+%define _configure_libtool_hardening_hack 0
+%endif
+
+#
+# spec file for package kmymoney (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kmymoney
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Required for Mageia >= 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Personal finance manager for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		kmymoneytitlelabel.png
+Source2:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	html2ps
+BuildRequires:	recode
+BuildRequires:	libofx-devel
+
+# OPENSP support
+%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}osp-devel
+%else
+BuildRequires:	%{_lib}OpenSP5-devel
+%endif
+%else
+BuildRequires:	opensp-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	opensp-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	openjade-devel
+%endif
+
+# TQT3-sqlite3
+BuildRequires:	libtqt3-mt-sqlite3
+Requires:		libtqt3-mt-sqlite3
+
+Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+KMyMoney is the Personal Finance Manager for TDE. It operates similar to
+MS-Money and Quicken, supports different account types, categorisation of
+expenses, QIF import/export, multiple currencies and initial online banking
+support.
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/kmymoney
+%{tde_bindir}/kmymoney2
+%{tde_tdeappdir}/kmymoney2.desktop
+%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
+%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
+%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
+%{tde_libdir}/*.so.*
+%{tde_tdelibdir}/kmm_ofximport.la
+%{tde_tdelibdir}/kmm_ofximport.so
+
+##########
+
+%package common
+Summary:		KMyMoney architecture independent files
+Group:			Applications/Utilities
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description common
+This package contains architecture independent files needed for KMyMoney to
+run properly. It also provides KMyMoney documentation. Therefore, unless you
+have '%{name}' package installed, you will hardly find this package useful.
+
+%files common -f kmymoney2.lang
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kmymoney2/
+%{tde_datadir}/config.kcfg/kmymoney2.kcfg
+%{tde_datadir}/icons/hicolor/*/*/*.png
+#%dir %{tde_datadir}/icons/Tango/
+#%dir %{tde_datadir}/icons/Tango/*/
+#%dir %{tde_datadir}/icons/Tango/*/*/
+#%{tde_datadir}/icons/Tango/*/*/*.png
+#%{tde_datadir}/icons/Tango/scalable/*.svgz
+%{tde_datadir}/icons/locolor/*/*/*.png
+#%dir %{tde_datadir}/icons/oxygen/
+#%dir %{tde_datadir}/icons/oxygen/*/
+#%dir %{tde_datadir}/icons/oxygen/*/*/
+#%{tde_datadir}/icons/oxygen/*/*/*.png
+#%{tde_datadir}/icons/oxygen/scalable/*.svgz
+%{tde_tdedocdir}/HTML/en/kmymoney2/
+%{tde_mandir}/man1/kmymoney2.*
+%{tde_datadir}/apps/kmm_ofximport/
+%{tde_datadir}/services/kmm_ofximport.desktop
+
+##########
+
+%package devel
+Summary:		KMyMoney development files
+Group:			Development/Libraries
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This package contains development files needed for KMyMoney plugins.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kmymoney/
+%{tde_libdir}/libkmm_kdchart.la
+%{tde_libdir}/libkmm_mymoney.la
+%{tde_libdir}/libkmm_plugin.la
+%{tde_libdir}/*.so
+%{_libdir}/tqt3/plugins/designer/libkmymoney.la
+%{_libdir}/tqt3/plugins/designer/libkmymoney.so
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__install -m644 %{SOURCE1} kmymoney2/widgets/
+
+
+%build
+unset QTDIR QTLIB QTINC
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  \
+  -DBUILD_ALL=ON \
+  \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang kmymoney2
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/kmymoney/kmymoneytitlelabel.png b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png
index 70d72ac98..70d72ac98 100644
--- a/redhat/applications/kmymoney/kmymoneytitlelabel.png
+++ b/redhat/applications/office/kmymoney/kmymoneytitlelabel.png
diff --git a/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc b/redhat/applications/office/kmymoney/trinity-kmymoney-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kmymoney/trinity-kmymoney-rpmlintrc
+++ b/redhat/applications/office/kmymoney/trinity-kmymoney-rpmlintrc
diff --git a/redhat/applications/office/knowit/knowit.spec b/redhat/applications/office/knowit/knowit.spec
new file mode 100644
index 000000000..9cb76c32d
--- /dev/null
+++ b/redhat/applications/office/knowit/knowit.spec
@@ -0,0 +1,162 @@
+#
+# spec file for package knowit (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg knowit
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.10
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Tool for managing notes [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KnowIt is a tool for managing notes which are organized in
+tree-like hierarchy. It is similar to TuxCards,
+but TDE-based, and requires Trinity.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{tde_pkg} Utility Applet X-SuSE-DesktopUtility
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/knowit
+%{tde_tdeappdir}/knowit.desktop
+%{tde_datadir}/apps/knowit/
+%{tde_datadir}/icons/hicolor/*/apps/knowit.png
+%{tde_datadir}/mimelnk/application/x-knowit.desktop
+%{tde_tdedocdir}/HTML/en/knowit/
+%{tde_mandir}/man*/knowit.*
+
+%changelog
diff --git a/redhat/applications/office/koffice-i18n/koffice-i18n.spec b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
new file mode 100644
index 000000000..e28ae5757
--- /dev/null
+++ b/redhat/applications/office/koffice-i18n/koffice-i18n.spec
@@ -0,0 +1,1113 @@
+#
+# spec file for package koffice-i18n (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg koffice-i18n
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+# Builds all supported languages (not unsupported ones)
+%if "%{?TDE_LANGS}" == ""
+%define TDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW
+%endif
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.6.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Internationalization support for Koffice [Trinity]
+Group:		User Interface/Desktops
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+# Speed build options
+%define debug_package %{nil}
+%define __spec_install_post %{nil}
+AutoReq: no
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	findutils
+BuildRequires:	gettext
+
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+%{summary}.
+
+%package Bulgarian
+Summary:		Bulgarian(bg) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-bg = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Bulgarian
+%{summary}.
+
+%package Bengali
+Summary:		Bengali(bn) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-bn = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Bengali
+%{summary}.
+
+%package Tibetan
+Summary:		Tibetan(bo) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-bo = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Tibetan
+%{summary}.
+
+%package Breton
+Summary:		Breton(br) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-br = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Breton
+%{summary}.
+
+%package Bosnian
+Summary:		Bosnian(bs) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-bs = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Bosnian
+%{summary}.
+
+%package Catalan
+Summary:		Catalan(ca) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ca = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Catalan
+%{summary}.
+
+%package Czech
+Summary:		Czech(cs) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-cs = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Czech
+%{summary}.
+
+%package Cymraeg
+Summary:		Cymraeg language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+%description Cymraeg
+%{summary}.
+
+%package Welsh
+Summary:		Welsh(cy) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-cy = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Welsh
+%{summary}.
+
+%package Danish
+Summary:		Danish(da) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-da = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Danish
+%{summary}.
+
+%package German
+Summary:		German(de) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-de = %{?epoch:%{epoch}:}%{version}-%{release}
+%description German
+%{summary}.
+
+%package Greek
+Summary:		Greek(el) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-el = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Greek
+%{summary}.
+
+%package British
+Summary:		British(en_GB) English support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-en_GB = %{?epoch:%{epoch}:}%{version}-%{release}
+%description British
+%{summary}.
+
+%package Esperanto
+Summary:		Esperanto(eo) support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-eo = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Esperanto
+%{summary}.
+
+%package Spanish
+Summary:		Spanish(es) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-es = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Spanish
+%{summary}.
+
+%package Estonian
+Summary:		Estonian(et) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-et = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Estonian
+%{summary}.
+
+%package Basque
+Summary:		Basque(eu) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-eu = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Basque
+%{summary}.
+
+%package Finnish
+Summary:		Finnish(fi) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-fi = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Finnish
+%{summary}.
+
+%package Faroese
+Summary:		Faroese(fo) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-fo = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Faroese
+%{summary}.
+
+%package French
+Summary:		French(fr) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-fr = %{?epoch:%{epoch}:}%{version}-%{release}
+%description French
+%{summary}.
+
+%package Frisian
+Summary:		Frisian(fy) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-fy = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Frisian
+%{summary}.
+
+%package Irish
+Summary:		Irish(ga) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Obsoletes: kde-i18n-Gaeilge < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-ga = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Irish
+%{summary}.
+
+%package Galician
+Summary:		Galician(gl) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-gl = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Galician
+%{summary}.
+
+%package Hebrew
+Summary:		Hebrew(he) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-he = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Hebrew
+%{summary}.
+
+%package Hindi
+Summary:		Hindi(hi) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-hi = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Hindi
+%{summary}.
+
+%package Croatian
+Summary:		Croatian(hr) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-hr = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Croatian
+%{summary}.
+
+%package Hungarian
+Summary:		Hungarian(hu) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-hu = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Hungarian
+%{summary}.
+
+%package Indonesian
+Summary:		Indonesian(id) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-id = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Indonesian
+%{summary}.
+
+%package Icelandic
+Summary:		Icelandic(is) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-is = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Icelandic
+%{summary}.
+
+%package Italian
+Summary:		Italian(it) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-it = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Italian
+%{summary}.
+
+%package Japanese
+Summary:		Japanese(ja) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ja = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Japanese
+%{summary}.
+
+%package Khmer
+Summary:		Khmer(km) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-km = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Khmer
+%{summary}.
+
+%package Korean
+Summary:		Korean(ko) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Korean
+%{summary}.
+
+%package Kurdish
+Summary:		Kurdish(ku) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ku = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Kurdish
+%{summary}.
+
+%package Lao
+Summary:		Lao(lo) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-lo = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Lao
+%{summary}.
+
+%package Lithuanian
+Summary:		Lithuanian(lt) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-lt = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Lithuanian
+%{summary}.
+
+%package Latvian
+Summary:		Latvian(lv) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-lv = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Latvian
+%{summary}.
+
+%package Maori
+Summary:		Maori(mi) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-mi = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Maori
+%{summary}.
+
+%package Macedonian
+Summary:		Macedonian(mk) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-mk = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Macedonian
+%{summary}.
+
+%package Malay
+Summary:		Malay(ms) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ms = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Malay
+%{summary}.
+
+%package Maltese
+Summary:		Maltese(mt) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-mt = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Maltese
+%{summary}.
+
+%package LowSaxon
+Summary:		Low Saxon (nds) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-nds = %{?epoch:%{epoch}:}%{version}-%{release}
+%description LowSaxon
+%{summary}.
+
+%package Nepali
+Summary:		Nepali(ne) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ne = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Nepali
+%{summary}.
+
+%package Dutch
+Summary:		Dutch(nl) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-nl = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Dutch
+%{summary}.
+
+%package Norwegian
+Summary:		Norwegian(no) (Bokmaal) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-no = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Norwegian
+%{summary}.
+
+%package Norwegian-Nynorsk
+Summary:		Norwegian(nn) (Nynorsk) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-nn = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Norwegian-Nynorsk
+%{summary}.
+
+%package Occitan
+Summary:		Occitan(oc) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-oc = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Occitan
+%{summary}.
+
+%package Polish
+Summary:		Polish(pl) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-pl = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Polish
+%{summary}.
+
+%package Portuguese
+Summary:		Portuguese(pt) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-pt = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Portuguese
+%{summary}.
+
+%package Punjabi
+Summary:		Punjabi(pa) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-pa = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Punjabi
+%{summary}.
+
+%package Brazil
+Summary:		Brazil(pt_BR) Portuguese language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Brazil
+%{summary}.
+
+%package Romanian
+Summary:		Romanian(ro) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ro = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Romanian
+%{summary}.
+
+%package Russian
+Summary:		Russian(ru) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ru = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Russian
+%{summary}.
+
+%package Slovak
+Summary:		Slovak(sk) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-sk = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Slovak
+%{summary}.
+
+%package Slovenian
+Summary:		Slovenian(sl) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-sl = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Slovenian
+%{summary}.
+
+%package Serbian
+Summary:		Serbian(sr) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-sr = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Serbian
+%{summary}.
+
+%package Swedish
+Summary:		Swedish(sv) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-sv = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Swedish
+%{summary}.
+
+%package Tamil
+Summary:		Tamil(ta) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ta = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Tamil
+%{summary}.
+
+%package Tajik
+Summary:		Tajik(tg) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-tg = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Tajik
+%{summary}.
+
+%package Thai
+Summary:		Thai(th) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-th = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Thai
+%{summary}.
+
+%package Turkish
+Summary:		Turkish(tr) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-tr = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Turkish
+%{summary}.
+
+%package Ukrainian
+Summary:		Ukrainian(uk) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-uk = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Ukrainian
+%{summary}.
+
+%package Venda
+Summary:		Venda(ven) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-ven = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Venda
+%{summary}.
+
+%package Vietnamese
+Summary:		Vietnamese(vi) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-vi = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Vietnamese
+%{summary}.
+
+%package Walloon
+Summary:		Walloon(wa) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-wa = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Walloon
+%{summary}.
+
+%package Xhosa
+Summary:		Xhosa(xh) (a Bantu language) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-xh = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Xhosa
+%{summary}.
+
+%package Chinese
+Summary:		Chinese(zh_CN) (Simplified Chinese) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-zh_CN = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Chinese
+%{summary}.
+
+%package Chinese-Big5
+Summary:		Chinese(zh_TW) (Big5) language support for Koffice [Trinity]
+Group:			User Interface/Desktops
+Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release}
+%description Chinese-Big5
+%{summary}.
+
+
+
+%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:${PKG_CONFIG_PATH}"
+
+(
+for l in . %{TDE_LANGS}; do
+  if [ $l != '.' ]; then
+    pushd "%{tde_pkg}-${l}"
+  else
+    pushd ${l}
+  fi
+
+  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}" \
+    -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+    -DCMAKE_SKIP_RPATH=OFF \
+    -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+    -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DWITH_GCC_VISIBILITY=OFF \
+    \
+    -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+    -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+    -DLIB_INSTALL_DIR=%{tde_libdir} \
+    -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+    \
+    -DBUILD_ALL=ON \
+    \
+    ..
+
+  %__make %{?_smp_mflags}
+
+  popd
+done
+) 2>&1 | tee /tmp/rpmbuild.$$
+
+if grep -qw TDE_Error /tmp/rpmbuild.$$; then
+  echo "Error while building. See '/tmp/rpmbuild.$$'"
+  exit 1
+fi
+
+wait
+rm -f /tmp/rpmbuild.$$
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+
+for l in %{TDE_LANGS}; do
+  %__make DESTDIR=%{buildroot} -C build install-${l}
+done
+
+
+%clean
+%__rm -rf %{buildroot}
+
+%if "%( grep -w af <<< '%{TDE_LANGS}' )" != ""
+%files Afrikaans
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/af/*
+%endif
+
+%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != ""
+%files Arabic 
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ar/*
+%endif
+
+%if "%( grep -w az <<< '%{TDE_LANGS}' )" != ""
+%files Azerbaijani
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/az/*
+%endif
+
+%if "%( grep -w be <<< '%{TDE_LANGS}' )" != ""
+%files Belarusian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/be/*
+%endif
+
+%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != ""
+%files Bulgarian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bg/*
+%endif
+
+%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != ""
+%files Bengali
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bn/*
+%endif
+
+%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != ""
+%files Tibetan
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bo/*
+%endif
+
+%if "%( grep -w br <<< '%{TDE_LANGS}' )" != ""
+%files Breton
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/br/*
+%endif
+
+%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != ""
+%files Bosnian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bs/*
+%endif
+
+%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != ""
+%files Catalan
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ca/*
+%{tde_tdedocdir}/HTML/ca/
+%dir %{tde_datadir}/apps/koffice
+%dir %{tde_datadir}/apps/koffice/autocorrect
+%{tde_datadir}/apps/koffice/autocorrect/ca.xml
+%endif
+
+%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != ""
+%files Czech
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/cs/*
+%dir %{tde_datadir}/apps/koffice
+%dir %{tde_datadir}/apps/koffice/autocorrect
+%{tde_datadir}/apps/koffice/autocorrect/cs.xml
+%endif
+
+%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != ""
+%files Welsh
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/cy/*
+%endif
+
+%if "%( grep -w da <<< '%{TDE_LANGS}' )" != ""
+%files Danish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/da/*
+%{tde_tdedocdir}/HTML/da/
+%endif
+
+%if "%( grep -w de <<< '%{TDE_LANGS}' )" != ""
+%files German
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/de/*
+%{tde_tdedocdir}/HTML/de/
+%dir %{tde_datadir}/apps/koffice
+%dir %{tde_datadir}/apps/koffice/autocorrect
+%{tde_datadir}/apps/koffice/autocorrect/de.xml
+%endif
+
+%if "%( grep -w el <<< '%{TDE_LANGS}' )" != ""
+%files Greek
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/el/*
+%endif
+
+%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != ""
+%files British
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/en_GB/*
+%{tde_tdedocdir}/HTML/en_GB/
+%endif
+
+%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != ""
+%files Esperanto
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/eo/*
+%endif
+
+%if "%( grep -w es <<< '%{TDE_LANGS}' )" != ""
+%files Spanish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/es/*
+%{tde_tdedocdir}/HTML/es/
+%dir %{tde_datadir}/apps/koffice
+%dir %{tde_datadir}/apps/koffice/autocorrect
+%{tde_datadir}/apps/koffice/autocorrect/es.xml
+%endif
+
+%if "%( grep -w et <<< '%{TDE_LANGS}' )" != ""
+%files Estonian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/et/*
+%{tde_tdedocdir}/HTML/et/
+%endif
+
+%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != ""
+%files Basque
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/eu/*
+%endif
+
+%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != ""
+%files Farsi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fa/*
+%endif
+
+%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != ""
+%files Finnish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fi/*
+%endif
+
+%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != ""
+%files Faroese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fo/*
+%endif
+
+%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != ""
+%files French
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fr/*
+%{tde_tdedocdir}/HTML/fr/
+%dir %{tde_datadir}/apps/koffice
+%dir %{tde_datadir}/apps/koffice/autocorrect
+%{tde_datadir}/apps/koffice/autocorrect/fr.xml
+%endif
+
+%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != ""
+%files Frisian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fy/*
+%endif
+
+%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != ""
+%files Irish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ga/*
+%endif
+
+%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != ""
+%files Galician
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/gl/*
+%endif
+
+%if "%( grep -w he <<< '%{TDE_LANGS}' )" != ""
+%files Hebrew
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/he/*
+%endif
+
+%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != ""
+%files Hindi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hi/*
+%endif
+
+%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != ""
+%files Croatian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hr/*
+%endif
+
+%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != ""
+%files Hungarian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hu/*
+%dir %{tde_datadir}/apps/koffice
+%dir %{tde_datadir}/apps/koffice/autocorrect
+%{tde_datadir}/apps/koffice/autocorrect/hu.xml
+%endif
+
+%if "%( grep -w id <<< '%{TDE_LANGS}' )" != ""
+%files Indonesian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/id/*
+%endif
+
+%if "%( grep -w is <<< '%{TDE_LANGS}' )" != ""
+%files Icelandic
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/is/*
+%endif
+
+%if "%( grep -w it <<< '%{TDE_LANGS}' )" != ""
+%files Italian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/it/*
+%{tde_tdedocdir}/HTML/it/
+%dir %{tde_datadir}/apps/koffice
+%dir %{tde_datadir}/apps/koffice/autocorrect
+%{tde_datadir}/apps/koffice/autocorrect/it.xml
+%endif
+
+%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != ""
+%files Japanese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ja/*
+%endif
+
+%if "%( grep -w km <<< '%{TDE_LANGS}' )" != ""
+%files Khmer
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/km/*
+%endif
+
+%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != ""
+%files Korean
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ko/*
+%endif
+
+%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != ""
+%files Kurdish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ku/*
+%endif
+
+%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != ""
+%files Lao
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/lo/*
+%endif
+
+%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != ""
+%files Lithuanian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/lt/*
+%endif
+
+%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != ""
+%files Latvian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/lv
+%{tde_datadir}/locale/lv/*
+%endif
+
+%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != ""
+%files Maori
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/mi/*
+%endif
+
+%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != ""
+%files Macedonian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/mk/*
+%endif
+
+%if "%( grep -w ms <<< '%{TDE_LANGS}' )" != ""
+%files Malay
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ms/*
+%endif
+
+%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != ""
+%files Maltese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/mt/*
+%endif
+
+%if "%( grep -w nds <<< '%{TDE_LANGS}' )" != ""
+%files LowSaxon
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nds/*
+%endif
+
+%if "%( grep -w ne <<< '%{TDE_LANGS}' )" != ""
+%files Nepali
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ne/*
+%endif
+
+%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != ""
+%files Dutch
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nl/*
+%{tde_tdedocdir}/HTML/nl/
+%endif
+
+%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != ""
+%files Norwegian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nb/*
+%endif
+
+%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != ""
+%files Norwegian-Nynorsk
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nn/*
+%endif
+
+%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != ""
+%files Occitan
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/oc/*
+%endif
+
+%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != ""
+%files Punjabi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pa/*
+%endif
+
+%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != ""
+%files Polish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pl/*
+%endif
+
+%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != ""
+%files Portuguese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pt/*
+%{tde_tdedocdir}/HTML/pt/
+%endif
+
+%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != ""
+%files Brazil
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pt_BR/*
+%{tde_tdedocdir}/HTML/pt_BR/
+%endif
+
+%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != ""
+%files Romanian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ro/*
+%endif
+
+%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != ""
+%files Russian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ru/*
+%{tde_tdedocdir}/HTML/ru/
+%endif
+
+%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != ""
+%files Slovak
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sk/*
+%{tde_tdedocdir}/HTML/sk/
+%dir %{tde_datadir}/apps/koffice
+%dir %{tde_datadir}/apps/koffice/autocorrect
+%{tde_datadir}/apps/koffice/autocorrect/sk.xml
+%endif
+
+%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != ""
+%files Slovenian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sl/*
+%{tde_tdedocdir}/HTML/sl/
+%endif
+
+%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != ""
+%files Serbian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sr/*
+%endif
+
+%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != ""
+%files Swedish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sv/*
+%{tde_tdedocdir}/HTML/sv/
+%endif
+
+%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != ""
+%files Tamil
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ta/*
+%endif
+
+%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != ""
+%files Tajik
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/tg/*
+%endif
+
+%if "%( grep -w th <<< '%{TDE_LANGS}' )" != ""
+%files Thai
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/th/*
+%endif
+
+%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != ""
+%files Turkish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/tr/*
+%endif
+
+%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != ""
+%files Ukrainian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/uk/*
+%endif
+
+%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != ""
+%files Venda
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ven/*
+%endif
+
+%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != ""
+%files Vietnamese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/vi/*
+%endif
+
+%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != ""
+%files Walloon
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/wa/*
+%endif
+
+%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != ""
+%files Xhosa
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/xh/*
+%endif
+
+%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != ""
+%files Chinese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/zh_CN/*
+%endif
+
+%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != ""
+%files Chinese-Big5
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/zh_TW/*
+%endif
+
+
+%changelog
diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
new file mode 100644
index 000000000..8d5a12144
--- /dev/null
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -0,0 +1,1190 @@
+#
+# spec file for package koffice (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg koffice
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Disable Kross support for RHEL <= 5 (python is too old)
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_kross 1
+%endif
+
+# Ruby support
+%define with_ruby 1
+
+# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
+%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
+
+# Required for Mageia 2: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.6.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	An integrated office suite
+Group:		Applications/Productivity
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	trinity-koffice-rpmlintrc
+
+# BuildRequires: world-devel ;)
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-tdegraphics-devel >= %{tde_version}
+BuildRequires:	trinity-libpoppler-tqt-devel >= %{tde_version}
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	fontconfig-devel
+BuildRequires:	libart_lgpl-devel
+BuildRequires:	libtiff-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	ImageMagick-devel
+BuildRequires:	zlib-devel
+BuildRequires:	openssl-devel
+BuildRequires:	pcre-devel
+BuildRequires:	gettext-devel
+BuildRequires:	mysql-devel
+BuildRequires:	perl
+BuildRequires:	doxygen
+BuildRequires:	aspell-devel
+BuildRequires:	libxslt-devel
+BuildRequires:	OpenEXR-devel
+BuildRequires:	libexif-devel
+BuildRequires:	readline-devel
+
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+%endif
+
+# LCMS support
+%if 0%{?suse_version} || 0%{?rhel} >= 7
+BuildRequires: liblcms-devel
+%else
+BuildRequires: lcms-devel
+%endif
+
+# LCMS2 support
+%if 0%{?suse_version}
+BuildRequires:	liblcms2-devel
+%endif
+
+# BZIP2 support
+%if 0%{?suse_version}
+BuildRequires:	libbz2-devel
+%else
+BuildRequires:	bzip2-devel
+%endif
+
+# PAPER support
+BuildRequires:	libpaper-devel
+
+# RUBY support
+%if 0%{?with_ruby}
+BuildRequires:	ruby ruby-devel >= 1.8.1
+%if 0%{?fedora} >= 19
+BuildRequires:	rubypick
+%endif
+%endif
+
+# FREETYPE support
+%if 0%{?suse_version} == 1140
+BuildRequires:	freetype2-devel
+%else
+BuildRequires:	freetype-devel
+%endif
+
+# LIBPNG support
+%if 0%{?mgaversion}
+BuildRequires:	%{_lib}png-devel
+%endif
+%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
+BuildRequires:	%{_lib}png15-devel
+%endif
+%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
+BuildRequires:	libpng-devel
+%endif
+
+# GRAPHICSMAGICK support
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5
+%define with_graphicsmagick 1
+%if 0%{?suse_version}
+BuildRequires:	GraphicsMagick >= 1.1.0
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires:	GraphicsMagick-devel >= 1.1.0
+%endif
+%endif
+
+# UTEMPTER support
+%if 0%{?suse_version}
+BuildRequires:	utempter-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	utempter
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}utempter-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires:	libutempter-devel
+%endif
+
+# POPPLER support
+%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} >= 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
+BuildRequires: poppler-devel >= 0.12
+%endif
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}poppler-devel
+%endif
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
+BuildRequires:	trinity-poppler-devel >= 0.12
+%endif
+
+# POSTGRESQL support
+#  Requires 'libpqxx', for kexi-driver-pgqsl
+%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0
+%define with_postgresql 1
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires:	postgresql-server-devel
+%else
+BuildRequires:	postgresql-devel
+BuildRequires:	libpqxx-devel
+%endif
+%endif
+%endif
+Obsoletes:		trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release}
+
+# WPD support
+#  For chalk and filters
+BuildRequires:	libwpd-devel
+Obsoletes:		trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
+
+# WV2 support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}wv2-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	wv2-devel
+%endif
+
+# MESA support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 8
+BuildRequires:	%{_lib}mesagl-devel
+%else
+BuildRequires:	%{_lib}mesagl1-devel
+%endif
+BuildRequires:	%{_lib}mesaglu1-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:	libGL-devel
+BuildRequires:	libGLU-devel
+%endif
+%if 0%{?suse_version} >= 1220
+BuildRequires:	Mesa-libGL-devel
+BuildRequires:	Mesa-libGLU-devel
+%endif
+
+# OPENJPEG
+%if 0%{?mgaversion} || 0%{?mdkversion}
+#BuildRequires:	%{_lib}openjpeg-devel
+%endif
+
+# LIBXI support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xi-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	libXi-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	libXi6-devel
+%endif
+%if 0%{?suse_version} >= 1220
+BuildRequires:	libXi-devel
+%endif
+
+# SQLITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	sqlite3-devel
+%else
+BuildRequires:	sqlite-devel
+%endif
+
+
+%description
+KOffice is an integrated office suite.
+
+##########
+
+%package suite
+Summary:		An integrated office suite
+Group:			Applications/Productivity
+Obsoletes:      %{name} <= %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:		%{name}-kword = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:		%{name}-kspread = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:		%{name}-kpresenter = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kivio = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-karbon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kugar = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kexi-driver-mysql = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_postgresql:Requires:       %{name}-kexi-driver-pgsql = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires:		%{name}-kchart = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kformula = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kplato = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-chalk = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description suite
+KOffice is an integrated office suite.
+
+%files suite
+#empty => virtual package
+
+##########
+
+%package core
+Summary:		Core support files for %{name} 
+Group:			Applications/Productivity
+Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		perl
+
+%description core
+%{summary}.
+
+%files core
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_bindir}/koshell
+%{tde_bindir}/kthesaurus
+%{tde_bindir}/koconverter
+%{tde_libdir}/libtdeinit_koshell.so
+%{tde_libdir}/libtdeinit_kthesaurus.so
+%{tde_tdelibdir}/tdefile_koffice.*
+%{tde_tdelibdir}/tdefile_ooo.*
+%{tde_tdelibdir}/tdefile_abiword.*
+%{tde_tdelibdir}/tdefile_gnumeric.*
+%{tde_tdelibdir}/kodocinfopropspage.*
+%{tde_tdelibdir}/kofficescan.*
+%{tde_tdelibdir}/kofficethumbnail.*
+%{tde_tdelibdir}/koshell.*
+%{tde_tdelibdir}/kthesaurus.*
+%{tde_tdelibdir}/kwmailmerge_classic.*
+%{tde_tdelibdir}/kwmailmerge_tdeabc.*
+%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.*
+%{tde_tdelibdir}/kwmailmerge_qtsqldb.*
+%{tde_tdelibdir}/libkounavailpart.*
+%{tde_tdelibdir}/libkprkword.*
+%{tde_tdelibdir}/libthesaurustool.*
+%{tde_tdelibdir}/clipartthumbnail.*
+%{tde_datadir}/apps/koffice/
+%{tde_datadir}/apps/konqueror/servicemenus/*
+%{tde_datadir}/apps/koshell/
+%{tde_datadir}/apps/thesaurus/
+%{tde_datadir}/config.kcfg/koshell.kcfg
+%{tde_tdedocdir}/HTML/en/koffice/
+%{tde_tdedocdir}/HTML/en/koshell/
+%{tde_tdedocdir}/HTML/en/thesaurus/
+%{tde_datadir}/icons/crystalsvg/*/*/*
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/icons/locolor/*/*/*
+%{tde_datadir}/services/clipartthumbnail.desktop
+%{tde_datadir}/services/tdefile_abiword.desktop
+%{tde_datadir}/services/tdefile_gnumeric.desktop
+%{tde_datadir}/services/tdefile_koffice.desktop
+%{tde_datadir}/services/tdefile_ooo.desktop
+%{tde_datadir}/services/kwmailmerge*.desktop
+%{tde_datadir}/services/kodocinfopropspage.desktop
+%{tde_datadir}/services/kofficethumbnail.desktop
+%{tde_datadir}/services/kounavail.desktop
+%{tde_datadir}/services/kprkword.desktop
+%{tde_datadir}/services/thesaurustool.desktop
+%{tde_datadir}/servicetypes/kochart.desktop
+%{tde_datadir}/servicetypes/kofficepart.desktop
+%{tde_datadir}/servicetypes/koplugin.desktop
+%{tde_datadir}/servicetypes/kwmailmerge.desktop
+%{tde_datadir}/servicetypes/widgetfactory.desktop
+%{tde_tdeappdir}/*koffice.desktop
+%{tde_tdeappdir}/KThesaurus.desktop
+%{tde_tdeappdir}/*koshell.desktop
+%{tde_datadir}/apps/kofficewidgets/
+%if 0%{?with_kross}
+%if 0%{?with_python}
+%{tde_datadir}/apps/kross/
+%{tde_tdelibdir}/krosspython.*
+%endif
+%if 0%{?with_ruby}
+%{tde_tdelibdir}/krossruby.*
+%endif
+%endif
+%{tde_mandir}/man1/koconverter.1*
+%{tde_mandir}/man1/koscript.1*
+%{tde_mandir}/man1/koshell.1*
+%{tde_mandir}/man1/kthesaurus.1*
+
+##########
+
+%package libs
+Summary:		Runtime libraries for %{name} 
+Group:			System Environment/Libraries
+Conflicts:      %{name} <= %{version}-%{release}
+Requires:		trinity-tdelibs
+License:		LGPLv2+
+
+%description libs
+%{summary}.
+
+%files libs
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+#_libdir/libk*common.so.*
+%{tde_libdir}/libkarboncommon.so.*
+%{tde_libdir}/libkspreadcommon.so.*
+%{tde_libdir}/libkdchart.so.*
+%{tde_libdir}/libkochart.so.*
+%{tde_libdir}/libkofficecore.so.*
+%{tde_libdir}/libkofficeui.so.*
+%{tde_libdir}/libkotext.so.*
+%{tde_libdir}/libkowmf.so.*
+%{tde_libdir}/libkopainter.so.*
+%{tde_libdir}/libkstore.so.*
+%{tde_libdir}/libkwmailmerge_interface.so.*
+%{tde_libdir}/libkwmf.so.*
+%{tde_libdir}/libkformulalib.so.*
+%{tde_libdir}/libkopalette.so.*
+%{tde_libdir}/libkoproperty.so.*
+%if 0%{?with_kross}
+%{tde_libdir}/libkrossapi.so.*
+%{tde_libdir}/libkrossmain.so.*
+%endif
+%{tde_mandir}/man1/kspread.1*
+
+##########
+
+%package devel
+Summary:		Development files for %{name} 
+Group:			Development/Libraries
+Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+License:		LGPLv2+
+
+%description devel
+%{summary}.
+
+%files devel
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/
+%{tde_includedir}/*
+# FIXME: include only shlib symlinks we know/want to export
+%{tde_libdir}/lib*.so
+%exclude %{tde_libdir}/libtdeinit_*.so
+%exclude %{tde_libdir}/libkudesignercore.so
+
+##########
+
+%package kword
+Summary:		A frame-based word processor capable of professional standard documents
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kword
+%{summary}.
+
+%files kword
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kword/
+%{tde_bindir}/kword
+%{tde_libdir}/libtdeinit_kword.so
+%{tde_libdir}/libkwordprivate.so.*
+%{tde_tdelibdir}/libkwordpart.*
+%{tde_tdelibdir}/kword.*
+%{tde_datadir}/apps/kword/
+%{tde_datadir}/services/kword*.desktop
+%{tde_datadir}/services/kwserial*.desktop
+%{tde_datadir}/templates/TextDocument.desktop
+%{tde_datadir}/templates/.source/TextDocument.kwt
+%{tde_tdeappdir}/*kword.desktop
+%{tde_mandir}/man1/kword.1*
+
+##########
+
+%package kspread
+Summary:		A powerful spreadsheet application
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kspread
+%{summary}.
+
+%files kspread
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kspread/
+%{tde_bindir}/kspread
+%{tde_libdir}/libtdeinit_kspread.so
+%{tde_tdelibdir}/kspread.*
+%{tde_tdelibdir}/libkspreadpart.*
+%{tde_tdelibdir}/kwmailmerge_kspread.*
+%{tde_tdelibdir}/libcsvexport.*
+%{tde_tdelibdir}/libcsvimport.*
+%{tde_tdelibdir}/libgnumericexport.*
+%{tde_tdelibdir}/libgnumericimport.*
+%{tde_tdelibdir}/libkspreadhtmlexport.*
+%{tde_tdelibdir}/libkspreadinsertcalendar.*
+%{tde_tdelibdir}/libopencalcexport.*
+%{tde_tdelibdir}/libopencalcimport.*
+%{tde_tdelibdir}/libqproimport.*
+%{tde_datadir}/apps/kspread/
+%{tde_datadir}/services/kspread*.desktop
+%{tde_datadir}/templates/SpreadSheet.desktop
+%{tde_datadir}/templates/.source/SpreadSheet.kst
+%{tde_tdeappdir}/*kspread.desktop
+%if 0%{?with_kross}
+%{tde_tdelibdir}/kspreadscripting.*
+%{tde_tdelibdir}/krosskspreadcore.*
+%endif
+
+##########
+
+%package kpresenter
+Summary:		A full-featured presentation program
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kpresenter
+%{summary}.
+
+%files kpresenter
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/
+%{tde_bindir}/kpresenter
+%{tde_bindir}/kprconverter.pl
+%{tde_libdir}/libtdeinit_kpresenter.so
+%{tde_libdir}/libkpresenterimageexport.so.*
+%{tde_libdir}/libkpresenterprivate.so.*
+%{tde_tdelibdir}/*kpresenter*.*
+%{tde_datadir}/apps/kpresenter/
+%{tde_datadir}/services/kpresenter*.desktop
+%{tde_datadir}/templates/Presentation.desktop
+%{tde_datadir}/templates/.source/Presentation.kpt
+%{tde_tdeappdir}/*kpresenter.desktop
+%{tde_mandir}/man1/kprconverter.pl.1*
+%{tde_mandir}/man1/kpresenter.1*
+
+##########
+
+%package kivio
+Summary:		A flowcharting application
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      kivio < %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kivio
+%{summary}.
+
+%files kivio
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kivio/
+%{tde_bindir}/kivio
+%{tde_libdir}/libtdeinit_kivio.so
+%{tde_libdir}/libkiviocommon.so.*
+%{tde_tdelibdir}/*kivio*.*
+%{tde_tdelibdir}/straight_connector.*
+%{tde_datadir}/apps/kivio/
+%{tde_datadir}/config.kcfg/kivio.kcfg
+%{tde_datadir}/services/kivio*.desktop
+%{tde_tdeappdir}/*kivio.desktop
+%{tde_mandir}/man1/kivio.1*
+
+##########
+
+%package karbon
+Summary:		A vector drawing application
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description karbon
+%{summary}.
+
+%files karbon
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/karbon/
+%{tde_bindir}/karbon
+%{tde_libdir}/libtdeinit_karbon.so
+%exclude %{tde_tdelibdir}/libkarbonepsimport.*
+%{tde_tdelibdir}/*karbon*.*
+%{tde_tdelibdir}/libwmfexport.*
+%{tde_tdelibdir}/libwmfimport.*
+%{tde_datadir}/apps/karbon/
+%{tde_datadir}/services/karbon*
+%{tde_datadir}/servicetypes/karbon_module.desktop
+%{tde_datadir}/templates/Illustration.desktop
+%{tde_datadir}/templates/.source/Illustration.karbon
+%{tde_tdeappdir}/*karbon.desktop
+%{tde_mandir}/man1/karbon.1*
+
+##########
+
+%package kugar
+Summary:		A tool for generating business quality reports
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kugar
+%{summary}.
+
+%files kugar
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kugar/
+%{tde_bindir}/kugar
+%{tde_bindir}/kudesigner
+%{tde_libdir}/libtdeinit_kugar.so
+%{tde_libdir}/libtdeinit_kudesigner.so
+%{tde_libdir}/libkugarlib.so.*
+%{tde_libdir}/libkudesignercore.so
+%{tde_tdelibdir}/kudesigner.*
+%{tde_tdelibdir}/kugar.*
+%{tde_tdelibdir}/libkudesignerpart.*
+%{tde_tdelibdir}/libkugarpart.*
+%{tde_datadir}/apps/kudesigner/
+%{tde_datadir}/apps/kugar/
+%{tde_datadir}/services/kugar*.desktop
+%{tde_tdeappdir}/*kugar.desktop
+%{tde_tdeappdir}/*kudesigner.desktop
+%{tde_mandir}/man1/kudesigner.1*
+%{tde_mandir}/man1/kugar.1*
+
+##########
+
+%package kexi
+Summary:		An integrated environment for managing data
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if 0%{?with_postgresql} == 0
+Obsoletes:		%{name}-kexi-driver-pgsql < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%description kexi
+%{summary}.
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%files kexi
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kexi/
+%{tde_bindir}/kexi*
+%{tde_bindir}/ksqlite*
+%{tde_libdir}/libtdeinit_kexi.so
+%{tde_libdir}/libkexi*.so.*
+%{tde_libdir}/libkformdesigner.so.*
+%{tde_tdelibdir}/kformdesigner_*.*
+%{tde_tdelibdir}/kexidb_sqlite2driver.*
+%{tde_tdelibdir}/kexidb_sqlite3driver.*
+%{tde_tdelibdir}/kexihandler_*.*
+%{tde_tdelibdir}/kexi.*
+# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
+%{tde_tdelibdir}/libkspreadkexiimport.*
+%config(noreplace) %{tde_confdir}/kexirc
+%config(noreplace) %{tde_confdir}/magic/kexi.magic
+%{tde_datadir}/mimelnk/application/*
+%{tde_datadir}/servicetypes/kexi*.desktop
+%{tde_datadir}/services/kexi/
+%{tde_datadir}/apps/kexi/
+%{tde_datadir}/services/kformdesigner/
+%{tde_tdeappdir}/*kexi.desktop
+%{tde_datadir}/services/kexidb_sqlite*driver.desktop
+%if 0%{?with_kross}
+%{tde_bindir}/krossrunner
+%{tde_tdelibdir}/krosskexiapp.*
+%{tde_tdelibdir}/krosskexidb.*
+%endif
+%config(noreplace) %{tde_confdir}/magic/kexi.magic.mgc
+
+##########
+
+%package kexi-driver-mysql
+Summary:		Mysql-driver for kexi
+Group:			Applications/Productivity
+Requires:		%{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kexi-driver-mysql
+%{summary}.
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kexidb_mysqldriver.*
+%{tde_tdelibdir}/keximigrate_mysql.*
+%{tde_datadir}/services/keximigrate_mysql.desktop
+%{tde_datadir}/services/kexidb_mysqldriver.desktop
+
+##########
+
+%if 0%{?with_postgresql}
+
+%package kexi-driver-pgsql
+Summary:		Postgresql driver for kexi
+Group:			Applications/Productivity
+Requires:		%{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kexi-driver-pgsql
+%{summary}.
+
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kexidb_pqxxsqldriver.*
+%{tde_tdelibdir}/keximigrate_pqxx.*
+%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{tde_datadir}/services/keximigrate_pqxx.desktop
+
+%endif
+
+##########
+
+%package kchart
+Summary:		An integrated graph and chart drawing tool
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kchart
+%{summary}.
+
+%files kchart
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kchart/
+%{tde_bindir}/kchart
+%{tde_libdir}/libkchart*.so.*
+%{tde_libdir}/libtdeinit_kchart.so
+%{tde_tdelibdir}/*kchart*.*
+%{tde_datadir}/apps/kchart/
+%{tde_datadir}/services/kchart*.desktop
+%{tde_tdeappdir}/*kchart.desktop
+%{tde_mandir}/man1/kchart.1*
+
+##########
+
+%package kformula
+Summary:		A powerful formula editor
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:		fonts-ttf-dejavu
+%else
+%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7
+Requires:		dejavu-lgc-sans-fonts
+%endif
+%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7
+Requires:		lyx-cmex10-fonts
+%endif
+%if 0%{?rhel} == 5
+Requires:		dejavu-lgc-fonts 
+%endif
+%if 0%{?suse_version} >= 1220
+Requires:		dejavu-fonts 
+%endif
+%if 0%{?suse_version} == 1140
+Requires:		dejavu
+%endif
+%endif
+
+%description kformula
+%{summary}.
+
+%files kformula
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kformula/
+%{tde_bindir}/kformula
+%{tde_libdir}/libtdeinit_kformula.so
+%{tde_tdelibdir}/*kformula*.*
+%{tde_datadir}/apps/kformula/
+%{tde_datadir}/services/kformula*.desktop
+%{tde_tdeappdir}/*kformula.desktop
+%{tde_mandir}/man1/kformula.1*
+
+##########
+
+%package filters
+Summary:		Import and Export Filters for KOffice
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description filters
+%{summary}.
+
+%files filters
+%defattr(-,root,root,-)
+%{tde_libdir}/libkwordexportfilters.so.*
+%{tde_tdelibdir}/libabiwordexport.*
+%{tde_tdelibdir}/libabiwordimport.*
+%{tde_tdelibdir}/libamiproexport.*
+%{tde_tdelibdir}/libamiproimport.*
+%{tde_tdelibdir}/libapplixspreadimport.*
+%{tde_tdelibdir}/libapplixwordimport.*
+%{tde_tdelibdir}/libasciiexport.*
+%{tde_tdelibdir}/libasciiimport.*
+%{tde_tdelibdir}/libdbaseimport.*
+%{tde_tdelibdir}/libdocbookexport.*
+%{tde_tdelibdir}/libexcelimport.*
+%{tde_tdelibdir}/libgenerickofilter.*
+%{tde_tdelibdir}/libhtmlexport.*
+%{tde_tdelibdir}/libhtmlimport.*
+%{tde_tdelibdir}/libkarbonepsimport.*
+%{tde_tdelibdir}/libkfolatexexport.*
+%{tde_tdelibdir}/libkfomathmlexport.*
+%{tde_tdelibdir}/libkfomathmlimport.*
+%{tde_tdelibdir}/libkfopngexport.*
+%{tde_tdelibdir}/libkspreadlatexexport.*
+%{tde_tdelibdir}/libkugarnopimport.*
+%{tde_tdelibdir}/libkwordkword1dot3import.*
+%{tde_tdelibdir}/libkwordlatexexport.*
+%{tde_tdelibdir}/libmswriteexport.*
+%{tde_tdelibdir}/libmswriteimport.*
+%{tde_tdelibdir}/libooimpressexport.*
+%{tde_tdelibdir}/libooimpressimport.*
+%{tde_tdelibdir}/liboowriterexport.*
+%{tde_tdelibdir}/liboowriterimport.*
+%{tde_tdelibdir}/libpalmdocexport.*
+%{tde_tdelibdir}/libpalmdocimport.*
+%{tde_tdelibdir}/libpdfimport.*
+%{tde_tdelibdir}/librtfexport.*
+%{tde_tdelibdir}/librtfimport.*
+%{tde_tdelibdir}/libwmlexport.*
+%{tde_tdelibdir}/libwmlimport.*
+%{tde_tdelibdir}/libwpexport.*
+%{tde_tdelibdir}/libwpimport.*
+%{tde_tdelibdir}/libmswordimport.*
+%{tde_tdelibdir}/libxsltimport.*
+%{tde_tdelibdir}/libxsltexport.*
+%{tde_tdelibdir}/libhancomwordimport.*
+%{tde_tdelibdir}/libkfosvgexport.*
+%{tde_tdelibdir}/liboodrawimport.*
+%{tde_tdelibdir}/libolefilter.*
+%{tde_datadir}/apps/xsltfilter/
+%{tde_datadir}/services/generic_filter.desktop
+%{tde_datadir}/services/ole_powerpoint97_import.desktop
+%{tde_datadir}/services/xslt*.desktop
+%{tde_datadir}/servicetypes/kofilter*.desktop
+
+##########
+
+%package kplato
+Summary:		An integrated project management and planning tool
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kplato
+%{summary}.
+
+%files kplato
+%defattr(-,root,root,-)
+%lang(en) %{tde_tdedocdir}/HTML/en/kplato/
+%{tde_bindir}/kplato
+%{tde_libdir}/libtdeinit_kplato.so
+%{tde_tdelibdir}/kplato.*
+%{tde_tdelibdir}/libkplatopart.*
+%{tde_datadir}/apps/kplato/
+%{tde_datadir}/services/kplatopart.desktop
+%{tde_tdeappdir}/*kplato.desktop
+
+##########
+
+%package chalk
+Summary:		pixel-based image manipulation program for the TDE Office Suite [Trinity]
+Group:			Applications/Productivity
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-chalk-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description chalk
+Chalk is a painting and image editing application for KOffice. Chalk contains
+both ease-of-use and fun features like guided painting.
+
+This package is part of the TDE Office Suite.
+
+%files chalk
+%defattr(-,root,root,-)
+%{tde_bindir}/chalk
+%{tde_tdelibdir}/chalkblurfilter.la
+%{tde_tdelibdir}/chalkblurfilter.so
+%{tde_tdelibdir}/chalkbumpmap.la
+%{tde_tdelibdir}/chalkbumpmap.so
+%{tde_tdelibdir}/chalkcimg.la
+%{tde_tdelibdir}/chalkcimg.so
+%{tde_tdelibdir}/chalk_cmyk_*
+%{tde_tdelibdir}/chalkcmykplugin.la
+%{tde_tdelibdir}/chalkcmykplugin.so
+%{tde_tdelibdir}/chalkcolorify.la
+%{tde_tdelibdir}/chalkcolorify.so
+%{tde_tdelibdir}/chalkcolorrange.la
+%{tde_tdelibdir}/chalkcolorrange.so
+%{tde_tdelibdir}/chalkcolorsfilters.la
+%{tde_tdelibdir}/chalkcolorsfilters.so
+%{tde_tdelibdir}/chalkcolorspaceconversion.la
+%{tde_tdelibdir}/chalkcolorspaceconversion.so
+%{tde_tdelibdir}/chalkconvolutionfilters.la
+%{tde_tdelibdir}/chalkconvolutionfilters.so
+%{tde_tdelibdir}/chalkdefaultpaintops.la
+%{tde_tdelibdir}/chalkdefaultpaintops.so
+%{tde_tdelibdir}/chalkdefaulttools.la
+%{tde_tdelibdir}/chalkdefaulttools.so
+%{tde_tdelibdir}/chalkdropshadow.la
+%{tde_tdelibdir}/chalkdropshadow.so
+%{tde_tdelibdir}/chalkembossfilter.la
+%{tde_tdelibdir}/chalkembossfilter.so
+%{tde_tdelibdir}/chalkexample.la
+%{tde_tdelibdir}/chalkexample.so
+%{tde_tdelibdir}/chalkextensioncolorsfilters.la
+%{tde_tdelibdir}/chalkextensioncolorsfilters.so
+%{tde_tdelibdir}/chalkfastcolortransfer.la
+%{tde_tdelibdir}/chalkfastcolortransfer.so
+%{tde_tdelibdir}/chalkfiltersgallery.la
+%{tde_tdelibdir}/chalkfiltersgallery.so
+%{tde_tdelibdir}/chalk_gray_*
+%{tde_tdelibdir}/chalkgrayplugin.la
+%{tde_tdelibdir}/chalkgrayplugin.so
+%{tde_tdelibdir}/chalkhistogramdocker.la
+%{tde_tdelibdir}/chalkhistogramdocker.so
+%{tde_tdelibdir}/chalkhistogram.la
+%{tde_tdelibdir}/chalkhistogram.so
+%{tde_tdelibdir}/chalkimageenhancement.la
+%{tde_tdelibdir}/chalkimageenhancement.so
+%{tde_tdelibdir}/chalkimagesize.la
+%{tde_tdelibdir}/chalkimagesize.so
+%{tde_tdelibdir}/chalk.la
+%{tde_tdelibdir}/chalklenscorrectionfilter.la
+%{tde_tdelibdir}/chalklenscorrectionfilter.so
+%{tde_tdelibdir}/chalklevelfilter.la
+%{tde_tdelibdir}/chalklevelfilter.so
+%{tde_tdelibdir}/chalk_lms_*
+%{tde_tdelibdir}/chalkmodifyselection.la
+%{tde_tdelibdir}/chalkmodifyselection.so
+%{tde_tdelibdir}/chalknoisefilter.la
+%{tde_tdelibdir}/chalknoisefilter.so
+%{tde_tdelibdir}/chalkoilpaintfilter.la
+%{tde_tdelibdir}/chalkoilpaintfilter.so
+%{tde_tdelibdir}/chalkpixelizefilter.la
+%{tde_tdelibdir}/chalkpixelizefilter.so
+%{tde_tdelibdir}/chalkraindropsfilter.la
+%{tde_tdelibdir}/chalkraindropsfilter.so
+%{tde_tdelibdir}/chalkrandompickfilter.la
+%{tde_tdelibdir}/chalkrandompickfilter.so
+%{tde_tdelibdir}/chalk_rgb_*
+%{tde_tdelibdir}/chalkrgbplugin.la
+%{tde_tdelibdir}/chalkrgbplugin.so
+%{tde_tdelibdir}/chalkrotateimage.la
+%{tde_tdelibdir}/chalkrotateimage.so
+%{tde_tdelibdir}/chalkroundcornersfilter.la
+%{tde_tdelibdir}/chalkroundcornersfilter.so
+%{tde_tdelibdir}/chalkselectiontools.la
+%{tde_tdelibdir}/chalkselectiontools.so
+%{tde_tdelibdir}/chalkselectopaque.la
+%{tde_tdelibdir}/chalkselectopaque.so
+%{tde_tdelibdir}/chalkseparatechannels.la
+%{tde_tdelibdir}/chalkseparatechannels.so
+%{tde_tdelibdir}/chalkshearimage.la
+%{tde_tdelibdir}/chalkshearimage.so
+%{tde_tdelibdir}/chalksmalltilesfilter.la
+%{tde_tdelibdir}/chalksmalltilesfilter.so
+%{tde_tdelibdir}/chalk.so
+%{tde_tdelibdir}/chalkscreenshot.la
+%{tde_tdelibdir}/chalkscreenshot.so
+%{tde_tdelibdir}/chalksobelfilter.la
+%{tde_tdelibdir}/chalksobelfilter.so
+%{tde_tdelibdir}/chalksubstrate.la
+%{tde_tdelibdir}/chalksubstrate.so
+%{tde_tdelibdir}/chalktoolcrop.la
+%{tde_tdelibdir}/chalktoolcrop.so
+%{tde_tdelibdir}/chalktoolcurves.la
+%{tde_tdelibdir}/chalktoolcurves.so
+%{tde_tdelibdir}/chalktoolfilter.la
+%{tde_tdelibdir}/chalktoolfilter.so
+%{tde_tdelibdir}/chalktoolperspectivegrid.la
+%{tde_tdelibdir}/chalktoolperspectivegrid.so
+%{tde_tdelibdir}/chalktoolperspectivetransform.la
+%{tde_tdelibdir}/chalktoolperspectivetransform.so
+%{tde_tdelibdir}/chalktoolpolygon.la
+%{tde_tdelibdir}/chalktoolpolygon.so
+%{tde_tdelibdir}/chalktoolpolyline.la
+%{tde_tdelibdir}/chalktoolpolyline.so
+%{tde_tdelibdir}/chalktoolselectsimilar.la
+%{tde_tdelibdir}/chalktoolselectsimilar.so
+%{tde_tdelibdir}/chalktoolstar.la
+%{tde_tdelibdir}/chalktoolstar.so
+%{tde_tdelibdir}/chalktooltransform.la
+%{tde_tdelibdir}/chalktooltransform.so
+%{tde_tdelibdir}/chalkunsharpfilter.la
+%{tde_tdelibdir}/chalkunsharpfilter.so
+%{tde_tdelibdir}/chalkwavefilter.la
+%{tde_tdelibdir}/chalkwavefilter.so
+%{tde_tdelibdir}/chalkwetplugin.la
+%{tde_tdelibdir}/chalkwetplugin.so
+%{tde_tdelibdir}/chalk_ycbcr_*
+%if 0%{?with_graphicsmagick}
+%{tde_tdelibdir}/libchalkgmagickexport.la
+%{tde_tdelibdir}/libchalkgmagickexport.so
+%{tde_tdelibdir}/libchalkgmagickimport.la
+%{tde_tdelibdir}/libchalkgmagickimport.so
+%{tde_tdelibdir}/libchalkjpegexport.la
+%{tde_tdelibdir}/libchalkjpegexport.so
+%{tde_tdelibdir}/libchalkjpegimport.la
+%{tde_tdelibdir}/libchalkjpegimport.so
+%endif
+%{tde_tdelibdir}/libchalk_openexr_export.la
+%{tde_tdelibdir}/libchalk_openexr_export.so
+%{tde_tdelibdir}/libchalk_openexr_import.la
+%{tde_tdelibdir}/libchalk_openexr_import.so
+%{tde_tdelibdir}/libchalkpart.la
+%{tde_tdelibdir}/libchalkpart.so
+%{tde_tdelibdir}/libchalkpdfimport.la
+%{tde_tdelibdir}/libchalkpdfimport.so
+%{tde_tdelibdir}/libchalkpngexport.la
+%{tde_tdelibdir}/libchalkpngexport.so
+%{tde_tdelibdir}/libchalkpngimport.la
+%{tde_tdelibdir}/libchalkpngimport.so
+%{tde_tdelibdir}/libchalk_raw_import.la
+%{tde_tdelibdir}/libchalk_raw_import.so
+%if 0%{?with_graphicsmagick}
+%{tde_tdelibdir}/libchalktiffexport.la
+%{tde_tdelibdir}/libchalktiffexport.so
+%{tde_tdelibdir}/libchalktiffimport.la
+%{tde_tdelibdir}/libchalktiffimport.so
+%endif
+%{tde_libdir}/libtdeinit_chalk.so
+%{tde_libdir}/libchalk_cmyk_*.so.*
+%{tde_libdir}/libchalkcolor.so.*
+%{tde_libdir}/libchalkcommon.so.*
+%{tde_libdir}/libchalkgrayscale.so.*
+%{tde_libdir}/libchalk_gray_*.so.*
+%{tde_libdir}/libchalkimage.so.*
+%{tde_libdir}/libchalk_lms_*.so.*
+%{tde_libdir}/libchalk_rgb_*.so.*
+%{tde_libdir}/libchalkrgb.so.*
+%{tde_libdir}/libchalkui.so.*
+%{tde_libdir}/libchalk_ycbcr_*.so.*
+%if 0%{?with_kross}
+%{tde_tdelibdir}/krosschalkcore.la
+%{tde_tdelibdir}/krosschalkcore.so
+%{tde_tdelibdir}/chalkscripting.la
+%{tde_tdelibdir}/chalkscripting.so
+%{tde_libdir}/libchalkscripting.so.*
+%endif
+
+##########
+
+%package chalk-data
+Summary:		data files for Chalk painting program [Trinity]
+Group:			Applications/Productivity
+
+%description chalk-data
+This package contains architecture-independent data files for Chalk,
+the painting program shipped with the TDE Office Suite.
+
+See the chalk package for further information.
+
+This package is part of the TDE Office Suite.
+
+%files chalk-data
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/chalk.desktop
+%{tde_datadir}/applnk/.hidden/chalk_*.desktop
+%{tde_datadir}/apps/chalk/
+%{tde_datadir}/apps/chalkplugins/
+%lang(en) %{tde_tdedocdir}/HTML/en/chalk/
+%{tde_datadir}/services/chalk*.desktop
+%{tde_datadir}/servicetypes/chalk*.desktop
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+export kde_confdir="%{tde_confdir}"
+
+%if 0%{?suse_version} == 1220
+RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])')
+CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
+%endif
+
+%if 0%{?suse_version} >= 1550
+CXXFLAGS="${CXXFLAGS} -std=c++11"
+%endif
+
+# FTBFS on RHEL 5
+%if 0%{?rhel} == 5
+%__sed -i "kexi/migration/keximigratetest.cpp" \
+       -e "/TDEApplication/ s|\");|\", true, true, true);|"
+%endif
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  --with-extra-libs=%{tde_libdir} \
+  --with-extra-includes=%{tde_includedir}/arts \
+  \
+  --disable-kexi-macros \
+  %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
+  %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
+#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do
+#  mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/;
+#done
+
+# Fix desktop icon location
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kudesigner    Office FlowChart
+%suse_update_desktop_file kivio		Office FlowChart
+%suse_update_desktop_file kchart	Office FlowChart
+%suse_update_desktop_file kexi		Office Database
+%suse_update_desktop_file -r chalk	Graphics RasterGraphics
+%suse_update_desktop_file -r karbon     Graphics VectorGraphics
+%suse_update_desktop_file kpresenter	Office Presentation
+%suse_update_desktop_file kspread	Office Spreadsheet
+%suse_update_desktop_file -u KThesaurus Office
+%suse_update_desktop_file -r kformula   Science Math
+%suse_update_desktop_file kword		Office WordProcessor
+%suse_update_desktop_file koshell    Office Core-Office
+%suse_update_desktop_file kplato        Office ProjectManagement
+%endif
+
+# Apps that should stay in TDE
+for i in kivio kplato; do
+  echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
+done
+
+# Links duplicate files
+%fdupes %{buildroot}
+
+## unpackaged files
+# fonts
+rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/
+# libtool archives
+rm -f %{buildroot}%{tde_libdir}/lib*.la
+# shouldn't these be in koffice-l10n? 
+rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/koffice/koshell.png b/redhat/applications/office/koffice/koshell.png
index c66ef99e8..c66ef99e8 100644
--- a/redhat/applications/koffice/koshell.png
+++ b/redhat/applications/office/koffice/koshell.png
diff --git a/redhat/applications/koffice/trinity-koffice-rpmlintrc b/redhat/applications/office/koffice/trinity-koffice-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/koffice/trinity-koffice-rpmlintrc
+++ b/redhat/applications/office/koffice/trinity-koffice-rpmlintrc
diff --git a/redhat/applications/office/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec
new file mode 100644
index 000000000..3b5a2320c
--- /dev/null
+++ b/redhat/applications/office/kpilot/kpilot.spec
@@ -0,0 +1,230 @@
+#
+# spec file for package kpilot (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kpilot
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.7
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE Palm Pilot hot-sync tool
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# ICAL support
+BuildRequires:	libical-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# FLEX
+%if 0%{?suse_version} || 0%{?mgaversion}
+BuildRequires:	flex
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	flex
+%if 0%{?rhel} != 5
+BuildRequires:	flex-devel
+%endif
+%endif
+
+# PILOT support
+BuildRequires:	pilot-link-devel >= 0.12
+
+
+%description
+KPilot is an application that synchronizes your Palm Pilot or similar device
+(like the Handspring Visor) with your TDE desktop, much like the Palm HotSync
+software does for Windows.  KPilot can back-up and restore your Palm Pilot
+and synchronize the built-in applications with their TDE counterparts.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Unwanted files
+%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
+%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kpilot.desktop          Utility  PDA SyncUtility X-KDE-Utilities-Peripherals
+%suse_update_desktop_file -u -r %{?buildroot}%{tde_tdeappdir}/kpalmdoc.desktop        Utility  PDA X-TDE-Utilities-File
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/kpalmdoc
+%{tde_bindir}/kpilot
+%{tde_bindir}/kpilotDaemon
+%{tde_libdir}/libkpilot.la
+%{tde_libdir}/libkpilot.so.0
+%{tde_libdir}/libkpilot.so.0.0.0
+%{tde_tdelibdir}/conduit_address.la
+%{tde_tdelibdir}/conduit_address.so
+%{tde_tdelibdir}/conduit_doc.la
+%{tde_tdelibdir}/conduit_doc.so
+%{tde_tdelibdir}/conduit_knotes.la
+%{tde_tdelibdir}/conduit_knotes.so
+%{tde_tdelibdir}/conduit_memofile.la
+%{tde_tdelibdir}/conduit_memofile.so
+%{tde_tdelibdir}/conduit_notepad.la
+%{tde_tdelibdir}/conduit_notepad.so
+%{tde_tdelibdir}/conduit_popmail.la
+%{tde_tdelibdir}/conduit_popmail.so
+%{tde_tdelibdir}/conduit_sysinfo.la
+%{tde_tdelibdir}/conduit_sysinfo.so
+%{tde_tdelibdir}/conduit_time.la
+%{tde_tdelibdir}/conduit_time.so
+%{tde_tdelibdir}/conduit_todo.la
+%{tde_tdelibdir}/conduit_todo.so
+%{tde_tdelibdir}/conduit_vcal.la
+%{tde_tdelibdir}/conduit_vcal.so
+%{tde_tdelibdir}/kcm_kpilot.la
+%{tde_tdelibdir}/kcm_kpilot.so
+%{tde_tdeappdir}/kpalmdoc.desktop
+%{tde_tdeappdir}/kpilot.desktop
+%{tde_tdeappdir}/kpilotdaemon.desktop
+%{tde_datadir}/apps/kaddressbook/contacteditorpages/
+%{tde_datadir}/apps/tdeconf_update/kpalmdoc.upd
+%{tde_datadir}/apps/tdeconf_update/kpilot.upd
+%{tde_datadir}/apps/kpilot
+%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/*.png
+%{tde_datadir}/icons/hicolor/*/apps/*.png
+%{tde_datadir}/services/*.desktop
+%{tde_datadir}/servicetypes/kpilotconduit.desktop
+%{tde_tdedocdir}/HTML/en/kpilot/
+
+
+%changelog
diff --git a/redhat/applications/kpilot/trinity-kpilot-rpmlintrc b/redhat/applications/office/kpilot/trinity-kpilot-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kpilot/trinity-kpilot-rpmlintrc
+++ b/redhat/applications/office/kpilot/trinity-kpilot-rpmlintrc
diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec
new file mode 100644
index 000000000..1645a3e61
--- /dev/null
+++ b/redhat/applications/office/tellico/tellico.spec
@@ -0,0 +1,362 @@
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 9
+%define _hardened_ldflags %nil
+%endif
+
+#
+# spec file for package tellico (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 confolrms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tellico
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.3.2.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Icollection manager for books, videos, music [Trinity]
+Group:		Applications/Utilities
+URL:		http://periapsis.org/tellico/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
+BuildRequires:	trinity-libkcal-devel >= %{tde_version}
+BuildRequires:	trinity-libpoppler-tqt-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# POPPLER support
+%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} >= 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
+BuildRequires: poppler-devel >= 0.12
+%endif
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}poppler-devel
+%endif
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
+BuildRequires:	trinity-poppler-devel >= 0.12
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# YAZ support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	yaz
+BuildRequires:	%{_lib}yaz-devel
+%endif
+
+# XML2 support
+BuildRequires:  libxml2-devel
+
+# XSLT support
+BuildRequires:  libxslt-devel
+%if 0%{?rhel} == 4
+# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
+BuildRequires:  libgcrypt-devel
+%endif
+
+# V4L support
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+BuildRequires:	libv4l-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}v4l-devel
+%endif
+
+# EXEMPI support
+%if 0%{?suse_version}
+BuildRequires:	libexempi-devel
+%else
+BuildRequires:	exempi-devel
+%endif
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# ATTR support
+BuildRequires:	libattr-devel
+
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
+# Readline support
+BuildRequires:	readline-devel
+
+
+Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+Tellico is a collection manager for TDE. It includes default collections for
+books, bibliographies, comic books, videos, music, coins, stamps, trading
+cards, and wines, and also allows custom collections; with unlimited
+user-defined fields allowed. Automatically formatted names, sorting by any
+property, filters, automatic ISBN validation and full customization for
+printing or display through XSLT files are some of the features present. It
+can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
+BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
+or any US-MARC compliant z39.50 server.
+
+The files are stored in XML format, avoiding the need for database server.
+It also makes it easy for other softwares to use the Tellico data.
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/tellico
+%{tde_datadir}/applications
+%config(noreplace) %{tde_confdir}/tellicorc
+%{tde_mandir}/man1/tellico.1*
+
+##########
+
+%package data
+Group:			Applications/Utilities
+Summary:		collection manager for books, videos, music [data] [Trinity]
+
+%description data
+Tellico is a collection manager for TDE. It includes default collections for
+books, bibliographies, comic books, videos, music, coins, stamps, trading
+cards, and wines, and also allows custom collections; with unlimited
+user-defined fields allowed. Automatically formatted names, sorting by any
+property, filters, automatic ISBN validation and full customization for
+printing or display through XSLT files are some of the features present. It
+can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
+BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
+or any US-MARC compliant z39.50 server.
+
+The files are stored in XML format, avoiding the need for database server.
+It also makes it easy for other softwares to use the Tellico data.
+
+This package contains the architecture independent files, such data files and
+documentation.
+
+%files data
+%defattr(-,root,root,-)
+%dir %{tde_datadir}/apps/tellico
+%{tde_datadir}/apps/tellico/*.xsl
+%{tde_datadir}/apps/tellico/*.xml
+%{tde_datadir}/apps/tellico/*.png
+%{tde_datadir}/apps/tellico/entry-templates
+%{tde_datadir}/apps/tellico/*.py*
+%{tde_datadir}/apps/tellico/pics
+%{tde_datadir}/apps/tellico/report-templates
+%{tde_datadir}/apps/tellico/tellico.dtd
+%{tde_datadir}/apps/tellico/tellico.tips
+%{tde_datadir}/apps/tellico/tellico2html.js
+%{tde_datadir}/apps/tellico/tellicoui.rc
+%{tde_datadir}/apps/tellico/welcome.html
+%{tde_datadir}/config.kcfg
+%{tde_tdedocdir}/HTML/*/tellico/
+%{tde_datadir}/icons/hicolor/*/apps/tellico.png
+%{tde_datadir}/icons/hicolor/*/mimetypes/application-x-tellico.png
+%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
+%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
+%{tde_datadir}/mime/packages/tellico.xml
+%{tde_datadir}/mimelnk/application/x-tellico.desktop
+%{tde_datadir}/apps/tdeconf_update/tellico-1-3-update.pl
+%{tde_datadir}/apps/tdeconf_update/tellico-rename.upd
+%{tde_datadir}/apps/tdeconf_update/tellico.upd
+
+##########
+
+%package scripts
+Group:			Applications/Utilities
+Summary:		collection manager for books, videos, music [scripts] [Trinity]
+
+%description scripts
+Tellico is a collection manager for TDE. It includes default collections for
+books, bibliographies, comic books, videos, music, coins, stamps, trading
+cards, and wines, and also allows custom collections; with unlimited
+user-defined fields allowed. Automatically formatted names, sorting by any
+property, filters, automatic ISBN validation and full customization for
+printing or display through XSLT files are some of the features present. It
+can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
+BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
+or any US-MARC compliant z39.50 server.
+
+The files are stored in XML format, avoiding the need for database server.
+It also makes it easy for other softwares to use the Tellico data.
+
+This package contains the scripts to import data from external sources, such
+as websites. As the format of the data may change, these scripts are provided
+as a separate package which can be updated through debian-volatile.
+
+%files scripts
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/tellico/data-sources
+%{tde_datadir}/apps/tellico/z3950-servers.cfg
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+if [ -r /usr/include/libv4l1-videodev.h ]; then
+%__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|"
+fi
+
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
+%__sed -i "src/fetch/scripts/dark_horse_comics.py" \
+          "src/fetch/scripts/ministerio_de_cultura.py" \
+          "src/fetch/scripts/fr.allocine.py" \
+          "src/translators/griffith2tellico.py" \
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
+%endif
+
+
+%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
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_LIBKCDDB=ON \
+  -DWITH_LIBKCAL=ON \
+  -DWITH_LIBBTPARSE=OFF \
+  -DWITH_SAX_LOADER=ON \
+%if 0%{?rhel} == 5
+  -DBUILD_WEBCAM_SUPPORT=OFF \
+%endif
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+# Add svg icons to xdg directories
+%__install -D -c -p -m 644 "icons/tellico.svg" "%{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg"
+%__install -D -c -p -m 644 "icons/tellico_mime.svg" "%{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg"
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/piklab/piklab.spec b/redhat/applications/piklab/piklab.spec
deleted file mode 100644
index 2074f5981..000000000
--- a/redhat/applications/piklab/piklab.spec
+++ /dev/null
@@ -1,189 +0,0 @@
-#
-# spec file for package piklab (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg piklab
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.15.2
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	IDE for PIC-microcontroller development [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# READLINE support
-BuildRequires:	readline-devel
-
-# LIBUSB support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
-BuildRequires:  %{_lib}usb1.0-devel
-BuildRequires:  %{_lib}usb-compat0.1-devel
-%else
-BuildRequires:  libusb-devel
-%endif
-
-
-%description
-Piklab is an integrated development environment for applications based on
-Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment.
-
-Support for several compiler and assembler toolchains is integrated. The
-GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and
-PICkit2 programmers, the PicStart+ programmer, and most direct programmers
-are supported. A command-line programmer and debugger are also available.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-final causes FTBFS
-# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --disable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-%if 0%{?rhel} == 5
-  --disable-libreadline \
-%endif
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in"
-%endif
-
-%__make %{?_smp_mflags}
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in"
-%endif
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Incorrect extension on manpage
-%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/piklab
-%{tde_bindir}/piklab-coff
-%{tde_bindir}/piklab-hex
-%{tde_bindir}/piklab-prog
-%{tde_tdeappdir}/piklab.desktop
-%{tde_datadir}/apps/katepart/syntax/asm-pic.xml
-%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml
-%{tde_datadir}/apps/katepart/syntax/coff-pic.xml
-%{tde_datadir}/apps/katepart/syntax/jal-pic.xml
-%{tde_datadir}/apps/piklab
-%{tde_tdedocdir}/HTML/en/piklab
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/mimelnk/application/x-piklab.desktop
-%{tde_mandir}/man1/piklab-coff.1
-%{tde_mandir}/man1/piklab-hex.1
-%{tde_mandir}/man1/piklab-prog.1
-%{tde_mandir}/man1/piklab.1
-
-
-%changelog
diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/potracegui/potracegui.spec
deleted file mode 100644
index 8c15440b5..000000000
--- a/redhat/applications/potracegui/potracegui.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# spec file for package potracegui (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg potracegui
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	TDE frontend for potrace [Trinity]
-Group:		Applications/Multimedia
-URL:		http://potracegui.sourceforge.net
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-A TDE interface for the commandline tracing tools potrace and/or autotrace. It
-supports drag and drop as well as all image types recognized by TDE, which are
-a lot more than the 4 recognized by the potrace commandline tool. Loading of
-remote files (web, ftp, ...) is also supported.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file potracegui -G "Potrace GUI" Graphics VectorGraphics
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{tde_bindir}/potracegui
-%{tde_tdeappdir}/potracegui.desktop
-%{tde_datadir}/apps/potracegui/
-%{tde_tdedocdir}/HTML/en/potracegui/
-%{tde_datadir}/icons/hicolor/*/apps/potracegui.png
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
deleted file mode 100644
index 4dac1976c..000000000
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# spec file for package qalculate-tde (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg qalculate-tde
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.9.7
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Powerful and easy to use desktop calculator - TDE version
-Group:		Applications/Multimedia
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-BuildRequires:	libqalculate-devel >= 0.9.6
-
-%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?rhel}
-BuildRequires:	cln-devel
-%endif
-%if 0%{?pclinuxos} >= 2018
-BuildRequires:	libcln-devel
-%endif
-%if 0%{?mgaversion} >= 7
-BuildRequires:	%{_lib}cln-devel
-%endif
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Qalculate! is small and simple to use but with much power and versatility
-underneath.  Features include customizable functions, units, arbitrary
-precision, plotting, and a graphical interface that uses a one-line
-fault-tolerant expression entry (although it supports optional traditional
-buttons).
-
-This package contains the TDE user interface of qalculate.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang qalculate_tde
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file qalculate_tde -r TDE Utility Calculator
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f qalculate_tde.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/qalculate
-%{tde_bindir}/qalculate-tde
-%{tde_datadir}/apps/qalculate_tde/
-%{tde_tdeappdir}/qalculate_tde.desktop
-%{tde_tdedocdir}/HTML/en/qalculate_tde/
-%{tde_datadir}/icons/hicolor/*/apps/qalculate_tde.png
-%{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png
-
-
-%changelog
diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
deleted file mode 100644
index 0af61c2f2..000000000
--- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# spec file for package qt4-tqt-theme-engine (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg qt4-tqt-theme-engine
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%if "%{?_qt4_plugindir}" == ""
-%define _qt4_plugindir %{_libdir}/qt4/plugins
-%endif
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	TDE theme engine for Qt4
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# QT4 support
-%if 0%{?suse_version}
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
-BuildRequires:	libqt4-devel
-%else
-BuildRequires:	qt-devel
-%endif
-%else
-BuildRequires:	qt4-devel
-%endif
-
-
-%description
-TDE theme engine for Qt4
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-# Fix compilation with 'lib64'
-%if "%_lib" == "lib64"
-%__sed -i */*.pro -e "s|/opt/trinity/lib|/opt/trinity/lib64|g"
-%endif
-
-# Fix TDE include directory
-%__sed -i */*.pro -e "s|INCLUDEPATH += /opt/trinity/include|INCLUDEPATH += %{tde_tdeincludedir}|"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-if [ -x "%{_libdir}/qt4/bin/qmake" ]; then
-  export PATH="%{_libdir}/qt4/bin:${PATH}"
-fi
-
-# Use QT4's qmake
-qmake
-
-
-# Not SMP SAFE !
-%__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install INSTALL_ROOT=%{buildroot}
-
-# Unwanted files (-devel ?)
-%__rm -f %{?buildroot}%{_libdir}/libtdeqt4interface.so
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/libtdeqt4interface.so.1
-%{_libdir}/libtdeqt4interface.so.1.0
-%{_libdir}/libtdeqt4interface.so.1.0.0
-%dir %{_qt4_plugindir}/styles/
-%{_qt4_plugindir}/styles/libsimplestyleplugin.so
-
-
-%changelog
diff --git a/redhat/applications/rosegarden/rosegarden.spec b/redhat/applications/rosegarden/rosegarden.spec
deleted file mode 100644
index 76dd1c543..000000000
--- a/redhat/applications/rosegarden/rosegarden.spec
+++ /dev/null
@@ -1,253 +0,0 @@
-#
-# spec file for package rosegarden (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg rosegarden
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.7.0
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Music editor and MIDI/audio sequencer [Trinity]
-Group:		Applications/Multimedia
-URL:		http://www.rosegardenmusic.com/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	fftw-devel
-BuildRequires:	liblo-devel
-BuildRequires:	fontconfig-devel
-
-# DSSI support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	dssi-devel
-%endif
-
-# LRDF support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	liblrdf-devel
-%endif
-
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-%else
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# LIRC support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
-%define with_lirc 1
-BuildRequires:	lirc-devel
-%endif
-
-# IDN support
-BuildRequires:  libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:  gamin-devel
-%endif
-
-Requires:		lilypond
-Requires:		perl-XML-Twig
-
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-Requires:		libsndfile-progs
-%else
-%if 0%{?rhel}
-Requires:		libsndfile
-%else
-Requires:		libsndfile-utils
-%endif
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-Rosegarden is a TDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-%package data
-Group:			Applications/Multimedia
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Summary:		music editor and MIDI/audio sequencer data files [Trinity]
-
-%description data
-Rosegarden is a TDE application which provides a mixed Audio/MIDI
-sequencer (for playback and recording), a multi-track editor, music
-editing using both piano-roll and score notation, MIDI file IO,
-lilypond and Csound files export, etc.
-
-This package provides the data files necessary for running Rosegarden
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWANT_SOUND=ON \
-  -DWANT_JACK=ON \
-  -DWANT_DSSI=ON \
-  %{?with_lirc:-DWANT_LIRC=ON} %{?!with_lirc:-DWANT_LIRC=OFF} \
-  -DWANT_PCH=OFF \
-  -DWANT_TEST=OFF \
-  -DWANT_DEBUG=OFF \
-  -DWANT_FULLDBG=OFF \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Unwanted files
-%__rm -f %{?buildroot}%{tde_libdir}/*.a
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/rosegarden
-%{tde_bindir}/rosegarden-audiofile-importer
-%{tde_bindir}/rosegarden-lilypondview
-%{tde_bindir}/rosegarden-project-package
-%{tde_bindir}/rosegardensequencer
-
-%files data -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/rosegarden.desktop
-%{tde_datadir}/apps/profiles/rosegarden.profile.xml
-%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden
-%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden
-%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden
-%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden
-%{tde_datadir}/apps/rosegarden
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/icons/locolor/*/*/*
-%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop
-%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop
-%{tde_datadir}/mimelnk/audio/x-soundfont.desktop
-
-
-%changelog
diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec
new file mode 100644
index 000000000..bde20158a
--- /dev/null
+++ b/redhat/applications/settings/kima/kima.spec
@@ -0,0 +1,173 @@
+#
+# spec file for package kima (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kima
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.7.3.2
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Kicker monitoring applet [Trinity]
+Group:			Applications/Utilities
+URL:			http://www.elliptique.net/~ken/kima/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
+BuildRequires:	libudev-devel
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+This applet monitors various temperature,
+frequency and fan sources in your kicker
+panel.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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 \
+  -DWITH_NVCONTROL=OFF \
+  \
+  -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,-)
+%doc AUTHORS ChangeLog COPYING README.md TODO
+%{tde_tdelibdir}/libkima.la
+%{tde_tdelibdir}/libkima.so
+%{tde_datadir}/apps/kicker/applets/kima.desktop
+%{tde_tdedocdir}/HTML/en/kima/
+
+
+%changelog
diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec
new file mode 100644
index 000000000..6bd1357a2
--- /dev/null
+++ b/redhat/applications/settings/kiosktool/kiosktool.spec
@@ -0,0 +1,187 @@
+#
+# spec file for package kiosktool (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kiosktool
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.0
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Tool to configure the TDE kiosk framework
+Group:			Applications/Multimedia
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+A Point&Click tool for system administrators to enable 
+TDE's KIOSK features or otherwise preconfigure TDE for 
+groups of users.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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 $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+%__mkdir_p "%{?buildroot}%{tde_confdir}"
+cat <<EOF >"%{?buildroot}%{tde_confdir}/kiosktoolrc"
+[General]
+GroupBlacklist=bin,daemon,sys,tty,disk,lp,www,kmem,wheel,mail,news,uucp,shadow,utmp,at,xok,named,ftp,postfix,maildrop,man,sshd,distcc,nobody,nogroup
+EOF
+
+# Updates applications categories for openSUSE
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%if 0%{?suse_version}
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System SystemSetup
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING README.md TODO
+%{tde_bindir}/kiosktool
+%{tde_bindir}/kiosktool-tdedirs
+%{tde_tdeappdir}/kiosktool.desktop
+%{tde_datadir}/apps/kiosktool/
+%lang(da) %{tde_tdedocdir}/HTML/da/kiosktool/
+%lang(en) %{tde_tdedocdir}/HTML/en/kiosktool/
+%lang(it) %{tde_tdedocdir}/HTML/it/kiosktool/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/kiosktool/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/kiosktool/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/kiosktool/
+%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
+%config(noreplace) %{tde_confdir}/kiosktoolrc
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec
new file mode 100644
index 000000000..b9113b344
--- /dev/null
+++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec
@@ -0,0 +1,192 @@
+#
+# spec file for package kkbswitch (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kkbswitch
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.4.3
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Keyboard layout indicator for TDE
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# XKBFILES support
+BuildRequires:	libxkbfile-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KKBSwitch displays an icon in the system tray that indicates which layout is 
+currently active and enables you to switch layouts by clicking the icon or by 
+selecting from the menu. It works with all desktop environments.
+
+Features include:
+- Configurable icons for the keyboard layouts.
+- The "toggle mode" to toggle between the two most recently-used keyboard 
+  layouts.
+- Choose to use a global layout or per-application or per-window layouts.
+- Configurable keyboard shortcuts.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Fix desktop icon location
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+  %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
+  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System TrayIcon
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog README.md TODO
+%{tde_bindir}/kkbswitch
+%{tde_tdeappdir}/kkbswitch.desktop
+%{tde_datadir}/apps/kkbswitch/
+%{tde_datadir}/apps/tdeconf_update/kkbswitch.upd
+%{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_icons
+%{tde_datadir}/apps/tdeconf_update/kkbswitch_update_14_options
+%{tde_datadir}/autostart/kkbswitch.desktop
+%{tde_datadir}/X11/xkb/symbols/ru_ua
+%{tde_tdedocdir}/HTML/en/kkbswitch/
+%{tde_mandir}/man1/kkbswitch.1
+%{tde_datadir}/icons/hicolor/*/apps/kkbswitch.png
+
+
+%changelog
diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec
new file mode 100644
index 000000000..bdd52f204
--- /dev/null
+++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec
@@ -0,0 +1,159 @@
+#
+# spec file for package klcddimmer (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg klcddimmer
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.3
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Applet to adjust LCD brightness for TDE
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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} || touch %{tde_pkg}.lang
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING LICENSE NEWS README.md
+%{tde_libdir}/klcddimmer_panelapplet.la
+%{tde_libdir}/klcddimmer_panelapplet.so
+%{tde_datadir}/apps/kicker/applets/klcddimmer.desktop
+%{tde_tdedocdir}/HTML/en/klcddimmer/
+%{tde_datadir}/icons/hicolor/*/apps/klcddimmer.png
+
+
+%changelog
diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
new file mode 100644
index 000000000..857fa4f82
--- /dev/null
+++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec
@@ -0,0 +1,224 @@
+#
+# spec file for package kmyfirewall (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kmyfirewall
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.1.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Iptables based firewall configuration tool for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KMyFirewall attempts to make it easier to setup iptables based firewalls on
+Linux systems. It will be the right tool if you like to have a so called
+"Personal Firewall" running on your Linux box, but don't have the time and/or
+the interest to spend hours in front of the iptables manual just to setup a 
+Firewall that keeps the "bad" people out.
+
+There is also the possibility to save entire rule sets, so you only have to
+configure your rule set one time and then you can use it on several computers
+giving each of them a similar configuration (p.e. school networks, office,
+university etc.)
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
+%{tde_bindir}/kmyfirewall
+%{tde_libdir}/libkmfcore.so.*
+%{tde_libdir}/libkmfwidgets.so.*
+%{tde_tdelibdir}/libkmfcompiler_ipt.la
+%{tde_tdelibdir}/libkmfcompiler_ipt.so
+%{tde_tdelibdir}/libkmfgenericinterfacepart.la
+%{tde_tdelibdir}/libkmfgenericinterfacepart.so
+%{tde_tdelibdir}/libkmfinstaller_linux.la
+%{tde_tdelibdir}/libkmfinstaller_linux.so
+%{tde_tdelibdir}/libkmfinstallerplugin.la
+%{tde_tdelibdir}/libkmfinstallerplugin.so
+%{tde_tdelibdir}/libkmfipteditorpart.la
+%{tde_tdelibdir}/libkmfipteditorpart.so
+%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
+%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
+%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
+%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
+%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
+%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
+%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
+%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
+%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
+%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
+%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
+%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
+%{tde_tdelibdir}/libkmfruleoptionedit_state.la
+%{tde_tdelibdir}/libkmfruleoptionedit_state.so
+%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
+%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
+%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
+%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
+%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
+%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
+%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
+%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
+%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
+%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
+%{tde_tdeappdir}/kmyfirewall.desktop
+%{tde_datadir}/apps/kmfgenericinterfacepart/
+%{tde_datadir}/apps/kmfipteditorpart/
+%{tde_datadir}/apps/kmfsystray/
+%{tde_datadir}/apps/kmyfirewall/
+%{tde_datadir}/config.kcfg/kmfconfig.kcfg
+%config(noreplace) %{tde_confdir}/kmyfirewallrc
+%{tde_tdedocdir}/HTML/en/kmyfirewall/
+%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
+%{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
+%{tde_datadir}/mimelnk/application/kmfgrs.desktop
+%{tde_datadir}/mimelnk/application/kmfnet.desktop
+%{tde_datadir}/mimelnk/application/kmfpkg.desktop
+%{tde_datadir}/mimelnk/application/kmfrs.desktop
+%{tde_datadir}/services/kmf*.desktop
+%{tde_datadir}/servicetypes/kmf*.desktop
+
+##########
+
+%package devel
+Summary:		Development files for %{name}
+Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
+
+%description devel
+%{summary}
+
+%files devel
+%{tde_tdeincludedir}/kmyfirewall
+%{tde_libdir}/libkmfcore.la
+%{tde_libdir}/libkmfcore.so
+%{tde_libdir}/libkmfwidgets.la
+%{tde_libdir}/libkmfwidgets.so
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{tde_pkg}" System Network
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc b/redhat/applications/settings/kmyfirewall/trinity-kmyfirewall-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/applications/kmyfirewall/trinity-kmyfirewall-rpmlintrc
+++ b/redhat/applications/settings/kmyfirewall/trinity-kmyfirewall-rpmlintrc
diff --git a/redhat/applications/settings/knetworkmanager8/knetworkmanager8.spec b/redhat/applications/settings/knetworkmanager8/knetworkmanager8.spec
new file mode 100644
index 000000000..10be14d90
--- /dev/null
+++ b/redhat/applications/settings/knetworkmanager8/knetworkmanager8.spec
@@ -0,0 +1,193 @@
+#
+# spec file for package knetworkmanager8 (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg knetworkmanager
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.8
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Trinity applet for Network Manager
+Group:		Applications/Internet
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}8-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+%if 0%{?rhel} || 0%{?fedora}
+Requires:		NetworkManager-gnome
+%else
+Requires:		networkmanager
+%endif
+
+# NetworkManager support
+BuildRequires:	NetworkManager-glib-devel
+
+# HAL support
+BuildRequires:	hal-devel
+
+Obsoletes:		trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+KNetworkManager is a system tray applet for controlling network
+connections on systems that use the NetworkManager daemon.
+
+%files -f knetworkmanager.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/knetworkmanager
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_tdelibdir}/knetworkmanager_openvpn.so.*
+%{tde_tdelibdir}/knetworkmanager_pptp.so.*
+%{tde_tdelibdir}/knetworkmanager_vpnc.so.*
+%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
+%{tde_tdeappdir}/knetworkmanager.desktop
+%{tde_datadir}/apps/knetworkmanager
+%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
+%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
+%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
+%{tde_datadir}/services/knetworkmanager_openvpn.desktop
+%{tde_datadir}/services/knetworkmanager_pptp.desktop
+%{tde_datadir}/services/knetworkmanager_vpnc.desktop
+
+##########
+
+%package devel
+Summary:		Common data shared among the MySQL GUI Suites
+Group:			Development/Libraries
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:		trinity-knetworkmanager-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-knetworkmanager-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+Development headers for knetworkmanager
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*.h
+%{tde_tdelibdir}/*.la
+%{tde_tdelibdir}/*.so
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep 
+%setup -q -n %{name}8-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+# Warning: --enable-final causes FTBFS
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --disable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  --with-openvpn \
+  --with-vpnc \
+  --with-pptp
+
+# Does not support parallel build
+%__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=%{?buildroot}
+%find_lang knetworkmanager
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
new file mode 100644
index 000000000..4d9b1bf9c
--- /dev/null
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -0,0 +1,462 @@
+#
+# spec file for package tde-guidance (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tde-guidance
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define __arch_install_post %{nil}
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.8.0svn20080103
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	A collection of system administration tools for Trinity
+Group:		Applications/Utilities
+URL:		http://www.simonzone.com/software/guidance
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		trinity-%{tde_pkg}-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-pytdeextensions
+BuildRequires:	trinity-libpythonize0-devel
+BuildRequires:	trinity-pytde
+BuildRequires:	chrpath
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# SIP support
+BuildRequires:	sip4-tqt-devel >= 4.10.5
+Requires:		sip4-tqt >= 4.10.5
+
+# PYTHON-QT support
+BuildRequires:	pytqt-devel
+BuildRequires:	trinity-pytde-devel
+BuildRequires:	trinity-pytqt-tools
+
+# LIBXXF86VM support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xxf86vm-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires:	libXxf86vm-devel
+%endif
+
+# XSCREENSAVER support
+#  RHEL 4: disabled
+#  RHEL 6: available in EPEL
+#  RHEL 7: available in NUX
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+BuildRequires:	xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires:	xscreensaver-extras-base
+%endif
+BuildRequires:	xscreensaver-gl-base
+BuildRequires:	xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-data
+BuildRequires:	xscreensaver-data-extra
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xscrnsaver-devel
+%else
+BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
+BuildRequires:	xscreensaver-extrusion
+%endif
+BuildRequires:	xscreensaver-gl
+%endif
+%endif
+
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
+Requires:		pytqt
+Requires:		trinity-pytde
+Requires:		trinity-pytdeextensions
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+Requires:		hwdata
+%endif
+
+Requires:		%{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# POWERMANAGER support (requires HAL)
+#define with_powermanager 1
+Obsoletes:	trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:		trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+Guidance currently consists of four programs designed to help you
+look after your system:
+ o  userconfig - User and Group administration
+ o  serviceconfig - Service/daemon administration
+ o  mountconfig - Disk and filesystem administration
+ o  wineconfig - Wine configuration
+
+These tools are available in Trinity Control Center, System Settings 
+or can be run as standalone applications.
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING README TODO
+%{tde_bindir}/grubconfig
+%{tde_bindir}/mountconfig
+%{tde_bindir}/serviceconfig
+%{tde_bindir}/userconfig
+%{tde_bindir}/wineconfig
+%attr(0644,root,root) %{tde_tdelibdir}/*.so
+%attr(0644,root,root) %{tde_tdelibdir}/*.la
+%{tde_datadir}/apps/guidance/
+%{tde_tdeappdir}/*.desktop
+%{tde_datadir}/icons/crystalsvg/*/*/*.png
+%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
+%{python_sitearch}/%{name}/SimpleCommandRunner.py*
+%{python_sitearch}/%{name}/fuser.py*
+%{python_sitearch}/%{name}/fuser_ui.py*
+%{python_sitearch}/%{name}/grubconfig.py*
+%{python_sitearch}/%{name}/mountconfig.py*
+%{python_sitearch}/%{name}/serviceconfig.py*
+%{python_sitearch}/%{name}/sizeview.py*
+%{python_sitearch}/%{name}/unixauthdb.py*
+%{python_sitearch}/%{name}/userconfig.py*
+%{python_sitearch}/%{name}/wineconfig.py*
+%{tde_tdedocdir}/HTML/en/guidance/
+
+
+# Files from powermanager
+%if 0%{?with_powermanager}
+%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
+%exclude %{tde_datadir}/apps/guidance/pics/processor.png
+%endif
+
+##########
+
+%package backends
+Group:			Applications/Utilities
+Summary:		collection of system administration tools for GNU/Linux [Trinity]
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+Requires:		hwdata
+%endif
+Requires:		%{python}
+
+Obsoletes:		trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description backends
+This package contains the platform neutral backends used in the
+Guidance configuration tools.
+
+%files backends
+%defattr(-,root,root,-)
+%dir %{python_sitearch}/%{name}
+%{python_sitearch}/%{name}/MicroHAL.py*
+%{python_sitearch}/%{name}/drivedetect.py*
+%{python_sitearch}/%{name}/wineread.py*
+%{python_sitearch}/%{name}/winewrite.py*
+%{python_sitearch}/%{name}/xf86misc.py*
+%{python_sitearch}/ixf86misc.so
+
+##########
+
+%if 0%{?with_powermanager}
+
+%package powermanager
+Group:			Applications/Utilities
+Summary:		HAL based power manager applet [Trinity]
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		hal
+
+Obsoletes:		trinity-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-guidance-powermanager = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if "%{tde_prefix}" == "/usr"
+Conflicts:	guidance-power-manager
+Conflicts:	kde-guidance-powermanager
+%endif
+
+%description powermanager
+A power management applet to indicate battery levels and perform hibernate or
+suspend using HAL.
+
+%files powermanager
+%defattr(-,root,root,-)
+%{tde_bindir}/guidance-power-manager
+%{python_sitearch}/%{name}/MicroHAL.py*
+%{python_sitearch}/%{name}/guidance-power-manager.py*
+%{python_sitearch}/%{name}/powermanage.py*
+%{python_sitearch}/%{name}/gpmhelper.py*
+%{python_sitearch}/%{name}/powermanager_ui.py*
+%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
+%{python_sitearch}/%{name}/notify.py*
+%{python_sitearch}/%{name}/tooltip.py*
+%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%{tde_datadir}/apps/guidance/pics/ac-adapter.png
+%{tde_datadir}/apps/guidance/pics/battery*.png
+%{tde_datadir}/apps/guidance/pics/processor.png
+%{tde_datadir}/autostart/guidance-power-manager.desktop
+
+%endif
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
+%__sed -i "userconfig/unixauthdb.py" \
+  -e "s|self.first_uid = .*|self.first_uid = 500|" \
+  -e "s|self.first_gid = .*|self.first_gid = 500|"
+%endif
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+#export PYTHONPATH=%{python_sitearch}/pytqt
+
+# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
+export PYTHONDONTWRITEBYTECODE=
+
+# FTBFS on PCLOS ...
+export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}"
+
+# Specific path for RHEL4
+if [ -d /usr/X11R6 ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g"
+fi
+
+%__python ./setup.py build
+
+
+%install
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
+export SIPTQT_DIR="%{python_sitearch}/sip4_tqt"
+export PYTHONPATH="%{python_sitearch}/pytqt"
+
+# Support for 'sip4-tqt'
+export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
+
+# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
+export PYTHONDONTWRITEBYTECODE=
+
+%__rm -rf %{buildroot}
+%__python ./setup.py install \
+	--prefix=%{tde_prefix} \
+	--root=%{buildroot}
+
+# Fix temporary build directories remaining inside .py files
+for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
+	%__sed -i "${f}" -e "s|%{buildroot}||g"
+done
+
+##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules)
+# install icons to right place
+%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
+%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
+%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
+%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
+%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
+%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
+	%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
+
+# fix binary-or-shlib-defines-rpath
+chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
+
+# fix executable-not-elf-or-script
+%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
+
+# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages)
+%__mkdir_p %{buildroot}%{python_sitearch}/%{name} 
+%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name}
+
+# Generates the startup scripts
+%__rm -f %{buildroot}%{tde_bindir}/*
+%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
+%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
+%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
+%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
+%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
+
+# fix script-not-executable
+%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
+%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
+
+##### BACKENDS INSTALLATION
+
+# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
+%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
+%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
+
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
+%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
+%endif
+
+%if 0%{?with_powermanager}
+##### POWERMANAGER INSTALLATION
+# install icon to right place
+%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
+		%{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%__install -D -p -m0644 kde/powermanager/pics/*.png \
+		%{buildroot}%{tde_datadir}/apps/guidance/pics/
+
+# install desktop file
+%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
+		%{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
+
+# copy python modules in PYSUPPORT_PATH
+%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
+%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
+%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
+
+# generate guidance-power-manager script
+cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager
+#!/bin/sh
+export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/sip4-tqt
+%{python_sitearch}/%{name}/guidance-power-manager.py &
+EOF
+chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
+
+# fix script-not-executable
+chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
+chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
+
+%else
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py*
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py*
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py*
+%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py*
+%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui
+
+%endif
+
+# Replace all '#!' calls to python with /usr/bin/python
+# and make them executable
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
+%define python /usr/bin/python2
+%else
+%define python /usr/bin/python
+%endif
+for i in `find %{buildroot} -type f`; do
+	sed '1s,#!.*python[^ ]*\(.*\),#! %python\1,' \
+		$i > $i.temp;
+	if cmp --quiet $i $i.temp; then
+		rm -f $i.temp;
+	else
+		mv -f $i.temp $i;
+		chmod 755 $i;
+		echo "fixed interpreter: $i";
+	fi;
+done
+
+# Removes useless files
+find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
+find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc b/redhat/applications/settings/tde-guidance/trinity-tde-guidance-rpmlintrc
index bd7a50a17..bd7a50a17 100644
--- a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc
+++ b/redhat/applications/settings/tde-guidance/trinity-tde-guidance-rpmlintrc
diff --git a/redhat/applications/tde-systemsettings/tde-settings-laptops.directory b/redhat/applications/settings/tde-systemsettings/tde-settings-laptops.directory
index d37d9ba13..d37d9ba13 100644
--- a/redhat/applications/tde-systemsettings/tde-settings-laptops.directory
+++ b/redhat/applications/settings/tde-systemsettings/tde-settings-laptops.directory
diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
new file mode 100644
index 000000000..4156d4ee7
--- /dev/null
+++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec
@@ -0,0 +1,197 @@
+#
+# spec file for package tde-systemsettings (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tde-systemsettings
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_sysconfdir %{_sysconfdir}/trinity
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.0svn20070312
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Easy to use control centre for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		tde-settings-laptops.directory
+
+
+Provides:	trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kde-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+%if 0%{?suse_version} == 0 || 0%{?sle_version} <= 150300
+Requires:		trinity-guidance
+%endif
+
+
+%description
+System preferences is a replacement for the TDE
+Control Centre with an improved user interface.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-laptops.directory
+
+# Unwanted files
+%__rm -f %{buildroot}%{tde_datadir}/applications/tde/kcmfontinst.desktop
+%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory
+%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory
+
+%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop
+
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/audioencoding.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/defaultapplication.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_ss.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop"
+
+# Fix translation names
+for d in "%{buildroot}%{tde_datadir}/locale/"*"/LC_MESSAGES"; do
+  mv "${d}/"*".mo" "${d}/%{tde_pkg}.mo"
+done
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc README.md TODO
+%dir %{tde_sysconfdir}/xdg
+%dir %{tde_sysconfdir}/xdg/menus
+%dir %{tde_sysconfdir}/xdg/menus/applications-merged
+%{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu
+%{tde_sysconfdir}/xdg/menus/tde-system-settings.menu
+%{tde_bindir}/systemsettings
+%{tde_datadir}/applications/tde/audioencoding.desktop
+%{tde_datadir}/applications/tde/defaultapplication.desktop
+%{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop
+%{tde_datadir}/applications/tde/medianotifications.desktop
+%{tde_datadir}/applications/tde/systemsettings.desktop
+%{tde_datadir}/apps/systemsettings/
+%config(noreplace) %{tde_confdir}/systemsettingsrc
+%{tde_datadir}/desktop-directories/*.directory
+%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
+%{tde_tdedocdir}/HTML/en/tde-systemsettings/
+%{tde_mandir}/man1/systemsettings.1*
+
+%changelog
diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
new file mode 100644
index 000000000..78979984e
--- /dev/null
+++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec
@@ -0,0 +1,251 @@
+#
+# spec file for package tdenetworkmanager (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdenetworkmanager
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.9
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Trinity applet for Network Manager
+Group:		Applications/Internet
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Obsoletes:		trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# NETWORKMANAGER support
+%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
+Requires:		NetworkManager
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+BuildRequires:	NetworkManager-libnm-devel
+%else
+BuildRequires:		NetworkManager-devel
+%endif
+%else
+Requires:		NetworkManager-gnome
+%endif
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+Requires:		networkmanager
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} != 8
+BuildRequires:	%{_lib}nm-util-devel
+%endif
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+BuildRequires:	NetworkManager-libnm-devel
+%else
+BuildRequires:	NetworkManager-glib-devel
+%endif
+%endif
+%endif
+%if 0%{?suse_version}
+BuildRequires:	NetworkManager-devel
+Requires:		NetworkManager
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# DBUS support
+BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires:	libudev-devel
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+TDENetworkManager is a system tray applet for controlling network
+connections on systems that use the NetworkManager daemon.
+
+%post
+# Prevent autostart of 'nm-applet', if installed.
+if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then
+  if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then
+    sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|"
+  fi
+fi
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/tdenetworkmanager
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{_sysconfdir}/dbus-1/system.d/tdenetworkmanager.conf
+%{tde_tdeappdir}/tdenetworkmanager.desktop
+%{tde_datadir}/apps/tdenetworkmanager
+%{tde_datadir}/icons/hicolor/*/apps/tdenetworkmanager*
+%{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop
+%{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop
+%{tde_datadir}/autostart/tdenetworkmanager.desktop
+#{tde_datadir}/services/tdenetman_openvpn.desktop
+#{tde_datadir}/services/tdenetman_pptp.desktop
+#{tde_datadir}/services/tdenetman_strongswan.desktop
+#{tde_datadir}/services/tdenetman_vpnc.desktop
+#{tde_tdedocdir}/HTML/en/tdenetworkmanager/
+
+##########
+
+%package devel
+Summary:		Common data shared among the MySQL GUI Suites
+Group:			Development/Libraries
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+Development headers for tdenetworkmanager
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*.h
+%{tde_tdelibdir}/*.la
+%{tde_tdelibdir}/*.so
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  ..
+  
+%__make %{?_smp_mflags} 
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=%{?buildroot} -C build
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
diff --git a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc b/redhat/applications/settings/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
index 8668d5e81..8668d5e81 100644
--- a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
+++ b/redhat/applications/settings/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec
new file mode 100644
index 000000000..0b68294f0
--- /dev/null
+++ b/redhat/applications/settings/tdesudo/tdesudo.spec
@@ -0,0 +1,165 @@
+#
+# spec file for package tdesudo (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdesudo
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.5.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Sudo frontend for Trinity
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Obsoletes:	trinity-kdesudo < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdesudo = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:		sudo
+
+
+%description
+TdeSudo is a graphical frontend for the sudo utility.
+It allows you to run programs as another user by entering your password.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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_bindir}/tdesudo
+%{tde_tdedocdir}/HTML/en/tdesudo/
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec
new file mode 100644
index 000000000..3ea4d2209
--- /dev/null
+++ b/redhat/applications/settings/wlassistant/wlassistant.spec
@@ -0,0 +1,207 @@
+#
+# spec file for package wlassistant (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg wlassistant
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.5.7
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	User friendly TDE frontend for wireless network connection
+Group:		Applications/Utilities
+URL:		http://wlassistant.sourceforge.net/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# Wireless support
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+BuildRequires: wireless-tools-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
+BuildRequires:	%{_lib}iw29-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?suse_version}
+BuildRequires: wireless-tools
+%endif
+%if 0%{?suse_version} || 0%{?mgaversion} >= 3
+BuildRequires:	libiw-devel
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+Wireless Assistant scans for wireless access points and displays link quality,
+encryption and other useful information. When user wants to connect to a
+network, Wireless Assistant opens up its wizards and guides the user through
+Wi-Fi settings. After a successful connection is made the settings are
+remembered so next time the user won't have to enter them again.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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"
+
+# Shitty hack for RHEL4 ...
+if [ -d "/usr/X11R6" ]; then
+  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network
+%endif
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc ChangeLog VERSION
+%{tde_bindir}/wlassistant
+%{tde_tdeappdir}/wlassistant.desktop
+%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
+%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
+
+
+%changelog
diff --git a/redhat/applications/smartcardauth/smartcardauth.spec b/redhat/applications/smartcardauth/smartcardauth.spec
deleted file mode 100644
index cc3726028..000000000
--- a/redhat/applications/smartcardauth/smartcardauth.spec
+++ /dev/null
@@ -1,238 +0,0 @@
-#
-# spec file for package smartcardauth (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg smartcardauth
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%if 0%{?fedora} >= 27 || 0%{?mgaversion}
-%define debug_package %{nil}
-%endif
-
-%define dont_check_desktop_files 1
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	SmartCard Login and LUKS Decrypt, Setup Utility
-Group:		Applications/System
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		trinity-%{tde_pkg}-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# PCSC support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
-Requires:	perl-pcsc-perl
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	pcsc-perl
-%endif
-%if 0%{?suse_version}
-Requires:	perl-pcsc
-%endif
-
-# PKCS11 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}pkcs11-helper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	pkcs11-helper-devel
-%endif
-
-# DB4/DB5 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
-%define with_db 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:  db5-devel
-%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-BuildRequires:  libdb-devel
-BuildRequires:  libdb-cxx-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:  libdb-4_8-devel
-%endif
-%if 0%{?rhel} && 0%{?rhel} <= 6
-BuildRequires:  db4-devel
-%endif
-%endif
-
-# PAM support
-BuildRequires:	pam-devel
-
-# TLS support
-%if 0%{?suse_version}
-BuildRequires:	libgnutls-devel
-%else
-BuildRequires:	gnutls-devel
-%endif
-
-# The 'pp' utility
-BuildRequires:	perl-PAR-Packer
-
-
-%description
-This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
-- Your encrypted LUKS partition
-- TDE, including automatic login, lock, and unlock features
-
-It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard
-Examples of such cards are:
-- The Schlumberger MultiFlex
-- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards
-
-If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run
-simultaneously with the certificate reading program(s) to provide single sign on
-in addition to the PKCS certificate functionality
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-%if 0%{?mgaversion} || 0%{?pclinuxos}
-  -DPERL_PAR_PACKER="pp.pl" \
-%endif
-%if 0%{?mgaversion} == 6 || 0%{?pclinuxos}
-  -DPERL_LIB_CHIPCARD="%{perl_sitearch}" \
-%endif
-%if 0%{?suse_version}
-  -DPERL_LIB_CHIPCARD="%{perl_vendorarch}" \
-%endif
-  \
-  -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
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file smartcardauth      System Security
-%suse_update_desktop_file smartcardrestrict  System Security
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc gpl.txt
-%{_bindir}/cryptosmartcard.sh
-%{_datadir}/initramfs-tools/
-%{_bindir}/scriptor_standalone
-%{_bindir}/setupcard.sh
-%{_bindir}/setupslavecard.sh
-%{_bindir}/smartauth.sh
-%{_bindir}/smartauthckpasswd
-%{_bindir}/smartauthmon
-%{_datadir}/applications/smartcardauth.desktop
-%{_datadir}/applications/smartcardrestrict.desktop
-%{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
-%{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
-%{_sysconfdir}/smartauth/
-%dir %{_sysconfdir}/init
-%{_sysconfdir}/init/smartauthlogin.conf
-
-
-%changelog
diff --git a/redhat/applications/smb4k/smb4k.spec b/redhat/applications/smb4k/smb4k.spec
deleted file mode 100644
index 6bba757a0..000000000
--- a/redhat/applications/smb4k/smb4k.spec
+++ /dev/null
@@ -1,198 +0,0 @@
-#
-# spec file for package smb4k (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg smb4k
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.9.4
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	A Samba (SMB) share advanced browser for Trinity
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Smb4K is a SMB (Windows) share browser for TDE. It uses the Samba software 
-suite to access the SMB shares of the local network neighborhood. Its purpose
-is to provide a program that's easy to use and has as many features as 
-possible.
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/smb4k
-%{tde_bindir}/smb4k_cat
-%{tde_bindir}/smb4k_kill
-%{tde_bindir}/smb4k_mount
-%{tde_bindir}/smb4k_mv
-%{tde_bindir}/smb4k_umount
-%{tde_libdir}/libsmb4kcore.so.2
-%{tde_libdir}/libsmb4kcore.so.2.0.0
-%{tde_libdir}/libsmb4kdialogs.la
-%{tde_libdir}/libsmb4kdialogs.so
-%{tde_tdelibdir}/konqsidebar_smb4k.la
-%{tde_tdelibdir}/konqsidebar_smb4k.so
-%{tde_tdelibdir}/libsmb4tdeconfigdialog.la
-%{tde_tdelibdir}/libsmb4tdeconfigdialog.so
-%{tde_tdelibdir}/libsmb4knetworkbrowser.la
-%{tde_tdelibdir}/libsmb4knetworkbrowser.so
-%{tde_tdelibdir}/libsmb4ksearchdialog.la
-%{tde_tdelibdir}/libsmb4ksearchdialog.so
-%{tde_tdelibdir}/libsmb4ksharesiconview.la
-%{tde_tdelibdir}/libsmb4ksharesiconview.so
-%{tde_tdelibdir}/libsmb4kshareslistview.la
-%{tde_tdelibdir}/libsmb4kshareslistview.so
-%{tde_tdeappdir}/smb4k.desktop
-%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
-%{tde_datadir}/apps/smb4k/
-%{tde_datadir}/apps/smb4knetworkbrowserpart/
-%{tde_datadir}/apps/smb4ksharesiconviewpart/
-%{tde_datadir}/apps/smb4kshareslistviewpart/
-%{tde_datadir}/config.kcfg/smb4k.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
-%{tde_tdedocdir}/HTML/en/smb4k/
-
-##########
-
-%package devel
-Summary:		Development files for %{name}
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libsmb4kcore.la
-%{tde_libdir}/libsmb4kcore.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --program-prefix="" \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-%suse_update_desktop_file -r %{tde_pkg} System Network
-%endif
-
-# Removes duplicate files
-%fdupes -s %buildroot
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/soundkonverter/soundkonverter.spec b/redhat/applications/soundkonverter/soundkonverter.spec
deleted file mode 100644
index a9d3f6ae4..000000000
--- a/redhat/applications/soundkonverter/soundkonverter.spec
+++ /dev/null
@@ -1,209 +0,0 @@
-#
-# spec file for package soundkonverter (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg soundkonverter
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.3.8
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Audio converter frontend for Trinity
-Group:		Application/Multimedia
-URL:		http://potracegui.sourceforge.net
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# TAGLIB support
-BuildRequires:	taglib-devel
-
-# CDDA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libcdda-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	cdparanoia-devel
-%endif
-
-
-%description
-soundKonverter is a frontend to various audio converters.
-
-The key features are:
- - Audio conversion
- - Replay Gain calculation
- - CD ripping
-
-soundKonverter supports reading and writing tags for many formats, so the tags
-are preserved when converting files.
-
-It comes with an Amarok script.
-
-See 'soundkonverter-amarok' package for more informations.
-
-See README.Debian for more informations on supported formats.
-
-
-%package amarok
-Summary:		audio converter frontend for Trinity (Amarok script)
-Group:			Application/Multimedia
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-amarok
-
-%description amarok
-Amarok script for soundKonverter. It allows you to easily transcode files when
-transferring them to your media device.
-
-See the 'trinity-soundkonverter' package for more information.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --program-prefix="" \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-   
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/soundkonverter
-%{tde_bindir}/userscript.sh
-%{tde_tdeappdir}/soundkonverter.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
-%{tde_datadir}/apps/soundkonverter
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/
-%{tde_tdedocdir}/HTML/en/soundkonverter/
-%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
-%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop
-%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop
-%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop
-%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop
-
-%files amarok
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/soundkonverter/amarokscript/
-
-
-%changelog
diff --git a/redhat/applications/system/adept/adept.spec b/redhat/applications/system/adept/adept.spec
new file mode 100644
index 000000000..ca5c2f430
--- /dev/null
+++ b/redhat/applications/system/adept/adept.spec
@@ -0,0 +1,208 @@
+#
+# spec file for package adept (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
+%define tde_pkg adept
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+
+# TDE specific building variables
+%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:		Package management suite for Trinity
+Version:		2.1.3
+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://lpnotfr.free.fr/
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-util
+
+BuildRequires:	libapt-front-devel
+
+Requires:		%{name}-manager = %{version}-%{release}
+Requires:		%{name}-installer = %{version}-%{release}
+Requires:		%{name}-updater = %{version}-%{release}
+Requires:		%{name}-notifier = %{version}-%{release}
+Requires:		%{name}-batch = %{version}-%{release}
+
+
+%description
+These packages belong to the adept suite:
+ * adept-manager - package manager
+ * adept-installer - application manager
+ * adept-updater - system upgrade wizard
+ * adept-notifier - systray notification of available updates
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS CHANGELOG ChangeLog COPYING
+
+##########
+
+%package common
+Requires:		trinity-konsole
+Summary:		Package manager for Trinity -- common files
+
+%description common
+Icons and other common files for all adept components.
+
+##########
+
+%package manager
+Requires:		%{name}-common = %{version}-%{release}
+Summary:		package manager for Trinity
+ 
+%description manager
+Adept Manager is a graphical user interface for package management.
+
+Besides these basic functions the following features are provided:
+ * Search and filter the list of available packages (also using debtags)
+ * Perform smart system upgrades
+ * Edit the list of used repositories (sources.list)
+ * Configure packages through the debconf system
+
+Please also install libtqt-perl if you want the TDE Debconf frontend
+to function.
+
+##########
+
+%package installer
+Requires:		%{name}-common = %{version}-%{release}
+Summary:		simple user interface for application management (for Trinity)
+
+%description installer
+Adept Installer presents a list of applications available through the
+Advanced Package Tool (APT). An application is considered a package
+that contains a .desktop file for use with TDE, GNOME or other
+desktop environment.
+
+##########
+
+%package updater
+Requires:		%{name}-common = %{version}-%{release}
+Summary:		system update tool for Trinity
+
+%description updater
+Adept Updater provides a simple wizard-style user interface to system
+upgrades. It uses same algorithms as apt-get dist-upgrade.
+
+##########
+
+%package notifier
+Requires:		%{name}-common = %{version}-%{release}
+Requires:		%{name}-updater = %{version}-%{release}
+Summary:		System tray notifier of available system updates
+ 
+%description notifier
+Adept Notifier provides a system tray icon notifying the user of
+available updates.  It will run Adept Updater for the user when
+clicked.
+
+##########
+
+%package batch
+Requires:		%{name}-manager = %{version}-%{release}
+Summary:		command line install for Adept
+
+%description batch
+Adept Batch lets you install packages with Adept from the
+command line.  It is intended for shell scripts and being run
+by external applications.
+
+##########
+
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  \
+  --enable-rpath \
+  --enable-closure \
+  \
+  --with-extra-includes=%{_includedir}/tqt3 \
+  \
+  --enable-adept
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+
+%changelog
diff --git a/redhat/applications/system/dolphin/dolphin.spec b/redhat/applications/system/dolphin/dolphin.spec
new file mode 100644
index 000000000..bfa6d1910
--- /dev/null
+++ b/redhat/applications/system/dolphin/dolphin.spec
@@ -0,0 +1,183 @@
+#
+# spec file for package dolphin (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg dolphin
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.9.2
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		File manager for TDE focusing on usability
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Dolphin focuses on being only a file manager.
+This approach allows to optimize the user
+interface for the task of file management.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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
+
+# Makes 'media_safelyremove.desktop' an alternative
+%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
+
+# Locales
+%find_lang d3lphin
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+update-alternatives --install \
+  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \
+  media_safelyremove.desktop_d3lphin \
+  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \
+  15
+
+%preun
+if [ $1 -eq 0 ]; then
+  update-alternatives --remove \
+    media_safelyremove.desktop_d3lphin \
+    %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || :
+fi
+
+
+%files -f d3lphin.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING TODO
+%{tde_bindir}/d3lphin
+%{tde_tdeappdir}/d3lphin.desktop
+%{tde_datadir}/apps/d3lphin/
+%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
+%{tde_mandir}/man1/*.1*
+%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/
+
+
+%changelog
diff --git a/redhat/applications/system/katapult/katapult.spec b/redhat/applications/system/katapult/katapult.spec
new file mode 100644
index 000000000..c1c1f2019
--- /dev/null
+++ b/redhat/applications/system/katapult/katapult.spec
@@ -0,0 +1,218 @@
+#
+# spec file for package katapult (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg katapult
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.3.2.1
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Faster access to applications, bookmarks, and other items.
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+%description
+Katapult is an application for TDE, designed to allow faster access to
+applications, bookmarks, and other items. It is plugin-based, so it can
+launch anything that is has a plugin for. Its display is driven by
+plugins as well, so its appearance is completely customizable. It was
+inspired by Quicksilver for OS X. 
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Removes useless files (-devel ?)
+%__rm -f %{?buildroot}%{tde_libdir}/*.so
+%__rm -f %{?buildroot}%{tde_libdir}/*.la
+
+# Fix desktop files (openSUSE only)
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Application Launcher" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/katapult
+%{tde_libdir}/libkatapult.so.2
+%{tde_libdir}/libkatapult.so.2.0.0
+%{tde_tdelibdir}/katapult_amarokcatalog.la
+%{tde_tdelibdir}/katapult_amarokcatalog.so
+%{tde_tdelibdir}/katapult_bookmarkcatalog.la
+%{tde_tdelibdir}/katapult_bookmarkcatalog.so
+%{tde_tdelibdir}/katapult_calculatorcatalog.la
+%{tde_tdelibdir}/katapult_calculatorcatalog.so
+%{tde_tdelibdir}/katapult_documentcatalog.la
+%{tde_tdelibdir}/katapult_documentcatalog.so
+%{tde_tdelibdir}/katapult_execcatalog.la
+%{tde_tdelibdir}/katapult_execcatalog.so
+%{tde_tdelibdir}/katapult_glassdisplay.la
+%{tde_tdelibdir}/katapult_glassdisplay.so
+%{tde_tdelibdir}/katapult_googlecatalog.la
+%{tde_tdelibdir}/katapult_googlecatalog.so
+%{tde_tdelibdir}/katapult_o2display.la
+%{tde_tdelibdir}/katapult_o2display.so
+%{tde_tdelibdir}/katapult_programcatalog.la
+%{tde_tdelibdir}/katapult_programcatalog.so
+%{tde_tdelibdir}/katapult_puredisplay.la
+%{tde_tdelibdir}/katapult_puredisplay.so
+%{tde_tdelibdir}/katapult_spellcatalog.la
+%{tde_tdelibdir}/katapult_spellcatalog.so
+%{tde_tdeappdir}/katapult.desktop
+%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz
+%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png
+%{tde_datadir}/icons/hicolor/128x128/actions/no.png
+%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png
+%{tde_datadir}/icons/hicolor/*/apps/katapult.png
+%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz
+%{tde_datadir}/services/katapult_amarokcatalog.desktop
+%{tde_datadir}/services/katapult_bookmarkcatalog.desktop
+%{tde_datadir}/services/katapult_calculatorcatalog.desktop
+%{tde_datadir}/services/katapult_documentcatalog.desktop
+%{tde_datadir}/services/katapult_execcatalog.desktop
+%{tde_datadir}/services/katapult_glassdisplay.desktop
+%{tde_datadir}/services/katapult_googlecatalog.desktop
+%{tde_datadir}/services/katapult_o2display.desktop
+%{tde_datadir}/services/katapult_programcatalog.desktop
+%{tde_datadir}/services/katapult_puredisplay.desktop
+%{tde_datadir}/services/katapult_spellcatalog.desktop
+%{tde_datadir}/servicetypes/katapultcatalog.desktop
+%{tde_datadir}/servicetypes/katapultdisplay.desktop
+%{tde_mandir}/man1/*.1*
+%{tde_tdedocdir}/HTML/en/katapult/
+
+
+%changelog
diff --git a/redhat/applications/system/kbfx/kbfx.spec b/redhat/applications/system/kbfx/kbfx.spec
new file mode 100644
index 000000000..909a33b8f
--- /dev/null
+++ b/redhat/applications/system/kbfx/kbfx.spec
@@ -0,0 +1,234 @@
+#
+# spec file for package kbfx (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kbfx
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.4.9.3.1
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		An alternative to K-Menu for TDE
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+KBFX is an alternative to the classical K-Menu button and its menu.
+It improves the user experience by enabling him to set a bigger (and thus more
+visible) start button and by finally replacing the Win95-like K-Menu.
+If you still want the old menu, because you're used to it, it is still
+available as an option in kbfx. We recommend, however, that you give the Spinx
+bar a try.
+
+Homepage: http://www.kbfx.org
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+# Fix TDE executable path in 'CMakeLists.txt' ...
+%__sed -i "CMakeLists.txt" \
+  -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \
+  -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \
+  -e "s|/usr/include/tqt||"
+  
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Shitty hack for RHEL4 ...
+if [ -d "/usr/X11R6" ]; then
+  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
+  -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\
+  -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  \
+  -DUSE_STRIGI=OFF \
+  -DUSE_MENUDRAKE=OFF \
+  -DBUILD_DOC=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+# Not SMP safe !
+%__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build VERBOSE=1
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "KBFX Configuration Utility" kbfxconfigapp -r KDE Utility DesktopUtility
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/applications/tde/kbfx_theme.desktop
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/kbfxconfigapp
+%{tde_tdeincludedir}/kbfx/
+%dir %{tde_libdir}/kbfx
+%dir %{tde_libdir}/kbfx/plugins
+%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la
+%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so
+%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la
+%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so
+%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la
+%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so
+%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la
+%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so
+%{tde_libdir}/libkbfxcommon.la
+%{tde_libdir}/libkbfxcommon.so
+%{tde_libdir}/libkbfxdata.la
+%{tde_libdir}/libkbfxdata.so
+%{tde_tdelibdir}/kbfxspinx.la
+%{tde_tdelibdir}/kbfxspinx.so
+%{tde_tdeappdir}/kbfx_theme.desktop
+%{tde_tdeappdir}/kbfxconfigapp.desktop
+%{tde_datadir}/apps/kbfx/
+%dir %{tde_datadir}/apps/kbfxconfigapp
+%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc
+%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
+%{tde_tdedocdir}/HTML/en/kbfxconfigapp/
+%{tde_docdir}/kbfx/
+%{tde_datadir}/icons/hicolor/*/apps/kbfx.png
+%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
+%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/kbfxconfigapp.mo
+%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo
+%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo
+%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo
+%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
+
+
+%changelog
diff --git a/redhat/applications/system/kcmautostart/kcmautostart.spec b/redhat/applications/system/kcmautostart/kcmautostart.spec
new file mode 100644
index 000000000..15702bf19
--- /dev/null
+++ b/redhat/applications/system/kcmautostart/kcmautostart.spec
@@ -0,0 +1,163 @@
+#
+# spec file for package kcmautostart (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kcmautostart
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.0
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Manage applications automatic startup
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Requires:		trinity-tdebase >= %{tde_version}
+
+
+%description
+%{summary}
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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 autostart
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f autostart.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING INSTALL README.md
+%{tde_tdelibdir}/kcm_autostart.la
+%{tde_tdelibdir}/kcm_autostart.so
+%{tde_tdeappdir}/autostart.desktop
+%{tde_tdedocdir}/HTML/en/autostart/
+
+
+%changelog
diff --git a/redhat/applications/system/kdbusnotification/kdbusnotification.spec b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
new file mode 100644
index 000000000..a919a36aa
--- /dev/null
+++ b/redhat/applications/system/kdbusnotification/kdbusnotification.spec
@@ -0,0 +1,177 @@
+#
+# spec file for package kdbusnotification (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kdbusnotification
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:		0.1
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		a DBUS notification service [Trinity]
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# GTK2 stuff
+BuildRequires:	gtk2-devel
+
+# DBUS stuff
+%if 0%{?suse_version}
+BuildRequires:	dbus-1-glib-devel
+%else
+BuildRequires:	dbus-glib-devel
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+kdbusnotification is a small program for Trinity that displays
+DBUS notifications via unobtrusive, easily dismissed passive popups.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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"
+
+# Fix for Fedora 31
+if [ -r "/usr/include/harfbuzz/hb.h" ]; then
+  #export CMAKE_INCLUDE_PATH="/usr/include/harfbuzz"
+  RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz"
+fi
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/notification-daemon-tde
+%{tde_datadir}/autostart/kdbusnotification-autostart.desktop
+
+
+
+%changelog
diff --git a/redhat/applications/system/klamav/klamav.spec b/redhat/applications/system/klamav/klamav.spec
new file mode 100644
index 000000000..98c891c6a
--- /dev/null
+++ b/redhat/applications/system/klamav/klamav.spec
@@ -0,0 +1,151 @@
+#
+# spec file for package klamav (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg klamav
+%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
+
+
+Name:			trinity-%{tde_pkg}
+Summary:        Frontend for clamav
+Version:		0.46
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+Group:			Applications/Utilities
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+#URL:			http://www.trinitydesktop.org/
+Url:            http://klamav.sourceforge.net/
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+BuildRequires:	curl-devel
+BuildRequires:	gmp-devel
+BuildRequires:	sqlite-devel
+#BuildRequires:	unsermake
+
+# CLAMAV support
+BuildRequires:  clamav
+BuildRequires:  clamav-devel
+Requires:		clamav
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+A TDE front-end for the Clam AntiVirus antivirus toolkit.
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+chmod u+r %{buildroot}%{tde_bindir}/ScanWithKlamAV
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+	
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%attr(111,root,root) %{tde_bindir}/ScanWithKlamAV
+%{tde_bindir}/klamav
+%{tde_bindir}/klammail
+%{tde_tdeappdir}/klamav.desktop
+%{tde_datadir}/apps/klamav/
+%{tde_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
+%{tde_tdedocdir}/HTML/en/klamav/
+%{tde_datadir}/icons/hicolor/32x32/apps/klamav.png
+%{tde_datadir}/icons/hicolor/48x48/apps/klamav.png
+
+
+%changelog
diff --git a/redhat/applications/system/knemo/knemo.spec b/redhat/applications/system/knemo/knemo.spec
new file mode 100644
index 000000000..b8c152a97
--- /dev/null
+++ b/redhat/applications/system/knemo/knemo.spec
@@ -0,0 +1,200 @@
+#
+# spec file for package knemo (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg knemo
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.8
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Network interfaces monitor for the Trinity systray
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+#URL:		http://beta.smileaf.org/projects
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	gettext
+
+%if 0%{?fedora} >= 18 || 0%{?suse_version} || 0%{?mgaversion}
+BuildRequires:	net-tools
+Requires:		net-tools
+%endif
+
+%if 0%{?suse_version} > 1320
+BuildRequires:	net-tools-deprecated
+Requires:		net-tools-deprecated
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# Wireless support
+%define with_wifi 1
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+BuildRequires: wireless-tools-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
+BuildRequires:	%{_lib}iw29-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?suse_version}
+BuildRequires: wireless-tools
+%endif
+%if 0%{?suse_version} || 0%{?mgaversion} >= 3
+BuildRequires:	libiw-devel
+%endif
+
+
+%description
+KNemo displays an icon in the systray for every network interface.
+Tooltips and an info dialog provide further information about the
+interface.  Passive popups inform about interface changes.
+A traffic plotter is also integrated.
+
+knemo polls the network interface status every second using the
+ifconfig, route and iwconfig tools. 
+
+Homepage: http://extragear.kde.org/apps/knemo/
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  %{!?with_wifi:-DWITH_LIBIW=OFF} \
+  -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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_knemo.la
+%{tde_tdelibdir}/kcm_knemo.so
+%{tde_tdelibdir}/kded_knemod.la
+%{tde_tdelibdir}/kded_knemod.so
+%{tde_tdeappdir}/kcm_knemo.desktop
+%{tde_datadir}/apps/knemo/
+%{tde_datadir}/icons/crystalsvg/*/*/*.png
+%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo
+%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo
+%{tde_datadir}/services/kded/knemod.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/knemo/
+
+
+%changelog
diff --git a/redhat/applications/system/knetload/knetload.spec b/redhat/applications/system/knetload/knetload.spec
new file mode 100644
index 000000000..cba84df2b
--- /dev/null
+++ b/redhat/applications/system/knetload/knetload.spec
@@ -0,0 +1,182 @@
+#
+# spec file for package knetload (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg knetload
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	A network meter for Kicker [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KNetLoad is a small network meter for Kicker (the TDE panel).  It shows
+a recent history of network usage in the form of two configurable
+diagrams in the system tray, one for incoming and one for outgoing
+data.  These diagrams have settings for colours and various different
+styles.
+
+KNetLoad can monitor just about any network device.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file %{tde_pkg} System Monitor
+%endif
+
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,32x32,48x48}"/apps/"
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,32,48}; do %__cp crystalsvg/"$i"x"$i"/apps/knetload.png  hicolor/"$i"x"$i"/apps/knetload.png  ;done
+popd
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/knetload
+%{tde_tdeappdir}/knetload.desktop
+%{tde_datadir}/apps/knetload
+%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png
+%{tde_datadir}/icons/hicolor/*/apps/knetload.png
+%{tde_datadir}/icons/locolor/*/apps/knetload.png
+%{tde_tdedocdir}/HTML/en/knetload/
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/system/knetstats/knetstats.spec b/redhat/applications/system/knetstats/knetstats.spec
new file mode 100644
index 000000000..6d873bc4c
--- /dev/null
+++ b/redhat/applications/system/knetstats/knetstats.spec
@@ -0,0 +1,169 @@
+#
+# spec file for package knetstats (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg knetstats
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.6.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Network interfaces monitor for the Trinity systray
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+A simple TDE network monitor that show rx/tx LEDs of any
+network interface on a system tray icon
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file %{tde_pkg} System Monitor
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/knetstats
+%{tde_tdeappdir}/knetstats.desktop
+%{tde_datadir}/apps/knetstats/
+%{tde_tdedocdir}/HTML/en/knetstats/
+%{tde_datadir}/icons/hicolor/*/apps/knetstats.png
+%{tde_mandir}/man*/knetstats.*
+
+
+%changelog
diff --git a/redhat/applications/system/kooldock/kooldock.spec b/redhat/applications/system/kooldock/kooldock.spec
new file mode 100644
index 000000000..679eb263b
--- /dev/null
+++ b/redhat/applications/system/kooldock/kooldock.spec
@@ -0,0 +1,174 @@
+#
+# spec file for package kooldock (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kooldock
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.7
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Dock for TDE with cool visual enhancements
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KoolDock is a fork of the original work of Dang Viet Dung,.
+KSmoothDock 2.1. KoolDock is a dock for TDE with cool.
+visual enhancements and effects.
+
+Some of it features are:
+* Display quick launchers to your favourite apps
+* A builtin task bar
+* Pager and clock. (Not done yet)
+* Smooth zooming effect (like Apple's OS X dock)
+* Transparent Background
+
+Homepage: http://sourceforge.net/projects/kooldock/
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{tde_bindir}/kooldock
+%{tde_datadir}/apps/kooldock/
+%{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png
+%{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png
+%{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png
+%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png
+
+
+%changelog
diff --git a/redhat/applications/system/kpowersave/kpowersave.spec b/redhat/applications/system/kpowersave/kpowersave.spec
new file mode 100644
index 000000000..b5aec8ecc
--- /dev/null
+++ b/redhat/applications/system/kpowersave/kpowersave.spec
@@ -0,0 +1,211 @@
+#
+# spec file for package kpowersave (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kpowersave
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.7.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	HAL based power management applet for Trinityfiles or directories.
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	hal-devel
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# XSCREENSAVER support
+#  RHEL 4: disabled
+#  RHEL 6: available in EPEL
+#  RHEL 7: available in NUX
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+BuildRequires:	xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires:	xscreensaver-extras-base
+%endif
+BuildRequires:	xscreensaver-gl-base
+BuildRequires:	xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-data
+BuildRequires:	xscreensaver-data-extra
+%endif
+
+%endif
+
+
+%description
+KPowersave is a TDE systray applet which allows to control the power 
+management settings and policies of your computer.
+It relies on HAL to do the heavy lifting.
+
+Current feature list:
+ * support for ACPI, APM and PMU
+ * trigger suspend to disk/ram and standby
+ * switch cpu frequency policy (between: performance, dynamic and powersave)
+ * applet icon with information about AC state, battery fill and battery
+   (warning) states
+ * applet tooltip with information about battery fill and remaining battery 
+   time/percentage
+ * autosuspend (to suspend the machine if the user has been inactive for a 
+   defined time)
+ * a global configurable blacklist with programs which prevent autosuspend
+   (e.g. videoplayer and cd burning tools)
+ * trigger lock screen and select the lock method
+ * KNotify support
+ * online help
+ * localisations for many languages
+ 
+KPowersave supports schemes with following configurable specific 
+settings for:
+ * screensaver
+ * DPMS
+ * autosuspend
+ * scheme specific blacklist for autosuspend
+ * notification settings
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README.md TODO
+%{tde_bindir}/kpowersave
+%{tde_libdir}/libtdeinit_kpowersave.la
+%{tde_libdir}/libtdeinit_kpowersave.so
+%{tde_tdelibdir}/kpowersave.la
+%{tde_tdelibdir}/kpowersave.so
+%{tde_tdeappdir}/kpowersave.desktop
+%{tde_datadir}/apps/kpowersave/eventsrc
+%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/autostart/kpowersave-autostart.desktop
+%{tde_datadir}/config/kpowersaverc
+
+%changelog
diff --git a/redhat/applications/system/krusader/krusader.spec b/redhat/applications/system/krusader/krusader.spec
new file mode 100644
index 000000000..25c9ff32e
--- /dev/null
+++ b/redhat/applications/system/krusader/krusader.spec
@@ -0,0 +1,183 @@
+#
+# spec file for package krusader (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg krusader
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.90.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Twin-panel (commander-style) file manager for TDE (and other desktops)
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	trinity-tdebindings-devel >= %{tde_version}
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Krusader is a simple, easy, powerful, twin-panel (commander-style) file
+manager for TDE and other desktops, similar to Midnight Commander (C) or Total
+Commander (C).
+
+It provides all the file management features you could possibly want.
+
+Plus: extensive archive handling, mounted filesystem support, FTP,
+advanced search module, viewer/editor, directory synchronisation,
+file content comparisons, powerful batch renaming and much much more.
+
+It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar,
+zip and 7-zip.
+
+It handles KIOSlaves such as smb:// or fish://.
+
+Almost completely customizable, Krusader is very user friendly, fast and looks
+great on your desktop.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+# Warning: --enable-final causes FTBFS
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --disable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%suse_update_desktop_file krusader            System FileManager
+%suse_update_desktop_file krusader_root-mode  System FileManager
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING FAQ README TODO
+%{tde_bindir}/krusader
+%{tde_tdelibdir}/tdeio_krarc.la
+%{tde_tdelibdir}/tdeio_krarc.so
+%{tde_tdelibdir}/tdeio_virt.la
+%{tde_tdelibdir}/tdeio_virt.so
+%{tde_tdeappdir}/krusader.desktop
+%{tde_tdeappdir}/krusader_root-mode.desktop
+%{tde_datadir}/apps/krusader
+%{tde_datadir}/icons/crystalsvg/*/apps/*.png
+%{tde_datadir}/icons/locolor/*/apps/*.png
+%{tde_datadir}/services/krarc.protocol
+%{tde_datadir}/services/virt.protocol
+%{tde_mandir}/man1/krusader.1
+%{tde_tdedocdir}/HTML/en/krusader/
+%{tde_tdedocdir}/HTML/en/tdeioslave/krarc/
+%{tde_tdedocdir}/HTML/en/tdeioslave/virt/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
+
+
+%changelog
diff --git a/redhat/applications/system/kshutdown/kshutdown.spec b/redhat/applications/system/kshutdown/kshutdown.spec
new file mode 100644
index 000000000..c7c463346
--- /dev/null
+++ b/redhat/applications/system/kshutdown/kshutdown.spec
@@ -0,0 +1,181 @@
+#
+# spec file for package kshutdown (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kshutdown
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	An advanced shut down utility for TDE
+Group:		Applications/Multimedia
+URL:		http://kde-apps.org/content/show.php?content=41180
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+It has 4 main commands:
+
+- Shut Down (logout and halt the system),
+- Reboot (logout and reboot the system),
+- Lock Screen (lock the screen using a screen saver),
+- Logout (end the session and logout the user).
+
+It features time and delay options, command line support, wizard,
+and sounds.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop"
+%suse_update_desktop_file %{tde_pkg} Utility DesktopUtility
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.md
+%{tde_bindir}/kshutdown
+%{tde_tdelibdir}/kshutdownlockout_panelapplet.la
+%{tde_tdelibdir}/kshutdownlockout_panelapplet.so
+%{tde_tdeappdir}/kshutdown.desktop
+%{tde_datadir}/apps/kicker/applets/kshutdownlockout.desktop
+%{tde_datadir}/apps/kshutdown/
+%{tde_datadir}/apps/tdeconf_update/kshutdown.upd
+%{tde_datadir}/icons/hicolor/*/apps/kshutdown.png
+%lang(de) %{tde_datadir}/doc/tde/HTML/de/kshutdown/
+%lang(en) %{tde_datadir}/doc/tde/HTML/en/kshutdown/
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/system/ksystemlog/ksystemlog.spec b/redhat/applications/system/ksystemlog/ksystemlog.spec
new file mode 100644
index 000000000..e7d443300
--- /dev/null
+++ b/redhat/applications/system/ksystemlog/ksystemlog.spec
@@ -0,0 +1,164 @@
+#
+# spec file for package ksystemlog (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg ksystemlog
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.3.2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	System log viewer tool for Trinity
+Group:		Applications/System
+URL:		http://ksystemlog.forum-software.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+ksystemlog is a system log viewer tool for Trinity.
+
+This program is developed for being used by beginner users, which don't know
+how to find information about their Linux system, and how the log files are in
+their computer. But it is also designed for advanced users, who want to
+quickly see problems occuring on their server.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Missing category will make this fail.
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_bindir}/ksystemlog
+%{tde_tdeappdir}/ksystemlog.desktop
+%{tde_datadir}/apps/ksystemlog/
+%{tde_datadir}/config.kcfg/ksystemlog.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png
+%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz
+%{tde_tdedocdir}/HTML/en/ksystemlog/
+%{tde_mandir}/man1/ksystemlog.1*
+
+
+%changelog
diff --git a/redhat/applications/system/kvkbd/kvkbd.spec b/redhat/applications/system/kvkbd/kvkbd.spec
new file mode 100644
index 000000000..c5f3283ff
--- /dev/null
+++ b/redhat/applications/system/kvkbd/kvkbd.spec
@@ -0,0 +1,169 @@
+#
+# spec file for package kvkbd (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kvkbd
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.8
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Virtual keyboard for TDE
+Group:		Applications/System
+URL:		http://pan4os.info/main/index.php
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Virtual keyboard for TDE for use with accessibility. Application contains
+a systray widget as well as a dockwidget.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kvkbd Utility Accessibility
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_bindir}/kvkbd
+%{tde_tdeappdir}/kvkbd.desktop
+%{tde_datadir}/apps/kvkbd/
+%{tde_datadir}/icons/hicolor/*/apps/kvkbd.png
+%{tde_tdedocdir}/HTML/en/kvkbd/
+
+
+%changelog
diff --git a/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
new file mode 100644
index 000000000..a2b1220c7
--- /dev/null
+++ b/redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec
@@ -0,0 +1,132 @@
+#
+# spec file for package polkit-agent-tde (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/
+#
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg polkit-agent-tde
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Version:	0.99.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE dialogs for PolicyKit
+Group:		Environment/Desktop
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	libpolkit-tqt-devel
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+%description
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+PolicyKit-agent-tde provides a D-Bus session bus service that is used to
+bring up authentication dialogs used for obtaining privileges.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__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,-)
+%{_bindir}/polkit-agent-tde
+%dir %{_datadir}/autostart
+%{_datadir}/autostart/polkit-agent-tde.desktop
+
+
+%changelog
diff --git a/redhat/applications/system/smartcardauth/smartcardauth.spec b/redhat/applications/system/smartcardauth/smartcardauth.spec
new file mode 100644
index 000000000..e001dfcd3
--- /dev/null
+++ b/redhat/applications/system/smartcardauth/smartcardauth.spec
@@ -0,0 +1,239 @@
+#
+# spec file for package smartcardauth (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg smartcardauth
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%if 0%{?fedora} >= 27 || 0%{?mgaversion}
+%define debug_package %{nil}
+%endif
+
+%define dont_check_desktop_files 1
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	SmartCard Login and LUKS Decrypt, Setup Utility
+Group:		Applications/System
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		trinity-%{tde_pkg}-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# PCSC support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+Requires:	perl-pcsc-perl
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	pcsc-perl
+%endif
+%if 0%{?suse_version}
+Requires:	perl-pcsc
+%endif
+
+# PKCS11 support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}pkcs11-helper-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	pkcs11-helper-devel
+%endif
+
+# DB4/DB5 support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
+%define with_db 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:  db5-devel
+%endif
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+BuildRequires:  libdb-devel
+BuildRequires:  libdb-cxx-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:  libdb-4_8-devel
+%endif
+%if 0%{?rhel} && 0%{?rhel} <= 6
+BuildRequires:  db4-devel
+%endif
+%endif
+
+# PAM support
+BuildRequires:	pam-devel
+
+# TLS support
+%if 0%{?suse_version}
+BuildRequires:	libgnutls-devel
+%else
+BuildRequires:	gnutls-devel
+%endif
+
+# The 'pp' utility
+BuildRequires:	perl-PAR-Packer
+
+
+%description
+This utility will allow you to set up your computer to accept a SmartCard as an authentication source for:
+- Your encrypted LUKS partition
+- TDE, including automatic login, lock, and unlock features
+
+It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard
+Examples of such cards are:
+- The Schlumberger MultiFlex
+- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards
+
+If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run
+simultaneously with the certificate reading program(s) to provide single sign on
+in addition to the PKCS certificate functionality
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+  -DPERL_PAR_PACKER="pp.pl" \
+%endif
+%if 0%{?mgaversion} == 6 || 0%{?pclinuxos}
+  -DPERL_LIB_CHIPCARD="%{perl_sitearch}" \
+%endif
+%if 0%{?suse_version}
+  -DPERL_LIB_CHIPCARD="%{perl_vendorarch}" \
+%endif
+  \
+  -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
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file smartcardauth      System Security
+%suse_update_desktop_file smartcardrestrict  System Security
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc gpl.txt
+%{_bindir}/cryptosmartcard.sh
+%{_datadir}/initramfs-tools/
+%{_bindir}/scriptor_standalone
+%{_bindir}/setupcard.sh
+%{_bindir}/setupslavecard.sh
+%{_bindir}/smartauth.sh
+%{_bindir}/smartauthckpasswd
+%{_bindir}/smartauthmon
+%{_datadir}/applications/smartcardauth.desktop
+%{_datadir}/applications/smartcardrestrict.desktop
+%{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png
+%{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png
+%{_sysconfdir}/smartauth/
+%dir %{_sysconfdir}/init
+%{_sysconfdir}/init/smartauthlogin.conf
+
+
+%changelog
diff --git a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc b/redhat/applications/system/smartcardauth/trinity-smartcardauth-rpmlintrc
index 7dc0bac20..7dc0bac20 100644
--- a/redhat/applications/smartcardauth/trinity-smartcardauth-rpmlintrc
+++ b/redhat/applications/system/smartcardauth/trinity-smartcardauth-rpmlintrc
diff --git a/redhat/applications/system/tastymenu/tastymenu.spec b/redhat/applications/system/tastymenu/tastymenu.spec
new file mode 100644
index 000000000..5e5c75ba8
--- /dev/null
+++ b/redhat/applications/system/tastymenu/tastymenu.spec
@@ -0,0 +1,167 @@
+#
+# spec file for package tastymenu (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tastymenu
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.8
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Replacement for TMenu
+Group:		Applications/Multimedia
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Tasty Menu is a TMenu replacement aiming to provide the maximum usability and flexibility.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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_tdelibdir}/tastymenu_panelapplet.la
+%{tde_tdelibdir}/tastymenu_panelapplet.so
+%{tde_datadir}/apps/kicker/applets/tastymenu.desktop
+%{tde_datadir}/config.kcfg/tastymenu.kcfg
+%{tde_tdedocdir}/HTML/en/tastymenu/
+
+
+%post
+
+
+%postun
+
+
+%changelog
diff --git a/redhat/applications/system/tdedocker/tdedocker.spec b/redhat/applications/system/tdedocker/tdedocker.spec
new file mode 100644
index 000000000..5812749bf
--- /dev/null
+++ b/redhat/applications/system/tdedocker/tdedocker.spec
@@ -0,0 +1,197 @@
+#
+# spec file for package tdedocker (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdedocker
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.4
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Minimize all applications to system tray
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# XKBFILES support
+BuildRequires:	libxkbfile-devel
+
+# XMU support
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXmu-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
+BuildRequires: libxmu-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
+%endif
+
+# XPM support
+%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
+BuildRequires:	libXpm-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}xpm-devel
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+tdedocker will help you dock any application into the system tray.
+This means you can dock openoffice, xmms, firefox, thunderbird,
+anything! Just point and click. Works for all NET WM compliant
+window managers - that includes TDE, KDE, GNOME, Xfce, Fluxbox
+and many more.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdedocker.desktop Utility DesktopUtility
+%endif
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS BUGS ChangeLog COPYING CREDITS HACKING INSTALL README TODO VERSION
+%{tde_bindir}/tdedocker
+%{tde_tdeappdir}/tdedocker.desktop
+%{tde_datadir}/apps/tdedocker/
+%{tde_datadir}/icons/hicolor/*/apps/tdedocker.png
+%{tde_datadir}/apps/tdedocker/icons/question.png
+%{tde_mandir}/man1/tdedocker.1*
+
+
+%changelog
diff --git a/redhat/applications/system/tdepowersave/tdepowersave.spec b/redhat/applications/system/tdepowersave/tdepowersave.spec
new file mode 100644
index 000000000..296de3b4c
--- /dev/null
+++ b/redhat/applications/system/tdepowersave/tdepowersave.spec
@@ -0,0 +1,258 @@
+#
+# spec file for package tdepowersave (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdepowersave
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.7.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Power management applet for Trinity
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
+BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
+BuildRequires:	libudev-devel
+%endif
+
+# XSCREENSAVER support
+#  Disabled on RHEL4
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_xscreensaver 1
+%if 0%{?rhel} == 5
+BuildRequires:	xorg-x11-proto-devel
+#BuildRequires:	gnome-screensaver
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xscrnsaver-devel
+%else
+BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
+BuildRequires:	libXScrnSaver-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	xscreensaver
+%endif
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+Obsoletes:		trinity-kpowersave < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kpowersave = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+TDEPowersave is a TDE systray applet which allows to control the power 
+management settings and policies of your computer.
+
+Current feature list:
+ * support for ACPI, APM and PMU
+ * trigger suspend to disk/ram and standby
+ * switch cpu frequency policy (between: performance, dynamic and powersave)
+ * applet icon with information about AC state, battery fill and battery
+   (warning) states
+ * applet tooltip with information about battery fill and remaining battery 
+   time/percentage
+ * autosuspend (to suspend the machine if the user has been inactive for a 
+   defined time)
+ * a global configurable blacklist with programs which prevent autosuspend
+   (e.g. videoplayer and cd burning tools)
+ * trigger lock screen and select the lock method
+ * KNotify support
+ * online help
+ * localisations for many languages
+ 
+TDEPowersave supports schemes with following configurable specific 
+settings for:
+ * screensaver
+ * DPMS
+ * autosuspend
+ * scheme specific blacklist for autosuspend
+ * notification settings
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+# Disables automatic poweroff, make sure we match both "kpowersave" and "tdepowersave"
+if [ $1 = 1 ] && [ -r /etc/acpi/actions/power.sh ]; then
+  %__cp -f "/etc/acpi/actions/power.sh" "/etc/acpi/actions/power.sh.tdepowersavebackup"
+  %__sed -i "/etc/acpi/actions/power.sh" -e "s|kpowersave|powersave|"
+fi
+
+%postun
+if [ $1 = 0 ] && [ -r "/etc/acpi/actions/power.sh.tdepowersavebackup" ]; then
+  %__mv -f "/etc/acpi/actions/power.sh.tdepowersavebackup" "/etc/acpi/actions/power.sh"
+fi
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING TODO
+%{tde_bindir}/tdepowersave
+%{tde_libdir}/libtdeinit_tdepowersave.la
+%{tde_libdir}/libtdeinit_tdepowersave.so
+%{tde_tdelibdir}/tdepowersave.la
+%{tde_tdelibdir}/tdepowersave.so
+%{tde_tdeappdir}/tdepowersave.desktop
+%{tde_datadir}/apps/tdepowersave/
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/autostart/tdepowersave-autostart.desktop
+%config(noreplace) %{tde_confdir}/tdepowersaverc
+%{tde_mandir}/man1/tdepowersave.*
+
+%lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/
+%lang(de) %{tde_tdedocdir}/HTML/de/tdepowersave/
+%lang(en) %{tde_tdedocdir}/HTML/en/tdepowersave/
+%lang(fi) %{tde_tdedocdir}/HTML/fi/tdepowersave/
+%lang(hu) %{tde_tdedocdir}/HTML/hu/tdepowersave/
+%lang(nb) %dir %{tde_tdedocdir}/HTML/nb
+%lang(nb) %{tde_tdedocdir}/HTML/nb/tdepowersave/
+
+
+%changelog
diff --git a/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
new file mode 100644
index 000000000..93c72ba6f
--- /dev/null
+++ b/redhat/applications/system/tdesshaskpass/tdesshaskpass.spec
@@ -0,0 +1,160 @@
+#
+# spec file for package tdesshaskpass (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdesshaskpass
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	interactively prompt users for a passphrase for ssh-add
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+%if 0%{?sle_version} >= 150200
+Requires:		openssh
+%else
+Requires:		openssh-clients
+%endif
+
+%description
+A TDE version of ssh-askpass with TDEWallet support.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING README.md
+%{tde_bindir}/*
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/system/yakuake/yakuake.spec b/redhat/applications/system/yakuake/yakuake.spec
new file mode 100644
index 000000000..849b49201
--- /dev/null
+++ b/redhat/applications/system/yakuake/yakuake.spec
@@ -0,0 +1,161 @@
+#
+# spec file for package yakuake (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg yakuake
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.8.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Yakuake is a Quake-style terminal emulator based on TDE Konsole technology
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/*
+%{tde_datadir}/applications/*/*.desktop
+%{tde_datadir}/apps/*/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/locale/*/*/*.mo
+%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_tdedocdir}/HTML/en/yakuake/
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/tastymenu/tastymenu.spec
deleted file mode 100644
index c68115e50..000000000
--- a/redhat/applications/tastymenu/tastymenu.spec
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-# spec file for package tastymenu (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tastymenu
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0.8
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Replacement for TMenu
-Group:		Applications/Multimedia
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Tasty Menu is a TMenu replacement aiming to provide the maximum usability and flexibility.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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_tdelibdir}/tastymenu_panelapplet.la
-%{tde_tdelibdir}/tastymenu_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/tastymenu.desktop
-%{tde_datadir}/config.kcfg/tastymenu.kcfg
-%{tde_tdedocdir}/HTML/en/tastymenu/
-
-
-%post
-
-
-%postun
-
-
-%changelog
diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec
deleted file mode 100644
index b7038ef49..000000000
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ /dev/null
@@ -1,463 +0,0 @@
-#
-# spec file for package tde-guidance (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tde-guidance
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define __arch_install_post %{nil}
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.8.0svn20080103
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	A collection of system administration tools for Trinity
-Group:		Applications/Utilities
-URL:		http://www.simonzone.com/software/guidance
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		trinity-%{tde_pkg}-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	trinity-pytdeextensions
-BuildRequires:	trinity-libpythonize0-devel
-BuildRequires:	trinity-python-trinity
-BuildRequires:	chrpath
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# SIP support
-BuildRequires:	sip4-tqt-devel >= 4.10.5
-Requires:		sip4-tqt >= 4.10.5
-
-# PYTHON-QT support
-BuildRequires:	python-tqt-devel
-BuildRequires:	trinity-python-trinity-devel
-BuildRequires:	trinity-pytqt-tools
-
-# LIBXXF86VM support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xxf86vm-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires:	libXxf86vm-devel
-%endif
-
-# XSCREENSAVER support
-#  RHEL 4: disabled
-#  RHEL 6: available in EPEL
-#  RHEL 7: available in NUX
-#  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-BuildRequires:	xscreensaver-extras
-%if 0%{?fedora}
-BuildRequires:	xscreensaver-extras-base
-%endif
-BuildRequires:	xscreensaver-gl-base
-BuildRequires:	xscreensaver-gl-extras
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-data
-BuildRequires:	xscreensaver-data-extra
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-%if 0%{?pclinuxos} == 0
-BuildRequires:	xscreensaver-extrusion
-%endif
-BuildRequires:	xscreensaver-gl
-%endif
-%endif
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-Requires:		python-tqt
-Requires:		trinity-python-trinity
-Requires:		trinity-pytdeextensions
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		hwdata
-%endif
-
-Requires:		%{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# POWERMANAGER support (requires HAL)
-#define with_powermanager 1
-Obsoletes:	trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:		trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-Guidance currently consists of four programs designed to help you
-look after your system:
- o  userconfig - User and Group administration
- o  serviceconfig - Service/daemon administration
- o  mountconfig - Disk and filesystem administration
- o  wineconfig - Wine configuration
-
-These tools are available in Trinity Control Center, System Settings 
-or can be run as standalone applications.
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
-%{tde_bindir}/grubconfig
-%{tde_bindir}/mountconfig
-%{tde_bindir}/serviceconfig
-%{tde_bindir}/userconfig
-%{tde_bindir}/wineconfig
-%attr(0644,root,root) %{tde_tdelibdir}/*.so
-%attr(0644,root,root) %{tde_tdelibdir}/*.la
-%{tde_datadir}/apps/guidance/
-%{tde_tdeappdir}/*.desktop
-%{tde_datadir}/icons/crystalsvg/*/*/*.png
-%{tde_datadir}/icons/crystalsvg/*/*/*.svg
-%{python_sitearch}/%{name}/SMBShareSelectDialog.py*
-%{python_sitearch}/%{name}/SimpleCommandRunner.py*
-%{python_sitearch}/%{name}/fuser.py*
-%{python_sitearch}/%{name}/fuser_ui.py*
-%{python_sitearch}/%{name}/grubconfig.py*
-%{python_sitearch}/%{name}/mountconfig.py*
-%{python_sitearch}/%{name}/serviceconfig.py*
-%{python_sitearch}/%{name}/sizeview.py*
-%{python_sitearch}/%{name}/unixauthdb.py*
-%{python_sitearch}/%{name}/userconfig.py*
-%{python_sitearch}/%{name}/wineconfig.py*
-%{tde_tdedocdir}/HTML/en/guidance/
-
-
-# Files from powermanager
-%if 0%{?with_powermanager}
-%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%exclude %{tde_datadir}/apps/guidance/pics/battery*.png
-%exclude %{tde_datadir}/apps/guidance/pics/processor.png
-%endif
-
-##########
-
-%package backends
-Group:			Applications/Utilities
-Summary:		collection of system administration tools for GNU/Linux [Trinity]
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:		hwdata
-%endif
-Requires:		%{python}
-
-Obsoletes:		trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description backends
-This package contains the platform neutral backends used in the
-Guidance configuration tools.
-
-%files backends
-%defattr(-,root,root,-)
-%dir %{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/drivedetect.py*
-%{python_sitearch}/%{name}/wineread.py*
-%{python_sitearch}/%{name}/winewrite.py*
-%{python_sitearch}/%{name}/xf86misc.py*
-%{python_sitearch}/ixf86misc.so
-
-##########
-
-%if 0%{?with_powermanager}
-
-%package powermanager
-Group:			Applications/Utilities
-Summary:		HAL based power manager applet [Trinity]
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		hal
-
-Obsoletes:		trinity-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-guidance-powermanager = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if "%{tde_prefix}" == "/usr"
-Conflicts:	guidance-power-manager
-Conflicts:	kde-guidance-powermanager
-%endif
-
-%description powermanager
-A power management applet to indicate battery levels and perform hibernate or
-suspend using HAL.
-
-%files powermanager
-%defattr(-,root,root,-)
-%{tde_bindir}/guidance-power-manager
-%{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/guidance-power-manager.py*
-%{python_sitearch}/%{name}/powermanage.py*
-%{python_sitearch}/%{name}/gpmhelper.py*
-%{python_sitearch}/%{name}/powermanager_ui.py*
-%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%{python_sitearch}/%{name}/notify.py*
-%{python_sitearch}/%{name}/tooltip.py*
-%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%{tde_datadir}/apps/guidance/pics/ac-adapter.png
-%{tde_datadir}/apps/guidance/pics/battery*.png
-%{tde_datadir}/apps/guidance/pics/processor.png
-%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
-%__sed -i "userconfig/unixauthdb.py" \
-  -e "s|self.first_uid = .*|self.first_uid = 500|" \
-  -e "s|self.first_gid = .*|self.first_gid = 500|"
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-#export PYTHONPATH=%{python_sitearch}/python-tqt
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-# FTBFS on PCLOS ...
-export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g"
-fi
-
-%__python ./setup.py build
-
-
-%install
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
-export SIPTQT_DIR="%{python_sitearch}/sip4_tqt"
-export PYTHONPATH="%{python_sitearch}/python-tqt"
-
-# Support for 'sip4-tqt'
-export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
-
-# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-%__python ./setup.py install \
-	--prefix=%{tde_prefix} \
-	--root=%{buildroot}
-
-# Fix temporary build directories remaining inside .py files
-for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do
-	%__sed -i "${f}" -e "s|%{buildroot}||g"
-done
-
-##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules)
-# install icons to right place
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png
-%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png
-
-# fix binary-or-shlib-defines-rpath
-chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
-
-# fix executable-not-elf-or-script
-%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png
-
-# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages)
-%__mkdir_p %{buildroot}%{python_sitearch}/%{name} 
-%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name}
-
-# Generates the startup scripts
-%__rm -f %{buildroot}%{tde_bindir}/*
-%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
-%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
-%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
-%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
-%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
-
-# fix script-not-executable
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
-%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
-
-##### BACKENDS INSTALLATION
-
-# The xf86misc stuff should not go under /opt/trinity bur under /usr !!!
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name}
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB
-%endif
-
-%if 0%{?with_powermanager}
-##### POWERMANAGER INSTALLATION
-# install icon to right place
-%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
-		%{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
-%__install -D -p -m0644 kde/powermanager/pics/*.png \
-		%{buildroot}%{tde_datadir}/apps/guidance/pics/
-
-# install desktop file
-%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		%{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop
-
-# copy python modules in PYSUPPORT_PATH
-%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name}
-%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name}
-
-# generate guidance-power-manager script
-cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager
-#!/bin/sh
-export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/sip4-tqt
-%{python_sitearch}/%{name}/guidance-power-manager.py &
-EOF
-chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager
-
-# fix script-not-executable
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py
-chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
-
-%else
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py*
-%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py*
-%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui
-
-%endif
-
-# Replace all '#!' calls to python with /usr/bin/python
-# and make them executable
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-%define python /usr/bin/python2
-%else
-%define python /usr/bin/python
-%endif
-for i in `find %{buildroot} -type f`; do
-	sed '1s,#!.*python[^ ]*\(.*\),#! %python\1,' \
-		$i > $i.temp;
-	if cmp --quiet $i $i.temp; then
-		rm -f $i.temp;
-	else
-		mv -f $i.temp $i;
-		chmod 755 $i;
-		echo "fixed interpreter: $i";
-	fi;
-done
-
-# Removes useless files
-find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
-find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec
deleted file mode 100644
index c0698f324..000000000
--- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec
+++ /dev/null
@@ -1,195 +0,0 @@
-#
-# spec file for package tde-style-baghira (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tde-style-baghira
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.8
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	TDE style for Apple junkies :)
-Group:		Graphical desktop/TDE
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:          trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-BuildRequires:          libjpeg-devel
-%else
-BuildRequires:          jpeg-devel
-%endif
-
-%description
-Based upon mosfet-liquid0.9.6pre4... the last heir of mosfet.
-Baghira includes both an style (custom widgets) and twin decoration as
-well as colour schemes.
-
-Baghira (panther, in german) makes TDE resemble Apple's MacOS X's Aqua,
-Panther and Jaguar looks, and also includes its own 'Baghira' look
-
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%{tde_bindir}/bab
-%{tde_libdir}/libbaghirastarter.la
-%{tde_libdir}/libbaghirastarter.so
-%{tde_tdelibdir}/b_menu_panelapplet.la
-%{tde_tdelibdir}/b_menu_panelapplet.so
-%{tde_tdelibdir}/plugins/styles/baghira.la
-%{tde_tdelibdir}/plugins/styles/baghira.so
-%{tde_tdelibdir}/tdestyle_baghira_config.la
-%{tde_tdelibdir}/tdestyle_baghira_config.so
-%{tde_tdelibdir}/twin3_baghira.la
-%{tde_tdelibdir}/twin3_baghira.so
-%{tde_tdelibdir}/twin_baghira_config.la
-%{tde_tdelibdir}/twin_baghira_config.so
-%{tde_libdir}/usermanager_panelapplet.la
-%{tde_libdir}/usermanager_panelapplet.so
-%{tde_datadir}/apps/baghira/
-%{tde_datadir}/apps/kicker/applets/baghira-starter.desktop
-%{tde_datadir}/apps/kicker/applets/baghira-usermanager.desktop
-%{tde_datadir}/apps/tdedisplay/color-schemes/AquaBlue.kcsrc
-%{tde_datadir}/apps/tdedisplay/color-schemes/AquaGraphite.kcsrc
-%{tde_datadir}/apps/tdestyle/themes/baghira.themerc
-%{tde_datadir}/apps/twin/baghira.desktop
-%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira.png
-%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_blue.png
-%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_grey.png
-%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_white.png
-%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_yellow.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_blue.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_grey.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_white.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_yellow.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_down.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_hover.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_itunes.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_jaguar.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_milk.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_panther.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_tiger.png
-%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira.png
-%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_blue.png
-%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_grey.png
-%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_white.png
-%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_yellow.png
-%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira.png
-%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_blue.png
-%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_grey.png
-%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_white.png
-%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_yellow.png
-%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira.png
-%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_blue.png
-%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_grey.png
-%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_white.png
-%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_yellow.png
-%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira.png
-%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_blue.png
-%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_grey.png
-%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_white.png
-%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_yellow.png
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo
-%{tde_mandir}/man1/bab.1*
-
-
-%changelog
diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/tde-style-domino/tde-style-domino.spec
deleted file mode 100644
index d1fd30d20..000000000
--- a/redhat/applications/tde-style-domino/tde-style-domino.spec
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# spec file for package domino (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tde-style-domino
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.4
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Domino widget style and twin decoration for TDE
-Group:		Graphical desktop/TDE
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:          trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-BuildRequires:          libjpeg-devel
-%else
-BuildRequires:          jpeg-devel
-%endif
-
-%description
-Domino is a style with a soft look. It allows to fine adjust the shininess
-of the widgets by customizable color gradients.
-
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%{tde_tdelibdir}/plugins/styles/domino.la
-%{tde_tdelibdir}/plugins/styles/domino.so
-%{tde_tdelibdir}/tdestyle_domino_config.la
-%{tde_tdelibdir}/tdestyle_domino_config.so
-%{tde_tdelibdir}/twin3_domino.la
-%{tde_tdelibdir}/twin3_domino.so
-%{tde_tdelibdir}/twin_domino_config.la
-%{tde_tdelibdir}/twin_domino_config.so
-%{tde_datadir}/apps/tdedisplay/color-schemes/Domino.kcsrc
-%{tde_datadir}/apps/tdestyle/themes/domino.themerc
-%{tde_datadir}/apps/twin/domino.desktop
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/tdestyle_domino_config.mo
-
-
-%changelog
diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
deleted file mode 100644
index 3d9c1aa10..000000000
--- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# spec file for package tde-style-ia-ora (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tde-style-ia-ora
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0.8
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Mandriva theme for TDE - Widget design
-Group:		Environment/Desktop
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-Requires:	trinity-twin
-
-Obsoletes:	trinity-style-ia-ora < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-style-ia-ora = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-Mandriva theme for Trinity
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/styles/ia_ora.la
-%{tde_tdelibdir}/plugins/styles/ia_ora.so
-%{tde_tdelibdir}/twin3_iaora.la
-%{tde_tdelibdir}/twin3_iaora.so
-%{tde_tdelibdir}/twin_iaora_config.la
-%{tde_tdelibdir}/twin_iaora_config.so
-%{tde_datadir}/apps/tdestyle/themes/ia_ora.themerc
-%{tde_datadir}/apps/twin/iaora.desktop
-
-
-%changelog
diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
deleted file mode 100644
index 739ec9a01..000000000
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-# spec file for package tde-style-lipstik (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tde-style-lipstik
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	2.2.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Lipstik style for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Obsoletes:		trinity-kde-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-Based on the plastik style, Lipstik is a purified style with many options to
-tune your desktop look.
-
-Lipstik also provides Lipstik-color-schemes
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DDATA_INSTALL_DIR="%{tde_datadir}/apps" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  \
-  -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,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/tdestyle_lipstik_config.la
-%{tde_tdelibdir}/tdestyle_lipstik_config.so
-%{tde_tdelibdir}/plugins/styles/lipstik.la
-%{tde_tdelibdir}/plugins/styles/lipstik.so
-%{tde_datadir}/apps/tdedisplay/color-schemes/lipstiknoble.kcsrc
-%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikstandard.kcsrc
-%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikwhite.kcsrc
-%{tde_datadir}/apps/tdestyle/themes/lipstik.themerc
-
-
-%changelog
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
deleted file mode 100644
index 588e0af1c..000000000
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-# spec file for package tde-style-qtcurve (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tde-style-qtcurve
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.55.2
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	This is a set of widget styles for Trinity based apps
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-Obsoletes:		trinity-kde-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-This package together with gtk2-engines-qtcurve aim to provide a unified look
-and feel on the desktop when using TDE and Gnome applications.
-
-This package is most useful when installed together with 
-gtk2-engines-qtcurve.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Error in "po/tr.po"
-%if 0%{?rhel} == 4
-%__rm -f "po/tr.po"
-%endif
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \
-  -DQTC_QT_ONLY=false \
-  -DQTC_STYLE_SUPPORT=true \
-  -DBUILD_ALL=on \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang qtcurve || touch qtcurve.lang
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files -f qtcurve.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/tdestyle_qtcurve_config.la
-%{tde_tdelibdir}/tdestyle_qtcurve_config.so
-%{tde_tdelibdir}/plugins/styles/qtcurve.so
-%{tde_tdelibdir}/plugins/styles/qtcurve.la
-%{tde_datadir}/apps/tdedisplay/color-schemes/QtCurve.kcsrc
-%{tde_datadir}/apps/tdestyle/themes/qtcurve.themerc
-%{tde_datadir}/apps/QtCurve/
-
-
-%changelog
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec
deleted file mode 100644
index a26faf82a..000000000
--- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec
+++ /dev/null
@@ -1,190 +0,0 @@
-#
-# spec file for package tde-systemsettings (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tde-systemsettings
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_sysconfdir %{_sysconfdir}/trinity
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.0svn20070312
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Easy to use control centre for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		tde-settings-laptops.directory
-
-
-Provides:	trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kde-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-systemsettings < %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Requires:		trinity-guidance
-
-
-%description
-System preferences is a replacement for the TDE
-Control Centre with an improved user interface.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export kde_confdir="%{tde_confdir}"
-
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --sysconfdir=%{tde_sysconfdir} \
-  --mandir=%{tde_mandir} \
-  --program-prefix="" \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-laptops.directory
-
-# Unwanted files
-%__rm -f %{buildroot}%{tde_datadir}/applications/tde/kcmfontinst.desktop
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-power.directory
-%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/tde-settings-system.directory
-
-%__rm -f %{buildroot}%{tde_datadir}/applications/tde/laptop.desktop
-
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/audioencoding.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/defaultapplication.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_ss.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop"
-
-# Fix translation names
-for d in "%{buildroot}%{tde_datadir}/locale/"*"/LC_MESSAGES"; do
-  mv "${d}/"*".mo" "${d}/%{tde_pkg}.mo"
-done
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc README TODO
-%dir %{tde_sysconfdir}/xdg
-%dir %{tde_sysconfdir}/xdg/menus
-%dir %{tde_sysconfdir}/xdg/menus/applications-merged
-%{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu
-%{tde_sysconfdir}/xdg/menus/tde-system-settings.menu
-%{tde_bindir}/systemsettings
-%{tde_datadir}/applications/tde/audioencoding.desktop
-%{tde_datadir}/applications/tde/defaultapplication.desktop
-%{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop
-%{tde_datadir}/applications/tde/medianotifications.desktop
-%{tde_datadir}/applications/tde/systemsettings.desktop
-%{tde_datadir}/apps/systemsettings/
-%config(noreplace) %{tde_confdir}/systemsettingsrc
-%{tde_datadir}/desktop-directories/*.directory
-%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-%{tde_tdedocdir}/HTML/en/systemsettings/
-%{tde_mandir}/man1/systemsettings.1*
-
-%changelog
diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec
deleted file mode 100644
index 0c58d26ac..000000000
--- a/redhat/applications/tdedocker/tdedocker.spec
+++ /dev/null
@@ -1,196 +0,0 @@
-#
-# spec file for package tdedocker (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdedocker
-%define tde_prefix /opt/trinity
-%define tde_appdir %{tde_datadir}/applications
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Epoch:			%{tde_epoch}
-Version:		1.4
-Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Minimize all applications to system tray
-Group:			Applications/Utilities
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# XKBFILES support
-BuildRequires:	libxkbfile-devel
-
-# XMU support
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXmu-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires: libXmu-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
-%endif
-%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
-BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
-%endif
-
-# XPM support
-%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
-BuildRequires:	libXpm-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}xpm-devel
-%endif
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-tdedocker will help you dock any application into the system tray.
-This means you can dock openoffice, xmms, firefox, thunderbird,
-anything! Just point and click. Works for all NET WM compliant
-window managers - that includes TDE, KDE, GNOME, Xfce, Fluxbox
-and many more.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdedocker.desktop Utility DesktopUtility
-%endif
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING CREDITS HACKING INSTALL README TODO VERSION
-%{tde_bindir}/tdedocker
-%{tde_tdeappdir}/tdedocker.desktop
-%{tde_datadir}/apps/tdedocker/
-%{tde_datadir}/icons/hicolor/*/apps/tdedocker.png
-%{tde_datadir}/apps/tdedocker/icons/question.png
-%{tde_mandir}/man1/tdedocker.1*
-
-
-%changelog
diff --git a/redhat/applications/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec
deleted file mode 100644
index 84cba8dd5..000000000
--- a/redhat/applications/tdeio-apt/tdeio-apt.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# spec file for package tdeio-apt (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeio-apt
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.13.2
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	An apt-cache ioslave for Trinity
-Group:		Applications/Utilities
-URL:		http://lpnotfr.free.fr/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-tdeio-apt is an ioslave which provides the apt:/ protocol. It
-integrates apt-cache functionalities into Konqueror, making
-browsing the packages easier. It provides:
- - apt-cache search: apt:/search?expression
- - apt-cache show: apt:/show?package . The show? target
-   prints the policy too.
- - apt-cache policy: apt:/policy?package
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=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,-)
-%doc AUTHORS CHANGELOG ChangeLog COPYING
-%{tde_tdelibdir}/tdeio_apt.la
-%{tde_tdelibdir}/tdeio_apt.so
-%{tde_datadir}/apps/tdeio_apt/
-%{tde_datadir}/services/apt+http.protocol
-%{tde_datadir}/services/apt.protocol
-%{tde_datadir}/services/searchproviders/apt-file.desktop
-%{tde_datadir}/services/searchproviders/apt-files.desktop
-%{tde_datadir}/services/searchproviders/apt-search.desktop
-
-
-%changelog
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec
deleted file mode 100644
index f7ba12a15..000000000
--- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec
+++ /dev/null
@@ -1,163 +0,0 @@
-#
-# spec file for package tdeio-ftps (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeio-ftps
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	An ftps TDEIO slave for Trinity
-Group:		Productivity/Networking/Ftp/Clients
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Obsoletes:		trinity-kio-ftps < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kio-ftps = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-An ftps TDEIO slave for Trinity, based on rfc4217. It should work yet with
-most server implementations.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__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,-)
-%defattr(-,root,root,-)
-%doc README Changelog COPYING AUTHORS
-%{tde_tdelibdir}/tdeio_ftps.la
-%{tde_tdelibdir}/tdeio_ftps.so
-%{tde_datadir}/services/ftps.protocol
-
-
-%changelog
diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec
deleted file mode 100644
index 3c494a94c..000000000
--- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec
+++ /dev/null
@@ -1,185 +0,0 @@
-#
-# spec file for package tdeio-gopher (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeio-gopher
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.1.4
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	tdeio-slave for the gopher protocol
-Group:		Productivity/Networking/Ftp/Clients
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Obsoletes:		trinity-kio-gopher < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kio-gopher = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-Adds support for the "gopher:" protocol
-to Konqueror and other TDE applications.
-
-This enables you to perform gopher searches in Konqueror.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__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,-)
-%doc ChangeLog COPYING FAQ README VERSION
-%{tde_tdelibdir}/tdeio_gopher.la
-%{tde_tdelibdir}/tdeio_gopher.so
-%{tde_datadir}/services/gopher.protocol
-%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeio-gopher/
-%lang(da) %{tde_tdedocdir}/HTML/da/tdeio-gopher/
-%lang(de) %{tde_tdedocdir}/HTML/de/tdeio-gopher/
-%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/gopher/
-%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeio-gopher/
-%lang(es) %{tde_tdedocdir}/HTML/es/tdeio-gopher/
-%lang(et) %{tde_tdedocdir}/HTML/et/tdeio-gopher/
-%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeio-gopher/
-%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeio-gopher/
-%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeio-gopher/
-%lang(it) %{tde_tdedocdir}/HTML/it/tdeio-gopher/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeio-gopher/
-%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeio-gopher/
-%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeio-gopher/
-%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeio-gopher/
-%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeio-gopher/
-%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeio-gopher/
-%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeio-gopher/
-%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeio-gopher/
-%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeio-gopher/
-%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeio-gopher/
-
-
-%changelog
diff --git a/redhat/applications/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio-locate/tdeio-locate.spec
deleted file mode 100644
index 85778c271..000000000
--- a/redhat/applications/tdeio-locate/tdeio-locate.spec
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# spec file for package tdeio-locate (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeio-locate
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.4.5
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Tdeio-slave for the locate command [Trinity]
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-Obsoletes:		trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-Adds support for the "locate" and "locater:"
-protocols to Konqueror and other TDE applications.
-
-This enables you to perform locate searches as you
-would in a terminal. The result is displayed just
-as a directory.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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:${PKG_CONFIG_PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%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,-)
-%doc AUTHORS ChangeLog COPYING TODO
-%{tde_tdelibdir}/tdeio_locate.la
-%{tde_tdelibdir}/tdeio_locate.so
-%{tde_tdedocdir}/HTML/en/tdeio-locate/
-%{tde_datadir}/services/locate.protocol
-%{tde_datadir}/services/locater.protocol
-%{tde_datadir}/services/rlocate.protocol
-%{tde_datadir}/services/searchproviders/locate.desktop
-
-%changelog
diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec
deleted file mode 100644
index 95c53878a..000000000
--- a/redhat/applications/tdeio-sword/tdeio-sword.spec
+++ /dev/null
@@ -1,176 +0,0 @@
-#
-# spec file for package tdeio-sword (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/
-#
-
-# Required for PCLinuxOS: removes the ldflag '--no-undefined'
-%if 0%{?pclinuxos} >= 2018
-%define _disable_ld_no_undefined 1
-%endif
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeio-sword
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Tdeio-slave for the Sword Bible tool
-Group:		Productivity/Networking/Ftp/Clients
-URL:		http://lukeplant.me.uk/kio-sword/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# Requires: sword
-BuildRequires:	sword-devel
-Requires:		sword
-
-
-%description
-TDEio-Sword provides access to Bibles, commentaries
-and other texts in an easy to use and attractive
-interface -- the Konqueror web browser.  It does so
-using the SWORD Bible project and implementing a TDE
-ioslave, providing the sword:/ protocol.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__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,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_tdelibdir}/tdeio_sword.la
-%{tde_tdelibdir}/tdeio_sword.so
-%{tde_datadir}/apps/tdeio_sword/
-%{tde_tdedocdir}/HTML/en/tdeio_sword/
-%{tde_datadir}/icons/hicolor/*/apps/tdeio_sword.png
-%{tde_datadir}/icons/hicolor/scalable/apps/tdeio_sword.svgz
-%{tde_datadir}/services/sword.protocol
-
-
-%changelog
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
deleted file mode 100644
index c415ace99..000000000
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec
+++ /dev/null
@@ -1,190 +0,0 @@
-#
-# spec file for package tdeio-umountwrapper (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeio-umountwrapper
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.2
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Progress dialog for safely removing devices in Trinity
-Group:		Applications/Utilities
-URL:		http://frode.kde.no/misc/tdeio_umountwrapper/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		media_safelyremove.desktop_tdeio
-
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-Obsoletes:		trinity-kio-umountwrapper < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kio-umountwrapper = %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Wrapper around tdeio_media_mountwrapper.
-Provides a progress dialog for Safely Removing of devices in Trinity.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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
-
-%__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
-%__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
-
-%find_lang tdeio_umountwrapper
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in konqueror d3lphin; do
-  update-alternatives --install \
-    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
-    media_safelyremove.desktop_${f} \
-    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper \
-    20
-done
-
-
-%postun
-if [ $1 -eq 0 ]; then
-  for f in konqueror d3lphin; do
-    update-alternatives --remove \
-      media_safelyremove.desktop_${f} \
-      %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper || :
-  done
-fi
-
-
-%files -f tdeio_umountwrapper.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/tdeio_umountwrapper
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
-%dir %{tde_datadir}/apps/d3lphin
-%dir %{tde_datadir}/apps/d3lphin/servicemenus
-%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
-
-
-%changelog
diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
new file mode 100644
index 000000000..1fecbfec7
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec
@@ -0,0 +1,160 @@
+#
+# spec file for package tdeio-appinfo (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeio-appinfo
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDEIO slave for the appinfo protocol
+Group:		Productivity/Networking/Ftp/Clients
+URL:		http://lukeplant.me.uk/kio-appinfo/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Adds support for the "appinfo:" protocol
+to Konqueror and other TDE applications.
+.
+This enables you to perform appinfo: searches in TDE.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_tdelibdir}/tdeio_appinfo.la
+%{tde_tdelibdir}/tdeio_appinfo.so
+%{tde_datadir}/services/appinfo.protocol
+
+
+%changelog
diff --git a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
new file mode 100644
index 000000000..21e330cf7
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec
@@ -0,0 +1,165 @@
+#
+# spec file for package tdeio-apt (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeio-apt
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.13.2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	An apt-cache ioslave for Trinity
+Group:		Applications/Utilities
+URL:		http://lpnotfr.free.fr/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+tdeio-apt is an ioslave which provides the apt:/ protocol. It
+integrates apt-cache functionalities into Konqueror, making
+browsing the packages easier. It provides:
+ - apt-cache search: apt:/search?expression
+ - apt-cache show: apt:/show?package . The show? target
+   prints the policy too.
+ - apt-cache policy: apt:/policy?package
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=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 tdeio_apt
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f tdeio_apt.lang
+%defattr(-,root,root,-)
+%doc AUTHORS CHANGELOG ChangeLog COPYING
+%{tde_tdelibdir}/tdeio_apt.la
+%{tde_tdelibdir}/tdeio_apt.so
+%{tde_datadir}/apps/tdeio_apt/
+%{tde_datadir}/services/apt+http.protocol
+%{tde_datadir}/services/apt.protocol
+%{tde_datadir}/services/searchproviders/apt-file.desktop
+%{tde_datadir}/services/searchproviders/apt-files.desktop
+%{tde_datadir}/services/searchproviders/apt-search.desktop
+
+
+%changelog
diff --git a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
new file mode 100644
index 000000000..c8e84f7e9
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec
@@ -0,0 +1,164 @@
+#
+# spec file for package tdeio-ftps (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeio-ftps
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	An ftps TDEIO slave for Trinity
+Group:		Productivity/Networking/Ftp/Clients
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Obsoletes:		trinity-kio-ftps < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kio-ftps = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+An ftps TDEIO slave for Trinity, based on rfc4217. It should work yet with
+most server implementations.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang tdeio_ftps
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files -f tdeio_ftps.lang
+%defattr(-,root,root,-)
+%defattr(-,root,root,-)
+%doc README.md Changelog COPYING AUTHORS
+%{tde_tdelibdir}/tdeio_ftps.la
+%{tde_tdelibdir}/tdeio_ftps.so
+%{tde_datadir}/services/ftps.protocol
+
+
+%changelog
diff --git a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
new file mode 100644
index 000000000..dbef03ad3
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec
@@ -0,0 +1,181 @@
+#
+# spec file for package tdeio-gopher (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeio-gopher
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	tdeio-slave for the gopher protocol
+Group:		Productivity/Networking/Ftp/Clients
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Adds support for the "gopher:" protocol
+to Konqueror and other TDE applications.
+
+This enables you to perform gopher searches in Konqueror.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang tdeio_gopher
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files -f tdeio_gopher.lang
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING FAQ README VERSION
+%{tde_tdelibdir}/tdeio_gopher.la
+%{tde_tdelibdir}/tdeio_gopher.so
+%{tde_datadir}/services/gopher.protocol
+%lang(ca) %{tde_tdedocdir}/HTML/ca/tdeioslave/
+%lang(da) %{tde_tdedocdir}/HTML/da/tdeioslave/
+%lang(de) %{tde_tdedocdir}/HTML/de/tdeioslave/
+%lang(en) %{tde_tdedocdir}/HTML/en/tdeioslave/
+%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/tdeioslave/
+%lang(es) %{tde_tdedocdir}/HTML/es/tdeioslave/
+%lang(et) %{tde_tdedocdir}/HTML/et/tdeioslave/
+%lang(fr) %{tde_tdedocdir}/HTML/fr/tdeioslave/
+%lang(gl) %{tde_tdedocdir}/HTML/gl/tdeioslave/
+%lang(hu) %{tde_tdedocdir}/HTML/hu/tdeioslave/
+%lang(it) %{tde_tdedocdir}/HTML/it/tdeioslave/
+%lang(nl) %{tde_tdedocdir}/HTML/nl/tdeioslave/
+%lang(pl) %{tde_tdedocdir}/HTML/pl/tdeioslave/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/tdeioslave/
+%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/tdeioslave/
+%lang(ro) %{tde_tdedocdir}/HTML/ro/tdeioslave/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/tdeioslave/
+%lang(sk) %{tde_tdedocdir}/HTML/sk/tdeioslave/
+%lang(sr) %{tde_tdedocdir}/HTML/sr/tdeioslave/
+%lang(sr@Latn) %{tde_tdedocdir}/HTML/sr@Latn/tdeioslave/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/tdeioslave/
+%lang(uk) %{tde_tdedocdir}/HTML/uk/tdeioslave/
+
+
+%changelog
diff --git a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
new file mode 100644
index 000000000..5d3339de7
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec
@@ -0,0 +1,178 @@
+#
+# spec file for package tdeio-locate (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeio-locate
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Tdeio-slave for the locate command [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+Obsoletes:		trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+Adds support for the "locate" and "locater:"
+protocols to Konqueror and other TDE applications.
+
+This enables you to perform locate searches as you
+would in a terminal. The result is displayed just
+as a directory.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  ..
+
+# SMP safe !
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang tdeio_locate
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files -f tdeio_locate.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING TODO
+%{tde_tdelibdir}/tdeio_locate.la
+%{tde_tdelibdir}/tdeio_locate.so
+%{tde_tdedocdir}/HTML/en/tdeioslave/locate/
+%{tde_datadir}/services/locate.protocol
+%{tde_datadir}/services/locater.protocol
+%{tde_datadir}/services/rlocate.protocol
+%{tde_datadir}/services/searchproviders/locate.desktop
+
+%changelog
diff --git a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
new file mode 100644
index 000000000..6d0ca5158
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec
@@ -0,0 +1,177 @@
+#
+# spec file for package tdeio-sword (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/
+#
+
+# Required for PCLinuxOS: removes the ldflag '--no-undefined'
+%if 0%{?pclinuxos} >= 2018
+%define _disable_ld_no_undefined 1
+%endif
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeio-sword
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Tdeio-slave for the Sword Bible tool
+Group:		Productivity/Networking/Ftp/Clients
+URL:		http://lukeplant.me.uk/kio-sword/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# Requires: sword
+BuildRequires:	sword-devel
+Requires:		sword
+
+
+%description
+TDEio-Sword provides access to Bibles, commentaries
+and other texts in an easy to use and attractive
+interface -- the Konqueror web browser.  It does so
+using the SWORD Bible project and implementing a TDE
+ioslave, providing the sword:/ protocol.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang tdeio_sword
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%files -f tdeio_sword.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.md TODO
+%{tde_tdelibdir}/tdeio_sword.la
+%{tde_tdelibdir}/tdeio_sword.so
+%{tde_datadir}/apps/tdeio_sword/
+%{tde_tdedocdir}/HTML/en/tdeioslave/sword/
+%{tde_datadir}/icons/hicolor/*/apps/tdeio_sword.png
+%{tde_datadir}/icons/hicolor/scalable/apps/tdeio_sword.svgz
+%{tde_datadir}/services/sword.protocol
+
+
+%changelog
diff --git a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop
index 22b716ad5..22b716ad5 100644
--- a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop
diff --git a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop_tdeio b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
index 38fa25d92..38fa25d92 100644
--- a/redhat/applications/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/media_safelyremove.desktop_tdeio
diff --git a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
new file mode 100644
index 000000000..cfd75c0a6
--- /dev/null
+++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec
@@ -0,0 +1,191 @@
+#
+# spec file for package tdeio-umountwrapper (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeio-umountwrapper
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Progress dialog for safely removing devices in Trinity
+Group:		Applications/Utilities
+URL:		http://frode.kde.no/misc/tdeio_umountwrapper/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		media_safelyremove.desktop_tdeio
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+Obsoletes:		trinity-kio-umountwrapper < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kio-umountwrapper = %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Wrapper around tdeio_media_mountwrapper.
+Provides a progress dialog for Safely Removing of devices in Trinity.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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
+
+%__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
+%__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
+
+%find_lang tdeio_umountwrapper
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+for f in konqueror d3lphin; do
+  update-alternatives --install \
+    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
+    media_safelyremove.desktop_${f} \
+    %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper \
+    20
+done
+
+
+%postun
+if [ $1 -eq 0 ]; then
+  for f in konqueror d3lphin; do
+    update-alternatives --remove \
+      media_safelyremove.desktop_${f} \
+      %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper || :
+  done
+fi
+
+
+%files -f tdeio_umountwrapper.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_bindir}/tdeio_umountwrapper
+%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
+%dir %{tde_datadir}/apps/d3lphin
+%dir %{tde_datadir}/apps/d3lphin/servicemenus
+%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
+
+
+%changelog
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
deleted file mode 100644
index 4adf88df1..000000000
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec
+++ /dev/null
@@ -1,249 +0,0 @@
-#
-# spec file for package tdenetworkmanager (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdenetworkmanager
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.9
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Trinity applet for Network Manager
-Group:		Applications/Internet
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Obsoletes:		trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# NETWORKMANAGER support
-%if 0%{?rhel} || 0%{?fedora}
-%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-Requires:		NetworkManager
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
-BuildRequires:	NetworkManager-libnm-devel
-%else
-BuildRequires:		NetworkManager-devel
-%endif
-%else
-Requires:		NetworkManager-gnome
-%endif
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires:		networkmanager
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} != 8
-BuildRequires:	%{_lib}nm-util-devel
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
-BuildRequires:	NetworkManager-libnm-devel
-%else
-BuildRequires:	NetworkManager-glib-devel
-%endif
-%endif
-%endif
-%if 0%{?suse_version}
-BuildRequires:	NetworkManager-devel
-Requires:		NetworkManager
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# DBUS support
-BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires:	libudev-devel
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-TDENetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-%post
-# Prevent autostart of 'nm-applet', if installed.
-if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then
-  if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then
-    sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|"
-  fi
-fi
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/tdenetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{_sysconfdir}/dbus-1/system.d/tdenetworkmanager.conf
-%{tde_tdeappdir}/tdenetworkmanager.desktop
-%{tde_datadir}/apps/tdenetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/tdenetworkmanager*
-%{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop
-%{tde_datadir}/autostart/tdenetworkmanager.desktop
-#{tde_datadir}/services/tdenetman_openvpn.desktop
-#{tde_datadir}/services/tdenetman_pptp.desktop
-#{tde_datadir}/services/tdenetman_strongswan.desktop
-#{tde_datadir}/services/tdenetman_vpnc.desktop
-#{tde_tdedocdir}/HTML/en/tdenetworkmanager/
-
-##########
-
-%package devel
-Summary:		Common data shared among the MySQL GUI Suites
-Group:			Development/Libraries
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Development headers for tdenetworkmanager
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  ..
-  
-%__make %{?_smp_mflags} 
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot} -C build
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/tdepacman/tdepacman.spec
deleted file mode 100644
index 06100d324..000000000
--- a/redhat/applications/tdepacman/tdepacman.spec
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# spec file for package tdepacman (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
-%define tde_pkg tdepacman
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-
-# TDE specific building variables
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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 pacman game for the Trinity Desktop
-Version:		0.3.2
-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://www.trinitydesktop.org/
-
-Prefix:			%{_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:	trinity-tdegames-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	gettext
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-
-%description
-Pacman is a legendary game with an enthusiastic following from around 
-the world. Since its introduction in 1980, Pacman's image has been 
-splashed across magazine covers, television screens, T-shirts, and 
-bumper stickers. Created by Japan's Namco, and distributed in the 
-United States by Bally, Pacman is an icon of 1980's popular culture
-
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%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,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{tde_bindir}/tdepacman
-%{tde_tdeappdir}/tdepacman.desktop
-%{tde_datadir}/apps/tdepacman/
-%dir %{tde_datadir}/config
-%{tde_datadir}/config/tdepacmanrc
-%lang(de) %{tde_tdedocdir}/HTML/de/tdepacman/
-%{tde_tdedocdir}/HTML/en/tdepacman/
-%{tde_datadir}/icons/hicolor/16x16/apps/tdepacman.png
-%{tde_datadir}/icons/hicolor/32x32/apps/tdepacman.png
-%{tde_datadir}/icons/locolor/16x16/apps/tdepacman.png
-%{tde_datadir}/icons/locolor/32x32/apps/tdepacman.png
-%{tde_mandir}/man1/tdepacman.1*
-
-
-%changelog
diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/tdepowersave/tdepowersave.spec
deleted file mode 100644
index 26c8b17c2..000000000
--- a/redhat/applications/tdepowersave/tdepowersave.spec
+++ /dev/null
@@ -1,256 +0,0 @@
-#
-# spec file for package tdepowersave (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdepowersave
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.7.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Power management applet for Trinity
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
-BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
-
-BuildRequires:	cmake libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-%define with_tdehwlib 1
-BuildRequires:	libudev-devel
-%endif
-
-# XSCREENSAVER support
-#  Disabled on RHEL4
-#  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-%if 0%{?rhel} == 5
-BuildRequires:	xorg-x11-proto-devel
-#BuildRequires:	gnome-screensaver
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
-BuildRequires:	libXScrnSaver-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	xscreensaver
-%endif
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-Obsoletes:		trinity-kpowersave < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kpowersave = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-TDEPowersave is a TDE systray applet which allows to control the power 
-management settings and policies of your computer.
-
-Current feature list:
- * support for ACPI, APM and PMU
- * trigger suspend to disk/ram and standby
- * switch cpu frequency policy (between: performance, dynamic and powersave)
- * applet icon with information about AC state, battery fill and battery
-   (warning) states
- * applet tooltip with information about battery fill and remaining battery 
-   time/percentage
- * autosuspend (to suspend the machine if the user has been inactive for a 
-   defined time)
- * a global configurable blacklist with programs which prevent autosuspend
-   (e.g. videoplayer and cd burning tools)
- * trigger lock screen and select the lock method
- * KNotify support
- * online help
- * localisations for many languages
- 
-TDEPowersave supports schemes with following configurable specific 
-settings for:
- * screensaver
- * DPMS
- * autosuspend
- * scheme specific blacklist for autosuspend
- * notification settings
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-# Disables automatic poweroff, make sure we match both "kpowersave" and "tdepowersave"
-if [ $1 = 1 ] && [ -r /etc/acpi/actions/power.sh ]; then
-  %__cp -f "/etc/acpi/actions/power.sh" "/etc/acpi/actions/power.sh.tdepowersavebackup"
-  %__sed -i "/etc/acpi/actions/power.sh" -e "s|kpowersave|powersave|"
-fi
-
-%postun
-if [ $1 = 0 ] && [ -r "/etc/acpi/actions/power.sh.tdepowersavebackup" ]; then
-  %__mv -f "/etc/acpi/actions/power.sh.tdepowersavebackup" "/etc/acpi/actions/power.sh"
-fi
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/tdepowersave
-%{tde_libdir}/libtdeinit_tdepowersave.la
-%{tde_libdir}/libtdeinit_tdepowersave.so
-%{tde_tdelibdir}/tdepowersave.la
-%{tde_tdelibdir}/tdepowersave.so
-%{tde_tdeappdir}/tdepowersave.desktop
-%{tde_datadir}/apps/tdepowersave/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/tdepowersave-autostart.desktop
-%config(noreplace) %{tde_confdir}/tdepowersaverc
-%{tde_mandir}/man1/tdepowersave.*
-
-%lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/
-%lang(de) %{tde_tdedocdir}/HTML/de/tdepowersave/
-%lang(en) %{tde_tdedocdir}/HTML/en/tdepowersave/
-%lang(fi) %{tde_tdedocdir}/HTML/fi/tdepowersave/
-%lang(hu) %{tde_tdedocdir}/HTML/hu/tdepowersave/
-%lang(nb) %dir %{tde_tdedocdir}/HTML/nb
-%lang(nb) %{tde_tdedocdir}/HTML/nb/tdepowersave/
-
-
-%changelog
diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec
deleted file mode 100644
index c3fda4346..000000000
--- a/redhat/applications/tderadio/tderadio.spec
+++ /dev/null
@@ -1,230 +0,0 @@
-#
-# spec file for package tderadio (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/
-#
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_lirc 1
-%endif
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tderadio
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.1.1.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Comfortable Radio Application for TDE
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	libsndfile-devel
-%{?with_lirc:BuildRequires:	lirc-devel}
-
-# LAME support
-%if 0%{?opensuse_bs} == 0
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel}
-%define with_lame 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:		liblame-devel
-%else
-%if 0%{?mgaversion} >= 6
-BuildRequires:		%{_lib}mp3lame-devel
-%else
-BuildRequires:		%{_lib}lame-devel
-%endif
-%endif
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libmp3lame-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:	lame-devel
-%endif
-%endif
-%endif
-
-Obsoletes:		trinity-kradio < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kradio = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-TDERadio is a comfortable radio application for Trinity with support for 
-V4L and V4L2 radio cards drivers.
-
-TDERadio currently provides
-
- * V4L/V4L2 radio support
-%if 0%{?with_lirc}
- * Remote control support (LIRC)
-%endif
- * Alarms, sleep Countdown
- * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display)
- * Recording capabilities, including MP3 and Ogg/Vorbis encoding
- * Timeshifter functionality
- * Extendable plugin architecture
-
-This package also includes a growing collection of station preset
-files for many cities around the world contributed by TDERadio users.
-
-As TDERadio is based on an extendable plugin architecture, contributions
-of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-visibility causes applications fails to start !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --program-prefix="" \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \
-  --enable-v4l2 \
-  --enable-lame \
-  --enable-ogg \
-  --enable-alsa \
-  --enable-oss
-
-%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
-%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||"
-%endif
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/convert-presets
-%{tde_bindir}/tderadio
-%dir %{tde_libdir}/tderadio
-%dir %{tde_libdir}/tderadio/plugins
-%{tde_libdir}/tderadio/plugins/*.la
-%{tde_libdir}/tderadio/plugins/*.so
-%{tde_tdeappdir}/tderadio.desktop
-%{tde_datadir}/apps/tderadio/
-%dir %{tde_datadir}/icons/hicolor/256x256
-%dir %{tde_datadir}/icons/hicolor/256x256/actions
-%{tde_datadir}/icons/hicolor/*/*/tderadio*.png
-%{tde_datadir}/icons/locolor/*/*/tderadio*.png
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
-%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
-%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
-%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
-%{tde_tdedocdir}/HTML/en/tderadio/
-
-%changelog
diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/tdesudo/tdesudo.spec
deleted file mode 100644
index fc9a15dbd..000000000
--- a/redhat/applications/tdesudo/tdesudo.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# spec file for package tdesudo (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdesudo
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	2.5.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Sudo frontend for Trinity
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Obsoletes:	trinity-kdesudo < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdesudo = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires:		sudo
-
-
-%description
-TdeSudo is a graphical frontend for the sudo utility.
-It allows you to run programs as another user by entering your password.
-
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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_bindir}/tdesudo
-%{tde_tdedocdir}/HTML/en/tdesudo/
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/applications/tdesvn/tdesvn.spec b/redhat/applications/tdesvn/tdesvn.spec
deleted file mode 100644
index 1cd22e4f8..000000000
--- a/redhat/applications/tdesvn/tdesvn.spec
+++ /dev/null
@@ -1,314 +0,0 @@
-#
-# spec file for package tdesvn (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdesvn
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0.4
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Subversion client with tight TDE integration
-Group:		Applications/Utilities
-URL:		http://www.elliptique.net/~ken/kima/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# SVN support
-BuildRequires:	subversion-devel
-
-# SQLITE support
-BuildRequires:	sqlite-devel
-BuildRequires:	libtqt3-mt-sqlite3
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-Requires:		%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-kdesvn < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdesvn = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-TDESvn is a graphical client for the subversion revision control
-system (svn).
-
-Besides offering common and advanced svn operations, it features
-a tight integration into TDE and can be embedded into other TDE 
-applications like konqueror via the TDE component technology KParts.
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/tdesvn
-%{tde_bindir}/tdesvnaskpass
-%{tde_tdelibdir}/tdesvnpart.la
-%{tde_tdelibdir}/tdesvnpart.so
-%{tde_datadir}/applications/tde/tdesvn.desktop
-%{tde_datadir}/apps/tdeconf_update/tdesvn-use-external-update.sh
-%{tde_datadir}/apps/tdeconf_update/tdesvnpartrc-use-external.upd
-%{tde_datadir}/apps/tdesvn/
-%{tde_datadir}/apps/tdesvnpart/
-%{tde_datadir}/apps/konqueror/servicemenus/tdesvn_subversion.desktop
-%{tde_datadir}/config.kcfg/tdesvn_part.kcfg
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/icons/hicolor/*/*/*.svgz
-%{tde_mandir}/man1/tdesvn.1*
-%{tde_mandir}/man1/tdesvnaskpass.1*
-%lang(en) %{tde_tdedocdir}/HTML/en/tdesvn/
-%lang(nl) %{tde_tdedocdir}/HTML/nl/tdesvn/
-%{tde_libdir}/libksvnwidgets.la
-%{tde_libdir}/libksvnwidgets.so
-%{tde_libdir}/libsvnfrontend.la
-%{tde_libdir}/libsvnfrontend.so
-%{tde_libdir}/libtdesvncfgreader.la
-%{tde_libdir}/libtdesvncfgreader.so
-%{tde_libdir}/libtdesvnevents.la
-%{tde_libdir}/libtdesvnevents.so
-%{tde_libdir}/libtdesvnhelpers.la
-%{tde_libdir}/libtdesvnhelpers.so
-
-##########
-
-%package -n trinity-libsvnqt
-Group:			Development/Libraries
-Summary:		Qt wrapper library for subversion [Trinity]
-
-%description -n trinity-libsvnqt
-This package provides svnqt, a Qt wrapper library around the 
-subversion library.
-
-It is based on the RapidSvn SvnCpp library, a subversion client API 
-written in C++.
-
-%files -n trinity-libsvnqt
-%defattr(-,root,root,-)
-%{tde_libdir}/libsvnqt.so.4
-%{tde_libdir}/libsvnqt.so.4.2.2
-
-##########
-
-%package -n trinity-libsvnqt-devel
-Group:			Development/Libraries
-Requires:		trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		qt-devel
-Requires:		subversion-devel
-Summary:		Qt wrapper library for subversion (development files) [Trinity]
-
-%description -n trinity-libsvnqt-devel
-This package contains the header files and symbolic links that developers
-using svnqt will need.
-
-%files -n trinity-libsvnqt-devel
-%defattr(-,root,root,-)
-%{tde_includedir}/svnqt
-%{tde_libdir}/libsvnqt.so
-
-##########
-
-%package tdeio-plugins
-Group:			Development/Libraries
-Conflicts:	trinity-kdesdk-tdeio-plugins
-Summary:		subversion I/O slaves for Trinity
-
-Obsoletes:	trinity-kdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-tdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tdeio-plugins
-This packages includes TDEIO slaves for svn, svn+file, svn+http, 
-svn+https, svn+ssh. This allows you to access subversion repositories 
-inside any TDEIO enabled TDE application.
-
-This package is part of tdesvn-trinity.
-
-%post tdeio-plugins
-for proto in svn+file svn+http svn+https svn+ssh svn; do
-  update-alternatives --install \
-    %{tde_datadir}/services/${proto}.protocol \
-    ${proto}.protocol \
-    %{tde_datadir}/services/${proto}.protocol_tdesvn \
-    20
-done
-
-%preun tdeio-plugins
-if [ $1 -eq 0 ]; then
-  for proto in svn+file svn+http svn+https svn+ssh svn; do
-    update-alternatives --remove \
-      ${proto}.protocol \
-      %{tde_datadir}/services/${proto}.protocol_tdesvn || :
-  done
-fi
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_datadir}/services/kded/tdesvnd.desktop
-%{tde_datadir}/services/ksvn+file.protocol
-%{tde_datadir}/services/ksvn+http.protocol
-%{tde_datadir}/services/ksvn+https.protocol
-%{tde_datadir}/services/ksvn+ssh.protocol
-%{tde_datadir}/services/ksvn.protocol
-%{tde_datadir}/services/svn+file.protocol_tdesvn
-%{tde_datadir}/services/svn+http.protocol_tdesvn
-%{tde_datadir}/services/svn+https.protocol_tdesvn
-%{tde_datadir}/services/svn+ssh.protocol_tdesvn
-%{tde_datadir}/services/svn.protocol_tdesvn
-%{tde_tdelibdir}/tdeio_ksvn.la
-%{tde_tdelibdir}/tdeio_ksvn.so
-%{tde_tdelibdir}/kded_tdesvnd.la
-%{tde_tdelibdir}/kded_tdesvnd.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-rm -f src/svnqt/CMakeLists.txt.orig
-#rm -fr src/svnqt/cache/sqlite3/
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_DOC=ON \
-  -DBUILD_TRANSLATIONS=ON \
-  ..
-
-# SMP safe !
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Installs SVN protocols as alternatives
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn
-
-# Locales
-%find_lang %{tde_pkg}
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -G "SVN Client" %{tde_pkg} Development RevisionControl
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/tdmtheme/tdmtheme.spec
deleted file mode 100644
index 88b5cdca1..000000000
--- a/redhat/applications/tdmtheme/tdmtheme.spec
+++ /dev/null
@@ -1,162 +0,0 @@
-#
-# spec file for package tdmtheme (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdmtheme
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.2.2
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Theme manager for TDM
-Group:		Applications/Utilities
-URL:		http://beta.smileaf.org/projects
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Obsoletes:		trinity-kdmtheme < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdmtheme = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-tdmtheme is a theme manager for TDM. It provides a Trinity Control Module (TDECM)
-that allows you to easily install, remove and change your TDM themes.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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_tdelibdir}/kcm_tdmtheme.la
-%{tde_tdelibdir}/kcm_tdmtheme.so
-%{tde_tdeappdir}/tdmtheme.desktop
-%{tde_tdedocdir}/HTML/en/tdmtheme/
-
-
-%changelog
diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec
deleted file mode 100644
index 44d4ad39c..000000000
--- a/redhat/applications/tellico/tellico.spec
+++ /dev/null
@@ -1,352 +0,0 @@
-%if 0%{?fedora} >= 23
-%define _hardened_ldflags %nil
-%endif
-
-#
-# spec file for package tellico (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tellico
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.3.2.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Icollection manager for books, videos, music [Trinity]
-Group:		Applications/Utilities
-URL:		http://periapsis.org/tellico/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
-BuildRequires:	trinity-libkcal-devel >= %{tde_version}
-BuildRequires:	trinity-libpoppler-tqt-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# POPPLER support
-%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%if 0%{?suse_version} >= 1500
-BuildRequires: libpoppler-devel >= 0.12
-%else
-BuildRequires: poppler-devel >= 0.12
-%endif
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}poppler-devel
-%endif
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
-BuildRequires:	trinity-poppler-devel >= 0.12
-%endif
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# YAZ support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	yaz
-BuildRequires:	%{_lib}yaz-devel
-%endif
-
-# XML2 support
-BuildRequires:  libxml2-devel
-
-# XSLT support
-BuildRequires:  libxslt-devel
-%if 0%{?rhel} == 4
-# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
-BuildRequires:  libgcrypt-devel
-%endif
-
-# V4L support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-BuildRequires:	libv4l-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}v4l-devel
-%endif
-
-# EXEMPI support
-%if 0%{?suse_version}
-BuildRequires:	libexempi-devel
-%else
-BuildRequires:	exempi-devel
-%endif
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# ATTR support
-BuildRequires:	libattr-devel
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-
-Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/tellico
-%{tde_datadir}/applications
-%config(noreplace) %{tde_confdir}/tellicorc
-
-##########
-
-%package data
-Group:			Applications/Utilities
-Summary:		collection manager for books, videos, music [data] [Trinity]
-
-%description data
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the architecture independent files, such data files and
-documentation.
-
-%files data
-%defattr(-,root,root,-)
-%dir %{tde_datadir}/apps/tellico
-%{tde_datadir}/apps/tellico/*.xsl
-%{tde_datadir}/apps/tellico/*.xml
-%{tde_datadir}/apps/tellico/*.png
-%{tde_datadir}/apps/tellico/entry-templates
-%{tde_datadir}/apps/tellico/*.py*
-%{tde_datadir}/apps/tellico/pics
-%{tde_datadir}/apps/tellico/report-templates
-%{tde_datadir}/apps/tellico/tellico.dtd
-%{tde_datadir}/apps/tellico/tellico.tips
-%{tde_datadir}/apps/tellico/tellico2html.js
-%{tde_datadir}/apps/tellico/tellicoui.rc
-%{tde_datadir}/apps/tellico/welcome.html
-%{tde_datadir}/config.kcfg
-%{tde_tdedocdir}/HTML/*/tellico/
-%{tde_datadir}/icons/hicolor/*/apps/tellico.png
-%{tde_datadir}/icons/hicolor/*/mimetypes/application-x-tellico.png
-%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
-%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
-%{tde_datadir}/mime/packages/tellico.xml
-%{tde_datadir}/mimelnk/application/x-tellico.desktop
-%{tde_datadir}/apps/tdeconf_update/tellico-1-3-update.pl
-%{tde_datadir}/apps/tdeconf_update/tellico-rename.upd
-%{tde_datadir}/apps/tdeconf_update/tellico.upd
-
-##########
-
-%package scripts
-Group:			Applications/Utilities
-Summary:		collection manager for books, videos, music [scripts] [Trinity]
-
-%description scripts
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the scripts to import data from external sources, such
-as websites. As the format of the data may change, these scripts are provided
-as a separate package which can be updated through debian-volatile.
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-if [ -r /usr/include/libv4l1-videodev.h ]; then
-%__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|"
-fi
-
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-%__sed -i "src/fetch/scripts/dark_horse_comics.py" \
-          "src/fetch/scripts/ministerio_de_cultura.py" \
-          "src/fetch/scripts/fr.allocine.py" \
-          "src/translators/griffith2tellico.py" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
-%endif
-
-
-%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
-
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_LIBKCDDB=ON \
-  -DWITH_LIBKCAL=ON \
-  -DWITH_LIBBTPARSE=OFF \
-  -DWITH_SAX_LOADER=ON \
-%if 0%{?rhel} == 5
-  -DBUILD_WEBCAM_SUPPORT=OFF \
-%endif
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-# Add svg icons to xdg directories
-%__install -D -c -p -m 644 "icons/tellico.svg" "%{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg"
-%__install -D -c -p -m 644 "icons/tellico_mime.svg" "%{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg"
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
new file mode 100644
index 000000000..8c42846fb
--- /dev/null
+++ b/redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec
@@ -0,0 +1,182 @@
+#
+# spec file for package gtk-qt-engine (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg gtk-qt-engine
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.8
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Theme engine using Qt for GTK+ 2.x and Trinity
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# GTK2 support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+BuildRequires:	gtk2-devel
+%endif
+%if 0%{?mgaversion} >= 5
+BuildRequires:	%{_lib}gtk+2.0-devel
+%endif
+%if 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:	%{_lib}gtk+2.0_0-devel
+%else
+BuildRequires:	gtk+2.0-devel
+%endif
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine
+that calls Qt to do the actual drawing. This makes your GTK 2 applications
+look almost like real Qt applications and gives you a more unified desktop
+experience.
+
+Please note that this package is targeted at Trinity users and therefore provides
+a way to configure it from within KControl.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes the KCM not to work at all !
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%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,-)
+%doc AUTHORS ChangeLog COPYING TODO
+%{tde_tdelibdir}/kcm_kcmgtk.la
+%{tde_tdelibdir}/kcm_kcmgtk.so
+%{tde_tdeappdir}/kcmgtk.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/gtk/
+
+# The following files are outside TDE's directory
+%dir %{_libdir}/gtk-2.0
+%dir %{_libdir}/gtk-2.0/2.10.0
+%dir %{_libdir}/gtk-2.0/2.10.0/engines
+%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.la
+%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so
+%dir %{_datadir}/themes
+%dir %{_datadir}/themes/Qt
+%dir %{_datadir}/themes/Qt/gtk-2.0
+%{_datadir}/themes/Qt/gtk-2.0/gtkrc
+
+
+%changelog
diff --git a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
new file mode 100644
index 000000000..320480e0d
--- /dev/null
+++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
@@ -0,0 +1,173 @@
+#
+# spec file for package gtk3-tqt-engine (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg gtk3-tqt-engine
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.5
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		GTK3 theme engine for TDE
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7
+BuildRequires:	gtk3-devel
+%else
+BuildRequires:	gtk+3.0-devel
+%endif
+
+%description
+GTK3 style engine which uses the active TDE style to draw its widgets
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if "%_lib" == "lib64"
+%__sed -i "tdegtk/Makefile.am" -e "s|/lib/|/lib64/|g"
+%endif
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+if [ -d "/usr/include/atk-1.0" ]; then
+  extra_includes="%{_includedir}/atk-1.0:${extra_includes}"
+fi
+if [ -d "/usr/include/gdk-pixbuf-2.0" ]; then
+  extra_includes="%{_includedir}/gdk-pixbuf-2.0:${extra_includes}"
+fi
+if [ -d "/usr/include/gtk-3.0" ]; then
+  extra_includes="%{_includedir}/gtk-3.0:${extra_includes}"
+fi
+if [ -d "/usr/include/pango-1.0" ]; then
+  extra_includes="%{_includedir}/pango-1.0:${extra_includes}"
+fi
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
+  --docdir=%{tde_tdedocdir} \
+  --libdir=%{tde_libdir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  --with-extra-includes=${extra_includes}
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_libdir}/libtqtcairo.la
+%{tde_libdir}/libtqtcairo.so
+%{tde_libdir}/libtqtcairo.so.0
+%{tde_libdir}/libtqtcairo.so.0.0.0
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0
+%dir %{_datadir}/themes/tdegtk
+%dir %{_datadir}/themes/tdegtk/gtk-3.0
+%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css
+
+
+%changelog
diff --git a/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
new file mode 100644
index 000000000..ec3311356
--- /dev/null
+++ b/redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec
@@ -0,0 +1,192 @@
+#
+# spec file for package kgtk-qt3 (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kgtk-qt3
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		0.10.2
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Use TDE dialogs in Gtk apps
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GTK2 support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+BuildRequires:	gtk2-devel
+%else
+BuildRequires:	gtk+2.0-devel
+%endif
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+This is an LD_PRELOAD hack that allows most GTK
+applications to use Trinity's file dialogs when run under Trinity.
+
+The Gtk file chooser functions have been overridden to communicate
+with this TDE module/application.
+
+This package includes the kqt3-wrapper
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  ..
+
+# SMP safe !
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# The "preload" file is used by "startkde" script
+%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
+echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
+
+%find_lang kgtk
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f kgtk.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{tde_bindir}/kdialogd-wrapper
+%{tde_bindir}/kdialogd3
+%{tde_bindir}/kgtk-wrapper
+%{tde_bindir}/kgtk2-wrapper
+%{tde_bindir}/kqt3-wrapper
+%dir %{tde_datadir}/kgtk
+%dir %{tde_libdir}/kgtk
+%{tde_libdir}/kgtk/libkgtk2.so
+%{tde_libdir}/kgtk/libkqt3.so
+%{tde_datadir}/kgtk/preload
+
+
+%changelog
diff --git a/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
new file mode 100644
index 000000000..be7398d7d
--- /dev/null
+++ b/redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec
@@ -0,0 +1,176 @@
+#
+# spec file for package ksplash-engine-moodin (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg ksplash-engine-moodin
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Fading splash screen engine for Trinity
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Heavily customizable engine for various types of themes.
+
+Features:
+* scale cache
+* fading images
+* use current icon set or custom images
+* unlimited Custom text labels
+* set fading delay and length
+* custom image arrangement
+* resolution independent themes
+
+This TDE splash screen engine is based upon Linspire's
+engine by Sean Meiners <Sean.Meiners@LinspireInc.com>
+
+Homepage: http://moodwrod.com
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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_tdelibdir}/ksplashmoodin.la
+%{tde_tdelibdir}/ksplashmoodin.so
+%if "%{?tde_version}" == "14.1.0"
+%{tde_datadir}/apps/ksplash/Themes/Architecture/
+%endif
+%{tde_datadir}/apps/ksplash/Themes/FingerPrint/
+%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/
+%{tde_datadir}/services/ksplashmoodin.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
new file mode 100644
index 000000000..9fdca0ed1
--- /dev/null
+++ b/redhat/applications/themes/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec
@@ -0,0 +1,158 @@
+#
+# spec file for package qt4-tqt-theme-engine (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg qt4-tqt-theme-engine
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%if "%{?_qt4_plugindir}" == ""
+%define _qt4_plugindir %{_libdir}/qt4/plugins
+%endif
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE theme engine for Qt4
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# QT4 support
+%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires:	libqt4-devel
+%else
+BuildRequires:	qt-devel
+%endif
+%else
+BuildRequires:	qt4-devel
+%endif
+
+
+%description
+TDE theme engine for Qt4
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+# Fix compilation with 'lib64'
+%if "%_lib" == "lib64"
+%__sed -i */*.pro -e "s|/opt/trinity/lib|/opt/trinity/lib64|g"
+%endif
+
+# Fix TDE include directory
+%__sed -i */*.pro -e "s|INCLUDEPATH += /opt/trinity/include|INCLUDEPATH += %{tde_tdeincludedir}|"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if [ -x "%{_libdir}/qt4/bin/qmake" ]; then
+  export PATH="%{_libdir}/qt4/bin:${PATH}"
+fi
+
+# Use QT4's qmake
+qmake
+
+
+# Not SMP SAFE !
+%__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install INSTALL_ROOT=%{buildroot}
+
+# Unwanted files (-devel ?)
+%__rm -f %{?buildroot}%{_libdir}/libtdeqt4interface.so
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/libtdeqt4interface.so.1
+%{_libdir}/libtdeqt4interface.so.1.0
+%{_libdir}/libtdeqt4interface.so.1.0.0
+%dir %{_qt4_plugindir}/styles/
+%{_qt4_plugindir}/styles/libsimplestyleplugin.so
+
+
+%changelog
diff --git a/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
new file mode 100644
index 000000000..e9ab3d09a
--- /dev/null
+++ b/redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec
@@ -0,0 +1,197 @@
+#
+# spec file for package tde-style-baghira (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tde-style-baghira
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.8
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE style for Apple junkies :)
+Group:		Graphical desktop/TDE
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:          trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+BuildRequires:          libjpeg-devel
+%else
+BuildRequires:          jpeg-devel
+%endif
+
+%description
+Based upon mosfet-liquid0.9.6pre4... the last heir of mosfet.
+Baghira includes both an style (custom widgets) and twin decoration as
+well as colour schemes.
+
+Baghira (panther, in german) makes TDE resemble Apple's MacOS X's Aqua,
+Panther and Jaguar looks, and also includes its own 'Baghira' look
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{tde_bindir}/bab
+%{tde_libdir}/libbaghirastarter.la
+%{tde_libdir}/libbaghirastarter.so
+%{tde_tdelibdir}/b_menu_panelapplet.la
+%{tde_tdelibdir}/b_menu_panelapplet.so
+%{tde_tdelibdir}/plugins/styles/baghira.la
+%{tde_tdelibdir}/plugins/styles/baghira.so
+%{tde_tdelibdir}/tdestyle_baghira_config.la
+%{tde_tdelibdir}/tdestyle_baghira_config.so
+%{tde_tdelibdir}/twin3_baghira.la
+%{tde_tdelibdir}/twin3_baghira.so
+%{tde_tdelibdir}/twin_baghira_config.la
+%{tde_tdelibdir}/twin_baghira_config.so
+%{tde_libdir}/usermanager_panelapplet.la
+%{tde_libdir}/usermanager_panelapplet.so
+%{tde_tdeappdir}/bab.desktop
+%{tde_datadir}/apps/baghira/
+%{tde_datadir}/apps/kicker/applets/baghira-starter.desktop
+%{tde_datadir}/apps/kicker/applets/baghira-usermanager.desktop
+%{tde_datadir}/apps/tdedisplay/color-schemes/AquaBlue.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/AquaGraphite.kcsrc
+%{tde_datadir}/apps/tdestyle/themes/baghira.themerc
+%{tde_datadir}/apps/twin/baghira.desktop
+%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira.png
+%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_blue.png
+%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_grey.png
+%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_white.png
+%{tde_datadir}/icons/crystalsvg/128x128/apps/baghira_yellow.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_blue.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_grey.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_white.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/baghira_yellow.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_down.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_hover.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_itunes.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_jaguar.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_milk.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_panther.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/bab_tiger.png
+%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira.png
+%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_blue.png
+%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_grey.png
+%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_white.png
+%{tde_datadir}/icons/crystalsvg/22x22/apps/baghira_yellow.png
+%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira.png
+%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_blue.png
+%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_grey.png
+%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_white.png
+%{tde_datadir}/icons/crystalsvg/32x32/apps/baghira_yellow.png
+%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira.png
+%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_blue.png
+%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_grey.png
+%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_white.png
+%{tde_datadir}/icons/crystalsvg/48x48/apps/baghira_yellow.png
+%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira.png
+%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_blue.png
+%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_grey.png
+%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_white.png
+%{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_yellow.png
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo
+%{tde_mandir}/man1/bab.1*
+
+
+%changelog
diff --git a/redhat/applications/themes/tde-style-domino/tde-style-domino.spec b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
new file mode 100644
index 000000000..ce45f8729
--- /dev/null
+++ b/redhat/applications/themes/tde-style-domino/tde-style-domino.spec
@@ -0,0 +1,142 @@
+#
+# spec file for package domino (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tde-style-domino
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Required for Mageia and PCLinuxOS: removes the ldflag '--no-undefined'
+%define _disable_ld_no_undefined 1
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Domino widget style and twin decoration for TDE
+Group:		Graphical desktop/TDE
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:          trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:          trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
+BuildRequires:          libjpeg-devel
+%else
+BuildRequires:          jpeg-devel
+%endif
+
+%description
+Domino is a style with a soft look. It allows to fine adjust the shininess
+of the widgets by customizable color gradients.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root)
+%{tde_tdelibdir}/plugins/styles/domino.la
+%{tde_tdelibdir}/plugins/styles/domino.so
+%{tde_tdelibdir}/tdestyle_domino_config.la
+%{tde_tdelibdir}/tdestyle_domino_config.so
+%{tde_tdelibdir}/twin3_domino.la
+%{tde_tdelibdir}/twin3_domino.so
+%{tde_tdelibdir}/twin_domino_config.la
+%{tde_tdelibdir}/twin_domino_config.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/Domino.kcsrc
+%{tde_datadir}/apps/tdestyle/themes/domino.themerc
+%{tde_datadir}/apps/twin/domino.desktop
+%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/tdestyle_domino_config.mo
+
+
+%changelog
diff --git a/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
new file mode 100644
index 000000000..a93f4b5d6
--- /dev/null
+++ b/redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec
@@ -0,0 +1,150 @@
+#
+# spec file for package tde-style-ia-ora (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tde-style-ia-ora
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.8
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Mandriva theme for TDE - Widget design
+Group:		Environment/Desktop
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+Requires:	trinity-twin
+
+Obsoletes:	trinity-style-ia-ora < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-style-ia-ora = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+Mandriva theme for Trinity
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/plugins/styles/ia_ora.la
+%{tde_tdelibdir}/plugins/styles/ia_ora.so
+%{tde_tdelibdir}/twin3_iaora.la
+%{tde_tdelibdir}/twin3_iaora.so
+%{tde_tdelibdir}/twin_iaora_config.la
+%{tde_tdelibdir}/twin_iaora_config.so
+%{tde_datadir}/apps/tdestyle/themes/ia_ora.themerc
+%{tde_datadir}/apps/twin/iaora.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
new file mode 100644
index 000000000..a51a4451e
--- /dev/null
+++ b/redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec
@@ -0,0 +1,170 @@
+#
+# spec file for package tde-style-lipstik (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tde-style-lipstik
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.2.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Lipstik style for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+Obsoletes:		trinity-kde-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+%description
+Based on the plastik style, Lipstik is a purified style with many options to
+tune your desktop look.
+
+Lipstik also provides Lipstik-color-schemes
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DDATA_INSTALL_DIR="%{tde_datadir}/apps" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -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,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/tdestyle_lipstik_config.la
+%{tde_tdelibdir}/tdestyle_lipstik_config.so
+%{tde_tdelibdir}/plugins/styles/lipstik.la
+%{tde_tdelibdir}/plugins/styles/lipstik.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/lipstiknoble.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikstandard.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikwhite.kcsrc
+%{tde_datadir}/apps/tdestyle/themes/lipstik.themerc
+
+
+%changelog
diff --git a/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
new file mode 100644
index 000000000..bbda03969
--- /dev/null
+++ b/redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec
@@ -0,0 +1,194 @@
+#
+# spec file for package tde-style-qtcurve (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tde-style-qtcurve
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.55.2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	This is a set of widget styles for Trinity based apps
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: libtool
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+Obsoletes:		trinity-kde-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+This package together with gtk2-engines-qtcurve aim to provide a unified look
+and feel on the desktop when using TDE and Gnome applications.
+
+This package is most useful when installed together with 
+gtk2-engines-qtcurve.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+# Shitty hack for RHEL4 ...
+if [ -d "/usr/X11R6" ]; then
+  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+# Error in "po/tr.po"
+%if 0%{?rhel} == 4
+%__rm -f "po/tr.po"
+%endif
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \
+  -DQTC_QT_ONLY=false \
+  -DQTC_STYLE_SUPPORT=true \
+  -DBUILD_ALL=on \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang qtcurve || touch qtcurve.lang
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files -f qtcurve.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/tdestyle_qtcurve_config.la
+%{tde_tdelibdir}/tdestyle_qtcurve_config.so
+%{tde_tdelibdir}/plugins/styles/qtcurve.so
+%{tde_tdelibdir}/plugins/styles/qtcurve.la
+%{tde_datadir}/apps/tdedisplay/color-schemes/QtCurve.kcsrc
+%{tde_datadir}/apps/tdestyle/themes/qtcurve.themerc
+%{tde_datadir}/apps/QtCurve/
+
+
+%changelog
diff --git a/redhat/applications/themes/tdmtheme/tdmtheme.spec b/redhat/applications/themes/tdmtheme/tdmtheme.spec
new file mode 100644
index 000000000..4a257ea81
--- /dev/null
+++ b/redhat/applications/themes/tdmtheme/tdmtheme.spec
@@ -0,0 +1,163 @@
+#
+# spec file for package tdmtheme (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdmtheme
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.2.2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Theme manager for TDM
+Group:		Applications/Utilities
+URL:		http://beta.smileaf.org/projects
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Obsoletes:		trinity-kdmtheme < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdmtheme = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+tdmtheme is a theme manager for TDM. It provides a Trinity Control Module (TDECM)
+that allows you to easily install, remove and change your TDM themes.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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_tdelibdir}/kcm_tdmtheme.la
+%{tde_tdelibdir}/kcm_tdmtheme.so
+%{tde_tdeappdir}/tdmtheme.desktop
+%{tde_tdedocdir}/HTML/en/tdmtheme/
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
new file mode 100644
index 000000000..7993d0589
--- /dev/null
+++ b/redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec
@@ -0,0 +1,155 @@
+#
+# spec file for package twin-style-crystal (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-crystal
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Semi transparant window decoration for Trinity
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Obsoletes:	trinity-kwin-style-crystal < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kwin-style-crystal = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+Crystal offers you pseudo transparent titlebar, buttons and borders
+transparent, so you can see more of your lovely background image
+Transparancy and buttons can be costumized to match your wishes.
+Offers rounded corners as well
+
+And it is of course nice to look at. Upstream says:
+"- Don't forget to breathe, while drooling."
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/twin3_crystal.la
+%{tde_tdelibdir}/twin3_crystal.so
+%{tde_tdelibdir}/twin_crystal_config.la
+%{tde_tdelibdir}/twin_crystal_config.so
+%{tde_datadir}/apps/twin/crystal.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
new file mode 100644
index 000000000..342a881ba
--- /dev/null
+++ b/redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec
@@ -0,0 +1,159 @@
+#
+# spec file for package twin-style-dekorator (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-dekorator
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Semi transparant window decoration for Trinity
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Crystal offers you pseudo transparent titlebar, buttons and borders
+transparent, so you can see more of your lovely background image
+Transparancy and buttons can be costumized to match your wishes.
+Offers rounded corners as well
+
+And it is of course nice to look at. Upstream says:
+"- Don't forget to breathe, while drooling."
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/twin3_deKorator.la
+%{tde_tdelibdir}/twin3_deKorator.so
+%{tde_tdelibdir}/twin_deKorator_config.la
+%{tde_tdelibdir}/twin_deKorator_config.so
+%{tde_datadir}/apps/deKorator/
+%{tde_datadir}/apps/twin/deKorator.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
new file mode 100644
index 000000000..5d17ee631
--- /dev/null
+++ b/redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec
@@ -0,0 +1,153 @@
+#
+# spec file for package twin-style-machbunt (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-machbunt
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE window decoration from SUSE 9.1/9.2
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+
+An example color scheme is provided too.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_tdelibdir}/twin3_MachBunt.la
+%{tde_tdelibdir}/twin3_MachBunt.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/MachBunt.kcsrc
+%{tde_datadir}/apps/twin/MachBunt.desktop
+
+
+%changelog
diff --git a/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
new file mode 100644
index 000000000..a7cb50bf4
--- /dev/null
+++ b/redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec
@@ -0,0 +1,158 @@
+#
+# spec file for package twin-style-suse2 (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg twin-style-suse2
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE window decoration from SUSE 9.3
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+This is a port of the SUSE 9.3 KDE Window decoration extracted from SUSE.
+
+It features in additon to the original theme several new button
+styles and a changeable titlebar image.
+
+A color scheme for TDE is provided too.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=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,-)
+%doc AUTHORS COPYING README TODO
+%{tde_tdelibdir}/twin3_SUSE2.la
+%{tde_tdelibdir}/twin3_SUSE2.so
+%{tde_tdelibdir}/twin_SUSE2_config.la
+%{tde_tdelibdir}/twin_SUSE2_config.so
+%{tde_datadir}/apps/tdedisplay/color-schemes/SUSE2.kcsrc
+%{tde_datadir}/apps/twin/SUSE2.desktop
+%{tde_datadir}/apps/twin/pics/SUSE2/
+
+
+%changelog
diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/tork/tork.spec
deleted file mode 100644
index 0b4b023cc..000000000
--- a/redhat/applications/tork/tork.spec
+++ /dev/null
@@ -1,186 +0,0 @@
-#
-# spec file for package tork (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tork
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.33
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Anonymity Manager for TDE
-Group:		Applications/Internet
-URL:		sourceforge.net/projects/tolrk/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# TORSOCKS support
-BuildRequires:	torsocks
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# GEOIP
-%if 0%{?suse_version}
-%if 0%{?suse_version} < 1550
-BuildRequires:	libGeoIP-devel
-%endif
-%else
-BuildRequires:	geoip-devel
-%endif
-
-
-%description
-TorK is an Anonymity Manager for the TDE Desktop. Browse anonymously on 
-Konqueror/Firefox/Opera. Send anonymous email via the MixMinion network.
-Use ssh/irc/IM anonymously. Control and monitor your anonymous traffic 
-on the Tor network.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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} \
-  \
-  -DBUILD_ALL=ON \
-  -DWITH_ALL_OPTIONS=ON \
-  \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README TODO ChangeLog USINGTORK
-%{tde_bindir}/tork
-%{tde_bindir}/torkarkollon
-%{tde_bindir}/usewithtor
-%{tde_tdelibdir}/kickermenu_tork.la
-%{tde_tdelibdir}/kickermenu_tork.so
-%{tde_tdelibdir}/tdehtml_tork.la
-%{tde_tdelibdir}/tdehtml_tork.so
-%{tde_tdelibdir}/tdeio_torioslave.la
-%{tde_tdelibdir}/tdeio_torioslave.so
-%{tde_tdeappdir}/tork_plug_in.desktop
-%{tde_datadir}/apps/kicker/menuext/torkmenu.desktop
-%{tde_datadir}/apps/tdehtml/kpartplugins/tork_plug_in.rc
-%{tde_datadir}/services/torioslave.protocol
-%{tde_tdeappdir}/tork.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithopera.desktop
-%{tde_datadir}/apps/tork/
-%{tde_datadir}/config.kcfg/torkconfig.kcfg
-%{tde_tdedocdir}/HTML/en/tork/
-%{tde_datadir}/icons/hicolor/*/apps/tork.png
-%dir %{tde_datadir}/menu
-%{tde_datadir}/menu/tork
-%dir %{tde_datadir}/pixmaps
-%{tde_datadir}/pixmaps/tork.xpm
-%{tde_mandir}/man1/tork.1*
-%{tde_mandir}/man1/torkarkollon.1*
-
-
-%changelog
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/twin-style-crystal/twin-style-crystal.spec
deleted file mode 100644
index 1ab277993..000000000
--- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# spec file for package twin-style-crystal (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg twin-style-crystal
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0.5
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Semi transparant window decoration for Trinity
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-Obsoletes:	trinity-kwin-style-crystal < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kwin-style-crystal = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-Crystal offers you pseudo transparent titlebar, buttons and borders
-transparent, so you can see more of your lovely background image
-Transparancy and buttons can be costumized to match your wishes.
-Offers rounded corners as well
-
-And it is of course nice to look at. Upstream says:
-"- Don't forget to breathe, while drooling."
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: --enable-gcc-visibility makes decoration unusable.
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_tdelibdir}/twin3_crystal.la
-%{tde_tdelibdir}/twin3_crystal.so
-%{tde_tdelibdir}/twin_crystal_config.la
-%{tde_tdelibdir}/twin_crystal_config.so
-%{tde_datadir}/apps/twin/crystal.desktop
-
-
-%changelog
diff --git a/redhat/applications/utilities/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec
new file mode 100644
index 000000000..04c4b1aad
--- /dev/null
+++ b/redhat/applications/utilities/abakus/abakus.spec
@@ -0,0 +1,175 @@
+#
+# spec file for package abakus (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg abakus
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.91
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Calculator for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+BuildRequires:	bison
+BuildRequires:	flex
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+AbaKus is a complex calculator, which provides
+many different kinds of calculations.
+Think of it as bc (the command-line calculator) with a nice GUI.
+It also gives information about mathematical variables and
+has the user-friendly menu options of a normal TDE application.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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"
+
+# Specific path for RHEL4
+if [ -d "/usr/X11R6" ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/abakus.desktop" Utility Calculator
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/abakus
+%{tde_datadir}/apps/abakus/
+%{tde_datadir}/icons/hicolor/*/apps/abakus.png
+%{tde_tdedocdir}/HTML/en/abakus/
+%{tde_tdeappdir}/abakus.desktop
+%{tde_mandir}/man1/abakus.1*
+
+
+%changelog
diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/utilities/filelight-l10n/filelight-l10n.spec
index 1525e5eb3..1525e5eb3 100644
--- a/redhat/applications/filelight-l10n/filelight-l10n.spec
+++ b/redhat/applications/utilities/filelight-l10n/filelight-l10n.spec
diff --git a/redhat/applications/utilities/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec
new file mode 100644
index 000000000..c89c62e87
--- /dev/null
+++ b/redhat/applications/utilities/filelight/filelight.spec
@@ -0,0 +1,190 @@
+#
+# spec file for package filelight (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg filelight
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		1.0
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Graphical disk usage display
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# ATTR support
+BuildRequires:	libattr-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Obsoletes:	filelight-l10n < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	filelight-l10n = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+Filelight creates a complex, but data-rich graphical representation of the files and
+directories on your computer. 
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/filelight.desktop FileManager
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/filelight
+%{tde_tdeappdir}/filelight.desktop
+%{tde_datadir}/apps/filelight/
+%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
+%{tde_datadir}/icons/hicolor/*/apps/filelight.png
+%config(noreplace) %{tde_confdir}/filelightrc
+%{tde_datadir}/services/*.desktop
+%{tde_tdelibdir}/libfilelight.so
+%{tde_tdelibdir}/libfilelight.la
+%lang(da) %{tde_tdedocdir}/HTML/da/filelight/
+%lang(en) %{tde_tdedocdir}/HTML/en/filelight/
+%lang(es) %{tde_tdedocdir}/HTML/es/filelight/
+%lang(et) %{tde_tdedocdir}/HTML/et/filelight/
+%lang(it) %{tde_tdedocdir}/HTML/it/filelight/
+%lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/
+%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
+%{tde_mandir}/man1/filelight.1*
+
+
+%changelog
diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec
new file mode 100644
index 000000000..1fed32a1f
--- /dev/null
+++ b/redhat/applications/utilities/kbarcode/kbarcode.spec
@@ -0,0 +1,221 @@
+#
+# spec file for package kbarcode (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kbarcode
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		2.0.7
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		barcode and label printing application for Trinity
+Group:			Applications/Utilities
+URL:			http://www.kbarcode.net
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+Requires:		%{name}-tdefile-plugin = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+KBarcode is a barcode and label printing application for Trinity. It can be used
+to print everything from simple business cards up to complex labels with
+several barcodes (e.g. article descriptions).
+
+KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard,
+batch import of data for batch printing labels (directly from the delivery
+note), thousands of predefined labels, database management tools and
+translations in many languages. Even printing more than 10.000 labels in one
+go is no problem for KBarcode. Data for printing can be imported from several
+different data sources, including SQL databases, CSV files and the TDE address
+book.
+
+Additionally it is a simple barcode generator (similar to the old xbarcode you
+might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are
+supported. Even complex 2D barcodes are supported using third party tools. The
+generated barcodes can be directly printed or you can export them into images
+to use them in another application.
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{tde_bindir}/kbarcode
+%{tde_tdeappdir}/kbarcode-batch.desktop
+%{tde_tdeappdir}/kbarcode-editor.desktop
+%{tde_tdeappdir}/kbarcode-single.desktop
+%{tde_tdeappdir}/kbarcode.desktop
+%{tde_datadir}/mimelnk/application/kbarcode-label.desktop
+%{tde_datadir}/apps/kbarcode/
+%{tde_datadir}/icons/hicolor/*/actions/barcode.png
+%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png
+%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png
+%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png
+%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png
+%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png
+%{tde_mandir}/man1/*.1*
+%{tde_tdedocdir}/HTML/en/kbarcode/
+
+##########
+
+%package tdefile-plugin
+Summary:		tdefile-plugin for %{name}
+Group:			Applications/Utilities
+
+%description tdefile-plugin
+%{summary}.
+
+%files tdefile-plugin
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/tdefile_kbarcode.la
+%{tde_tdelibdir}/tdefile_kbarcode.so
+%{tde_datadir}/services/tdefile_kbarcode.desktop
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  -DWITH_NATIVE_GNU_BARCODE=OFF \
+  -DWITH_JAVASCRIPT=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}
+
+# Fix invalid icon path
+%__sed -i "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" -e "s|Icon=.*|Icon=kbarcode|"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop"        Utility PrintingUtility
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-batch.desktop"  Utility PrintingUtility
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-editor.desktop" Utility PrintingUtility
+%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-single.desktop" Utility PrintingUtility
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/applications/utilities/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
new file mode 100644
index 000000000..148d5ec8a
--- /dev/null
+++ b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
@@ -0,0 +1,208 @@
+#
+# spec file for package kchmviewer (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kchmviewer
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		3.1.2
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		CHM viewer for Trinity
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# CHMLIB support
+%if 0%{?rhel} == 8
+%define with_chmlib 0
+%else
+%define with_chmlib 1
+BuildRequires:	chmlib-devel
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+%description
+KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
+Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
+library, and does not depend on TDE or GNOME. However, it may be compiled
+with full Trinity support, including Trinity widgets and KIO/KHTML. 
+
+The main advantage of KchmViewer is non-English language support. Unlike
+others, KchmViewer in most cases correctly detects help file encoding,
+correctly shows tables of context of Russian, Korean, Chinese and Japanese
+help files, and correctly searches in non-English help files (search for
+MBCS languages - ja/ko/ch is still in progress).
+
+Completely safe and harmless. Does not support JavaScript in any way,
+optionally warns you before opening an external web page, or switching to
+another help file. Shows an appropriate image for every TOC entry. 
+
+KchmViewer Has complete chm index support, including multiple index entries,
+cross-links and parent/child entries in index as well as Persistent bookmarks
+support. Correctly detects and shows encoding of any valid chm file.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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 \
+  -DWITH_CHMLIB=%{?with_chmlib} \
+  \
+  -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}
+
+# Removes useless files
+%__rm -f %{?buildroot}%{tde_libdir}/*.a
+
+# Fix desktop icon location
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+  %__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
+  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
+# Updates applications categories for openSUSE
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop"
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Compressed HTML Viewer" kchmviewer  Office Viewer
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING FAQ README.md
+%{tde_bindir}/kchmviewer
+%{tde_tdelibdir}/tdeio_msits.la
+%{tde_tdelibdir}/tdeio_msits.so
+%{tde_tdeappdir}/kchmviewer.desktop
+%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
+%{tde_datadir}/services/msits.protocol
+%{tde_tdedocdir}/HTML/en/kchmviewer/
+%{tde_tdedocdir}/HTML/en/tdeioslave/msits/
+%{tde_mandir}/man1/kchmviewer.*
+
+
+%changelog
diff --git a/redhat/applications/utilities/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec
new file mode 100644
index 000000000..4b2a2340c
--- /dev/null
+++ b/redhat/applications/utilities/kcpuload/kcpuload.spec
@@ -0,0 +1,172 @@
+#
+# spec file for package kcpuload (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kcpuload
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Epoch:			%{tde_epoch}
+Version:		2.00
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		CPU meter for Kicker [Trinity]
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KCPULoad is a small program for Kicker (the TDE panel).  It shows a
+recent history of CPU usage in the form of one or two configurable
+diagrams in the system tray.  These diagrams have settings for colours
+and various different styles.
+
+KCPULoad has support for SMP and separate user/system loads.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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} || touch %{tde_pkg}.lang
+
+# Fix desktop files (openSUSE only)
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%if 0%{?suse_version}
+%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/kcpuload
+%{tde_tdeappdir}/kcpuload.desktop
+%{tde_datadir}/apps/kcpuload/
+%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png
+%{tde_datadir}/icons/locolor/*/apps/kcpuload.png
+%{tde_mandir}/man1/*.1*
+%{tde_tdedocdir}/HTML/en/kcpuload/
+
+
+%changelog
diff --git a/redhat/applications/utilities/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec
new file mode 100644
index 000000000..dcd7f2598
--- /dev/null
+++ b/redhat/applications/utilities/kdirstat/kdirstat.spec
@@ -0,0 +1,178 @@
+#
+# spec file for package kdirstat (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kdirstat
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	2.4.4
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Graphical disk usage display with cleanup facilities [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KDirStat (TDE Directory Statistics) is a small utility program that sums
+up disk usage for directory trees, very much like the Unix 'du' command.
+It displays the disk space used up by a directory tree, both numerically
+and graphically.  It is network transparent (i.e., you can use it to sum
+up FTP servers), and comes with predefined and user configurable cleanup
+actions.  You can directly open a directory branch in Konqueror or the
+shell of your choice, compress it to a .tar.bz2 archive, or define your
+own cleanup actions. 
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" Filesystem
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/kdirstat
+%{tde_tdeappdir}/kdirstat.desktop
+%{tde_datadir}/apps/tdeconf_update/fix_move_to_trash_bin.pl
+%{tde_datadir}/apps/tdeconf_update/kdirstat.upd
+%{tde_datadir}/apps/kdirstat/
+%{tde_tdedocdir}/HTML/en/kdirstat/
+%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png
+%{tde_datadir}/icons/locolor/*/apps/kdirstat.png
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/utilities/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec
new file mode 100644
index 000000000..c480e868b
--- /dev/null
+++ b/redhat/applications/utilities/keep/keep.spec
@@ -0,0 +1,180 @@
+#
+# spec file for package keep (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg keep
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.4.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Backup system for TDE [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+Requires:		rdiff-backup
+
+
+%description
+Keep is an automatic backup program that allows users to set the parameters of
+the backup, including the frequency and the number of backups.
+
+Homepage: http://jr.falleri.free.fr/keep
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/keep.desktop" System Backup
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/keep
+%{tde_tdelibdir}/kded_keep.la
+%{tde_tdelibdir}/kded_keep.so
+%{tde_tdeappdir}/keep.desktop
+%{tde_datadir}/icons/hicolor/scalable/apps/keep.svgz
+%{tde_datadir}/apps/keep/
+%{tde_datadir}/config.kcfg/keepsettings.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/keep.png
+%{tde_datadir}/services/kded/keep.desktop
+%{tde_mandir}/man1/keep.*
+
+
+%changelog
diff --git a/redhat/applications/utilities/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec
new file mode 100644
index 000000000..d2b7c8399
--- /dev/null
+++ b/redhat/applications/utilities/knutclient/knutclient.spec
@@ -0,0 +1,183 @@
+#
+# spec file for package knutclient (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg knutclient
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.9.5
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	A TDE GUI that displays UPS statistics from NUT's upsd [Trinity]
+Group:		Applications/Utilities
+URL:		http://www.knut.noveradsl.cz/knutclient/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
+http://www.networkupstools.org/) framework on Linux and other systems. This
+information, presented in a nice visual format, can be invaluable on
+stations using an UPS.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+# Fix permissions
+chmod 644 AUTHORS README.md COPYING ChangeLog
+
+
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -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}
+
+# Move desktop icon to XDG directory
+if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then
+  %__mkdir_p %{buildroot}%{tde_tdeappdir}
+  %__mv "%{buildroot}%{tde_datadir}/applnk/Utilities/knutclient.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+  %__rm -r "%{buildroot}%{tde_datadir}/applnk"
+fi
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.md
+%{tde_bindir}/knutclient
+%{tde_tdeappdir}/knutclient.desktop
+%{tde_datadir}/apps/knutclient/knutclientui.rc
+%{tde_datadir}/apps/knutclient
+%{tde_tdedocdir}/HTML/cs/knutclient
+%{tde_tdedocdir}/HTML/en/knutclient
+%{tde_datadir}/icons/hicolor/*/apps/*.png
+%{tde_datadir}/icons/locolor/*/apps/*.png
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/utilities/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec
new file mode 100644
index 000000000..6e5f55137
--- /dev/null
+++ b/redhat/applications/utilities/kompose/kompose.spec
@@ -0,0 +1,157 @@
+#
+# spec file for package kompose (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg kompose
+%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
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Full-Screen Task Manager for TDE
+Version:		0.5.3
+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://www.trinitydesktop.org/
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	gettext
+
+# IMLIB2 support
+BuildRequires:	imlib2-devel
+
+# XCOMPOSITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+%define xcomposite_devel %{_lib}xcomposite-devel
+%else
+%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+%define xcomposite_devel libXcomposite-devel
+%endif
+%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
+
+# XDAMAGE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xdamage-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXdamage-devel
+%endif
+
+
+%description
+Kompose creates a full-screen view in which every window is represented
+by a scaled screen shot of it. It appears as a panel applet.
+
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=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,-)
+%doc README AUTHORS ChangeLog COPYING
+%{tde_bindir}/kompose
+%{tde_tdeappdir}/kompose.desktop
+%{tde_datadir}/apps/kompose/
+%{tde_tdedocdir}/HTML/en/kompose/
+%{tde_datadir}/icons/hicolor/16x16/apps/kompose.png
+%{tde_datadir}/icons/hicolor/32x32/apps/kompose.png
+
+
+%changelog
diff --git a/redhat/applications/utilities/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec
new file mode 100644
index 000000000..29f70adc8
--- /dev/null
+++ b/redhat/applications/utilities/krename/krename.spec
@@ -0,0 +1,172 @@
+#
+# spec file for package krename (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg krename
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	3.0.14
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	A TDE batch file renaming utility
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or
+even more files in one go. The filenames can be created by parts of the original filename,
+numbering the files or accessing hundreds of informations about the file, like creation date
+or Exif informations of an image. 
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file krename System FileManager
+%suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
+%suse_update_desktop_file -n %{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_bindir}/krename
+%{tde_tdeappdir}/krename.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop
+%{tde_datadir}/apps/krename/
+%{tde_tdedocdir}/HTML/en/krename/
+%{tde_datadir}/icons/hicolor/*/apps/krename.png
+%{tde_datadir}/icons/locolor/*/apps/krename.png
+%{tde_mandir}/man*/krename.*
+
+
+%changelog
diff --git a/redhat/applications/utilities/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec
new file mode 100644
index 000000000..9786d45b2
--- /dev/null
+++ b/redhat/applications/utilities/ksensors/ksensors.spec
@@ -0,0 +1,179 @@
+#
+# spec file for package ksensors (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg ksensors
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.7.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Trinity Frontend to lm_sensors
+Group:		Applications/System
+URL:		http://ksensors.sourceforge.net/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	libsensors4-devel
+%else
+BuildRequires:	lm_sensors-devel
+%endif
+
+# Keep archs in sync with lm_sensors
+ExcludeArch:    s390 s390x
+
+
+%description
+KSensors is a nice lm-sensors frontend for the K Desktop Environment.
+Install the hddtemp package if you wish to monitor hard disk
+temperatures with KSensors.
+
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
+
+%find_lang %{tde_pkg}
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Sensors Frontend" %{tde_pkg} System Monitor
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING FAQ README.md TODO
+%{tde_bindir}/ksensors
+%{tde_tdeappdir}/ksensors.desktop
+%{tde_datadir}/apps/ksensors/
+%{tde_datadir}/autostart/ksensors.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ksensors.png
+%{tde_datadir}/icons/locolor/*/apps/ksensors.png
+%{tde_datadir}/sounds/ksensors_alert.wav
+%{tde_tdedocdir}/HTML/en/ksensors/
+%{tde_mandir}/man1/*.1*
+
+
+%changelog
diff --git a/redhat/applications/utilities/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec
new file mode 100644
index 000000000..61421491f
--- /dev/null
+++ b/redhat/applications/utilities/mathemagics/mathemagics.spec
@@ -0,0 +1,133 @@
+#
+# spec file for package mathemagics (version R14.0.0)
+#
+# 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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg mathemagics
+%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_mandir %{tde_datadir}/man
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Mathemagics is a RPN Calculator.
+Version:		1.1
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:		GPL-2.0+
+%else
+License:		GPLv2+
+%endif
+
+#Vendor:			Trinity Desktop
+#Packager:		Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+
+%description
+Mathemagics is a RPN Calculator.
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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} \
+  -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang %{tde_pkg}
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{tde_pkg}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md
+%{tde_bindir}/mathemagics
+%{tde_tdeappdir}/mathemagics.desktop
+%{tde_datadir}/apps/mathemagics/
+%{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png
+%{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png
+%{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png
+%{tde_datadir}/icons/locolor/16x16/apps/mathemagics.png
+%{tde_datadir}/icons/locolor/32x32/apps/mathemagics.png
+%{tde_tdedocdir}/HTML/en/mathemagics/
+%{tde_mandir}/man1/mathemagics.1*
+
+
+%changelog
diff --git a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
new file mode 100644
index 000000000..5e690b485
--- /dev/null
+++ b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
@@ -0,0 +1,171 @@
+#
+# spec file for package qalculate-tde (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg qalculate-tde
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.9.7
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Powerful and easy to use desktop calculator - TDE version
+Group:		Applications/Multimedia
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+BuildRequires:	libqalculate-devel >= 0.9.6
+
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?rhel}
+BuildRequires:	cln-devel
+%endif
+%if 0%{?pclinuxos} >= 2018
+BuildRequires:	libcln-devel
+%endif
+%if 0%{?mgaversion} >= 7
+BuildRequires:	%{_lib}cln-devel
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
+%description
+Qalculate! is small and simple to use but with much power and versatility
+underneath.  Features include customizable functions, units, arbitrary
+precision, plotting, and a graphical interface that uses a one-line
+fault-tolerant expression entry (although it supports optional traditional
+buttons).
+
+This package contains the TDE user interface of qalculate.
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL=ON \
+  -DWITH_ALL_OPTIONS=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+%find_lang qalculate_tde
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file qalculate_tde -r TDE Utility Calculator
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%files -f qalculate_tde.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/qalculate-tde
+%{tde_datadir}/apps/qalculate_tde/
+%{tde_tdeappdir}/qalculate_tde.desktop
+%{tde_tdedocdir}/HTML/en/qalculate_tde/
+%{tde_datadir}/icons/hicolor/*/apps/qalculate_tde.png
+%{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png
+%{tde_mandir}/man1/qalculate-tde.1*
+
+
+%changelog
diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec
deleted file mode 100644
index 60865dde0..000000000
--- a/redhat/applications/wlassistant/wlassistant.spec
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# spec file for package wlassistant (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg wlassistant
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.5.7
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	User friendly TDE frontend for wireless network connection
-Group:		Applications/Utilities
-URL:		http://wlassistant.sourceforge.net/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-BuildRequires:	cmake libtool
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# Wireless support
-%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
-%endif
-%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires:	%{_lib}iw29-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
-%endif
-%if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires:	libiw-devel
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-%description
-Wireless Assistant scans for wireless access points and displays link quality,
-encryption and other useful information. When user wants to connect to a
-network, Wireless Assistant opens up its wizards and guides the user through
-Wi-Fi settings. After a successful connection is made the settings are
-remembered so next time the user won't have to enter them again.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL=on \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network
-%endif
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog VERSION
-%{tde_bindir}/wlassistant
-%{tde_tdeappdir}/wlassistant.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
-%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
-
-
-%changelog
diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/yakuake/yakuake.spec
deleted file mode 100644
index 17e2ffcbf..000000000
--- a/redhat/applications/yakuake/yakuake.spec
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-# spec file for package yakuake (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg yakuake
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	2.8.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Yakuake is a Quake-style terminal emulator based on TDE Konsole technology
-Group:		Applications/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-
-%description
-Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -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}" \
-  \
-  -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
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_datadir}/locale/*/*/*.mo
-%{tde_datadir}/config.kcfg/*.kcfg
-%{tde_tdedocdir}/HTML/en/yakuake/
-%{tde_mandir}/man1/*.1*
-
-
-%changelog
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 2ae9c17c5..4642a7298 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -1,12 +1,12 @@
 #!/bin/bash -ex
 
 # Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION]
-# Example: build_rpm_package.sh tdebase 14.0.10
+# Example: build_rpm_package.sh tdebase 14.0.13
 
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 PATH="$(cd $(dirname $0); pwd):${PATH}"
 
 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index 63d7b0b86..4dc708a6a 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-TDE_VERSION="${1:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${1:-${TDE_VERSION:-14.0.13}}"
 ARCH=$(rpm -E %_target_cpu)
 RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
 
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh
index 8c16c56f4..ee1d1ca6e 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 # Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>
-# Example: gather_rpm_sources.sh tdebase 14.0.10 /tmp/tdebase
+# Example: gather_rpm_sources.sh tdebase 14.0.13 /tmp/tdebase
 
 PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
 DIST="$4"
 
@@ -32,10 +32,14 @@ cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}"
 
 PATCHDIR="${HOME}/tde/patches/${TDE_VERSION}/$1"
 if [ -d "${PATCHDIR}" ]; then
-  cat "${PATCHDIR}/"*".patch" "${PATCHDIR}/"*".patch${DIST}" >>"${TARGETDIR}/one.patch"
-  sed -i "${TARGETDIR}/"*".spec" \
-      -e "/^Source0:/ s/$/\nPatch389: one.patch/" \
-      -e "/%setup/ s/$/\n%patch389 -p1/"
+  cat "${PATCHDIR}/"*".patch" "${PATCHDIR}/"*".patch${DIST}" >>"${TARGETDIR}/one.patch" 2>/dev/null
+  if [ "$(cat "${TARGETDIR}/one.patch" | wc -c)" = 0 ]; then
+    rm -f "${TARGETDIR}/one.patch"
+  else
+    sed -i "${TARGETDIR}/"*".spec" \
+        -e "/^Source0:/ s/$/\nPatch389: one.patch/" \
+        -e "/%setup/ s/$/\n%patch389 -p1/"
+  fi
 fi
 
 exit $RET
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index 521f16e44..c97c38b13 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Sample package name: trinity-tdelibs-14.0.10-0_pre727+6be06b3d.mga3.opt
+# Sample package name: trinity-tdelibs-14.0.13-0_pre727+6be06b3d.mga3.opt
 
 PKGNAME="${1##*/}"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index 645442256..9431fa519 100755
--- a/redhat/build/get_latest_built_package_filename.sh
+++ b/redhat/build/get_latest_built_package_filename.sh
@@ -2,7 +2,7 @@
 
 PKGNAME="$1"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
 RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)"
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh
index c0dd53c02..fad941a9e 100755
--- a/redhat/build/get_latest_built_package_version.sh
+++ b/redhat/build/get_latest_built_package_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="$1"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
@@ -13,11 +13,25 @@ pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")"
 pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")"
 
 # Application packages: version does not match TDE version
-if [[ "${pkg_release}" =~ _0_ ]] || [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
-  eval VERSION="${pkg_release/_0_/\~}"
+if [[ "${pkg_release}" =~ ^0_ ]] || [[ "${pkg_release}" =~ _0_ ]]; then
+  # Preversion
+  if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
+     # Likely application package
+    eval VERSION="${pkg_release/0_/\~}"
+  else
+    # Likely core package
+    eval VERSION="${pkg_version}${pkg_release/0_/\~}"
+  fi
+  VERSION="${VERSION/_~/\~}"
 else
-  # Base package (tdelibs ...)
-  eval VERSION="${pkg_version}_${pkg_release/0_/\~}"
+  # Stable version
+  if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
+     # Likely application package
+    eval VERSION="${pkg_release/_*/}"
+  else
+    # Likely core package
+    eval VERSION="${pkg_version}"
+  fi
 fi
 
 VERSION="${VERSION%.opt}" # Remove '.opt' suffix
diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index d5f652914..275fb2e27 100755
--- a/redhat/build/get_latest_tarball_filename.sh
+++ b/redhat/build/get_latest_tarball_filename.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/
diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh
index 7d5eb00f6..e30e89794 100755
--- a/redhat/build/get_latest_tarball_version.sh
+++ b/redhat/build/get_latest_tarball_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 5cfc902e3..ea121d4a1 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -20,12 +20,11 @@ case "${PKGNAME}" in
   # In case prefix is already there, don't add it again.
   "trinity-"*) PREFIX="";;
   # Most TDE dependencies have no prefix
-  "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
+  "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"polkit-tqt"|"pytqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
   # 3rd party dependencies
   "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
   # Extra build stuff
-  "autoconf"|"automake"|"brp-check-trinity"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";;
-  # Other
+  "autoconf"|"automake"|"brp-check-trinity"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";;  # Other
   "curl") PREFIX="trinity-lib";;
   # Default case: add prefix
   *) PREFIX="trinity-";;
@@ -59,11 +58,13 @@ case "${PKGNAME}" in
   "libkipi")          PKGRUNTIME="${lib}kipi0";;
   "libr")             PKGRUNTIME="${lib}r";;
   "mp4v2")            PKGRUNTIME="mp4v2";;
+  "polkit-tqt")       PKGRUNTIME="${lib}polkit-tqt0";;
   "tqscintilla")      PKGRUNTIME="${lib}tqscintilla7";;
   "tqca")             PKGRUNTIME="${lib}tqca1";;
   "tqca-tls")         PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
   "tqt3")             PKGRUNTIME="${lib}tqt3-mt";;
   "tqtinterface")     PKGRUNTIME="${lib}tqt4";;
+  "trinity-desktop")  PKGRUNTIME="${PKGNAME}-all";;
   "yaz")              PKGRUNTIME="${lib}yaz";;
   # Language package: install only French language package
   "k3b-i18n"|"koffice-i18n"|"tde-i18n")
@@ -111,6 +112,7 @@ if [ -n "${DEVEL}" ]; then
     "libr")        PKGDEVEL="${lib}r-devel";;
     "mp4v2")       PKGDEVEL="${lib}mp4v2-devel";;
     "pan")         PKGDEVEL="uulib-devel";;
+    "polkit-tqt")  PKGDEVEL="${lib}polkit-tqt-devel";;
     "tqca")        PKGDEVEL="${lib}tqca-devel";;
     "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
     "tqt3")        PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";;
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index 506b2eb88..1817b58ba 100755
--- a/redhat/build/get_source_files.sh
+++ b/redhat/build/get_source_files.sh
@@ -1,21 +1,24 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 DIST="$3"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
 SPECDIR="${SPECFILE%/*}"
 RPMPKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"
-
 [ ! -r "${SPECFILE}" ] && exit 2
 
 while read var val; do
   case "${var}" in
     Version:*) VERSION="${val}";;
-    Source[0-9]*:|Source:|Patch[0-9]*:)
-      FILE="${SPECDIR}/${val##*/}"
+    Source*:|Source:|Patch[0-9]*:)
+      if [ "${val:0:7}" = "http://" ] || [ "${val:0:8}" = "https://" ]; then
+        FILE="${SPECDIR}/${val##*/}"
+      else
+        FILE="${SPECDIR}/${val}"
+      fi
       if [ "${DIST}" = "any" ] && [ "${var//%\{?dist\}/}" = "${var}" ]; then
         FILES="${FILE//%\{?dist\}/.}"*
       else
@@ -23,12 +26,15 @@ while read var val; do
       fi
 
       for FILE in $FILES; do
-        file=$(rpm --define "tde_pkg ${PKGNAME}" \
-                   --define "tde_version ${TDE_VERSION}" \
-                   --define "name ${RPMPKGNAME}" \
-                   --define "version ${VERSION}" \
-                   --define "dist ${DIST:-$(rpm -E %dist)}" \
-                   -E "${FILE}")
+        for name in ${RPMPKGNAME} ${PKGNAME} trinity-${PKGNAME}; do
+          file=$(rpm --define "tde_pkg ${PKGNAME}" \
+                     --define "tde_version ${TDE_VERSION}" \
+                     --define "name ${name}" \
+                     --define "version ${VERSION}" \
+                     --define "dist ${DIST:-$(rpm -E %dist)}" \
+                     -E "${FILE}")
+          [ -r "${file}" ] && break
+        done
         [ -r "${file}" ] && echo "${file}"
       done
     ;;
diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh
index 186b68f9c..b6911bff6 100755
--- a/redhat/build/get_spec_version.sh
+++ b/redhat/build/get_spec_version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh
index 97c00f4b0..f203660e2 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh
index 156d02aec..d70bcc5c0 100755
--- a/redhat/build/install_rpm_package.sh
+++ b/redhat/build/install_rpm_package.sh
@@ -13,7 +13,7 @@ if [ -x /usr/sbin/urpmi ]; then
 elif [ -x /usr/bin/dnf ]; then
   PKGINST="sudo dnf install -y --nogpgcheck"
 elif [ -x /usr/bin/zypper ]; then
-  PKGINST="sudo zypper install -y"
+  PKGINST="sudo zypper install -y --allow-vendor-change"
 elif [ -x /usr/bin/yum ]; then
   PKGINST='sudo yum install -y'
 elif [ -x /usr/bin/apt-get ]; then
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 6248a9c78..c6e0a85a6 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 BUILT="$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})"
 TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})"
diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index ae44e4af1..01c3d93e7 100755
--- a/redhat/build/is_latest_package_installed.sh
+++ b/redhat/build/is_latest_package_installed.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PKGNAME="${1##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION})
 TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh
index f890bfb2e..7f06af83e 100755
--- a/redhat/build/rpmdist.sh
+++ b/redhat/build/rpmdist.sh
@@ -24,7 +24,7 @@ case $a in
   ;;
   # CentOS release 5.7 (Final)
   # CentOS Linux release 6.0 (Final)
-  CentOS*)
+  CentOS*|Rocky*)
     if [ $c = "release" ]; then
       RHEL="${d%%.*}"; DIST=".el${RHEL}"
     else
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index aecae4805..2a80f02d8 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 WORKERS=$(getconf _NPROCESSORS_ONLN)
-TDE_VERSION="${2:-${TDE_VERSION:-14.0.10}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.0.13}}"
 
 LOCKFILE="/tmp/lock.${0##*/}"
 while [ -e "${LOCKFILE}" ]; do
diff --git a/redhat/common/cmake/cmake.spec b/redhat/common/cmake/cmake.spec
new file mode 100644
index 000000000..1303fcb24
--- /dev/null
+++ b/redhat/common/cmake/cmake.spec
@@ -0,0 +1,119 @@
+#
+# spec file for package cmake-trinity (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/
+#
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg cmake
+
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7
+%define cmake_datadir %{_datadir}/cmake3
+%else
+%define cmake_datadir %{_datadir}/cmake
+%endif
+
+
+Name:		trinity-%{tde_pkg}
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TDE CMake modules
+Group:		Development/Libraries/C and C++
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	cmake
+BuildRequires:	desktop-file-utils
+
+Requires:		cmake
+
+
+%description
+TDE uses its own set of modules and macros to simplify CMake rules.
+
+This also includes the TDEL10n module that is used to generate and
+update templates for translations and the modified version of
+intltool-merge used to merge translations into desktop files.
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{cmake_datadir}/Modules/FindTDE.cmake
+%{cmake_datadir}/Modules/FindTQt.cmake
+%{cmake_datadir}/Modules/FindTQtQUI.cmake
+%{cmake_datadir}/Modules/TDEL10n.cmake
+%{cmake_datadir}/Modules/TDEMacros.cmake
+%{cmake_datadir}/Modules/TDESetupPaths.cmake
+%{cmake_datadir}/Modules/TDEVersion.cmake
+%{cmake_datadir}/Modules/tde_automoc.cmake
+%{cmake_datadir}/Modules/tde_l10n_merge.pl
+%{cmake_datadir}/Modules/tde_uic.cmake
+%{cmake_datadir}/Templates/tde_dummy_cpp.cmake
+%{cmake_datadir}/Templates/tde_export_library.cmake
+%{cmake_datadir}/Templates/tde_libtool_file.cmake
+%{cmake_datadir}/Templates/tde_tdeinit_executable.cmake
+%{cmake_datadir}/Templates/tde_tdeinit_module.cmake
+
+
+%changelog
diff --git a/redhat/core/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec
new file mode 100644
index 000000000..7f39132a7
--- /dev/null
+++ b/redhat/core/tde-i18n/tde-i18n.spec
@@ -0,0 +1,1499 @@
+#
+# spec file for package tde-i18n (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tde-i18n
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Builds all supported languages (not unsupported ones)
+%if "%{?TDE_LANGS}" == ""
+%define TDE_LANGS af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW
+%endif
+
+
+Name:			trinity-%{tde_pkg}
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Internationalization support for Trinity
+Group:			User Interface/Desktops
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:		noarch
+
+# Speed build options
+%define debug_package %{nil}
+%define __spec_install_post %{nil}
+AutoReq: no
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	findutils
+BuildRequires:	gettext
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+
+%description
+This package contains %{summary}.
+
+##########
+
+%package Afrikaans
+Summary:		Afrikaans(af) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-af = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Afrikaans < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Afrikaans = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Afrikaans
+This package contains %{summary}.
+
+%files Afrikaans
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/af/
+
+##########
+
+%package Arabic 
+Summary:		Arabic(ar) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ar = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Arabic < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Arabic = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Arabic
+This package contains %{summary}.
+
+%files Arabic 
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ar/
+
+##########
+
+%package Azerbaijani
+Summary:		Azerbaijani(az) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-az = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Arabic < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Arabic = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Azerbaijani
+This package contains %{summary}.
+
+%files Azerbaijani
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/az/
+
+##########
+
+%package Belarusian
+Summary:		Belarusian(be) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-be = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Belarusian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Belarusian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Belarusian
+This package contains %{summary}.
+
+%files Belarusian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/be/
+
+##########
+
+%package Bulgarian
+Summary:		Bulgarian(bg) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-bg = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Bulgarian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Bulgarian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Bulgarian
+This package contains %{summary}.
+
+%files Bulgarian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bg/
+
+##########
+
+%package Bengali
+Summary:		Bengali(bn) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-bn = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Bengali < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Bengali = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Bengali
+This package contains %{summary}.
+
+%files Bengali
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bn/
+
+##########
+
+%package Tibetan
+Summary:		Tibetan(bo) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-bo = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Tibetan < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Tibetan = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Tibetan
+This package contains %{summary}.
+
+#%files Tibetan
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/bo/
+
+##########
+
+%package Breton
+Summary:		Breton(br) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-br = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Breton < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Breton = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Breton
+This package contains %{summary}.
+
+%files Breton
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/br/
+
+##########
+
+%package Bosnian
+Summary:		Bosnian(bs) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-bs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Bosnian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Bosnian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Bosnian
+This package contains %{summary}.
+
+%files Bosnian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/bs/
+
+##########
+
+%package Catalan
+Summary:		Catalan(ca) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ca = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Catalan < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Catalan = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Catalan
+This package contains %{summary}.
+
+%files Catalan
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ca/
+%{tde_tdedocdir}/HTML/ca/
+
+##########
+
+%package Czech
+Summary:		Czech(cs) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-cs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Czech < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Czech = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Czech
+This package contains %{summary}.
+
+%files Czech
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/cs/
+%{tde_tdedocdir}/HTML/cs/
+
+##########
+
+%package Kashubian
+Summary:		Kashubian(csb) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-csb = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Kashubian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Kashubian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Kashubian
+This package contains %{summary}.
+
+%files Kashubian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/csb/
+
+##########
+
+%package Cymraeg
+Summary:		Cymraeg language support for TDE
+Group:			User Interface/Desktops
+Obsoletes:		trinity-kde-i18n-Cymraeg < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Cymraeg = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Cymraeg
+This package contains %{summary}.
+
+##########
+
+%package Welsh
+Summary:		Welsh(cy) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-cy = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Welsh < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Welsh = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Welsh
+This package contains %{summary}.
+
+%files Welsh
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/cy/
+
+##########
+
+%package Danish
+Summary:		Danish(da) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-da = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Danish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Danish = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Danish
+This package contains %{summary}.
+
+%files Danish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/da/
+%{tde_tdedocdir}/HTML/da/
+
+##########
+
+%package German
+Summary:		German(de) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-de = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-German < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-German = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description German
+This package contains %{summary}.
+
+%files German
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/de/
+%{tde_tdedocdir}/HTML/de/
+
+##########
+
+%package Greek
+Summary:		Greek(el) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-el = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Greek < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Greek = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Greek
+This package contains %{summary}.
+
+%files Greek
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/el/
+
+##########
+
+%package British
+Summary:		British(en_GB) English support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-en_GB = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-British < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-British = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description British
+This package contains %{summary}.
+
+%files British
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/en_GB/
+%{tde_tdedocdir}/HTML/en_GB/
+
+##########
+
+%package Esperanto
+Summary:		Esperanto(eo) support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-eo = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Esperanto < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Esperanto = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Esperanto
+This package contains %{summary}.
+
+%files Esperanto
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/eo/
+
+##########
+
+%package Spanish
+Summary:		Spanish(es) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-es = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Spanish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Spanish = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Spanish
+This package contains %{summary}.
+
+%files Spanish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/es/
+%{tde_tdedocdir}/HTML/es/
+
+##########
+
+%package Estonian
+Summary:		Estonian(et) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-et = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Estonian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Estonian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Estonian
+This package contains %{summary}.
+
+%files Estonian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/et/
+%{tde_tdedocdir}/HTML/et/
+
+##########
+
+%package Basque
+Summary:		Basque(eu) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-eu = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Basque < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Basque = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Basque
+This package contains %{summary}.
+
+%files Basque
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/eu/
+%{tde_tdedocdir}/HTML/eu/
+
+##########
+
+%package Farsi
+Summary:		Farsi(fa) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-fa = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Farsi < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Farsi = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Farsi
+This package contains %{summary}.
+
+%files Farsi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fa/
+
+##########
+
+%package Finnish
+Summary:		Finnish(fi) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-fi = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Finnish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Finnish = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Finnish
+This package contains %{summary}.
+
+%files Finnish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fi/
+%{tde_tdedocdir}/HTML/fi/
+
+##########
+
+%package Faroese
+Summary:		Faroese(fo) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-fo = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Faroese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Faroese = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Faroese
+This package contains %{summary}.
+
+#%files Faroese
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/fo/
+
+##########
+
+%package French
+Summary:		French(fr) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-fr = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-French < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-French = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description French
+This package contains %{summary}.
+
+%files French
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fr/
+%{tde_tdedocdir}/HTML/fr/
+
+##########
+
+%package Frisian
+Summary:		Frisian(fy) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-fy = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Frisian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Frisian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Frisian
+This package contains %{summary}.
+
+%files Frisian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/fy/
+
+##########
+
+%package Irish
+Summary:		Irish(ga) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ga = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Irish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Irish = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Irish
+This package contains %{summary}.
+
+%files Irish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ga/
+
+##########
+
+%package Galician
+Summary:		Galician(gl) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-gl = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Galician < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Galician = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Galician
+This package contains %{summary}.
+
+%files Galician
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/gl/
+
+##########
+
+%package Hebrew
+Summary:		Hebrew(he) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-he = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Hebrew < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Hebrew = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Hebrew
+This package contains %{summary}.
+
+%files Hebrew
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/he/
+%{tde_tdedocdir}/HTML/he/
+
+##########
+
+%package Hindi
+Summary:		Hindi(hi) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-hi = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Hindi < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Hindi = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Hindi
+This package contains %{summary}.
+
+%files Hindi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hi/
+
+##########
+
+%package Croatian
+Summary:		Croatian(hr) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-hr = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Croatian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Croatian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Croatian
+This package contains %{summary}.
+
+%files Croatian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hr/
+%{tde_tdedocdir}/HTML/hr/
+
+##########
+
+%package Hungarian
+Summary:		Hungarian(hu) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-hu = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Hungarian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Hungarian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Hungarian
+This package contains %{summary}.
+
+%files Hungarian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/hu/
+%{tde_tdedocdir}/HTML/hu/
+
+##########
+
+%package Indonesian
+Summary:		Indonesian(id) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-id = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Indonesian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Indonesian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Indonesian
+This package contains %{summary}.
+
+#%files Indonesian
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/id/
+
+##########
+
+%package Icelandic
+Summary:		Icelandic(is) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-is = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Icelandic < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Icelandic = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Icelandic
+This package contains %{summary}.
+
+%files Icelandic
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/is/
+
+##########
+
+%package Italian
+Summary:		Italian(it) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-it = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Italian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Italian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Italian
+This package contains %{summary}.
+
+%files Italian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/it/
+%{tde_tdedocdir}/HTML/it/
+
+##########
+
+%package Japanese
+Summary:		Japanese(ja) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ja = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Japanese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Japanese = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Japanese
+This package contains %{summary}.
+
+%files Japanese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ja/
+%{tde_tdedocdir}/HTML/ja/
+
+##########
+
+%package Kazakh
+Summary:		Kazakh(kk) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-kk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Kazakh < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Kazakh = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Kazakh
+This package contains %{summary}.
+
+%files Kazakh
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/kk/
+
+##########
+
+%package Khmer
+Summary:		Khmer(km) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Khmer < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Khmer = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Khmer
+This package contains %{summary}.
+
+%files Khmer
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/km/
+
+##########
+
+%package Korean
+Summary:		Korean(ko) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Korean < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Korean = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Korean
+This package contains %{summary}.
+
+%files Korean
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ko/
+%{tde_tdedocdir}/HTML/ko/
+
+##########
+
+%package Kurdish
+Summary:		Kurdish(ku) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ku = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Kurdish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Kurdish = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Kurdish
+This package contains %{summary}.
+
+#%files Kurdish
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/ku/
+
+##########
+
+%package Lao
+Summary:		Lao(lo) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-lo = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Lao < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Lao = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Lao
+This package contains %{summary}.
+
+#%files Lao
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/lo/
+
+##########
+
+%package Lithuanian
+Summary:		Lithuanian(lt) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-lt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Lithuanian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Lithuanian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Lithuanian
+This package contains %{summary}.
+
+%files Lithuanian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/lt/
+
+##########
+
+%package Latvian
+Summary:		Latvian(lv) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-lv = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Latvian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Latvian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Latvian
+This package contains %{summary}.
+
+%files Latvian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/lv/
+
+##########
+
+%package Maori
+Summary:		Maori(mi) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-mi = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Maori < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Maori = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Maori
+This package contains %{summary}.
+
+#%files Maori
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/mi/
+
+##########
+
+%package Macedonian
+Summary:		Macedonian(mk) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-mk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Macedonian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Macedonian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Macedonian
+This package contains %{summary}.
+
+%files Macedonian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/mk/
+
+##########
+
+%package Mongolian
+Summary:		Mongolian(mn) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-mn = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Mongolian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Mongolian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Mongolian
+This package contains %{summary}.
+
+%files Mongolian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/mn/
+
+##########
+
+%package Malay
+Summary:		Malay(ms) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ms = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Malay < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Malay = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Malay
+This package contains %{summary}.
+
+%files Malay
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ms/
+
+##########
+
+%package Maltese
+Summary:		Maltese(mt) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-mt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Maltese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Maltese = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Maltese
+This package contains %{summary}.
+
+#%files Maltese
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/mt/
+
+##########
+
+%package Low-Saxon
+Summary:		Low Saxon(nds) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-nds = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Low-Saxon < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Low-Saxon = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Low-Saxon
+This package contains %{summary}.
+
+%files Low-Saxon
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nds/
+
+##########
+
+%package Dutch
+Summary:		Dutch(nl) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-nl = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Dutch < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Dutch = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Dutch
+This package contains %{summary}.
+
+%files Dutch
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nl/
+%{tde_tdedocdir}/HTML/nl/
+
+##########
+
+%package Norwegian
+Summary:		Norwegian(no) (Bokmaal) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-no = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Norwegian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Norwegian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Norwegian
+This package contains %{summary}.
+
+%files Norwegian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nb/
+
+##########
+
+%package Norwegian-Nynorsk
+Summary:		Norwegian(nn) (Nynorsk) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-nn = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Norwegian-Nynorsk < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Norwegian-Nynorsk = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Norwegian-Nynorsk
+This package contains %{summary}.
+
+%files Norwegian-Nynorsk
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/nn/
+
+##########
+
+%package Occitan
+Summary:		Occitan(oc) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-oc = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Occitan < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Occitan = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Occitan
+This package contains %{summary}.
+
+#%files Occitan
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/oc/
+
+##########
+
+%package Polish
+Summary:		Polish(pl) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-pl = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Polish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Polish = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Polish
+This package contains %{summary}.
+
+%files Polish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pl/
+%{tde_tdedocdir}/HTML/pl/
+
+##########
+
+%package Portuguese
+Summary:		Portuguese(pt) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-pt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Portuguese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Portuguese = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Portuguese
+This package contains %{summary}.
+
+%files Portuguese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pt/
+%{tde_tdedocdir}/HTML/pt/
+
+##########
+
+%package Punjabi
+Summary:		Punjabi(pa) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-pa = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Punjabi < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Punjabi = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Punjabi
+This package contains %{summary}.
+
+%files Punjabi
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pa/
+
+##########
+
+%package Brazil
+Summary:		Brazil(pt_BR) Portuguese language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Brazil < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Brazil = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Brazil
+This package contains %{summary}.
+
+%files Brazil
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/pt_BR/
+%{tde_tdedocdir}/HTML/pt_BR/
+
+##########
+
+%package Romanian
+Summary:		Romanian(ro) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ro = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Romanian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Romanian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Romanian
+This package contains %{summary}.
+
+%files Romanian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ro/
+%{tde_tdedocdir}/HTML/ro/
+
+##########
+
+%package Russian
+Summary:		Russian(ru) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ru = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Russian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Russian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Russian
+This package contains %{summary}.
+
+%files Russian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ru/
+%{tde_tdedocdir}/HTML/ru/
+
+##########
+
+%package Kinyarwanda
+Summary:		Kinyarwanda(rw) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-rw = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Kinyarwanda < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Kinyarwanda = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Kinyarwanda
+This package contains %{summary}.
+
+%files Kinyarwanda
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/rw/
+
+##########
+
+%package Northern-Sami
+Summary:		Northern-Sami(se) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-se = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Northern-Sami < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Northern-Sami = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Northern-Sami
+This package contains %{summary}.
+
+%files Northern-Sami
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/se/
+
+##########
+
+%package Slovak
+Summary:		Slovak(sk) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-sk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Slovak < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Slovak = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Slovak
+This package contains %{summary}.
+
+%files Slovak
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sk/
+%{tde_tdedocdir}/HTML/sk/
+
+##########
+
+%package Slovenian
+Summary:		Slovenian(sl) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-sl = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Slovenian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Slovenian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Slovenian
+This package contains %{summary}.
+
+%files Slovenian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sl/
+%{tde_tdedocdir}/HTML/sl/
+
+##########
+
+%package Serbian
+Summary:		Serbian(sr) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-sr = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Serbian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Serbian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Serbian
+This package contains %{summary}.
+
+%files Serbian
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sr/
+%{tde_tdedocdir}/HTML/sr/
+
+##########
+
+%package Serbian-Latin
+Summary:		Serbian-Latin(sr@Latn) language support for TDE
+Group:			User Interface/Desktops
+Obsoletes:		trinity-kde-i18n-Serbian-Latin < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Serbian-Latin = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Serbian-Latin
+This package contains %{summary}.
+
+%files Serbian-Latin
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sr@Latn/
+
+##########
+
+%package South-Sudan
+Summary:		South-Sudan(ss) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ss = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-South-Sudan < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-South-Sudan = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description South-Sudan
+This package contains %{summary}.
+
+%files South-Sudan
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ss/
+
+##########
+
+%package Swedish
+Summary:		Swedish(sv) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-sv = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Swedish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Swedish = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Swedish
+This package contains %{summary}.
+
+%files Swedish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/sv/
+%{tde_tdedocdir}/HTML/sv/
+
+##########
+
+%package Tamil
+Summary:		Tamil(ta) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ta = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Tamil < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Tamil = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Tamil
+This package contains %{summary}.
+
+%files Tamil
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/ta/
+
+##########
+
+%package Telugu
+Summary:		Telugu(te) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-te = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Telugu < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Telugu = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Telugu
+This package contains %{summary}.
+
+%files Telugu
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/te/
+
+##########
+
+%package Tajik
+Summary:		Tajik(tg) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-tg = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Tajik < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Tajik = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Tajik
+This package contains %{summary}.
+
+%files Tajik
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/tg/
+
+##########
+
+%package Thai
+Summary:		Thai(th) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-th = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Thai < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Thai = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Thai
+This package contains %{summary}.
+
+%files Thai
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/th/
+
+##########
+
+%package Turkish
+Summary:		Turkish(tr) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-tr = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Turkish < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Turkish = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Turkish
+This package contains %{summary}.
+
+%files Turkish
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/tr/
+%{tde_tdedocdir}/HTML/tr/
+
+##########
+
+%package Ukrainian
+Summary:		Ukrainian(uk) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-uk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Ukrainian < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Ukrainian = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Ukrainian
+This package contains %{summary}.
+
+%files Ukrainian
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/uk/
+%{tde_datadir}/locale/uk/
+
+##########
+
+%package Uzbek
+Summary:		Uzbek(uz) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-uz = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Uzbek < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Uzbek = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Uzbek
+This package contains %{summary}.
+
+%files Uzbek
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/uz/
+
+##########
+
+%package Uzbek-Cyrillic
+Summary:		Uzbek(uz@cyrillic) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-uz@cyrillic = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Uzbek-Cyrillic < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Uzbek-Cyrillic = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Uzbek-Cyrillic
+This package contains %{summary}.
+
+%files Uzbek-Cyrillic
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/uz@cyrillic/
+
+##########
+
+%package Venda
+Summary:		Venda(ven) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-ven = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Venda < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Venda = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Venda
+This package contains %{summary}.
+
+#%files Venda
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/ven/
+
+##########
+
+%package Vietnamese
+Summary:		Vietnamese(vi) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-vi = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Vietnamese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Vietnamese = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Vietnamese
+This package contains %{summary}.
+
+%files Vietnamese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/vi/
+
+##########
+
+%package Walloon
+Summary:		Walloon(wa) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-wa = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Walloon < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Walloon = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Walloon
+This package contains %{summary}.
+
+%files Walloon
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/wa/
+
+##########
+
+%package Xhosa
+Summary:		Xhosa(xh) (a Bantu language) support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-xh = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Xhosa < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Xhosa = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Xhosa
+This package contains %{summary}.
+
+#%files Xhosa
+#%defattr(-,root,root,-)
+#%{tde_datadir}/locale/xh/
+
+##########
+
+%package Chinese
+Summary:		Chinese(zh_CN) (Simplified Chinese) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-zh_CN = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Chinese < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Chinese = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Chinese
+This package contains %{summary}.
+
+%files Chinese
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/zh_CN/
+%{tde_tdedocdir}/HTML/zh_CN/
+
+##########
+
+%package Chinese-Big5
+Summary:		Chinese(zh_TW) (Big5) language support for TDE
+Group:			User Interface/Desktops
+Provides:		%{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kde-i18n-Chinese-Big5 < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kde-i18n-Chinese-Big5 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description Chinese-Big5
+This package contains %{summary}.
+
+%files Chinese-Big5
+%defattr(-,root,root,-)
+%{tde_datadir}/locale/zh_TW/
+%{tde_tdedocdir}/HTML/zh_TW/
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+(
+for l in %{TDE_LANGS}; do
+  for f in tde-i18n-${l}/; do
+    if [ -d "${f}" ]; then 
+      pushd ${f}
+
+      if [ ! -d cmake ]; then
+        ln -s ../cmake cmake
+      fi
+
+      if ! rpm -E %%cmake|grep -q "cd build"; then
+        %__mkdir_p build
+        cd build
+      fi
+      
+      %cmake \
+        -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+        -DCMAKE_VERBOSE_MAKEFILE=ON \
+        \
+        -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+        -DBIN_INSTALL_DIR="%{tde_bindir}" \
+        -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+        -DLIB_INSTALL_DIR="%{tde_libdir}" \
+        -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+        -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+        \
+        -DBUILD_ALL=ON \
+        -DBUILD_DOC=ON \
+        -DBUILD_DATA=ON \
+        -DBUILD_MESSAGES=ON \
+      ..
+
+      # Run the build process in background
+      ( %__make -j4 || %__make || echo TDE_Error ) &
+
+      # Do not build more than 4 languages at the same time
+      while [ $(jobs | wc -l) -ge 4 ]; do sleep 3; done
+      popd
+    fi
+  done
+done
+) 2>&1 | tee /tmp/rpmbuild.$$
+
+if grep -qw TDE_Error /tmp/rpmbuild.$$; then
+  echo "Error while building. See '/tmp/rpmbuild.$$'"
+  exit 1
+fi
+
+wait
+rm -f /tmp/rpmbuild.$$
+
+
+%install
+%__rm -rf %{?buildroot}
+export PATH="%{tde_bindir}:${PATH}"
+
+for l in %{TDE_LANGS}; do
+  for f in tde-i18n-${l}/; do
+    %__make install DESTDIR="%{?buildroot}" -C "${f}/build"
+  done
+done
+
+
+# remove zero-length file
+find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
+
+# remove obsolete KDE 3 application data translations
+%__rm -rf "%{buildroot}%{tde_datadir}/apps"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec
new file mode 100644
index 000000000..38d70957e
--- /dev/null
+++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec
@@ -0,0 +1,512 @@
+#
+# spec file for package tdeaccessibility (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeaccessibility
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-tdeaccessibility
+Summary:		Trinity Desktop Environment - Accessibility
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:			System/GUI/Other
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
+
+BuildRequires:	cmake
+BuildRequires:	gcc-c++
+BuildRequires:	desktop-file-utils
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# AUDIOFILE support
+BuildRequires:	audiofile-devel
+
+# AKODE support
+%define with_akode 1
+BuildRequires: trinity-akode-devel
+
+# MAD support
+%ifarch %{ix86} x86_64
+%define with_libmad 1
+%{?with_libmad:BuildRequires: libakode_mpeg_decoder}
+%endif
+
+# ALSA support
+BuildRequires:	alsa-lib-devel
+
+# GLIB2 support
+BuildRequires:	glib2-devel
+
+# XCB support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
+BuildRequires:	libxcb-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+BuildRequires:	%{_lib}xcb-devel
+%endif
+%endif
+
+# XAU support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xau-devel
+%else
+BuildRequires:	%{_lib}xau%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXau-devel
+%endif
+
+Obsoletes:		trinity-kdeaccessibility < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeaccessibility = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdeaccessibility-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeaccessibility-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-tde-icons-mono = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbstate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmag = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmousetool = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmouth = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksayit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kttsd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kttsd-contrib-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+Included with this package are:
+* kmag, a screen magnifier,
+* kmousetool, a program for people whom it hurts to click the mouse,
+* kmouth, program that allows people who have lost their voice
+  to let their computer speak for them.
+
+%files
+
+##########
+
+%package -n trinity-tde-icons-mono
+Summary:	A monochromatic icons theme for TDE
+Group:		System/GUI/Other
+
+Obsoletes:	trinity-kde-icons-mono < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kde-icons-mono = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tde-icons-mono
+A monochromatic icon theme for TDE, designed for accessibility purposes.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-tde-icons-mono
+%defattr(-,root,root,-)
+%{tde_datadir}/icons/mono/
+
+##########
+
+%package -n trinity-kbstate
+Summary:	A keyboard status applet for TDE
+Group:		System/GUI/Other
+
+%description -n trinity-kbstate
+A panel applet that displays the keyboard status.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kbstate
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kbstate_panelapplet.la
+%{tde_tdelibdir}/kbstate_panelapplet.so
+%{tde_datadir}/apps/kbstateapplet/
+%{tde_datadir}/apps/kicker/applets/kbstateapplet.desktop
+
+##########
+
+%package -n trinity-kmag
+Summary:	A screen magnifier for TDE
+Group:		System/GUI/Other
+
+%description -n trinity-kmag
+TDE's screen magnifier tool.
+
+You can use KMagnifier to magnify a part of the screen just as you would use 
+a lens to magnify a newspaper fine-print or a photograph.  This application is
+useful for a variety of people: from researchers to artists to web-designers to
+people with low vision.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kmag
+%defattr(-,root,root,-)
+%{tde_bindir}/kmag
+%{tde_tdeappdir}/kmag.desktop
+%{tde_datadir}/apps/kmag/
+%{tde_datadir}/icons/hicolor/*/apps/kmag.png
+%{tde_datadir}/icons/locolor/*/apps/kmag.png
+%{tde_tdedocdir}/HTML/en/kmag/
+%{tde_mandir}/man1/kmag.1*
+
+##########
+
+%package -n trinity-kmousetool
+Summary:	TDE mouse manipulation tool for the disabled
+Group:		System/GUI/Other
+
+%description -n trinity-kmousetool
+KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
+designed to help those with repetitive strain injuries, for whom pressing
+buttons hurts.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kmousetool
+%defattr(-,root,root,-)
+%{tde_bindir}/kmousetool
+%{tde_tdeappdir}/kmousetool.desktop
+%{tde_datadir}/apps/kmousetool/
+%{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
+%{tde_tdedocdir}/HTML/en/kmousetool/
+%{tde_mandir}/man1/kmousetool.1*
+
+##########
+
+%package -n trinity-kmouth
+Summary:	A type-and-say KDE frontend for speech synthesizers
+Group:		System/GUI/Other
+
+%description -n trinity-kmouth
+KDE's type-and-say frontend for speech synthesizers.
+
+It includes a history of spoken sentences from which the user can select
+sentences to be re-spoken.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kmouth
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/kmouthrc
+%{tde_bindir}/kmouth
+%{tde_tdeappdir}/kmouth.desktop
+%{tde_datadir}/apps/kmouth/
+%{tde_datadir}/icons/hicolor/*/actions/speak.png
+%{tde_datadir}/icons/hicolor/*/actions/nospeak.png
+%{tde_datadir}/icons/hicolor/*/apps/kmouth.png
+%{tde_datadir}/icons/locolor/*/actions/speak.png
+%{tde_datadir}/icons/locolor/*/apps/kmouth.png
+%{tde_tdedocdir}/HTML/en/kmouth/
+%{tde_mandir}/man1/kmouth.1*
+
+##########
+
+%package -n trinity-ksayit
+Summary:	A frontend for the TDE Text-to-Speech system
+Group:		System/GUI/Other
+
+%description -n trinity-ksayit
+Text-to-speech front-end to kttsd.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-ksayit
+%defattr(-,root,root,-)
+%{tde_bindir}/ksayit
+%{tde_tdelibdir}/libFreeverb_plugin.la
+%{tde_tdelibdir}/libFreeverb_plugin.so
+%{tde_libdir}/libKTTSD_Lib.so.*
+%{tde_tdeappdir}/ksayit.desktop
+%{tde_datadir}/apps/ksayit/
+%{tde_datadir}/icons/hicolor/*/apps/ksayit.png
+%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_clipempty.png
+%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_talking.png
+%{tde_datadir}/services/ksayit_libFreeverb.desktop
+%{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop
+%{tde_tdedocdir}/HTML/en/ksayit/
+%{tde_mandir}/man1/ksayit.1*
+
+##########
+
+%package -n trinity-kttsd
+Summary:	A Text-to-Speech system for TDE
+Group:		System/GUI/Other
+
+%description -n trinity-kttsd
+The KDE Text-to-Speech system is a plugin based service that allows any KDE
+(or non-KDE) application to speak using the DCOP interface.
+
+ksayit and kmouth are useful front-ends for this capability, while one of
+festival, flite, and epos are essential back-ends.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+Homepage: http://accessibility.kde.org/developer/kttsd
+
+%files -n trinity-kttsd
+%defattr(-,root,root,-)
+%{tde_bindir}/kttsd
+%{tde_bindir}/kttsmgr
+%{tde_tdelibdir}/kcm_kttsd.la
+%{tde_tdelibdir}/kcm_kttsd.so
+%{tde_tdelibdir}/tdetexteditor_kttsd.la
+%{tde_tdelibdir}/tdetexteditor_kttsd.so
+%if 0%{?with_akode}
+%{tde_tdelibdir}/libkttsd_akodeplugin.la
+%{tde_tdelibdir}/libkttsd_akodeplugin.so
+%endif
+%{tde_tdelibdir}/libkttsd_alsaplugin.la
+%{tde_tdelibdir}/libkttsd_alsaplugin.so
+%{tde_tdelibdir}/libkttsd_artsplugin.la
+%{tde_tdelibdir}/libkttsd_artsplugin.so
+%{tde_tdelibdir}/libkttsd_commandplugin.la
+%{tde_tdelibdir}/libkttsd_commandplugin.so
+%{tde_tdelibdir}/libkttsd_eposplugin.la
+%{tde_tdelibdir}/libkttsd_eposplugin.so
+%{tde_tdelibdir}/libkttsd_festivalintplugin.la
+%{tde_tdelibdir}/libkttsd_festivalintplugin.so
+%{tde_tdelibdir}/libkttsd_fliteplugin.la
+%{tde_tdelibdir}/libkttsd_fliteplugin.so
+%{tde_tdelibdir}/libkttsd_sbdplugin.la
+%{tde_tdelibdir}/libkttsd_sbdplugin.so
+%{tde_tdelibdir}/libkttsd_stringreplacerplugin.la
+%{tde_tdelibdir}/libkttsd_stringreplacerplugin.so
+%{tde_tdelibdir}/libkttsd_talkerchooserplugin.la
+%{tde_tdelibdir}/libkttsd_talkerchooserplugin.so
+%{tde_tdelibdir}/libkttsd_xmltransformerplugin.la
+%{tde_tdelibdir}/libkttsd_xmltransformerplugin.so
+%{tde_tdelibdir}/libkttsjobmgrpart.la
+%{tde_tdelibdir}/libkttsjobmgrpart.so
+%{tde_libdir}/libkttsd.so.*
+%{tde_tdeappdir}/kcmkttsd.desktop
+%{tde_tdeappdir}/kttsmgr.desktop
+%{tde_datadir}/apps/tdetexteditor_kttsd/
+%exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
+%{tde_datadir}/apps/kttsd/
+%{tde_datadir}/icons/hicolor/16x16/actions/female.png
+%{tde_datadir}/icons/hicolor/16x16/actions/male.png
+%{tde_datadir}/icons/hicolor/*/apps/kttsd.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmkttsd.png
+%{tde_datadir}/services/tdetexteditor_kttsd.desktop
+%{tde_datadir}/services/kttsd.desktop
+%if 0%{?with_akode}
+%{tde_datadir}/services/kttsd_akodeplugin.desktop
+%endif
+%{tde_datadir}/services/kttsd_alsaplugin.desktop
+%{tde_datadir}/services/kttsd_artsplugin.desktop
+%{tde_datadir}/services/kttsd_commandplugin.desktop
+%{tde_datadir}/services/kttsd_eposplugin.desktop
+%{tde_datadir}/services/kttsd_festivalintplugin.desktop
+%{tde_datadir}/services/kttsd_fliteplugin.desktop
+%{tde_datadir}/services/kttsd_sbdplugin.desktop
+%{tde_datadir}/services/kttsd_stringreplacerplugin.desktop
+%{tde_datadir}/services/kttsd_talkerchooserplugin.desktop
+%{tde_datadir}/services/kttsd_xmltransformerplugin.desktop
+%{tde_datadir}/services/kttsjobmgr.desktop
+%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
+%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
+%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
+%{tde_tdedocdir}/HTML/en/kttsd/
+%{tde_mandir}/man1/kttsd.1*
+%{tde_mandir}/man1/kttsmgr.1*
+
+##########
+
+%package -n trinity-kttsd-contrib-plugins
+Summary:	The TDE Text-to-Speech system
+Group:		System/GUI/Other
+Requires:	trinity-kttsd = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kttsd-contrib-plugins
+kttsd synthetizer plugins that depends on non-free software :
+* FreeTTS plugin.
+* Hadifix (mbrola/txt2pho) plugin.
+Those plugins will require manual installation of third party,
+non free software to work.
+
+This package is part of Trinity, as a component of the TDE accessibility module.
+
+%files -n trinity-kttsd-contrib-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/libkttsd_freettsplugin.la
+%{tde_tdelibdir}/libkttsd_freettsplugin.so
+%{tde_tdelibdir}/libkttsd_hadifixplugin.la
+%{tde_tdelibdir}/libkttsd_hadifixplugin.so
+%{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
+%{tde_datadir}/services/kttsd_freettsplugin.desktop
+%{tde_datadir}/services/kttsd_hadifixplugin.desktop
+
+##########
+
+%package devel
+Summary:	Development files for tdeaccessibility
+Group:		Development/Libraries/X11
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdelibs-devel >= %{version}
+Requires:	libjpeg-devel
+Requires:	libpng-devel
+
+Obsoletes:		trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeaccessibility-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This package contains the development file for TDE accessibility 
+programs.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkttsd.la
+%{tde_libdir}/libkttsd.so
+%{tde_libdir}/libKTTSD_Lib.la
+%{tde_libdir}/libKTTSD_Lib.so
+%{tde_tdeincludedir}/ksayit_fxplugin.h
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+# Update icons for some control center modules
+%__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
+
+
+%build
+unset QTDIR QTLIB QTINC
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  \
+  -DBUILD_ALL=ON \
+  \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Adds missing icons in 'hicolor' theme
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png  hicolor/"$i"x"$i"/apps/kttsd.png    ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png  hicolor/"$i"x"$i"/apps/kcmkttsd.png ;done
+popd
+
+# Avoid conflict with tdelibs
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
+%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kmag         Utility Accessibility
+%suse_update_desktop_file    kmousetool   Utility Accessibility
+%suse_update_desktop_file    kmouth       Utility Accessibility
+%suse_update_desktop_file    kttsmgr      Utility Accessibility
+%suse_update_desktop_file    ksayit       Utility Accessibility
+%suse_update_desktop_file    kcmkttsd     Utility Accessibility
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc b/redhat/core/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
+++ b/redhat/core/tdeaccessibility/trinity-tdeaccessibility-rpmlintrc
diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec
new file mode 100644
index 000000000..87e0df3f9
--- /dev/null
+++ b/redhat/core/tdeaddons/tdeaddons.spec
@@ -0,0 +1,783 @@
+#
+# spec file for package tdeaddons (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeaddons
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Summary:	Trinity Desktop Environment - Plugins
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:		User Interface/Desktops
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Obsoletes:	trinity-kdeaddons < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeaddons = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdeaddons-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeaddons-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Prefix:    %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+
+
+# Trinity dependencies
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+BuildRequires: trinity-tdegames-devel >= %{tde_version}
+BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
+BuildRequires: trinity-tdepim-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# SDL support
+BuildRequires: SDL-devel
+
+# ALSA support
+BuildRequires: alsa-lib-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# PCRE support
+%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_pcre 1
+BuildRequires:	pcre-devel
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# DB4/DB5 support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
+%define with_db 1
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+BuildRequires:	db5-devel
+%endif
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+BuildRequires:	libdb-devel
+BuildRequires:	libdb-cxx-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libdb-4_8-devel
+%endif
+%if 0%{?rhel} && 0%{?rhel} <= 6
+BuildRequires:	db4-devel
+%endif
+%endif
+
+# XMMS support: no, always disabled, even on Fedora
+#%if 0%{?fedora}
+#define with_xmms 1
+#BuildRequires:	xmms-devel
+#%endif
+
+# PYTHON2 support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
+%global python python2
+%global __python %__python2
+%else
+%global python python
+%endif
+%endif
+
+Requires: trinity-atlantikdesigner = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kaddressbook-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kate-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdeaddons-tdefile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kicker-applets = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knewsticker-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konq-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksig = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-noatun-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+A collection of TDE Addons/Plugins, including: 
+* atlantikdesigner: game board designer
+* konq-plugins: akregator, babelfish, domtreeviewer, imagerotation, validators, webarchiver
+* kate (plugins) 
+* kicker-applets: kbinaryclock, kolourpicker, ktimemon, mediacontrol
+* knewsticker-scripts
+* noatun-plugins
+
+%files
+%defattr(-,root,root,-)
+
+##########
+
+%package -n trinity-atlantikdesigner
+Summary:	Game board designer for Atlantik
+Group:		Applications/Games
+#Requires:	trinity-atlantik
+Requires:	trinity-tdegames
+
+%description -n trinity-atlantikdesigner
+Atlantik Designer is a game board designer for the game Atlantik.
+
+Atlantik is a TDE client for playing Monopoly-like board games on the
+monopd network.  It can play any board supported by the network
+server, including the classic Monopoly game as well as the Atlantik
+game in which the properties include several major cities in North
+America and Europe.
+
+%files -n trinity-atlantikdesigner
+%defattr(-,root,root,-)
+%doc README atlantikdesigner/TODO
+%{tde_bindir}/atlantikdesigner
+%{tde_datadir}/apps/atlantikdesigner
+%{tde_tdeappdir}/atlantikdesigner.desktop
+%{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
+%{tde_tdedocdir}/HTML/en/atlantikdesigner/
+%{tde_mandir}/man1/atlantikdesigner.1*
+
+##########
+
+%package -n trinity-kaddressbook-plugins
+Summary:	Plugins for KAddressBook, the Trinity address book
+Group:		Applications/Utilities
+Requires:	trinity-kaddressbook
+
+%description -n trinity-kaddressbook-plugins
+This package contains a variety of useful plugins for the KDE address
+book.  These plugins can be loaded through the TDE address book settings.
+
+Highlights include exporting postal addresses as flags in KWorldClock,
+as well as importing and exporting contacts in the native format used
+by the German freemail provider GMX.
+
+%files -n trinity-kaddressbook-plugins
+%defattr(-,root,root,-)
+%doc README
+%{tde_tdelibdir}/libkaddrbk_geo_xxport.la
+%{tde_tdelibdir}/libkaddrbk_geo_xxport.so
+%{tde_tdelibdir}/libkaddrbk_gmx_xxport.la
+%{tde_tdelibdir}/libkaddrbk_gmx_xxport.so
+%{tde_datadir}/apps/kaddressbook
+%{tde_datadir}/services/kaddressbook
+
+##########
+
+%package -n trinity-kate-plugins
+Summary:	Plugins for Kate, the TDE Advanced Text Editor
+Group:		Applications/Utilities
+Requires:	trinity-kate
+Requires:	tidy
+
+%description -n trinity-kate-plugins
+This package contains a variety of useful plugins for Kate, the KDE
+Advanced Text Editor.  These plugins can be loaded through the plugin
+manager in Kate settings.
+
+Highlights include spell checking, text filtering, HTML/XML construction
+and validation, vim/emacs modeline handling, templates for new files
+and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
+a tab bar, a Python browser and even more.
+
+%files -n trinity-kate-plugins
+%defattr(-,root,root,-)
+%doc kate/xmltools/ChangeLog kate/xmltools/README
+%{tde_tdelibdir}/katecppsymbolviewerplugin.la
+%{tde_tdelibdir}/katecppsymbolviewerplugin.so
+%{tde_tdelibdir}/katefiletemplates.la
+%{tde_tdelibdir}/katefiletemplates.so
+%{tde_tdelibdir}/katefll_plugin.la
+%{tde_tdelibdir}/katefll_plugin.so
+%{tde_tdelibdir}/katehelloworldplugin.la
+%{tde_tdelibdir}/katehelloworldplugin.so
+%{tde_tdelibdir}/katehtmltoolsplugin.la
+%{tde_tdelibdir}/katehtmltoolsplugin.so
+%{tde_tdelibdir}/kateinsertcommandplugin.la
+%{tde_tdelibdir}/kateinsertcommandplugin.so
+%{tde_tdelibdir}/katemakeplugin.la
+%{tde_tdelibdir}/katemakeplugin.so
+%{tde_tdelibdir}/katemodelineplugin.la
+%{tde_tdelibdir}/katemodelineplugin.so
+%{tde_tdelibdir}/kateopenheaderplugin.la
+%{tde_tdelibdir}/kateopenheaderplugin.so
+%{tde_tdelibdir}/katepybrowseplugin.la
+%{tde_tdelibdir}/katepybrowseplugin.so
+%{tde_tdelibdir}/katesnippetsplugin.la
+%{tde_tdelibdir}/katesnippetsplugin.so
+%{tde_tdelibdir}/katetextfilterplugin.la
+%{tde_tdelibdir}/katetextfilterplugin.so
+%{tde_tdelibdir}/katexmlcheckplugin.la
+%{tde_tdelibdir}/katexmlcheckplugin.so
+%{tde_tdelibdir}/katexmltoolsplugin.la
+%{tde_tdelibdir}/katexmltoolsplugin.so
+%{tde_tdelibdir}/libkatetabbarextensionplugin.la
+%{tde_tdelibdir}/libkatetabbarextensionplugin.so
+%{tde_datadir}/applnk/.hidden/kate-plugins.desktop
+%{tde_datadir}/applnk/.hidden/katefll.desktop
+%{tde_datadir}/apps/kate
+%{tde_datadir}/apps/katepart
+%{tde_datadir}/apps/katexmltools
+%{tde_datadir}/services/katecppsymbolviewer.desktop
+%{tde_datadir}/services/katefiletemplates.desktop
+%{tde_datadir}/services/katefll_plugin.desktop
+%{tde_datadir}/services/katehelloworld.desktop
+%{tde_datadir}/services/katehtmltools.desktop
+%{tde_datadir}/services/kateinsertcommand.desktop
+%{tde_datadir}/services/katemake.desktop
+%{tde_datadir}/services/katemodeline.desktop
+%{tde_datadir}/services/kateopenheader.desktop
+%{tde_datadir}/services/katepybrowse.desktop
+%{tde_datadir}/services/katesnippets.desktop
+%{tde_datadir}/services/katetabbarextension.desktop
+%{tde_datadir}/services/katetextfilter.desktop
+%{tde_datadir}/services/katexmlcheck.desktop
+%{tde_datadir}/services/katexmltools.desktop
+%{tde_tdedocdir}/HTML/en/kate-plugins/
+# katesort plugin
+%{tde_tdelibdir}/katesortplugin.la
+%{tde_tdelibdir}/katesortplugin.so
+%{tde_datadir}/icons/hicolor/*/actions/katesort.png
+%{tde_datadir}/services/katesort.desktop
+
+##########
+
+%package tdefile-plugins
+Summary:	Trinity file dialog plugins for text files and folders
+Group:		Applications/Utilities
+
+Obsoletes:	trinity-tdeaddons-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdeaddons-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tdefile-plugins
+This is a collection of plugins for the TDE file dialog.  These plugins
+extend the file dialog to offer advanced meta-information for text,
+HTML and desktop files, as well as for folders, Windows .lnk files,
+MIME archives and X.509 certificates.
+
+This package also includes plugins for the KDE file rename dialog,
+allowing a user to more easily decide what to do when faced with a
+decision regarding conflicting filenames.  Rename dialog plugins are
+provided for audio and image files.
+
+%files tdefile-plugins
+%defattr(-,root,root,-)
+%doc tdefile-plugins/lnk/README
+%{tde_bindir}/lnkforward
+%{tde_tdelibdir}/tdefile_cert.la
+%{tde_tdelibdir}/tdefile_cert.so
+%{tde_tdelibdir}/tdefile_desktop.la
+%{tde_tdelibdir}/tdefile_desktop.so
+%{tde_tdelibdir}/tdefile_folder.la
+%{tde_tdelibdir}/tdefile_folder.so
+%{tde_tdelibdir}/tdefile_html.la
+%{tde_tdelibdir}/tdefile_html.so
+%{tde_tdelibdir}/tdefile_lnk.la
+%{tde_tdelibdir}/tdefile_lnk.so
+%{tde_tdelibdir}/tdefile_mhtml.la
+%{tde_tdelibdir}/tdefile_mhtml.so
+%{tde_tdelibdir}/tdefile_txt.la
+%{tde_tdelibdir}/tdefile_txt.so
+%{tde_tdelibdir}/librenaudioplugin.la
+%{tde_tdelibdir}/librenaudioplugin.so
+%{tde_tdelibdir}/librenimageplugin.la
+%{tde_tdelibdir}/librenimageplugin.so
+%{tde_datadir}/applnk/.hidden/lnkforward.desktop
+%{tde_datadir}/mimelnk/application/x-win-lnk.desktop
+%{tde_datadir}/services/tdefile_cert.desktop
+%{tde_datadir}/services/tdefile_desktop.desktop
+%{tde_datadir}/services/tdefile_folder.desktop
+%{tde_datadir}/services/tdefile_html.desktop
+%{tde_datadir}/services/tdefile_lnk.desktop
+%{tde_datadir}/services/tdefile_mhtml.desktop
+%{tde_datadir}/services/tdefile_txt.desktop
+%{tde_datadir}/services/renaudiodlg.desktop
+%{tde_datadir}/services/renimagedlg.desktop
+%{tde_mandir}/man1/lnkforward.1*
+
+##########
+
+%package -n trinity-kicker-applets
+Summary:	Applets for Kicker, the Trinity panel
+Group:		Applications/Utilities
+Requires:	trinity-kicker
+
+%description -n trinity-kicker-applets
+This package contains a variety of applets for Kicker, the KDE panel.
+These applets will appear in the panel's Add--Applet menu.
+
+Included are a system monitor, a colour picker, a media player controller,
+a mathematical evaluator and a binary clock.
+
+The media control applet does not support XMMS, as this would force all
+kicker-applets users to install XMMS. If you want a kicker applet that
+controls XMMS, install the xmms-kde-trinity package.
+
+%files -n trinity-kicker-applets
+%defattr(-,root,root,-)
+%doc README 
+%{tde_tdelibdir}/kolourpicker_panelapplet.la
+%{tde_tdelibdir}/kolourpicker_panelapplet.so
+%{tde_tdelibdir}/ktimemon_panelapplet.la
+%{tde_tdelibdir}/ktimemon_panelapplet.so
+%{tde_tdelibdir}/math_panelapplet.la
+%{tde_tdelibdir}/math_panelapplet.so
+%{tde_tdelibdir}/mediacontrol_panelapplet.la
+%{tde_tdelibdir}/mediacontrol_panelapplet.so
+%{tde_tdelibdir}/kbinaryclock_panelapplet.la
+%{tde_tdelibdir}/kbinaryclock_panelapplet.so
+%{tde_datadir}/apps/kicker/applets
+%{tde_datadir}/apps/mediacontrol
+%{tde_datadir}/config.kcfg/kbinaryclock.kcfg
+%{tde_datadir}/icons/locolor/*/apps/ktimemon.png
+%{tde_datadir}/icons/crystalsvg/*/apps/ktimemon.png
+%{tde_tdedocdir}/HTML/en/kicker-applets/
+
+##########
+
+%package -n trinity-knewsticker-scripts
+Summary: scripts for KNewsTicker, the Trinity news ticker
+Group:		Applications/Utilities
+Requires:	perl
+%if 0%{with_python}
+Requires:	%{python}
+%endif
+#Requires:	libfinance-quote-perl
+#Requires:	libmime-perl
+#Requires:	libnews-nntpclient-perl
+Requires:	perl-libwww-perl
+Requires:	trinity-knewsticker
+
+%description -n trinity-knewsticker-scripts
+This package contains a variety of scripts that provide additional news
+sources for KNewsTicker, the news ticker applet for the TDE panel.
+
+Highlights include newsgroup handling, stock data retrieval, sports scores
+and various local news sources.
+
+%files -n trinity-knewsticker-scripts
+%defattr(-,root,root,-)
+%doc README
+%{tde_datadir}/apps/knewsticker/
+
+##########
+
+%package -n trinity-konq-plugins
+Summary:	plugins for Konqueror, the Trinity file/web/doc browser
+Group:		Applications/Utilities
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
+Requires:	%{_lib}jpeg8
+%endif
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	libjpeg
+%endif
+%if 0%{?suse_version} == 1220
+Requires:	libjpeg62
+%endif
+%if 0%{?pclinuxos}
+Requires:	%{_lib}jpeg62
+%endif
+%if 0%{?suse_version} == 1230
+Requires:	libjpeg8
+%endif
+%if 0%{with_python}
+Requires:	%{python}
+%endif
+Requires:	rsync
+#Requires:	unison
+Requires:	trinity-konqueror
+%if 0%{?fedora}
+Requires:	%{python}-exif
+%endif
+
+%description -n trinity-konq-plugins
+This package contains a variety of useful plugins for Konqueror, the
+file manager, web browser and document viewer for TDE.  Many of these
+plugins will appear in Konqueror's Tools menu.
+
+Highlights for web browsing include web page translation, web page archiving,
+auto-refreshing, HTML and CSS structural analysis, a search toolbar, a
+sidebar news ticker, fast access to common options, bookmarklets, a crash
+monitor, a microformat availability indicator, a del.icio.us bookmarks
+sidebar, and integration with the aKregator RSS feed reader.
+
+Highlights for directory browsing include directory filters, image gallery
+creation, archive compression and extraction, quick copy/move, a sidebar
+media player, a file information metabar/sidebar, a media folder helper, a
+graphical disk usage viewer and image conversions and transformations.
+
+%files -n trinity-konq-plugins
+%defattr(-,root,root,-)
+%doc konq-plugins/README
+%{_sysconfdir}/trinity/translaterc
+%{tde_bindir}/fsview
+%{tde_bindir}/jpegorient
+%{tde_bindir}/tdeio_media_realfolder
+%{tde_tdelibdir}/konq_sidebarnews.la
+%{tde_tdelibdir}/konq_sidebarnews.so
+%{tde_tdelibdir}/konqsidebar_delicious.la
+%{tde_tdelibdir}/konqsidebar_delicious.so
+%{tde_tdelibdir}/konqsidebar_mediaplayer.la
+%{tde_tdelibdir}/konqsidebar_mediaplayer.so
+%{tde_tdelibdir}/konqsidebar_metabar.la
+%{tde_tdelibdir}/konqsidebar_metabar.so
+%{tde_tdelibdir}/libakregatorkonqfeedicon.la
+%{tde_tdelibdir}/libakregatorkonqfeedicon.so
+%{tde_tdelibdir}/libakregatorkonqplugin.la
+%{tde_tdelibdir}/libakregatorkonqplugin.so
+%{tde_tdelibdir}/libarkplugin.la
+%{tde_tdelibdir}/libarkplugin.so
+%{tde_tdelibdir}/libautorefresh.la
+%{tde_tdelibdir}/libautorefresh.so
+%{tde_tdelibdir}/libbabelfishplugin.la
+%{tde_tdelibdir}/libbabelfishplugin.so
+%{tde_tdelibdir}/libcrashesplugin.la
+%{tde_tdelibdir}/libcrashesplugin.so
+%{tde_tdelibdir}/libdirfilterplugin.la
+%{tde_tdelibdir}/libdirfilterplugin.so
+%{tde_tdelibdir}/librsyncplugin.la
+%{tde_tdelibdir}/librsyncplugin.so
+%{tde_tdelibdir}/libdomtreeviewerplugin.la
+%{tde_tdelibdir}/libdomtreeviewerplugin.so
+%{tde_tdelibdir}/libfsviewpart.la
+%{tde_tdelibdir}/libfsviewpart.so
+%{tde_tdelibdir}/libtdehtmlsettingsplugin.la
+%{tde_tdelibdir}/libtdehtmlsettingsplugin.so
+%{tde_tdelibdir}/kcm_kuick.la
+%{tde_tdelibdir}/kcm_kuick.so
+%{tde_tdelibdir}/libkimgallery.la
+%{tde_tdelibdir}/libkimgallery.so
+%{tde_tdelibdir}/libkuickplugin.la
+%{tde_tdelibdir}/libkuickplugin.so
+%{tde_tdelibdir}/libmfkonqmficon.la
+%{tde_tdelibdir}/libmfkonqmficon.so
+%{tde_tdelibdir}/libminitoolsplugin.la
+%{tde_tdelibdir}/libminitoolsplugin.so
+%{tde_tdelibdir}/librellinksplugin.la
+%{tde_tdelibdir}/librellinksplugin.so
+%{tde_tdelibdir}/libsearchbarplugin.la
+%{tde_tdelibdir}/libsearchbarplugin.so
+%{tde_tdelibdir}/libuachangerplugin.la
+%{tde_tdelibdir}/libuachangerplugin.so
+%{tde_tdelibdir}/libvalidatorsplugin.la
+%{tde_tdelibdir}/libvalidatorsplugin.so
+%{tde_tdelibdir}/libwebarchiverplugin.la
+%{tde_tdelibdir}/libwebarchiverplugin.so
+%{tde_tdelibdir}/webarchivethumbnail.la
+%{tde_tdelibdir}/webarchivethumbnail.so
+%{tde_datadir}/applnk/.hidden/arkplugin.desktop
+%{tde_datadir}/applnk/.hidden/kcmkuick.desktop
+%{tde_datadir}/applnk/.hidden/kuickplugin.desktop
+%{tde_datadir}/applnk/.hidden/mediaplayerplugin.desktop
+%{tde_datadir}/applnk/.hidden/crashesplugin.desktop
+%{tde_datadir}/applnk/.hidden/dirfilterplugin.desktop
+%{tde_datadir}/applnk/.hidden/rsyncplugin.desktop
+%{tde_datadir}/applnk/.hidden/fsview.desktop
+%{tde_datadir}/applnk/.hidden/tdehtmlsettingsplugin.desktop
+%{tde_datadir}/applnk/.hidden/kimgalleryplugin.desktop
+%{tde_datadir}/applnk/.hidden/plugin_babelfish.desktop
+%{tde_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop
+%{tde_datadir}/applnk/.hidden/plugin_validators.desktop
+%{tde_datadir}/applnk/.hidden/plugin_webarchiver.desktop
+%{tde_datadir}/applnk/.hidden/uachangerplugin.desktop
+%{tde_datadir}/apps/akregator
+%{tde_datadir}/apps/domtreeviewer
+%{tde_datadir}/apps/fsview
+%{tde_datadir}/apps/imagerotation/
+%{tde_datadir}/apps/tdehtml/kpartplugins
+%{tde_datadir}/apps/konqiconview
+%{tde_datadir}/apps/konqlistview
+%{tde_datadir}/apps/konqsidebartng
+%{tde_datadir}/apps/konqueror/icons
+%{tde_datadir}/apps/konqueror/kpartplugins
+%{tde_datadir}/apps/konqueror/servicemenus
+%{tde_datadir}/apps/metabar/
+%{tde_datadir}/apps/microformat/
+%{tde_datadir}/config.kcfg/konq_sidebarnews.kcfg
+%{tde_datadir}/icons/crystalsvg/*/actions/babelfish.png
+%{tde_datadir}/icons/crystalsvg/*/actions/cssvalidator.png
+%{tde_datadir}/icons/crystalsvg/*/actions/domtreeviewer.png
+%{tde_datadir}/icons/crystalsvg/*/actions/htmlvalidator.png
+%{tde_datadir}/icons/crystalsvg/*/actions/imagegallery.png
+%{tde_datadir}/icons/crystalsvg/*/actions/remotesync.png
+%{tde_datadir}/icons/crystalsvg/*/actions/remotesyncconfig.png
+%{tde_datadir}/icons/crystalsvg/*/actions/minitools.png
+%{tde_datadir}/icons/crystalsvg/*/actions/validators.png
+%{tde_datadir}/icons/crystalsvg/*/actions/webarchiver.png
+%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_delicious.png
+%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_mediaplayer.png
+%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_news.png
+%{tde_datadir}/icons/hicolor/*/apps/metabar.png
+%{tde_datadir}/icons/hicolor/*/apps/fsview.png
+%{tde_datadir}/icons/hicolor/scalable/apps/metabar.svgz
+%{tde_datadir}/icons/locolor/*/apps/autorefresh.png
+%{tde_datadir}/icons/locolor/*/apps/konqsidebar_mediaplayer.png
+%{tde_datadir}/services/akregator_konqplugin.desktop
+%{tde_datadir}/services/ark_plugin.desktop
+%{tde_datadir}/services/fsview_part.desktop
+%{tde_datadir}/services/kuick_plugin.desktop
+%{tde_datadir}/services/webarchivethumbnail.desktop
+%{tde_tdelibdir}/libadblock.la
+%{tde_tdelibdir}/libadblock.so
+%{tde_tdedocdir}/HTML/en/konq-plugins/
+%{tde_mandir}/man1/exif.py.1*
+%{tde_mandir}/man1/fsview.1*
+%{tde_mandir}/man1/jpegorient.1*
+%{tde_mandir}/man1/orient.py.1*
+
+##########
+
+%package -n trinity-ksig
+Summary:	Graphical tool for managing multiple email signatures
+Group:		Applications/Utilities
+Requires:	trinity-kmail
+
+%description -n trinity-ksig
+KSig is a graphical tool for keeping track of many different email
+signatures.  The signatures themselves can be edited through KSig's
+graphical user interface.  A command-line interface is then available
+for generating random or daily signatures from this list.
+
+The command-line interface makes a suitable plugin for generating
+signatures in external mail clients such as KMail.
+
+%files -n trinity-ksig
+%defattr(-,root,root,-)
+%doc README
+%{tde_bindir}/ksig
+%{tde_tdeappdir}/ksig.desktop
+%{tde_datadir}/apps/ksig/
+%{tde_datadir}/icons/hicolor/*/apps/ksig.png
+%{tde_tdedocdir}/HTML/en/ksig/
+%{tde_mandir}/man1/ksig.1*
+
+##########
+
+%package -n trinity-noatun-plugins
+Summary:	plugins for Noatun, the Trinity media player
+Group:		Applications/Utilities
+Requires:	trinity-noatun
+
+%description -n trinity-noatun-plugins
+This package contains a variety of useful plugins for Noatun, the audio and
+video media player for TDE. These plugins can be loaded through the plugin
+manager in Noatun settings.
+
+Highlights include an alarm clock, guessing tags from filenames, adjustable
+playback speed, capture to wave file and displaying lyrics, plus a variety
+of user interfaces, playlists and visualisation plugins.
+
+%files -n trinity-noatun-plugins
+%defattr(-,root,root,-)
+%doc README
+%{tde_bindir}/noatunsynaescope.bin
+%{tde_bindir}/noatuntippecanoe.bin
+%{tde_bindir}/noatuntyler.bin
+%{tde_tdelibdir}/noatunalsaplayer.la
+%{tde_tdelibdir}/noatunalsaplayer.so
+%{tde_tdelibdir}/noatunblurscope.la
+%{tde_tdelibdir}/noatunblurscope.so
+%{tde_tdelibdir}/noatuncharlatan.la
+%{tde_tdelibdir}/noatuncharlatan.so
+%{tde_tdelibdir}/noatundub.la
+%{tde_tdelibdir}/noatundub.so
+%{tde_tdelibdir}/noatun_ffrs.la
+%{tde_tdelibdir}/noatun_ffrs.so
+%{tde_tdelibdir}/noatunluckytag.la
+%{tde_tdelibdir}/noatunluckytag.so
+%{tde_tdelibdir}/noatunlyrics.la
+%{tde_tdelibdir}/noatunlyrics.so
+%{tde_tdelibdir}/noatunmadness.la
+%{tde_tdelibdir}/noatunmadness.so
+%if 0%{?with_db}
+%{tde_tdelibdir}/noatun_oblique.la
+%{tde_tdelibdir}/noatun_oblique.so
+%endif
+%{tde_tdelibdir}/noatunpitchablespeed.la
+%{tde_tdelibdir}/noatunpitchablespeed.so
+%{tde_tdelibdir}/noatunsynaescope.la
+%{tde_tdelibdir}/noatunsynaescope.so
+%{tde_tdelibdir}/noatuntippecanoe.la
+%{tde_tdelibdir}/noatuntippecanoe.so
+%{tde_tdelibdir}/noatuntyler.la
+%{tde_tdelibdir}/noatuntyler.so
+%{tde_tdelibdir}/noatunwakeup.la
+%{tde_tdelibdir}/noatunwakeup.so
+%{tde_tdelibdir}/noatunwavecapture.la
+%{tde_tdelibdir}/noatunwavecapture.so
+%{tde_datadir}/apps/noatun/*
+%{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
+%{tde_mandir}/man1/noatunsynaescope.bin.1*
+%{tde_mandir}/man1/noatuntippecanoe.bin.1*
+%{tde_mandir}/man1/noatuntyler.bin.1*
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
+# Fix shebangs
+sed -i "knewsticker-scripts/sportscores.py" \
+       "konq-plugins/imagerotation/orient.py" \
+       "konq-plugins/imagerotation/exif.py" \
+    -e "s|env python|env %{python}|"
+%endif
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Help cmake to find DB headers ...
+if [ -d "/usr/include/db53" ]; then
+  export CMAKE_INCLUDE_PATH="/usr/include/db53"
+fi
+if [ -d "/usr/include/db4" ]; then
+  export CMAKE_INCLUDE_PATH="/usr/include/db4"
+fi
+
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_ARTS=ON \
+  -DWITH_SDL=ON \
+  -DWITH_BERKELEY_DB=ON \
+  -DWITH_XMMS=OFF \
+  -DWITH_TEST=OFF \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_ATLANTIKDESIGNER=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_KADDRESSBOOK_PLUGINS=ON \
+  -DBUILD_KATE_PLUGINS=ON \
+  -DBUILD_KICKER_APPLETS=ON \
+  -DBUILD_KNEWSTICKER_SCRIPTS=ON \
+  -DBUILD_KONQ_PLUGINS=ON \
+  -DBUILD_KSIG=ON \
+  -DBUILD_NOATUN_PLUGINS=ON \
+  -DBUILD_RENAMEDLG_PLUGINS=ON \
+  -DBUILD_TDEFILE_PLUGINS=ON \
+  -DBUILD_TUTORIALS=OFF \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Temporary
+%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter
+
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file atlantikdesigner Game    BoardGame
+%suse_update_desktop_file -r ksig          Network Email
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdeadmin/kpackagerc b/redhat/core/tdeadmin/kpackagerc
index 72be06d46..72be06d46 100644
--- a/redhat/main/tdeadmin/kpackagerc
+++ b/redhat/core/tdeadmin/kpackagerc
diff --git a/redhat/main/tdeadmin/ksysvrc b/redhat/core/tdeadmin/ksysvrc
index 48754643d..48754643d 100644
--- a/redhat/main/tdeadmin/ksysvrc
+++ b/redhat/core/tdeadmin/ksysvrc
diff --git a/redhat/main/tdeadmin/kuser.pam b/redhat/core/tdeadmin/kuser.pam
index 30492636a..30492636a 100644
--- a/redhat/main/tdeadmin/kuser.pam
+++ b/redhat/core/tdeadmin/kuser.pam
diff --git a/redhat/main/tdeadmin/kuser.pamd b/redhat/core/tdeadmin/kuser.pamd
index c7d67e332..c7d67e332 100644
--- a/redhat/main/tdeadmin/kuser.pamd
+++ b/redhat/core/tdeadmin/kuser.pamd
diff --git a/redhat/main/tdeadmin/kuserrc b/redhat/core/tdeadmin/kuserrc
index baeb5a53b..baeb5a53b 100644
--- a/redhat/main/tdeadmin/kuserrc
+++ b/redhat/core/tdeadmin/kuserrc
diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec
new file mode 100644
index 000000000..cd5669db0
--- /dev/null
+++ b/redhat/core/tdeadmin/tdeadmin.spec
@@ -0,0 +1,476 @@
+#
+# spec file for package tdeadmin (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeadmin
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%define tde_sbindir %{tde_prefix}/sbin
+%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_sbindir %{tde_prefix}/sbin
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Summary:	Administrative tools for TDE
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:		System/GUI/Other
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		kuser.pam
+Source2:		kuser.pamd
+Source5:		kpackagerc
+Source6:		ksysvrc
+Source7:		kuserrc
+
+Obsoletes:		trinity-kdeadmin < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeadmin = %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	libtool
+BuildRequires:	fdupes
+BuildRequires:	gcc-c++
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# RPM support
+BuildRequires: rpm-devel
+
+# PAM support
+BuildRequires: pam-devel
+
+# LILO support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+#define with_lilo 1
+%endif
+%if 0%{?with_lilo}
+BuildRequires:	lilo
+%endif
+
+Requires: trinity-kcron = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdat = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knetworkconf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpackage = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksysv = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kuser = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_lilo}
+Requires: trinity-lilo-config = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: trinity-lilo-config < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+# CONSOLEHELPER (usermode) support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_consolehelper 1
+
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
+%endif
+
+%description
+The tdeadmin package includes administrative tools for the Trinity Desktop
+Environment (TDE) including:
+kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
+
+%files
+%defattr(-,root,root,-)
+
+##########
+
+%package -n trinity-kcron
+Summary:	The Trinity crontab editor
+Group:		System/GUI/Other
+
+%description -n trinity-kcron
+KCron is an application for scheduling programs to run in the background.
+It is a graphical user interface to cron, the UNIX system scheduler.
+
+%files -n trinity-kcron
+%defattr(-,root,root,-)
+%{tde_bindir}/kcron
+%{tde_tdeappdir}/kcron.desktop
+%{tde_datadir}/apps/kcron/
+%{tde_datadir}/icons/hicolor/*/apps/kcron.png
+%{tde_tdedocdir}/HTML/en/kcron/
+
+##########
+
+%package -n trinity-kdat
+Summary:	A Trinity tape backup tool
+Group:		System/GUI/Other
+
+%description -n trinity-kdat
+KDat is a tar-based tape archiver. It is designed to work with multiple
+archives on a single tape.
+
+Main features are:
+* Simple graphical interface to local filesystem and tape contents.
+* Multiple archives on the same physical tape.
+* Complete index of archives and files is stored on local hard disk.
+* Selective restore of files from an archive.
+* Backup profiles for frequently used backups.
+
+%files -n trinity-kdat
+%defattr(-,root,root,-)
+%doc rpmdocs/kdat/*
+%{tde_bindir}/kdat
+%{tde_tdeappdir}/kdat.desktop
+%{tde_datadir}/apps/kdat/
+%{tde_datadir}/icons/hicolor/*/apps/kdat.png
+%{tde_datadir}/icons/locolor/*/apps/kdat.png
+%{tde_tdedocdir}/HTML/en/kdat/
+
+##########
+
+%package kfile-plugins
+Summary:	Trinity file metainfo plugins for deb and rpm files
+Group:		System/GUI/Other
+
+%description kfile-plugins
+This package contains the Trinity File metainfo plugins for deb and rpm
+package files.
+
+%files kfile-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/tdefile_deb.la
+%{tde_tdelibdir}/tdefile_deb.so
+%{tde_tdelibdir}/tdefile_rpm.la
+%{tde_tdelibdir}/tdefile_rpm.so
+%{tde_datadir}/services/tdefile_deb.desktop
+%{tde_datadir}/services/tdefile_rpm.desktop
+
+##########
+
+%package -n trinity-knetworkconf
+Summary:	Trinity network configuration tool
+Group:		System/GUI/Other
+
+%description -n trinity-knetworkconf
+This is a TDE control center module to configure TCP/IP settings.  It
+can be used to manage network devices and settings for each device.
+
+%files -n trinity-knetworkconf
+%defattr(-,root,root,-)
+%doc rpmdocs/knetworkconf/*
+%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png
+%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png
+%{tde_datadir}/apps/knetworkconf/
+%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop
+%{tde_tdelibdir}/kcm_knetworkconfmodule.so
+%{tde_tdelibdir}/kcm_knetworkconfmodule.la
+%{tde_tdedocdir}/HTML/en/knetworkconf/
+
+##########
+
+%package -n trinity-kpackage
+Summary:	Trinity package management tool
+Group:		System/GUI/Other
+
+%description -n trinity-kpackage
+This is a frontend to both .rpm and .deb package formats. It allows you
+to view currently installed packages, browse available packages, and
+install/remove them.
+
+%files -n trinity-kpackage
+%defattr(-,root,root,-)
+%doc rpmdocs/kpackage/*
+%{tde_bindir}/kpackage
+%{tde_tdeappdir}/kpackage.desktop
+%{tde_datadir}/apps/kpackage/
+%config(noreplace) %{tde_confdir}/kpackagerc
+%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
+%{tde_tdedocdir}/HTML/en/kpackage/
+
+##########
+
+%package -n trinity-ksysv
+Summary:	Trinity SysV-style init configuration editor
+Group:		System/GUI/Other
+
+%description -n trinity-ksysv
+This program allows you to edit your start and stop scripts using a
+drag and drop GUI.
+
+%files -n trinity-ksysv
+%defattr(-,root,root,-)
+%doc rpmdocs/ksysv/*
+%{tde_bindir}/ksysv
+%{tde_tdeappdir}/ksysv.desktop
+%{tde_datadir}/apps/ksysv/
+%config(noreplace) %{tde_confdir}/ksysvrc
+%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
+%{tde_datadir}/mimelnk/application/x-ksysv.desktop
+%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
+%{tde_tdedocdir}/HTML/en/ksysv/
+
+##########
+
+%package -n trinity-kuser
+Summary:	Trinity user/group administration tool
+Group:		System/GUI/Other
+
+%if 0%{?with_consolehelper}
+# package 'usermode' provides '/usr/bin/consolehelper-gtk'
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	usermode-gtk
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	usermode
+%endif
+%endif
+
+%description -n trinity-kuser
+A user/group administration tool for TDE.
+
+%files -n trinity-kuser
+%defattr(-,root,root,-)
+%doc rpmdocs/kuser/*
+%{tde_bindir}/kuser
+%{tde_tdeappdir}/kuser.desktop
+%{tde_datadir}/apps/kuser/
+%config(noreplace) %{tde_confdir}/kuserrc
+%{tde_datadir}/config.kcfg/kuser.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kuser.png
+%{tde_tdedocdir}/HTML/en/kuser/
+
+%if 0%{?with_consolehelper}
+%{tde_sbindir}/kuser
+%{_sbindir}/kuser
+%config(noreplace) /etc/pam.d/kuser
+%config(noreplace) /etc/security/console.apps/kuser
+%endif
+
+##########
+
+%if 0%{?with_lilo}
+%package -n trinity-lilo-config
+Summary:	Trinity frontend for lilo configuration
+Group:		System/GUI/Other
+Requires:	trinity-kcontrol
+Requires:	trinity-tdebase-bin
+#Requires:	lilo
+
+%description -n trinity-lilo-config
+lilo-config is a TDE based frontend to the lilo boot manager configuration.
+It runs out of the Trinity Control Center.
+
+If you want to use the menu entry to launch lilo-config, you need to install
+tdebase-bin since it uses the tdesu command to gain root privileges.
+
+%files -n trinity-lilo-config
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_lilo.la
+%{tde_tdelibdir}/kcm_lilo.so
+%{tde_tdeappdir}/lilo.desktop
+%{tde_tdedocdir}/HTML/en/lilo-config/
+
+%post -n trinity-lilo-config
+touch /etc/lilo.conf
+%endif
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTLIB QTINC
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_KCRON=ON \
+  -DBUILD_KDAT=ON \
+  -DBUILD_KNETWORKCONF=ON \
+  -DBUILD_KPACKAGE=ON \
+  -DBUILD_KSYSV=ON \
+  -DBUILD_KUSER=ON \
+  -DBUILD_LILO_CONFIG=ON \
+  -DBUILD_SECPOLICY=ON \
+  -DBUILD_TDEFILE_PLUGINS=ON \
+  \
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+  -DKU_FIRSTUID="1000" \
+  -DKU_FIRSTGID="1000" \
+%endif
+  -DKU_USERPRIVATEGROUP=false \
+  -DKU_HOMEDIR_PERM="0700" \
+  -DKU_HOMETEMPLATE="/home/%U" \
+  -DKU_MAILBOX_GID="0" \
+  -DKU_MAILBOX_PERM="0660" \
+  \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+comps="kcron kdat knetworkconf kpackage ksysv kuser"
+%__mkdir_p	%{buildroot}%{tde_datadir}/config \
+			%{buildroot}%{_sysconfdir}/security/console.apps \
+			%{buildroot}%{_sysconfdir}/pam.d \
+			%{buildroot}%{tde_sbindir} \
+			%{buildroot}%{_sbindir}
+
+%__mkdir_p "%{buildroot}%{tde_confdir}/"
+%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} "%{buildroot}%{tde_confdir}/"
+
+%if 0%{?with_consolehelper}
+# Run kuser through consolehelper
+%__install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/security/console.apps/kuser
+%__install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/kuser
+%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
+%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kuser
+%if "%{tde_prefix}" != "/usr"
+%__ln_s %{tde_sbindir}/kuser %{?buildroot}%{_sbindir}/kuser
+%endif
+%endif
+
+# rpmdocs
+for dir in $comps ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+# The following files are not installed in any binary package.
+# This is deliberate.
+
+# - This file serves no purpose that we can see, and conflicts
+#   with GNOME system tools, so be sure to leave it out.
+%__rm -f %{?buildroot}%{tde_libdir}/pkgconfig/*.pc
+
+# Extract from changelog:
+# tdeadmin (4:3.5.5-2) unstable; urgency=low
+#  +++ Changes by Ana Beatriz Guerrero Lopez:
+#  * Removed useless program secpolicy. (Closes: #399426)
+%__rm -f %{?buildroot}%{tde_bindir}/secpolicy
+
+# Remove lilo related files, if unwanted.
+%if 0%{?with_lilo} == 0
+%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/lilo-config/
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.la
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.so
+%__rm -f %{?buildroot}%{tde_tdeappdir}/lilo.desktop
+%endif
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kdat     System Backup
+%suse_update_desktop_file kpackage System PackageManager
+%suse_update_desktop_file kcron    System ServiceConfiguration
+%suse_update_desktop_file ksysv    System ServiceConfiguration
+%suse_update_desktop_file kuser    System SystemSetup
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec
new file mode 100644
index 000000000..84be28d21
--- /dev/null
+++ b/redhat/core/tdeartwork/tdeartwork.spec
@@ -0,0 +1,804 @@
+#
+# spec file for package tdeartwork (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeartwork
+%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_sbindir %{tde_prefix}/sbin
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Summary:	Additional artwork (themes, sound themes, ...) for TDE
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:		System/GUI/Other
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+
+Obsoletes:	trinity-kdeartwork < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeartwork = %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	fdupes
+
+BuildRequires:	gettext
+BuildRequires:	libidn-devel
+
+# ESOUND support
+BuildRequires:	esound-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-Mesa-libGLU
+%endif
+
+# LIBART support
+%define with_libart 1
+BuildRequires:	libart_lgpl-devel
+
+# XSCREENSAVER support
+#  RHEL 4: disabled
+#  RHEL 6: available in EPEL
+#  RHEL 7: available in NUX
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+BuildRequires:	xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires:	xscreensaver-extras-base
+%endif
+BuildRequires:	xscreensaver-gl-base
+BuildRequires:	xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-data
+BuildRequires:	xscreensaver-data-extra
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xscrnsaver-devel
+%else
+BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
+BuildRequires:	xscreensaver-extrusion
+%endif
+BuildRequires:	xscreensaver-gl
+%endif
+
+# Opensuse <= 13.10 does not provide 'webcollage' screensaver
+%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1320
+%define with_webcollage 1
+%endif
+
+%endif
+
+# JACK support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%define with_jack 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define jack_devel %{_lib}jack-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+%define jack_devel jack-audio-connection-kit-devel
+%endif
+%if 0%{?suse_version}
+%define jack_devel libjack-devel
+%endif
+BuildRequires:	%{jack_devel}
+%endif
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+# Metapackage
+Requires: %{name}-emoticons = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-style = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-theme-icon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-theme-window = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdewallpapers = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdescreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if 0%{?with_xscreensaver}
+Requires: trinity-tdescreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdescreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_webcollage}
+Requires: trinity-tdescreensaver-xsavers-webcollage = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
+
+
+%description
+TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
+desktop environment for Unix workstations. It combines ease of use,
+contemporary functionality, and outstanding graphical design with the
+technological superiority of the Unix operating system.
+
+This metapackage includes a collection of artistic extras (themes, widget
+styles, screen savers, wallpaper, icons, emoticons and so on) provided
+with the official release of TDE.
+
+
+%files
+
+##########
+
+%package emoticons
+Summary:	Emoticon collections for tDE chat clients
+Group:		System/GUI/Other
+
+%description emoticons
+This package contains several collections of emoticons used by official
+and unofficial TDE chat clients, such as Kopete and Konversation.
+
+This package is part of TDE, and a component of the TDE artwork module.
+
+%files emoticons
+%defattr(-,root,root,-)
+%{tde_datadir}/emoticons/
+
+##########
+
+%package misc
+Summary:	Various multimedia goodies released with TDE
+Group:		System/GUI/Other
+
+%description misc
+This package contains miscellaneous multimedia goodies for TDE.
+Included are additional TDE sounds and kworldclock themes.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files misc
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kworldclock/
+%{tde_datadir}/sounds/KDE_Logout_new.wav
+%{tde_datadir}/sounds/KDE_Startup_new.wav
+
+##########
+
+%package style
+Summary:	Widget styles released with Trinity
+Group:		System/GUI/Other
+
+%description style
+This package contains additional widget styles for Trinity. Widget styles
+can be used to customise the look and feel of interface components such
+as buttons, scrollbars and so on.  They can be applied using the style
+manager in the Trinity Control Center.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files style
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/plugins/styles/
+%{tde_tdelibdir}/tdestyle_phase_config.la
+%{tde_tdelibdir}/tdestyle_phase_config.so
+%{tde_datadir}/apps/tdestyle/
+
+##########
+
+%package theme-icon
+Summary:	Icon themes released with Trinity
+Group:		System/GUI/Other
+
+Obsoletes:	trinity-kdeartwork-icons < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeartwork-icons = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description theme-icon
+This package contains additional icon themes for Trinity. Icon themes can be
+used to customise the appearance of standard icons throughout TDE. They
+can be applied using the icon manager in the Trinity Control Centre.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files theme-icon
+%defattr(-,root,root,-)
+%{tde_datadir}/icons/ikons/
+%{tde_datadir}/icons/kdeclassic/
+%{tde_datadir}/icons/kids/
+%{tde_datadir}/icons/slick/
+%{tde_datadir}/icons/locolor/index.theme
+%{tde_datadir}/icons/locolor/*/*/*.png
+
+##########
+
+%package theme-window
+Summary:	Window decoration themes released with Trinity
+Group:		System/GUI/Other
+
+%description theme-window
+This package contains additional window decoration themes for Trinity. Window
+decoration themes can be used to customise the look of window borders and
+buttons, and can be applied using the window decoration manager in the Trinity
+Control Center.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files theme-window
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/twin*
+%{tde_datadir}/apps/twin/
+
+##########
+
+%package -n trinity-tdewallpapers
+Summary:	Wallpapers released with Trinity
+Group:		System/GUI/Other
+Obsoletes:	trinity-kdewallpapers < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdewallpapers = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdewallpapers
+This package contains additional wallpapers for Trinity. Wallpapers can be
+applied using the background manager in the Trinity Control Center.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-tdewallpapers
+%defattr(-,root,root,-)
+%{tde_datadir}/wallpapers/*
+
+##########
+
+%package -n trinity-tdescreensaver
+Summary:	Additional screen savers released with Trinity
+Group:		System/GUI/Other
+
+Obsoletes:	trinity-kscreensaver < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdescreensaver
+This package contains the screen savers for Trinity. They can be tested and
+selected within the Appearance and Themes section of the Trinity Control
+Center.
+
+The hooks for the standard xscreensavers are no longer part of this
+package. To select and/or configure the standard xscreensavers through
+the Trinity Control Center, install the separate package tdescreensaver-xsavers.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-tdescreensaver
+%defattr(-,root,root,-)
+%{tde_bindir}/kslideshow.kss
+%{tde_bindir}/kpolygon.kss
+%{tde_bindir}/krotation.kss
+%{tde_bindir}/ksolarwinds.kss
+%{tde_bindir}/klorenz.kss
+%{tde_bindir}/kvm.kss
+%{tde_bindir}/kflux.kss
+%{tde_bindir}/kscience.kss
+%{tde_bindir}/kbanner.kss
+%{tde_bindir}/kclock.kss
+%{tde_bindir}/kfiresaver.kss
+%{tde_bindir}/keuphoria.kss
+%{tde_bindir}/kfountain.kss
+%{tde_bindir}/kgravity.kss
+%{tde_bindir}/tdepartsaver.kss
+%{tde_bindir}/kpendulum.kss
+%{tde_bindir}/kblob.kss
+%{tde_bindir}/klines.kss
+%{tde_bindir}/kwave.kss
+%{tde_bindir}/tdeasciiquarium.kss
+%{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop
+%{tde_datadir}/apps/kfiresaver/
+%{tde_datadir}/apps/tdescreensaver/
+%{tde_mandir}/man1/kbanner.kss.1*
+%{tde_mandir}/man1/kblob.kss.1*
+%{tde_mandir}/man1/kclock.kss.1*
+%{tde_mandir}/man1/keuphoria.kss.1
+%{tde_mandir}/man1/kfiresaver.kss.1
+%{tde_mandir}/man1/kflux.kss.1
+%{tde_mandir}/man1/kfountain.kss.1
+%{tde_mandir}/man1/kgravity.kss.1
+%{tde_mandir}/man1/klines.kss.1
+%{tde_mandir}/man1/klorenz.kss.1
+%{tde_mandir}/man1/kpendulum.kss.1
+%{tde_mandir}/man1/kpolygon.kss.1
+%{tde_mandir}/man1/krotation.kss.1
+%{tde_mandir}/man1/kscience.kss.1
+%{tde_mandir}/man1/kslideshow.kss.1
+%{tde_mandir}/man1/ksolarwinds.kss.1
+%{tde_mandir}/man1/kvm.kss.1
+%{tde_mandir}/man1/kwave.kss.1
+%{tde_mandir}/man1/tdeasciiquarium.kss.1
+%{tde_mandir}/man1/tdepartsaver.kss.1
+
+%if 0%{?with_xscreensaver}
+%{tde_bindir}/kspace.kss
+%{tde_bindir}/kswarm.kss
+%{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
+%{tde_mandir}/man1/kspace.kss.1
+%{tde_mandir}/man1/kswarm.kss.1
+%endif
+
+##########
+
+%if 0%{?with_xscreensaver}
+
+%package -n trinity-tdescreensaver-xsavers
+Summary:	Trinity hooks for standard xscreensavers
+Group:		System/GUI/Other
+Requires:	trinity-tdebase-bin >= %{tde_version}
+Requires:	xscreensaver
+
+Obsoletes:	trinity-kscreensaver-xsavers < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kscreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdescreensaver-xsavers
+This package allows a smooth integration of the standard xscreensavers
+into Trinity. With this package installed you can select and/or configure
+the standard xscreensavers through the Appearances and Themes section of
+the Trinity Control Centre.
+
+Note that this package does not actually contain any screensavers itself.
+For the additional screensavers shipped with Trinity, see the separate package
+tdescreensaver-trinity. This package does depend on the xscreensaver package, and
+recommend the xscreensaver-gl package, as well as contain the necessary
+files to integrate these packages into Trinity.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-tdescreensaver-xsavers
+%defattr(-,root,root,-)
+%{tde_bindir}/xscreensaver-getimage-file
+%{tde_bindir}/xscreensaver-getimage
+%{tde_bindir}/kxsconfig
+%{tde_bindir}/kxsrun
+%{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
+%endif
+%if 0%{?rhel} == 5
+%{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/critical.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/flag.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/forest.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/laser.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/vines.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
+%endif
+%{tde_mandir}/man1/kxsconfig.1
+%{tde_mandir}/man1/kxsrun.1
+
+%endif
+
+##########
+
+%if 0%{?with_webcollage}
+
+%package -n trinity-tdescreensaver-xsavers-webcollage
+Summary:	Webcollage screensaver Trinity hook
+Group:		System/GUI/Other
+Requires:	trinity-tdescreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	netpbm
+
+Obsoletes:	trinity-kscreensaver-xsavers-webcollage < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kscreensaver-xsavers-webcollage = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdescreensaver-xsavers-webcollage
+This package give access to the webcollage screensaver through the Trinity
+screensaver configuration.
+
+This screensaver downloads random pictures from the internet and creates
+a collage as screensaver.
+
+IMPORTANT NOTICE: The internet contains all kinds of pictures, some of which
+you might find inappropriate and offensive.
+You are specially discouraged to install this package if you are using 
+your computer in a working environment or in an environment with children.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-tdescreensaver-xsavers-webcollage
+%defattr(-,root,root,-)
+%{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
+
+%endif
+
+##########
+
+%package -n trinity-tdescreensaver-xsavers-extra
+Summary:	Trinity hooks for standard xscreensavers
+Group:		System/GUI/Other
+Requires:	trinity-tdescreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kscreensaver-xsavers-extra < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kscreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdescreensaver-xsavers-extra
+This package allows a smooth integration of the universe xscreensavers
+into Trinity. With this package installed you can select and/or configure
+the universe xscreensavers through the Appearances and Themes section of
+the Trinity Control Centre.
+
+Note that this package does not actually contain any screensavers itself.
+For the additional screensavers shipped with TDE, see the separate package
+tdescreensaver.
+
+This package is part of Trinity, and a component of the TDE artwork module.
+
+%files -n trinity-tdescreensaver-xsavers-extra
+%defattr(-,root,root,-)
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
+%endif
+%if 0%{?rhel} == 5
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/critical.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flag.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/forest.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/laser.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/vines.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
+%endif
+
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop
+
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
+
+%{tde_datadir}/applnk/System/ScreenSavers/*.desktop
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+# http://www.trinitydesktop.org/wiki/bin/view/Developers/HowToBuild
+# NOTE: Before building tdeartwork, install any and all xhack screensavers that might be uses, then:
+cd tdescreensaver/kxsconfig/
+./update_hacks.sh
+
+
+%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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
+  %{!?with_libart}:-DWITH_LIBART=OFF} \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_ARTS=ON \
+  -DWITH_LIBART=ON \
+  -DWITH_OPENGL=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf "%{buildroot}"
+%__make install -C build DESTDIR="%{buildroot}"
+
+# Should not be here if xscreensaver is disabled
+%if 0%{?with_xscreensaver} == 0
+%__rm -f "%{?buildroot}%{tde_bindir}/xscreensaver-getimage"
+%__rm -f "%{?buildroot}%{tde_bindir}/xscreensaver-getimage-file"
+%endif
+
+# Duplicate with trinity-kbabel (from tdesdk)
+%__rm -f "%{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png"
+%__rm -f "%{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png"
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+# Fix invalid permissions
+%if 0%{?with_xscreensaver}
+chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage"
+chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage-file"
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdebase/mgabutton.svg b/redhat/core/tdebase/mgabutton.svg
index 5897323c5..5897323c5 100644
--- a/redhat/main/tdebase/mgabutton.svg
+++ b/redhat/core/tdebase/mgabutton.svg
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el5 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el5
index 56939d5a9..56939d5a9 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el5
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el5
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el6 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el6
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el6
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el7 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el7
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el7
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el7
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el8
index dab729b22..dab729b22 120000
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el8
diff --git a/redhat/core/tdebase/pamd.kcheckpass-trinity.el9 b/redhat/core/tdebase/pamd.kcheckpass-trinity.el9
new file mode 120000
index 000000000..dab729b22
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.el9
@@ -0,0 +1 @@
+pamd.kcheckpass-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc34 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc34
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc34
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc35
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc36
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc32 b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc37
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc32
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mdv2011.0
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8 b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga8
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.mga8
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.opensuse1220 b/redhat/core/tdebase/pamd.kcheckpass-trinity.opensuse1220
index c6a7c9c90..c6a7c9c90 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.opensuse1220
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.opensuse1220
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos
index ad0fc6da6..ad0fc6da6 120000
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2012
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2013
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2014
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2015
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2016
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2016
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2017
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2017
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018 b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2018
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kcheckpass-trinity.pclos2018
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el5 b/redhat/core/tdebase/pamd.kdm-trinity-np.el5
index 8dc8ef34d..8dc8ef34d 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el5
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el5
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el6 b/redhat/core/tdebase/pamd.kdm-trinity-np.el6
index c3f7172de..c3f7172de 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el6
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el6
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el7 b/redhat/core/tdebase/pamd.kdm-trinity-np.el7
index c3f7172de..c3f7172de 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el7
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el7
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el8 b/redhat/core/tdebase/pamd.kdm-trinity-np.el8
index 3415e7d55..3415e7d55 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el8
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el8
diff --git a/redhat/core/tdebase/pamd.kdm-trinity-np.el9 b/redhat/core/tdebase/pamd.kdm-trinity-np.el9
new file mode 120000
index 000000000..3415e7d55
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.el9
@@ -0,0 +1 @@
+pamd.kdm-trinity-np.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc34 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc34
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc34
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc34
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc35
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc30
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc35
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc31 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc36
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc31
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc36
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc32 b/redhat/core/tdebase/pamd.kdm-trinity-np.fc37
index 0616e66f6..0616e66f6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc32
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.fc37
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mdv2011.0 b/redhat/core/tdebase/pamd.kdm-trinity-np.mdv2011.0
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga8 b/redhat/core/tdebase/pamd.kdm-trinity-np.mga8
index f884c1de6..f884c1de6 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga8
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.mga8
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos
index 5cde6e2c5..5cde6e2c5 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2012
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2012
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2013
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2013
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2014
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2014
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2015
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2015
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2016
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2016
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2016
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2017
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2017
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2017
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018 b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2018
index 690b4df08..690b4df08 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2018
+++ b/redhat/core/tdebase/pamd.kdm-trinity-np.pclos2018
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el5 b/redhat/core/tdebase/pamd.kdm-trinity.el5
index 30a26ae99..30a26ae99 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.el5
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el5
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el6 b/redhat/core/tdebase/pamd.kdm-trinity.el6
index 14f4aa748..14f4aa748 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.el6
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el7 b/redhat/core/tdebase/pamd.kdm-trinity.el7
index 14f4aa748..14f4aa748 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.el7
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el7
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el8 b/redhat/core/tdebase/pamd.kdm-trinity.el8
index f85413ec6..f85413ec6 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity.el8
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el8
diff --git a/redhat/core/tdebase/pamd.kdm-trinity.el9 b/redhat/core/tdebase/pamd.kdm-trinity.el9
new file mode 120000
index 000000000..f85413ec6
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kdm-trinity.el9
@@ -0,0 +1 @@
+pamd.kdm-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc34 b/redhat/core/tdebase/pamd.kdm-trinity.fc34
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc34
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc30 b/redhat/core/tdebase/pamd.kdm-trinity.fc35
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc30
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc31 b/redhat/core/tdebase/pamd.kdm-trinity.fc36
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc31
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc32 b/redhat/core/tdebase/pamd.kdm-trinity.fc37
index 4e760760f..4e760760f 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc32
+++ b/redhat/core/tdebase/pamd.kdm-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kdm-trinity.mdv2011.0
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kdm-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga8 b/redhat/core/tdebase/pamd.kdm-trinity.mga8
index cb0982c9a..cb0982c9a 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kdm-trinity.mga8
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos b/redhat/core/tdebase/pamd.kdm-trinity.pclos
index fcc6957f7..fcc6957f7 120000
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2012 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2012
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2013 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2013
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2014 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2014
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2015
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2016 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2016
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2016
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2017 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2017
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2017
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2018 b/redhat/core/tdebase/pamd.kdm-trinity.pclos2018
index 87d080f58..87d080f58 100644
--- a/redhat/main/tdebase/pamd.kdm-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kdm-trinity.pclos2018
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el5 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el5
index 56939d5a9..56939d5a9 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el5
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el5
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el6 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el6
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el6
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el6
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el7 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el7
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el7
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el7
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el8
index a5fab9e3e..a5fab9e3e 120000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el8
diff --git a/redhat/core/tdebase/pamd.kscreensaver-trinity.el9 b/redhat/core/tdebase/pamd.kscreensaver-trinity.el9
new file mode 120000
index 000000000..a5fab9e3e
--- /dev/null
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.el9
@@ -0,0 +1 @@
+pamd.kscreensaver-trinity.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc34 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc34
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc34
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc34
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc33 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc35
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc33
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc35
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc36
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga5
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc36
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6 b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc37
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga6
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.fc37
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mdv2011.0 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mdv2011.0
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mdv2011.0
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mdv2011.0
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8 b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga8
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga8
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.mga8
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos
index 31d43e302..31d43e302 120000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2012
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2012
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2013
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2013
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2014
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2014
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2015
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2015
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2016
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2016
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2016
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2017
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2017
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018 b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018
index 0a37e6e13..0a37e6e13 100644
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2018
+++ b/redhat/core/tdebase/pamd.kscreensaver-trinity.pclos2018
diff --git a/redhat/main/tdebase/suse-displaymanagers-tdm b/redhat/core/tdebase/suse-displaymanagers-tdm
index 5bf0eb4ef..5bf0eb4ef 100644
--- a/redhat/main/tdebase/suse-displaymanagers-tdm
+++ b/redhat/core/tdebase/suse-displaymanagers-tdm
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
new file mode 100644
index 000000000..20d2c036d
--- /dev/null
+++ b/redhat/core/tdebase/tdebase.spec
@@ -0,0 +1,3578 @@
+#
+# spec file for package tdebase (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdebase
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define tdm tdm
+%define tdm_datadir %{tde_datadir}/apps/%{tdm}
+%define starttde starttde
+
+
+Name:			trinity-%{tde_pkg}
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Trinity Base Programs
+Group:			System/GUI/Other
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:		GPL-2.0+
+%else
+License:		GPLv2+
+%endif
+
+#Vendor:			Trinity Desktop
+#Packager:		Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+# Pam configuration files for RHEL / Fedora
+%if 0%{?suse_version} == 0
+Source2:		pamd.kdm-trinity%{?dist}
+Source3:		pamd.kdm-trinity-np%{?dist}
+Source4:		pamd.kcheckpass-trinity%{?dist}
+Source5:		pamd.kscreensaver-trinity%{?dist}
+%endif
+
+# openSUSE: configuration file for TDM
+%if 0%{?suse_version} >= 1210
+Source6:		suse-displaymanagers-tdm
+%endif
+
+# Fedora 18: use SYSTEMD for TDM startup
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+Source7:		tdm.service%{?dist}
+%endif
+
+# openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
+%if 0%{?suse_version} == 1140
+Source7:		xdm%{?dist}
+%endif
+
+# Fedora >= 17: special selinux policy required for TDM
+#  If login through TDM takes ages, then look at '/var/log/audit/audit.log'.
+#  Locate the line containing 'USER_AVC' and dbus stuff.
+#  Put this line into a temporary file, then (e.g for Fedora 17):
+#   audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te
+#   audit2allow -i /tmp/file -M tdm.fc17
+
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
+%define with_selinux_policy 1
+Source8:	tdm%{?dist}.te
+%endif
+
+%if 0%{?mgaversion} >= 3
+Source9:	mgabutton.svg
+%endif
+
+Obsoletes:	trinity-kdebase < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebase = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebase-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebase-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+### Distribution-specific settings ###
+
+# Fedora Theme
+%if 0%{?fedora}
+Requires:	f%{?fedora}-backgrounds-base
+%define tde_bg /usr/share/backgrounds/f%{?fedora}/default/standard/%{?fedora}.png
+Requires:	fedora-logos
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
+%endif
+
+# RHEL 4 Theme
+%if 0%{?rhel} == 4
+Requires:	desktop-backgrounds-basic
+%define tde_bg /usr/share/backgrounds/images/default.png
+Requires:	redhat-logos
+%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
+%endif
+
+# RHEL 5 Theme
+%if 0%{?rhel} == 5
+Requires:	desktop-backgrounds-basic
+%define tde_bg /usr/share/backgrounds/images/default.jpg
+%define tde_starticon /usr/share/pixmaps/redhat-starthere.png
+%endif
+
+# RHEL 6 Theme
+%if 0%{?rhel} == 6
+Requires:	redhat-logos
+%define tde_bg /usr/share/backgrounds/default.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+%endif
+
+# RHEL 7 Theme
+%if 0%{?rhel} == 7
+Requires:	redhat-logos
+%define tde_bg /usr/share/backgrounds/day.jpg
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+%endif
+
+# RHEL 8 Theme
+%if 0%{?rhel} == 8
+Requires:	redhat-logos
+%define tde_bg /usr/share/backgrounds/c8/default/normalish/c8.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+%endif
+
+# RHEL 9 Theme
+%if 0%{?rhel} == 9
+#Requires:	redhat-backgrounds
+Requires:	redhat-logos
+%define tde_bg /usr/share/backgrounds/rocky-default-9-abstract-1-day.png
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+%endif
+
+# Mageia Theme
+%if 0%{?mgaversion}
+Requires:	mageia-theme-Default
+%define tde_bg /usr/share/mga/backgrounds/default.jpg
+%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
+%endif
+
+# Mandriva 2011 Theme: "rosa"
+%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
+Requires:	mandriva-theme
+%define tde_bg /usr/share/mdk/backgrounds/default.jpg
+%define tde_starticon /usr/share/icons/mandriva.png
+%endif
+
+# PCLINUXOS
+%if 0%{?pclinuxos}
+Requires:	desktop-common-data
+%define tde_starticon /usr/share/icons/pclinuxos.png
+%endif
+
+# OpenSuse 15.x Theme
+%if "%{?suse_version}" == "1500"
+Requires:	wallpaper-branding
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
+# OpenSuse TW Theme
+%if "%{?suse_version}" == "1550"
+Requires:	wallpaper-branding
+%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
+Requires:	hicolor-icon-theme-branding
+%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
+%endif
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	make
+BuildRequires:	fdupes
+
+# HTDIG support
+BuildRequires:	htdig
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# AUDIOFILE support
+BuildRequires:	audiofile-devel
+
+# ALSA supportl
+BuildRequires:	alsa-lib-devel
+
+# RAW1394 support
+BuildRequires:	libraw1394-devel
+
+# VORBIS support
+BuildRequires:	libvorbis-devel
+
+# GLIB2 support
+BuildRequires:	glib2-devel
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# SASL support
+%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+BuildRequires:	%{_lib}sasl2-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	cyrus-sasl-devel
+%endif
+
+# PAM support
+BuildRequires:	pam-devel
+
+# LIBUSB support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+BuildRequires:	%{_lib}usb1.0-devel
+BuildRequires:	%{_lib}usb-compat0.1-devel
+%else
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
+BuildRequires:	libusb-devel
+%endif
+%endif
+
+# ESOUND support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_esound 1
+BuildRequires:	esound-devel
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} && 0%{?rhel} <= 8 || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	openldap-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	openldap2-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires:	openldap24-libs-devel
+%endif
+
+# SENSORS support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel}
+BuildRequires:	lm_sensors-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libsensors4-devel
+%endif
+
+# TSAK support (requires libudev-devel)
+#  On RHEL5, udev is built statically, so TSAK cannot build.
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?suse_version} >= 1310
+BuildRequires:	udev
+%endif
+BuildRequires:	libudev-devel
+%define with_tsak 1
+%define with_tdehwlib 1
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# XRANDR support
+#  On RHEL5, xrandr library is too old.
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%define with_xrandr 1
+%endif
+
+# XTEST support
+#  On RHEL4, xtest library is too old.
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_xtest 1
+%endif
+
+# HAL support
+# Only for RHEL5
+%if 0%{?rhel} == 5
+%define with_hal 1
+BuildRequires:	hal-devel >= 0.5
+%endif
+
+# OPENEXR support
+#  Disabled on RHEL4
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_exr 1
+BuildRequires:	OpenEXR-devel
+%endif
+
+# XSCREENSAVER support
+#  RHEL 4: disabled
+#  RHEL 5: available in centos-extras
+#  RHEL 6: available in EPEL
+#  RHEL 7: available in NUX
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+BuildRequires:	xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires:	xscreensaver-extras-base
+%endif
+BuildRequires:	xscreensaver-gl-base
+BuildRequires:	xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-data
+BuildRequires:	xscreensaver-data-extra
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xscrnsaver-devel
+%else
+BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
+BuildRequires:	xscreensaver-extrusion
+%endif
+BuildRequires:	xscreensaver-gl
+%endif
+%endif
+
+# AVAHI support
+#  Disabled on RHEL4 and RHEL5
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+BuildRequires:	libavahi-tqt-devel
+%endif
+
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+
+# DBUS support
+#  TQT bindings not available for RHEL4
+%if 0%{?rhel} == 4
+# Dbus bindings were rebuilt with Qt support
+BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
+Requires:		dbus-qt >= 0.22-12.EL.9p1
+%else
+BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
+BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
+Requires:		libdbus-tqt-1-0 >= %{tde_epoch}:0.63
+%endif
+
+%if 0%{?fedora} >= 17
+BuildRequires:	perl-Digest-MD5
+%endif
+
+# LIBART_LGPL support
+%define with_libart 1
+BuildRequires:	libart_lgpl-devel
+
+# SAMBA support
+%if 0%{?rhel} == 4
+BuildRequires:	samba-common
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+BuildRequires:	libsmbclient-devel
+%endif
+
+# IMAKE
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
+BuildRequires:	imake
+%endif
+
+# XKB support
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libxkbfile-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
+BuildRequires:	libxkbfile-devel
+%endif
+
+# XDMCP support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xdmcp-devel
+%else
+BuildRequires:	%{_lib}xdmcp%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXdmcp-devel
+%endif
+
+# XTST support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+%define xtst_devel %{_lib}xtst-devel
+%else
+%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+%define xtst_devel libXtst-devel
+%endif
+%{?xtst_devel:BuildRequires: %{xtst_devel}}
+
+# XDAMAGE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xdamage-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXdamage-devel
+%endif
+
+# Requires 'usb.ids'
+BuildRequires:	usbutils
+
+# LIBFONTENC support
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libfontenc-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
+BuildRequires:	libfontenc-devel
+%endif
+
+# Other X11 stuff ...
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	x11-font-util
+BuildRequires:	x11-proto-devel
+%endif
+
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	xorg-x11-proto-devel
+%endif
+
+%if ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?fedora}
+BuildRequires:	xorg-x11-font-utils
+%endif
+
+%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
+BuildRequires:	font-util
+%endif
+
+%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34 || 0%{?rhel} >= 9
+BuildRequires:	bdftopcf
+%endif
+
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	drakconf
+%endif
+
+# LIBCONFIG support
+# Needed for "compton" stuff
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
+%define with_libconfig 1
+BuildRequires:	libconfig-devel
+%endif
+
+# KBDLEDSYNC support
+%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
+%define with_kbdledsync 1
+%endif
+
+# TDERANDR support
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_tderandrtray 1
+%endif
+
+# ELFICON support
+%if 0
+%define with_elficon 1
+BuildRequires:		libr-devel >= 0.6.0
+%endif
+
+# RPC support
+%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 || 0%{?pclinuxos}
+BuildRequires:		libtirpc-devel
+BuildRequires:		rpcgen
+%if 0%{?fedora}
+BuildRequires:		libnsl2-devel
+%else
+BuildRequires:		libnsl-devel
+%endif
+%endif
+
+# ATTR support
+BuildRequires:	libattr-devel
+
+# SELINUX support
+%if 0%{?rhel} >= 6 || 0%{?fedora}
+BuildRequires:	checkpolicy
+BuildRequires:	selinux-policy-devel
+%endif
+
+# LIBSSH support
+%if 0%{?rhel} == 6
+%define with_libssh 0
+%else
+%define with_libssh 1
+%endif
+%if 0%{?with_libssh}
+BuildRequires:	libssh-devel
+%endif
+
+# tdebase is a metapackage that installs all sub-packages
+Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kappfinder = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdepasswd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdeprint = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-khelpcenter = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klipper = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmenuedit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konqueror-nsplugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konsole = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpersonalizer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksmserver = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktip = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-smb-plugin = %{?epoch:%{epoch}:}%{version}-%{release}
+ 
+Requires:	trinity-arts >= %{tde_epoch}:1.5.10
+Requires:	trinity-tdelibs >= %{tde_version}
+Requires:	openssl
+
+
+# RHEL 6 Configuration files are provided in separate packages
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	redhat-menus
+%endif
+
+%if 0%{?suse_version}
+Requires:	desktop-data-openSUSE
+%endif
+
+%description
+TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
+desktop environment for Unix workstations. It combines ease of use,
+contemporary functionality, and outstanding graphical design with the
+technological superiority of the Unix operating system.
+
+This metapackage includes the nucleus of TDE, namely the minimal package
+set necessary to run TDE as a desktop environment. This includes the
+window manager, taskbar, control center, a text editor, file manager,
+web browser, X terminal emulator, and many other programs and components.
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING COPYING-DOCS README README.pam
+%{tde_bindir}/tde_release_notes
+%{tde_datadir}/autostart/tde_release_notes.desktop
+%{tde_tdeappdir}/tdehtml_userinterface.desktop
+
+##########
+
+%package devel
+Summary:	%{summary} - Development files
+Group:		Development/Libraries/Other
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+Requires:	trinity-tdelibs-devel >= %{tde_version}
+
+Requires:	%{name}-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kate-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kcontrol-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kdesktop-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kicker-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-konqueror-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ksplash-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ksysguard-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkonq-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdm-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-twin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Provides:	trinity-kdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This is a meta-package that installs all tdebase development packages.
+
+Header files for developing applications using %{name}.
+Install tdebase-devel if you want to develop or compile Konqueror,
+Kate plugins or TWin styles.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_datadir}/cmake/*.cmake
+
+##########
+
+%package tdeio-pim-plugins
+Summary:	PIM TDEIOslaves from %{name}
+Group:		System/GUI/Other
+
+Provides:	trinity-kdebase-pim-ioslaves = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdebase-pim-ioslaves < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tdeio-pim-plugins
+Protocol handlers (TDEIOslaves) for personal information management, including:
+ * tdeio_ldap
+ * tdeio_nntp
+ * tdeio_pop3
+ * tdeio_smtp
+
+%files tdeio-pim-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/tdeio_ldap.la
+%{tde_tdelibdir}/tdeio_ldap.so
+%{tde_tdelibdir}/tdeio_nntp.la
+%{tde_tdelibdir}/tdeio_nntp.so
+%{tde_tdelibdir}/tdeio_pop3.la
+%{tde_tdelibdir}/tdeio_pop3.so
+%{tde_tdelibdir}/tdeio_smtp.la
+%{tde_tdelibdir}/tdeio_smtp.so
+%{tde_datadir}/services/ldap.protocol
+%{tde_datadir}/services/ldaps.protocol
+%{tde_datadir}/services/nntp.protocol
+%{tde_datadir}/services/nntps.protocol
+%{tde_datadir}/services/pop3.protocol
+%{tde_datadir}/services/pop3s.protocol
+%{tde_datadir}/services/smtp.protocol
+%{tde_datadir}/services/smtps.protocol
+
+##########
+
+%package runtime-data-common
+Summary:	Shared common files for Trinity and KDE4
+Group:		System/GUI/Other
+
+Provides:	tdebase-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-runtime-data-common < %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description runtime-data-common
+Shared common files for both Trinity and KDE4
+Such as the desktop right-click-"Create New" list
+
+%files runtime-data-common
+%defattr(-,root,root,-)
+%{tde_datadir}/desktop-directories/
+%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
+%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
+%{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
+%{tde_datadir}/icons/hicolor/*/apps/kmenuedit.png
+%{tde_datadir}/icons/hicolor/*/apps/ksplash.png
+%{tde_datadir}/locale/en_US/entry.desktop
+%{tde_datadir}/locale/l10n/*.desktop
+%{tde_datadir}/locale/l10n/*/entry.desktop
+%{tde_datadir}/locale/l10n/*/flag.png
+%{tde_datadir}/sounds/pop.wav
+%{tde_datadir}/templates/
+
+##########
+
+%package -n trinity-kappfinder
+Summary:	Non-TDE application finder for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kappfinder
+kappfinder searches your workstation for many common applications and
+creates menu entries for them.
+
+%files -n trinity-kappfinder
+%defattr(-,root,root,-)
+%{tde_bindir}/kappfinder
+%{tde_tdeappdir}/kappfinder.desktop
+%{tde_datadir}/applnk/System/kappfinder.desktop
+%{tde_datadir}/apps/kappfinder
+%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
+%{tde_mandir}/man1/kappfinder.1*
+
+##########
+
+%package -n trinity-libkateinterfaces
+Summary:	Common libraries used by kwrite and kate
+Group:		System/GUI/Other
+
+%description -n trinity-libkateinterfaces
+This package contains the kateinterface library.
+
+%files -n trinity-libkateinterfaces
+%defattr(-,root,root,-)
+%{tde_libdir}/libkateinterfaces.so.*
+
+##########
+
+%package -n trinity-kate
+Summary:	Advanced text editor for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kate
+Kate is a multi document editor, based on a rewritten version of the kwrite
+editing widget of TDE.
+
+It is a multi-view editor that lets you view several instances of the same
+document with all instances being synced, or view more files at the same
+time for easy reference or simultaneous editing. The terminal emulation
+and sidebar are docked windows that can be plugged out of the main window,
+or replaced therein according to your preference.
+
+Some random features:
+* Editing of big files
+* Extensible syntax highlighting
+* Folding
+* Dynamic word wrap
+* Selectable encoding
+* Filter command
+* Global grep dialog
+
+%files -n trinity-kate
+%defattr(-,root,root,-)
+%{tde_bindir}/kate
+%{tde_tdelibdir}/kate.la
+%{tde_tdelibdir}/kate.so
+%{tde_libdir}/libkateutils.so.*
+%{tde_libdir}/libtdeinit_kate.la
+%{tde_libdir}/libtdeinit_kate.so
+%{tde_tdeappdir}/kate.desktop
+%{tde_datadir}/apps/kate/
+%{tde_datadir}/apps/tdeconf_update/kate-2.4.upd
+%config(noreplace) %{tde_confdir}/katerc
+%{tde_datadir}/icons/hicolor/*/apps/kate.png
+%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
+%{tde_datadir}/servicetypes/kateplugin.desktop
+%{tde_tdedocdir}/HTML/en/kate/
+%{tde_mandir}/man1/kate.1*
+
+##########
+
+%package -n trinity-kate-devel
+Summary:	Development files for kate
+Group:		Development/Libraries/Other
+Requires:	trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kate-devel
+This package contains the development files fare Kate.
+
+%files -n trinity-kate-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kate/
+%{tde_libdir}/libkateutils.so
+%{tde_libdir}/libkateutils.la
+%{tde_libdir}/libkateinterfaces.so
+%{tde_libdir}/libkateinterfaces.la
+
+##########
+
+%package -n trinity-kwrite
+Summary:	Advanced text editor for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kwrite
+Kwrite is an advanced text editor for TDE.
+
+%files -n trinity-kwrite
+%defattr(-,root,root,-)
+%{tde_bindir}/kwrite
+%{tde_tdelibdir}/kwrite.la
+%{tde_tdelibdir}/kwrite.so
+%{tde_libdir}/libtdeinit_kwrite.la
+%{tde_libdir}/libtdeinit_kwrite.so
+%{tde_tdeappdir}/kwrite.desktop
+%{tde_datadir}/apps/kwrite/
+%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
+%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
+%{tde_tdedocdir}/HTML/en/kwrite/
+%{tde_mandir}/man1/kwrite.1*
+
+##########
+
+%package -n trinity-kcontrol
+Summary:	Control center for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# Requires 'usb.ids'
+Requires:		usbutils
+BuildRequires:	usbutils
+%if 0%{?suse_version} == 0
+BuildRequires:	hwdata
+Requires:		hwdata
+%endif
+
+%description -n trinity-kcontrol
+The Trinity Control Center provides you with a centralized and convenient
+way to configure all of your TDE settings.
+
+It is made up of multiple modules. Each module is a separate application,
+but the control center organizes all of these programs into a convenient
+location.
+
+In combination with udev KControl supports the advanced
+configuration of Logitech mice, though the user must be a member of the
+plugdev group.
+
+%files -n trinity-kcontrol
+%defattr(-,root,root,-)
+%{tde_bindir}/kaccess
+%{tde_bindir}/kcontrol
+%{tde_bindir}/kdeinstallktheme
+%{tde_bindir}/keditfiletype
+%{tde_bindir}/tdefontinst
+%{tde_bindir}/tdefontview
+%{tde_bindir}/klocaldomainurifilterhelper
+%{tde_bindir}/krdb
+%{tde_tdelibdir}/fontthumbnail.la
+%{tde_tdelibdir}/fontthumbnail.so
+%{tde_tdelibdir}/kaccess.la
+%{tde_tdelibdir}/kaccess.so
+%{tde_tdelibdir}/kcm_access.la
+%{tde_tdelibdir}/kcm_access.so
+%{tde_tdelibdir}/kcm_arts.la
+%{tde_tdelibdir}/kcm_arts.so
+%{tde_tdelibdir}/kcm_background.la
+%{tde_tdelibdir}/kcm_background.so
+%{tde_tdelibdir}/kcm_bell.la
+%{tde_tdelibdir}/kcm_bell.so
+%{tde_tdelibdir}/kcm_clock.la
+%{tde_tdelibdir}/kcm_clock.so
+%{tde_tdelibdir}/kcm_colors.la
+%{tde_tdelibdir}/kcm_colors.so
+%{tde_tdelibdir}/kcm_componentchooser.la
+%{tde_tdelibdir}/kcm_componentchooser.so
+%{tde_tdelibdir}/kcm_crypto.la
+%{tde_tdelibdir}/kcm_crypto.so
+%{tde_tdelibdir}/kcm_css.la
+%{tde_tdelibdir}/kcm_css.so
+%{tde_tdelibdir}/kcm_display.la
+%{tde_tdelibdir}/kcm_display.so
+%{tde_tdelibdir}/kcm_energy.la
+%{tde_tdelibdir}/kcm_energy.so
+%{tde_tdelibdir}/kcm_filetypes.la
+%{tde_tdelibdir}/kcm_filetypes.so
+%{tde_tdelibdir}/kcm_fontinst.la
+%{tde_tdelibdir}/kcm_fontinst.so
+%{tde_tdelibdir}/kcm_fonts.la
+%{tde_tdelibdir}/kcm_fonts.so
+%if 0%{?with_tdehwlib}
+%{tde_tdelibdir}/kcm_hwmanager.la
+%{tde_tdelibdir}/kcm_hwmanager.so
+%endif
+%{tde_tdelibdir}/kcm_icons.la
+%{tde_tdelibdir}/kcm_icons.so
+%{tde_tdelibdir}/kcm_info.la
+%{tde_tdelibdir}/kcm_info.so
+%{tde_tdelibdir}/kcm_input.la
+%{tde_tdelibdir}/kcm_input.so
+%{tde_tdelibdir}/kcm_joystick.la
+%{tde_tdelibdir}/kcm_joystick.so
+%{tde_tdelibdir}/kcm_kded.la
+%{tde_tdelibdir}/kcm_kded.so
+%{tde_tdelibdir}/kcm_%{tdm}.la
+%{tde_tdelibdir}/kcm_%{tdm}.so
+%{tde_tdelibdir}/kcm_tdednssd.so
+%{tde_tdelibdir}/kcm_tdednssd.la
+%{tde_tdelibdir}/kcm_keys.la
+%{tde_tdelibdir}/kcm_keys.so
+%{tde_tdelibdir}/kcm_kicker.la
+%{tde_tdelibdir}/kcm_kicker.so
+%{tde_tdelibdir}/kcm_tdeio.la
+%{tde_tdelibdir}/kcm_tdeio.so
+%{tde_tdelibdir}/kcm_knotify.la
+%{tde_tdelibdir}/kcm_knotify.so
+%{tde_tdelibdir}/kcm_konqhtml.la
+%{tde_tdelibdir}/kcm_konqhtml.so
+%{tde_tdelibdir}/kcm_konq.la
+%{tde_tdelibdir}/kcm_konq.so
+%{tde_tdelibdir}/kcm_kthememanager.la
+%{tde_tdelibdir}/kcm_kthememanager.so
+%{tde_tdelibdir}/kcm_kurifilt.la
+%{tde_tdelibdir}/kcm_kurifilt.so
+%{tde_tdelibdir}/kcm_launch.la
+%{tde_tdelibdir}/kcm_launch.so
+%{tde_tdelibdir}/kcm_locale.la
+%{tde_tdelibdir}/kcm_locale.so
+%{tde_tdelibdir}/kcm_nic.la
+%{tde_tdelibdir}/kcm_nic.so
+%{tde_tdelibdir}/kcm_performance.la
+%{tde_tdelibdir}/kcm_performance.so
+%{tde_tdelibdir}/kcm_privacy.la
+%{tde_tdelibdir}/kcm_privacy.so
+%{tde_tdelibdir}/kcm_screensaver.la
+%{tde_tdelibdir}/kcm_screensaver.so
+%{tde_tdelibdir}/kcm_smserver.la
+%{tde_tdelibdir}/kcm_smserver.so
+%{tde_tdelibdir}/kcm_spellchecking.la
+%{tde_tdelibdir}/kcm_spellchecking.so
+%{tde_tdelibdir}/kcm_style.la
+%{tde_tdelibdir}/kcm_style.so
+%{tde_tdelibdir}/kcm_taskbar.la
+%{tde_tdelibdir}/kcm_taskbar.so
+%{tde_tdelibdir}/kcm_usb.la
+%{tde_tdelibdir}/kcm_usb.so
+%{tde_tdelibdir}/kcm_view1394.la
+%{tde_tdelibdir}/kcm_view1394.so
+%{tde_tdelibdir}/kcm_xinerama.la
+%{tde_tdelibdir}/kcm_xinerama.so
+%{tde_tdelibdir}/kcontrol.la
+%{tde_tdelibdir}/kcontrol.so
+%{tde_tdelibdir}/tdefile_font.la
+%{tde_tdelibdir}/tdefile_font.so
+%{tde_tdelibdir}/tdeio_fonts.la
+%{tde_tdelibdir}/tdeio_fonts.so
+%{tde_tdelibdir}/tdestyle_keramik_config.la
+%{tde_tdelibdir}/tdestyle_keramik_config.so
+%{tde_tdelibdir}/libtdefontviewpart.la
+%{tde_tdelibdir}/libtdefontviewpart.so
+%{tde_tdelibdir}/libtdeshorturifilter.la
+%{tde_tdelibdir}/libtdeshorturifilter.so
+%{tde_tdelibdir}/libkuriikwsfilter.la
+%{tde_tdelibdir}/libkuriikwsfilter.so
+%{tde_tdelibdir}/libkurisearchfilter.la
+%{tde_tdelibdir}/libkurisearchfilter.so
+%{tde_tdelibdir}/liblocaldomainurifilter.la
+%{tde_tdelibdir}/liblocaldomainurifilter.so
+%{tde_libdir}/libtdeinit_kaccess.la
+%{tde_libdir}/libtdeinit_kaccess.so
+%{tde_libdir}/libtdeinit_kcontrol.la
+%{tde_libdir}/libtdeinit_kcontrol.so
+%{tde_libdir}/libtdefontinst.so.*
+%{tde_tdeappdir}/arts.desktop
+%{tde_tdeappdir}/background.desktop
+%{tde_tdeappdir}/bell.desktop
+%{tde_tdeappdir}/cache.desktop
+%{tde_tdeappdir}/cdinfo.desktop
+%{tde_tdeappdir}/clock.desktop
+%{tde_tdeappdir}/colors.desktop
+%{tde_tdeappdir}/componentchooser.desktop
+%{tde_tdeappdir}/cookies.desktop
+%{tde_tdeappdir}/crypto.desktop
+%{tde_tdeappdir}/desktopbehavior.desktop
+%{tde_tdeappdir}/desktop.desktop
+%{tde_tdeappdir}/desktoppath.desktop
+%{tde_tdeappdir}/devices.desktop
+%{tde_tdeappdir}/display.desktop
+%{tde_tdeappdir}/dma.desktop
+%{tde_tdeappdir}/ebrowsing.desktop
+%{tde_tdeappdir}/filebrowser.desktop
+%{tde_tdeappdir}/filetypes.desktop
+%{tde_tdeappdir}/fonts.desktop
+%if 0%{?with_tdehwlib}
+%{tde_tdeappdir}/hwmanager.desktop
+%endif
+%{tde_tdeappdir}/icons.desktop
+%{tde_tdeappdir}/installktheme.desktop
+%{tde_tdeappdir}/interrupts.desktop
+%{tde_tdeappdir}/ioports.desktop
+%{tde_tdeappdir}/joystick.desktop
+%{tde_tdeappdir}/kcm_tdednssd.desktop
+%{tde_tdeappdir}/kcmaccess.desktop
+%{tde_tdeappdir}/kcmcss.desktop
+%{tde_tdeappdir}/kcmfontinst.desktop
+%{tde_tdeappdir}/kcmkded.desktop
+%{tde_tdeappdir}/kcmlaunch.desktop
+%{tde_tdeappdir}/kcmnotify.desktop
+%{tde_tdeappdir}/kcmperformance.desktop
+%{tde_tdeappdir}/kcmsmserver.desktop
+%{tde_tdeappdir}/kcmtaskbar.desktop
+%{tde_tdeappdir}/kcmusb.desktop
+%{tde_tdeappdir}/kcmview1394.desktop
+%{tde_tdeappdir}/KControl.desktop
+%{tde_tdeappdir}/%{tdm}.desktop
+%{tde_tdeappdir}/keys.desktop
+%{tde_tdeappdir}/tdefontview.desktop
+%{tde_tdeappdir}/tdehtml_behavior.desktop
+%{tde_tdeappdir}/tdehtml_fonts.desktop
+%{tde_tdeappdir}/tdehtml_java_js.desktop
+%{tde_tdeappdir}/kthememanager.desktop
+%{tde_tdeappdir}/lanbrowser.desktop
+%{tde_tdeappdir}/language.desktop
+%{tde_tdeappdir}/media.desktop
+%{tde_tdeappdir}/memory.desktop
+%{tde_tdeappdir}/mouse.desktop
+%{tde_tdeappdir}/netpref.desktop
+%{tde_tdeappdir}/nic.desktop
+%{tde_tdeappdir}/opengl.desktop
+%{tde_tdeappdir}/panel_appearance.desktop
+%{tde_tdeappdir}/panel.desktop
+%{tde_tdeappdir}/partitions.desktop
+%{tde_tdeappdir}/pci.desktop
+%{tde_tdeappdir}/privacy.desktop
+%{tde_tdeappdir}/processor.desktop
+%{tde_tdeappdir}/proxy.desktop
+%{tde_tdeappdir}/screensaver.desktop
+%{tde_tdeappdir}/scsi.desktop
+%{tde_tdeappdir}/smbstatus.desktop
+%{tde_tdeappdir}/sound.desktop
+%{tde_tdeappdir}/spellchecking.desktop
+%{tde_tdeappdir}/style.desktop
+%{tde_tdeappdir}/tde-kcontrol.desktop
+%{tde_tdeappdir}/useragent.desktop
+%{tde_tdeappdir}/xserver.desktop
+%{tde_datadir}/applnk/.hidden/energy.desktop
+%{tde_datadir}/applnk/.hidden/fileappearance.desktop
+%{tde_datadir}/applnk/.hidden/filebehavior.desktop
+%{tde_datadir}/applnk/.hidden/filepreviews.desktop
+%{tde_datadir}/applnk/.hidden/kcmkonqyperformance.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config_appearance.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config.desktop
+%{tde_datadir}/applnk/.hidden/smb.desktop
+%{tde_datadir}/applnk/.hidden/xinerama.desktop
+%{tde_datadir}/applnk/Settings/LookNFeel/
+%{tde_datadir}/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop
+%{tde_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
+%{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop
+%{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop
+%{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop
+%{tde_datadir}/apps/kcm_componentchooser/kcm_filemanager.desktop
+%{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop
+%{tde_datadir}/apps/kcmview1394/
+%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
+%{tde_datadir}/apps/usb.ids
+%{tde_datadir}/mimelnk/application/x-ktheme.desktop
+%{tde_datadir}/mimelnk/fonts/folder.desktop
+%{tde_datadir}/mimelnk/fonts/package.desktop
+%{tde_datadir}/mimelnk/fonts/system-folder.desktop
+%{tde_datadir}/services/fonts.protocol
+%{tde_datadir}/services/fontthumbnail.desktop
+%{tde_datadir}/services/kaccess.desktop
+%{tde_datadir}/services/tdefile_font.desktop
+%{tde_datadir}/services/tdefontviewpart.desktop
+%{tde_datadir}/services/tdeshorturifilter.desktop
+%{tde_datadir}/services/kuriikwsfilter.desktop
+%{tde_datadir}/services/kurisearchfilter.desktop
+%{tde_datadir}/services/localdomainurifilter.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kcmcolors.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmcomponentchooser.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmdesktop.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmdesktopbehavior.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmkdnssd.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmlaunch.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmmedia.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmmouse.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmnetpref.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmnic.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmperformance.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmprivacy.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmtaskbar.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmcgi.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmcrypto.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmhistory.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmjoystick.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmkded.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmsmserver.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
+%{tde_tdedocdir}/HTML/en/tdefontview/
+
+# tdehwtray
+%if "%{?tde_version}" == "14.1.0"
+%{tde_bindir}/tdehwdevicetray
+%{tde_tdeappdir}/tdehwdevicetray.desktop
+%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop
+%endif
+
+# The following features are not compiled under RHEL 5 and older
+%if 0%{?with_tderandrtray}
+%{tde_bindir}/tderandrtray
+%{tde_tdelibdir}/kcm_displayconfig.la
+%{tde_tdelibdir}/kcm_displayconfig.so
+%{tde_tdelibdir}/kcm_iccconfig.la
+%{tde_tdelibdir}/kcm_iccconfig.so
+%{tde_tdelibdir}/kcm_randr.la
+%{tde_tdelibdir}/kcm_randr.so
+%{tde_tdeappdir}/displayconfig.desktop
+%{tde_tdeappdir}/iccconfig.desktop
+%{tde_tdeappdir}/tderandrtray.desktop
+%{tde_datadir}/applnk/.hidden/randr.desktop
+%{tde_datadir}/autostart/tderandrtray-autostart.desktop
+%{tde_tdedocdir}/HTML/en/tderandrtray/
+%endif
+
+##########
+
+%package -n trinity-kcontrol-devel
+Summary:	Development files for kcontrol
+Group:		Development/Libraries/Other
+Requires:	trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kcontrol-devel
+%{summary}.
+
+%files -n trinity-kcontrol-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libtdefontinst.la
+%{tde_libdir}/libtdefontinst.so
+
+##########
+
+%package bin
+Summary:	Core binaries for the TDE base module
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pam
+%if 0%{?rhel} >= 7
+Requires:	xorg-x11-server-Xorg
+Requires:	xorg-x11-drv-evdev
+Requires:	dejavu-sans-fonts
+%endif
+
+Provides:	tdebase-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdebase-bin < %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description bin
+This package contains miscellaneous programs needed by other
+TDE applications, particularly those in the TDE base module.
+
+%files bin
+%defattr(-,root,root,-)
+%{tde_bindir}/krootbacking
+%if 0%{?with_tsak}
+%{tde_bindir}/tsak
+%endif
+%if 0%{?with_libconfig}
+%{tde_bindir}/compton-tde
+%endif
+%{tde_bindir}/tdedebugdialog
+%{tde_bindir}/kreadconfig
+%{tde_bindir}/kwriteconfig
+%{tde_bindir}/kstart
+%config(noreplace) %{tde_confdir}/kxkb_groups
+%{tde_bindir}/drkonqi
+%{tde_bindir}/crashtest
+%{tde_bindir}/kapplymousetheme
+%{tde_bindir}/kblankscrn.kss
+%{tde_bindir}/kcminit
+%{tde_bindir}/kcminit_startup
+%{tde_bindir}/kdcop
+%{tde_bindir}/tdesu
+%attr(0755,root,root) %{tde_bindir}/tdesud
+%{tde_bindir}/kdialog
+%{tde_bindir}/khotkeys
+%{tde_bindir}/knetattach
+%{tde_bindir}/krandom.kss
+%{tde_bindir}/ksystraycmd
+%{tde_bindir}/kxkb
+%dir %{tde_libdir}/tdeconf_update_bin
+%{tde_libdir}/tdeconf_update_bin/khotkeys_update
+%{tde_tdelibdir}/kcminit.la
+%{tde_tdelibdir}/kcminit.so
+%{tde_tdelibdir}/kcminit_startup.la
+%{tde_tdelibdir}/kcminit_startup.so
+%{tde_tdelibdir}/kcm_keyboard.la
+%{tde_tdelibdir}/kcm_keyboard.so
+%{tde_tdelibdir}/kcm_khotkeys_init.la
+%{tde_tdelibdir}/kcm_khotkeys_init.so
+%{tde_tdelibdir}/kcm_khotkeys.la
+%{tde_tdelibdir}/kcm_khotkeys.so
+%{tde_tdelibdir}/kded_khotkeys.la
+%{tde_tdelibdir}/kded_khotkeys.so
+%{tde_tdelibdir}/kgreet_classic.la
+%{tde_tdelibdir}/kgreet_classic.so
+%{tde_tdelibdir}/kgreet_winbind.la
+%{tde_tdelibdir}/kgreet_winbind.so
+%{tde_tdelibdir}/khotkeys.la
+%{tde_tdelibdir}/khotkeys.so
+%{tde_tdelibdir}/khotkeys_arts.la
+%{tde_tdelibdir}/khotkeys_arts.so
+%{tde_tdelibdir}/kxkb.la
+%{tde_tdelibdir}/kxkb.so
+%{tde_libdir}/libtdeinit_kcminit.la
+%{tde_libdir}/libtdeinit_kcminit.so
+%{tde_libdir}/libtdeinit_kcminit_startup.la
+%{tde_libdir}/libtdeinit_kcminit_startup.so
+%{tde_libdir}/libtdeinit_khotkeys.la
+%{tde_libdir}/libtdeinit_khotkeys.so
+%{tde_libdir}/libtdeinit_kxkb.la
+%{tde_libdir}/libtdeinit_kxkb.so
+%{tde_libdir}/libkhotkeys_shared.so.*
+%{tde_tdeappdir}/kdcop.desktop
+%{tde_tdeappdir}/keyboard.desktop
+%{tde_tdeappdir}/keyboard_layout.desktop
+%{tde_tdeappdir}/khotkeys.desktop
+%{tde_tdeappdir}/knetattach.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/
+%{tde_datadir}/apps/drkonqi/
+%{tde_datadir}/apps/tdeconf_update/khotkeys_32b1_update.upd
+%{tde_datadir}/apps/tdeconf_update/khotkeys_printscreen.upd
+%{tde_datadir}/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd
+%{tde_datadir}/apps/kdcop/
+%{tde_datadir}/apps/khotkeys/
+%{tde_datadir}/services/kxkb.desktop
+%if 0%{?suse_version} == 0
+%config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity
+%config(noreplace) %{_sysconfdir}/pam.d/tdescreensaver-trinity
+%endif
+%{tde_tdedocdir}/HTML/en/kdcop/
+%{tde_tdedocdir}/HTML/en/tdedebugdialog//
+%{tde_tdedocdir}/HTML/en/tdesu/
+%{tde_tdedocdir}/HTML/en/knetattach/
+%{tde_tdedocdir}/HTML/en/kxkb/
+%{tde_mandir}/man1/drkonqi.1*
+%{tde_mandir}/man1/kblankscrn.kss.1*
+%{tde_mandir}/man1/kcheckpass.1*
+%{tde_mandir}/man1/kcminit.1*
+%{tde_mandir}/man1/kdcop.1*
+%{tde_mandir}/man1/kdialog.1*
+%{tde_mandir}/man1/khotkeys.1*
+%{tde_mandir}/man1/knetattach.1*
+%{tde_mandir}/man1/krandom.kss.1*
+%{tde_mandir}/man1/kreadconfig.1*
+%{tde_mandir}/man1/kstart.1*
+%{tde_mandir}/man1/ksystraycmd.1*
+%{tde_mandir}/man1/kwriteconfig.1*
+%{tde_mandir}/man1/kxkb.1*
+%{tde_mandir}/man1/tdedebugdialog.1*
+%{tde_mandir}/man1/tdesu.1*
+
+# SETUID binaries
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%{?with_tsak:%verify(not mode) %{tde_bindir}/%{tdm}tsak}
+%verify(not mode) %{tde_bindir}/kcheckpass
+%{?with_kbdledsync:%verify(not mode) %{tde_bindir}/tdekbdledsync}
+%else
+%{?with_tsak:%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak}
+%attr(4755,root,root) %{tde_bindir}/kcheckpass
+%{?with_kbdledsync:%attr(4755,root,root) %{tde_bindir}/tdekbdledsync}
+%endif
+
+# SUSE's runupdater utility
+%if 0
+%{tde_bindir}/runupdater
+%{tde_libdir}/libtdeinit_runupdater.la
+%{tde_libdir}/libtdeinit_runupdater.so
+%{tde_tdelibdir}/runupdater.la
+%{tde_tdelibdir}/runupdater.so
+%{tde_datadir}/apps/autostart/runupdater.desktop
+%endif
+
+%post bin
+# Sets permissions on setuid files (openSUSE specific)
+%if 0%{?suse_version}
+%{?with_tsak:%set_permissions %{tde_bindir}/%{tdm}tsak}
+%set_permissions %{tde_bindir}/kcheckpass
+%{?with_kbdledsync:%set_permissions %{tde_bindir}/tdekbdledsync}
+%endif
+
+##########
+
+%package bin-devel
+Summary:	Development files for core binaries for the TDE base module
+Group:		Development/Libraries/Other
+Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
+
+Obsoletes:	tdebase-bin-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description bin-devel
+This package contains the development files for core binaries for 
+the TDE base module
+
+%files bin-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkhotkeys_shared.la
+%{tde_libdir}/libkhotkeys_shared.so
+
+##########
+
+%package data
+Summary:	Shared data files for the TDE base module
+Group:		System/GUI/Other
+Requires:	%{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	tdebase-data < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description data
+This package contains the architecture-independent shared data files
+needed for a basic TDE desktop installation.
+
+%files data
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/tdeshorturifilterrc
+%{tde_datadir}/applnk/.hidden/battery.desktop
+%{tde_datadir}/applnk/.hidden/bwarning.desktop
+%{tde_datadir}/applnk/.hidden/cwarning.desktop
+%{tde_datadir}/applnk/.hidden/.directory
+%{tde_datadir}/applnk/.hidden/email.desktop
+%{tde_datadir}/applnk/.hidden/kcmkonq.desktop
+%{tde_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop
+%{tde_datadir}/applnk/.hidden/konqhtml.desktop
+%{tde_datadir}/applnk/.hidden/passwords.desktop
+%{tde_datadir}/applnk/.hidden/power.desktop
+%{tde_datadir}/applnk/.hidden/socks.desktop
+%{tde_datadir}/applnk/.hidden/userinfo.desktop
+%{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
+%{tde_datadir}/apps/kaccess/
+%{tde_datadir}/apps/kcmcss/
+%{tde_datadir}/apps/kcminput/
+%{tde_datadir}/apps/kcmkeys/
+%{tde_datadir}/apps/kcmlocale/
+%{tde_datadir}/apps/tdeconf_update/convertShortcuts.pl
+%{tde_datadir}/apps/tdeconf_update/tdeaccel.upd
+%{tde_datadir}/apps/tdeconf_update/kcmdisplayrc.upd
+%{tde_datadir}/apps/tdeconf_update/kuriikwsfilter.upd
+%{tde_datadir}/apps/tdeconf_update/mouse_cursor_theme.upd
+%{tde_datadir}/apps/tdeconf_update/socks.upd
+%{tde_datadir}/apps/kcontrol/
+%{tde_datadir}/apps/tdedisplay/
+%{tde_datadir}/apps/tdefontview/
+%{tde_datadir}/apps/kthememanager/
+%{tde_datadir}/icons/crystalsvg/*/apps/access.png
+%{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
+%{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
+%{tde_datadir}/icons/crystalsvg/*/apps/arts.png
+%{tde_datadir}/icons/crystalsvg/*/apps/background.png
+%{tde_datadir}/icons/crystalsvg/*/apps/bell.png
+%{tde_datadir}/icons/crystalsvg/*/apps/cache.png
+%{tde_datadir}/icons/crystalsvg/*/apps/clanbomber.png
+%{tde_datadir}/icons/crystalsvg/*/apps/clock.png
+%{tde_datadir}/icons/crystalsvg/*/apps/colors.png
+%{tde_datadir}/icons/crystalsvg/*/apps/date.png
+%{tde_datadir}/icons/crystalsvg/*/apps/email.png
+%{tde_datadir}/icons/crystalsvg/*/apps/energy.png
+%{tde_datadir}/icons/crystalsvg/*/apps/energy_star.png
+%{tde_datadir}/icons/crystalsvg/*/apps/filetypes.png
+%{tde_datadir}/icons/crystalsvg/*/apps/fonts.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gimp.png
+%{tde_datadir}/icons/crystalsvg/*/apps/help_index.png
+%{tde_datadir}/icons/crystalsvg/*/apps/hwinfo.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmdevices.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmkwm.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmmemory.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
+%{tde_datadir}/icons/crystalsvg/*/apps/%{tdm}config.png
+%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
+%{tde_datadir}/icons/crystalsvg/*/apps/tdescreensaver.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kthememgr.png
+%{tde_datadir}/icons/crystalsvg/*/apps/licq.png
+%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png
+%{tde_datadir}/icons/crystalsvg/*/apps/locale.png
+%{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop.png
+%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png
+%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png
+%{tde_datadir}/icons/crystalsvg/*/categories/applications-development.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
+%{tde_datadir}/icons/crystalsvg/*/categories/applications-games.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_kids.png
+%{tde_datadir}/icons/crystalsvg/*/categories/applications-multimedia.png
+%{tde_datadir}/icons/crystalsvg/*/categories/applications-internet.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png
+%{tde_datadir}/icons/crystalsvg/*/categories/applications-utilities.png
+%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png
+%{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-personal.png
+%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_logic.png
+%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png
+%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png
+%{tde_datadir}/icons/crystalsvg/*/apps/randr.png
+%{tde_datadir}/icons/crystalsvg/*/apps/samba.png
+%{tde_datadir}/icons/crystalsvg/*/apps/staroffice.png
+%{tde_datadir}/icons/crystalsvg/*/apps/stylesheet.png
+%{tde_datadir}/icons/crystalsvg/*/apps/terminal.png
+%{tde_datadir}/icons/crystalsvg/*/apps/tux.png
+%{tde_datadir}/icons/crystalsvg/*/apps/wp.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xclock.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xfmail.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xmag.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xpaint.png
+%{tde_datadir}/icons/crystalsvg/scalable/apps/access.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/aim.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/arts.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/background.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/bell.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/browser.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/cache.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/camera.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/clock.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/colors.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/core.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/date.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/display.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/email.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/energy.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/error.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/locale.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/package_games_kids.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/samba.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/shell.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/tux.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/wine.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/x.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz
+%{tde_datadir}/icons/crystalsvg/*/devices/laptop.png
+%{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz
+%{tde_datadir}/icons/crystalsvg/*/actions/newfont.png
+%{tde_datadir}/icons/crystalsvg/*/apps/abiword.png
+%{tde_datadir}/icons/crystalsvg/*/apps/agent.png
+%{tde_datadir}/icons/crystalsvg/*/apps/alevt.png
+%{tde_datadir}/icons/crystalsvg/*/apps/assistant.png
+%{tde_datadir}/icons/crystalsvg/*/apps/blender.png
+%{tde_datadir}/icons/crystalsvg/*/apps/bluefish.png
+%{tde_datadir}/icons/crystalsvg/*/apps/cookie.png
+%{tde_datadir}/icons/crystalsvg/*/apps/designer.png
+%{tde_datadir}/icons/crystalsvg/*/apps/dia.png
+%{tde_datadir}/icons/crystalsvg/*/apps/dlgedit.png
+%{tde_datadir}/icons/crystalsvg/*/apps/eclipse.png
+%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png
+%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
+%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
+%{tde_datadir}/icons/crystalsvg/*/categories/applications-science.png
+%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png
+%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
+%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png
+%{tde_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gabber.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gaim.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gnome_apps.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gnucash.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gnumeric.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gv.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gvim.png
+%{tde_datadir}/icons/crystalsvg/*/apps/icons.png
+%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png
+%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png
+%{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-peripherals.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png
+%{tde_datadir}/icons/crystalsvg/*/categories/preferences-system.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png
+%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png
+%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
+%{tde_datadir}/icons/crystalsvg/*/apps/knotify.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kvirc.png
+%{tde_datadir}/icons/crystalsvg/*/apps/linguist.png
+%{tde_datadir}/icons/crystalsvg/*/apps/lyx.png
+%{tde_datadir}/icons/crystalsvg/*/apps/mac.png
+%{tde_datadir}/icons/crystalsvg/*/apps/mathematica.png
+%{tde_datadir}/icons/crystalsvg/*/apps/nedit.png
+%{tde_datadir}/icons/crystalsvg/*/apps/opera.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_application.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_editors.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_edutainment.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
+%{tde_datadir}/icons/crystalsvg/*/categories/applications-graphics.png
+%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png
+%{tde_datadir}/icons/crystalsvg/*/categories/applications-office.png
+%{tde_datadir}/icons/crystalsvg/*/apps/pan.png
+%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png
+%{tde_datadir}/icons/crystalsvg/*/apps/plan.png
+%{tde_datadir}/icons/crystalsvg/*/apps/planner.png
+%{tde_datadir}/icons/crystalsvg/*/apps/pybliographic.png
+%{tde_datadir}/icons/crystalsvg/*/apps/realplayer.png
+%{tde_datadir}/icons/crystalsvg/*/apps/remote.png
+%{tde_datadir}/icons/crystalsvg/*/apps/scribus.png
+%{tde_datadir}/icons/crystalsvg/*/apps/sodipodi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/style.png
+%{tde_datadir}/icons/crystalsvg/*/apps/usb.png
+%{tde_datadir}/icons/crystalsvg/*/apps/vnc.png
+%{tde_datadir}/icons/crystalsvg/*/apps/wabi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/wine.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xcalc.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xchat.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xclipboard.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xconsole.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xedit.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xemacs.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xeyes.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xfig.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xload.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xmms.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xosview.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xv.png
+%{tde_datadir}/icons/crystalsvg/*/apps/galeon.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png
+%{tde_datadir}/icons/crystalsvg/*/apps/pinguin.png
+%{tde_datadir}/icons/crystalsvg/*/apps/x.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xapp.png
+%{tde_datadir}/icons/crystalsvg/*/apps/xawtv.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kcmopengl.png
+%{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
+%{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
+%{tde_datadir}/services/searchproviders
+%{tde_datadir}/services/useragentstrings/
+%{tde_datadir}/servicetypes/searchprovider.desktop
+%{tde_datadir}/servicetypes/uasprovider.desktop
+%exclude %{tde_datadir}/sounds/pop.wav
+%{tde_datadir}/sounds/
+%{tde_datadir}/wallpapers/*
+
+# XDG directories information
+%dir %{_sysconfdir}/xdg/menus/applications-merged
+%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
+%config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu
+
+%{tde_tdedocdir}/HTML/en/kcontrol/
+%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
+
+%post data
+%if "%{distribution}" == "Mandriva Linux"
+# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
+# First, we read the "product" key in /etc/product.id
+eval $(tr "," ";" </etc/product.id) 2>/dev/null
+# Then, we create a symbolic link to the corresponding background
+if [ -r "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" ]; then
+  ln -sf "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
+fi
+%endif
+
+%if "%{distribution}" == "Mageia"
+if [ ! -r "%{tde_bg}" ] && [ -r "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" ]; then
+  ln -sf "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" "%{tde_bg}"
+fi
+%endif
+
+##########
+
+%package tdeio-plugins
+Summary:	Core I/O slaves for TDE
+Group:		System/GUI/Other
+Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	cyrus-sasl
+Requires:	psmisc
+%if 0%{?with_hal}
+Requires:	hal >= 0.5
+%endif
+#%if 0%{?rhel} == 4 || 0%{?suse_version} || 0%{?fedora} >= 35
+#Requires:	cryptsetup
+#%else
+#Requires:	cryptsetup-luks
+#%endif
+
+Obsoletes:	tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tdeio-plugins
+This package includes the base tdeioslaves. They include, amongst many
+others, file, http, and ftp.
+
+It also includes the media tdeioslave, which handles removable devices,
+and which works best with udev, udisks and pmount. Media
+also extends the functionality of many other tdeioslaves. To use this
+service, please make sure that your user is a member of the plugdev
+group.
+
+%files tdeio-plugins
+%defattr(-,root,root,-)
+%{tde_bindir}/tdeio_media_mounthelper
+%{tde_bindir}/ktrash
+%{tde_tdelibdir}/cursorthumbnail.la
+%{tde_tdelibdir}/cursorthumbnail.so
+%{tde_tdelibdir}/djvuthumbnail.la
+%{tde_tdelibdir}/djvuthumbnail.so
+%{tde_tdelibdir}/htmlthumbnail.la
+%{tde_tdelibdir}/htmlthumbnail.so
+%{tde_tdelibdir}/imagethumbnail.la
+%{tde_tdelibdir}/imagethumbnail.so
+%{tde_tdelibdir}/kcm_cgi.la
+%{tde_tdelibdir}/kcm_cgi.so
+%{tde_tdelibdir}/kcm_media.la
+%{tde_tdelibdir}/kcm_media.so
+%{tde_tdelibdir}/kded_homedirnotify.la
+%{tde_tdelibdir}/kded_homedirnotify.so
+%{tde_tdelibdir}/kded_mediamanager.la
+%{tde_tdelibdir}/kded_mediamanager.so
+%{tde_tdelibdir}/kded_medianotifier.la
+%{tde_tdelibdir}/kded_medianotifier.so
+%{tde_tdelibdir}/kded_remotedirnotify.la
+%{tde_tdelibdir}/kded_remotedirnotify.so
+%{tde_tdelibdir}/kded_systemdirnotify.la
+%{tde_tdelibdir}/kded_systemdirnotify.so
+%{tde_tdelibdir}/tdefile_media.la
+%{tde_tdelibdir}/tdefile_media.so
+%{tde_tdelibdir}/tdefile_trash.la
+%{tde_tdelibdir}/tdefile_trash.so
+%{tde_tdelibdir}/tdeio_about.la
+%{tde_tdelibdir}/tdeio_about.so
+%{tde_tdelibdir}/tdeio_cgi.la
+%{tde_tdelibdir}/tdeio_cgi.so
+%{tde_tdelibdir}/tdeio_filter.la
+%{tde_tdelibdir}/tdeio_filter.so
+%{tde_tdelibdir}/tdeio_finger.la
+%{tde_tdelibdir}/tdeio_finger.so
+%{tde_tdelibdir}/tdeio_fish.la
+%{tde_tdelibdir}/tdeio_fish.so
+%{tde_tdelibdir}/tdeio_floppy.la
+%{tde_tdelibdir}/tdeio_floppy.so
+%{tde_tdelibdir}/tdeio_home.la
+%{tde_tdelibdir}/tdeio_home.so
+%{tde_tdelibdir}/tdeio_info.la
+%{tde_tdelibdir}/tdeio_info.so
+%{tde_tdelibdir}/tdeio_mac.la
+%{tde_tdelibdir}/tdeio_mac.so
+%{tde_tdelibdir}/tdeio_man.la
+%{tde_tdelibdir}/tdeio_man.so
+%{tde_tdelibdir}/tdeio_media.la
+%{tde_tdelibdir}/tdeio_media.so
+%{tde_tdelibdir}/tdeio_nfs.la
+%{tde_tdelibdir}/tdeio_nfs.so
+%{tde_tdelibdir}/tdeio_remote.la
+%{tde_tdelibdir}/tdeio_remote.so
+%{tde_tdelibdir}/tdeio_settings.la
+%{tde_tdelibdir}/tdeio_settings.so
+%if 0%{?with_libssh}
+%{tde_tdelibdir}/tdeio_sftp.la
+%{tde_tdelibdir}/tdeio_sftp.so
+%endif
+%{tde_tdelibdir}/tdeio_system.la
+%{tde_tdelibdir}/tdeio_system.so
+%{tde_tdelibdir}/tdeio_tar.la
+%{tde_tdelibdir}/tdeio_tar.so
+%{tde_tdelibdir}/tdeio_thumbnail.la
+%{tde_tdelibdir}/tdeio_thumbnail.so
+%{tde_tdelibdir}/tdeio_trash.la
+%{tde_tdelibdir}/tdeio_trash.so
+%{tde_tdelibdir}/libkmanpart.la
+%{tde_tdelibdir}/libkmanpart.so
+%{tde_tdelibdir}/textthumbnail.la
+%{tde_tdelibdir}/textthumbnail.so
+%{tde_tdeappdir}/kcmcgi.desktop
+%{tde_datadir}/apps/tdeio_finger/
+%{tde_datadir}/apps/tdeio_info/
+%{tde_datadir}/apps/tdeio_man/
+%{tde_datadir}/apps/systemview/
+%{tde_datadir}/autostart/mediabackend.desktop
+%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
+%{tde_datadir}/mimelnk/application/x-smb-server.desktop
+%{tde_datadir}/mimelnk/inode/system_directory.desktop
+%{tde_datadir}/mimelnk/media/*.desktop
+%{tde_datadir}/services/about.protocol
+%{tde_datadir}/services/applications.protocol
+%{tde_datadir}/services/ar.protocol
+%{tde_datadir}/services/bzip.protocol
+%{tde_datadir}/services/bzip2.protocol
+%{tde_datadir}/services/cgi.protocol
+%{tde_datadir}/services/cursorthumbnail.desktop
+%{tde_datadir}/services/djvuthumbnail.desktop
+%{tde_datadir}/services/finger.protocol
+%{tde_datadir}/services/fish.protocol
+%{tde_datadir}/services/floppy.protocol
+%{tde_datadir}/services/gzip.protocol
+%{tde_datadir}/services/home.protocol
+%{tde_datadir}/services/htmlthumbnail.desktop
+%{tde_datadir}/services/imagethumbnail.desktop
+%{tde_datadir}/services/info.protocol
+%{tde_datadir}/services/kded/homedirnotify.desktop
+%{tde_datadir}/services/kded/mediamanager.desktop
+%{tde_datadir}/services/kded/medianotifier.desktop
+%{tde_datadir}/services/kded/remotedirnotify.desktop
+%{tde_datadir}/services/kded/systemdirnotify.desktop
+%{tde_datadir}/services/tdefile_media.desktop
+%{tde_datadir}/services/tdefile_trash_system.desktop
+%{tde_datadir}/services/lzma.protocol
+%{tde_datadir}/services/kmanpart.desktop
+%{tde_datadir}/services/mac.protocol
+%{tde_datadir}/services/man.protocol
+%{tde_datadir}/services/media.protocol
+%{tde_datadir}/services/nfs.protocol
+%{tde_datadir}/services/nxfish.protocol
+%{tde_datadir}/services/programs.protocol
+%{tde_datadir}/services/remote.protocol
+%{tde_datadir}/services/settings.protocol
+%if 0%{?with_libssh}
+%{tde_datadir}/services/sftp.protocol
+%endif
+%{tde_datadir}/services/system.protocol
+%{tde_datadir}/services/tar.protocol
+%{tde_datadir}/services/textthumbnail.desktop
+%{tde_datadir}/services/thumbnail.protocol
+%{tde_datadir}/services/trash.protocol
+%{tde_datadir}/services/xz.protocol
+%{tde_datadir}/services/zip.protocol
+%{tde_datadir}/servicetypes/thumbcreator.desktop
+%{tde_datadir}/services/tdefile_trash.desktop
+%{tde_tdedocdir}/HTML/en/tdeioslave/
+%{tde_mandir}/man1/ktrash.1*
+%{tde_mandir}/man1/tdeio_media_mounthelper.1*
+%{tde_mandir}/man1/tdeio_system_documenthelper.1*
+
+%if 0%{?with_exr}
+%{tde_tdelibdir}/exrthumbnail.la
+%{tde_tdelibdir}/exrthumbnail.so
+%{tde_datadir}/services/exrthumbnail.desktop
+%endif
+
+# HWManager
+%{tde_tdelibdir}/media_propsdlgplugin.la
+%{tde_tdelibdir}/media_propsdlgplugin.so
+%{tde_datadir}/services/media_propsdlgplugin.desktop
+
+%if "%{tde_version}" == "14.1.0"
+%{tde_tdelibdir}/ktrashpropsdlgplugin.la
+%{tde_tdelibdir}/ktrashpropsdlgplugin.so
+%{tde_datadir}/services/ktrashpropsdlgplugin.desktop
+%endif
+
+##########
+
+%package -n trinity-tdepasswd
+Summary:	Password changer for TDE
+Group:		System/GUI/Other
+
+Obsoletes:	trinity-kdepasswd < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdepasswd = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdepasswd
+This is a simple application which allows users to change their
+system passwords.
+
+%files -n trinity-tdepasswd
+%defattr(-,root,root,-)
+%{tde_bindir}/tdepasswd
+%{tde_tdelibdir}/kcm_useraccount.la
+%{tde_tdelibdir}/kcm_useraccount.so
+%{tde_tdeappdir}/kcm_useraccount.desktop
+%{tde_tdeappdir}/tdepasswd.desktop
+%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
+%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
+%{tde_tdedocdir}/HTML/en/tdepasswd/
+%{_datadir}/faces/Apple.png
+%{_datadir}/faces/BeachBall.png
+%{_datadir}/faces/Blowfish.png
+%{_datadir}/faces/Bug.png
+%{_datadir}/faces/Butterfly.png
+%{_datadir}/faces/Car.png
+%{_datadir}/faces/Cow.png 
+%{_datadir}/faces/Daemon.png
+%{_datadir}/faces/Dog.png
+%{_datadir}/faces/Elephant.png
+%{_datadir}/faces/Flower.png
+%{_datadir}/faces/Frog.png
+%{_datadir}/faces/Ghost.png
+%{_datadir}/faces/Guitar.png
+%{_datadir}/faces/Heart.png
+%{_datadir}/faces/Konqui.png
+%{_datadir}/faces/Lion.png
+%{_datadir}/faces/Monkey.png
+%{_datadir}/faces/Penguin.png
+%{_datadir}/faces/Pig.png
+%{_datadir}/faces/Rabbit.png
+%{_datadir}/faces/Ring.png
+%{_datadir}/faces/Scream.png
+%{_datadir}/faces/Shark.png
+%{_datadir}/faces/Splash.png
+%{_datadir}/faces/Star.png
+%{_datadir}/faces/Teddybear.png
+%{_datadir}/faces/Turtle.png
+%{tde_mandir}/man1/tdepasswd.1*
+
+##########
+
+%package -n trinity-tdeprint
+Summary:	Print system for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	psutils
+
+%description -n trinity-tdeprint
+This package contains the TDE printing subsystem. It can use CUPS,
+lpd-ng or the traditional lpd. It also includes support for fax and
+pdf printing.
+
+Installation of smbclient will make you able to use smb shared printers.
+
+%files -n trinity-tdeprint
+%defattr(-,root,root,-)
+%{tde_bindir}/tdeprintfax
+%{tde_bindir}/kjobviewer
+%{tde_bindir}/kprinter
+%{tde_tdelibdir}/kcm_printmgr.la
+%{tde_tdelibdir}/kcm_printmgr.so
+%{tde_tdelibdir}/tdeio_print.la
+%{tde_tdelibdir}/tdeio_print.so
+%{tde_tdelibdir}/kjobviewer.la
+%{tde_tdelibdir}/kjobviewer.so
+%{tde_tdelibdir}/kprinter.la
+%{tde_tdelibdir}/kprinter.so
+%{tde_tdelibdir}/libtdeprint_part.la
+%{tde_tdelibdir}/libtdeprint_part.so
+%{tde_libdir}/libtdeinit_kjobviewer.la
+%{tde_libdir}/libtdeinit_kjobviewer.so
+%{tde_libdir}/libtdeinit_kprinter.la
+%{tde_libdir}/libtdeinit_kprinter.so
+%{tde_tdeappdir}/tdeprintfax.desktop
+%{tde_tdeappdir}/kjobviewer.desktop
+%{tde_tdeappdir}/printers.desktop
+%{tde_datadir}/apps/tdeprint/
+%{tde_datadir}/apps/tdeprintfax/
+%{tde_datadir}/apps/kjobviewer/
+%{tde_datadir}/apps/tdeprint_part/
+%{tde_datadir}/autostart/kjobviewer-autostart.desktop
+%{tde_datadir}/icons/hicolor/*/apps/tdeprintfax.png
+%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
+%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
+%{tde_datadir}/icons/hicolor/scalable/apps/tdeprintfax.svgz
+%{tde_datadir}/icons/hicolor/scalable/apps/kjobviewer.svgz
+%{tde_datadir}/icons/hicolor/scalable/apps/printmgr.svgz
+%{tde_datadir}/mimelnk/print/class.desktop
+%{tde_datadir}/mimelnk/print/driver.desktop
+%{tde_datadir}/mimelnk/print/folder.desktop
+%{tde_datadir}/mimelnk/print/jobs.desktop
+%{tde_datadir}/mimelnk/print/manager.desktop
+%{tde_datadir}/mimelnk/print/printer.desktop
+%{tde_datadir}/mimelnk/print/printermodel.desktop
+%{tde_datadir}/services/tdeprint_part.desktop
+%{tde_datadir}/services/print.protocol
+%{tde_datadir}/services/printdb.protocol
+%{tde_tdedocdir}/HTML/en/tdeprint/
+%{tde_tdedocdir}/HTML/en/tdeprintfax/
+%{tde_tdedocdir}/HTML/en/kjobviewer/
+%{tde_mandir}/man1/kjobviewer.1*
+%{tde_mandir}/man1/kprinter.1*
+%{tde_mandir}/man1/tdeprintfax.1*
+
+##########
+
+%package -n trinity-kdesktop
+Summary:	Miscellaneous binaries and files for the TDE desktop
+Group:		System/GUI/Other
+Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	eject
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	xdg-utils
+%endif
+
+%description -n trinity-kdesktop
+This package contains miscellaneous binaries and files integral to
+the TDE desktop.
+
+%files -n trinity-kdesktop
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/kdesktop_custom_menu1
+%config(noreplace) %{tde_confdir}/kdesktop_custom_menu2
+%{tde_bindir}/kcheckrunning
+%{tde_bindir}/tdeeject
+%{tde_bindir}/kdesktop
+%{tde_bindir}/kdesktop_lock
+%{tde_bindir}/kwebdesktop
+%{tde_tdelibdir}/kdesktop.la
+%{tde_tdelibdir}/kdesktop.so
+%{tde_libdir}/libtdeinit_kdesktop.la
+%{tde_libdir}/libtdeinit_kdesktop.so
+%{tde_datadir}/apps/kdesktop/
+%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
+%{tde_datadir}/autostart/kdesktop.desktop
+%{tde_datadir}/config.kcfg/kdesktop.kcfg
+%{tde_datadir}/config.kcfg/tdelaunch.kcfg
+%{tde_datadir}/config.kcfg/kwebdesktop.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/error.png
+
+##########
+
+%package -n trinity-kdesktop-devel
+Summary:	Development files for kdesktop
+Group:		Development/Libraries/Other
+Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kdesktop-devel
+This package contains the development files for kdesktop.
+
+%files -n trinity-kdesktop-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/KBackgroundIface.h
+%{tde_tdeincludedir}/KDesktopIface.h
+%{tde_tdeincludedir}/KScreensaverIface.h
+
+##########
+
+%package -n trinity-tdm
+Summary:	X Display manager for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	pam
+Requires:	logrotate
+
+# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
+Requires:	xinitrc
+%endif
+%if 0%{?suse_version} == 1140
+Requires:	xorg-x11
+%endif
+%if 0%{?suse_version} >= 1220
+Requires:	xdm
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+Requires:	xorg-x11-xinit
+%endif
+
+# Required for Fedora LiveCD
+%if 0%{?rhel} || 0%{?fedora}
+Provides:	service(graphical-login)
+%endif
+# Required for Mandriva's installer
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Provides:	dm
+Provides:	%{tdm}
+%endif
+
+%description -n trinity-tdm
+TDM manages a collection of X servers, which may be on the local host or
+remote machines. It provides services similar to those provided by init,
+getty, and login on character-based terminals: prompting for login name and
+password, authenticating the user, and running a session. tdm supports XDMCP
+(X Display Manager Control Protocol) and can also be used to run a chooser
+process which presents the user with a menu of possible hosts that offer
+XDMCP display management.
+
+A collection of icons to associate with individual users is included with
+TDE, but as part of the tdepasswd package.
+
+The menu package will help to provide TDM with a list of window managers
+that can be launched, if the window manager does not register with TDM
+already. Most users won't need this.
+
+%files -n trinity-tdm
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kgreet_pam.la
+%{tde_tdelibdir}/kgreet_pam.so
+%{tde_bindir}/gen%{tdm}conf
+%{tde_bindir}/%{tdm}
+%{tde_bindir}/%{tdm}_config
+%{tde_bindir}/%{tdm}ctl
+%{tde_bindir}/%{tdm}_greet
+%{tde_bindir}/krootimage
+%dir %{tdm_datadir}
+%dir %{tdm_datadir}/pics
+%{tdm_datadir}/pics/tdelogo.png
+%{tdm_datadir}/pics/shutdown.jpg
+%{tdm_datadir}/pics/users
+%dir %{tdm_datadir}/sessions
+%{tdm_datadir}/sessions/*.desktop
+%{tdm_datadir}/themes/
+%config(noreplace) %{tde_confdir}/%{tdm}
+%if 0%{?with_selinux_policy}
+%exclude %{tde_confdir}/%{tdm}/tdm.pp
+%endif
+%{tde_tdedocdir}/HTML/en/%{tdm}/
+%if 0%{?suse_version} == 0
+%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
+%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
+%endif
+%{tde_mandir}/man1/gentdmconf.1*
+%{tde_mandir}/man1/krootimage.1*
+%{tde_mandir}/man1/tdm.1*
+%{tde_mandir}/man1/tdmctl.1*
+%{tde_mandir}/man1/tdm_config.1*
+%{tde_mandir}/man1/tdm_greet.1*
+
+%if "%{?tde_version}" == "14.1.0"
+%{tde_bindir}/tdecryptocardwatcher
+%endif
+
+# XDG user faces
+%dir %{_datadir}/faces
+%{_datadir}/faces/default1.png
+%{_datadir}/faces/default2.png
+%{_datadir}/faces/default3.png
+%{_datadir}/faces/default4.png
+%{_datadir}/faces/root1.png
+
+# Distribution specific stuff
+%if 0%{?suse_version} == 1140
+%{_sysconfdir}/init.d/xdm.tde
+%endif
+%if 0%{?suse_version} >= 1210
+/usr/lib/X11/displaymanagers/
+%endif
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+/usr/lib/systemd/system/tdm.service
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%{_datadir}/xsessions/tde.desktop
+%endif
+
+# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%{_sysconfdir}/X11/wmsession.d/45TDE
+%{_datadir}/X11/dm.d/45TDE.conf
+%endif
+
+# SELINUX policy
+%if 0%{?with_selinux_policy}
+%config %{tde_confdir}/%{tdm}/tdm.pp
+%endif
+
+# Logrotate configuration
+%config %{_sysconfdir}/logrotate.d/trinity-tdm
+
+%pre -n trinity-tdm
+# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
+if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
+  if [ -d "%{tde_confdir}/%{tdm}" ]; then
+    # If there is already something under '/etc/trinity/tdm', simply delete old configuration
+    echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
+    rm -rf "%{tde_datadir}/config/%{tdm}"
+  else
+    # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
+    if [ ! -d "%{tde_confdir}" ]; then
+      mkdir -p "%{tde_confdir}"
+    fi
+    echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{tde_confdir}/%{tdm}'"
+    mv -f "%{tde_datadir}/config/%{tdm}" "%{tde_confdir}/%{tdm}.migr"
+  fi
+fi
+
+# Remove actual directory before creating a symlink
+if [ ! -L "%{tdm_datadir}/pics/users" ] && [ -d "%{tdm_datadir}/pics/users" ] ; then
+  [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces"
+  cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces"
+  rm -rf "%{tdm_datadir}/pics/users"
+fi
+
+%post -n trinity-tdm
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%make_session
+%endif
+
+# SELINUX context for tdm
+%if 0%{?with_selinux_policy}
+/usr/sbin/semodule -i "%{tde_confdir}/%{tdm}/tdm.pp"
+%endif
+
+%if 0%{?fedora} == 21 || 0%{?rhel} >= 7
+if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then
+  echo "%{tde_bindir}/tdm	--	system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local"
+  restorecon "%{tde_bindir}/tdm"
+fi
+%endif
+
+# Sets default user icon in TDM
+if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then
+  [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces"
+  cp -f "%{tdm_datadir}/pics/users/default2.png" "%{tdm_datadir}/faces/.default.face.icon"
+fi
+
+# Sets default language for TDM
+if [ "$1" = "1" ]; then
+  if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
+    sed -i "%{tde_confdir}/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
+  fi
+fi
+
+# openSUSE 11.4 tdm's startup script
+if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then
+  cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
+fi
+
+# openSUSE 15.0 alternatives
+%if 0%{?suse_version} >= 1500
+update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager default-displaymanager /usr/lib/X11/displaymanagers/tdm 30 || :
+%endif
+
+%posttrans -n trinity-tdm
+# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
+if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then
+  mv -f "%{tde_confdir}/%{tdm}.migr/"* "%{tde_confdir}/%{tdm}/"
+  rmdir "%{tde_confdir}/%{tdm}.migr/"
+fi
+
+%postun -n trinity-tdm
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%make_session
+%endif
+
+# openSUSE 15.0 alternatives
+%if 0%{?suse_version} >= 1500
+if [ "$1" = "0" ]; then
+  update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || :
+fi
+%endif
+
+##########
+
+%package -n trinity-tdm-devel
+Summary:	Development files for tdm
+Group:		Development/Libraries/Other
+Requires:	trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
+
+%description -n trinity-tdm-devel
+This package contains the development files for TDM.
+
+%files -n trinity-tdm-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kgreeterplugin.h
+
+##########
+
+%package -n trinity-kfind
+Summary:	File-find utility for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kfind
+kfind can be used to find files and directories on your
+workstations.
+
+%files -n trinity-kfind
+%defattr(-,root,root,-)
+%{tde_bindir}/kfind
+%{tde_tdelibdir}/libkfindpart.la
+%{tde_tdelibdir}/libkfindpart.so
+%{tde_tdeappdir}/Kfind.desktop
+%{tde_datadir}/apps/kfindpart/
+%{tde_datadir}/icons/hicolor/*/apps/kfind.png
+%{tde_datadir}/services/kfindpart.desktop
+%{tde_datadir}/servicetypes/findpart.desktop
+%{tde_tdedocdir}/HTML/en/kfind/
+%{tde_mandir}/man1/kfind.1*
+
+##########
+
+%package -n trinity-khelpcenter
+Summary:	Help center for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	htdig
+
+%description -n trinity-khelpcenter
+The TDE Help Center provides documentation on how to use the TDE desktop.
+
+The htdig package is needed to build a searchable archive of TDE
+documentation.
+
+%files -n trinity-khelpcenter
+%defattr(-,root,root,-)
+%{tde_bindir}/khc_docbookdig.pl
+%{tde_bindir}/khc_htdig.pl
+%{tde_bindir}/khc_htsearch.pl
+%{tde_bindir}/khc_indexbuilder
+%{tde_bindir}/khc_mansearch.pl
+%{tde_bindir}/khelpcenter
+%{tde_tdelibdir}/khelpcenter.la
+%{tde_tdelibdir}/khelpcenter.so
+%{tde_libdir}/libtdeinit_khelpcenter.la
+%{tde_libdir}/libtdeinit_khelpcenter.so
+%{tde_tdeappdir}/Help.desktop
+%{tde_datadir}/apps/khelpcenter/
+%{tde_datadir}/config.kcfg/khelpcenter.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/khelpcenter.*
+%{tde_datadir}/services/khelpcenter.desktop
+%{tde_tdedocdir}/HTML/en/khelpcenter/
+
+##########
+
+%package -n trinity-kicker
+Summary:	Desktop panel for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kicker
+Kicker provides the TDE panel on you desktop. It can be used as a
+program launcher and can load plugins to provide additional
+functionality.
+
+%files -n trinity-kicker
+%defattr(-,root,root,-)
+%{tde_bindir}/appletproxy
+%{tde_bindir}/extensionproxy
+%{tde_bindir}/kasbar
+%{tde_bindir}/kicker
+%{tde_libdir}/tdeconf_update_bin/kicker-3.4-reverseLayout
+%{tde_tdelibdir}/appletproxy.la
+%{tde_tdelibdir}/appletproxy.so
+%{tde_tdelibdir}/clock_panelapplet.la
+%{tde_tdelibdir}/clock_panelapplet.so
+%{tde_tdelibdir}/dockbar_panelextension.la
+%{tde_tdelibdir}/dockbar_panelextension.so
+%{tde_tdelibdir}/extensionproxy.la
+%{tde_tdelibdir}/extensionproxy.so
+%{tde_tdelibdir}/kasbar_panelextension.la
+%{tde_tdelibdir}/kasbar_panelextension.so
+%{tde_tdelibdir}/kicker.la
+%{tde_tdelibdir}/kickermenu_find.la
+%{tde_tdelibdir}/kickermenu_find.so
+%{tde_tdelibdir}/kickermenu_kate.so
+%{tde_tdelibdir}/kickermenu_kate.la
+%{tde_tdelibdir}/kickermenu_tdeprint.la
+%{tde_tdelibdir}/kickermenu_tdeprint.so
+%{tde_tdelibdir}/kickermenu_konqueror.la
+%{tde_tdelibdir}/kickermenu_konqueror.so
+%{tde_tdelibdir}/kickermenu_konsole.la
+%{tde_tdelibdir}/kickermenu_konsole.so
+%{tde_tdelibdir}/kickermenu_prefmenu.la
+%{tde_tdelibdir}/kickermenu_prefmenu.so
+%{tde_tdelibdir}/kickermenu_recentdocs.la
+%{tde_tdelibdir}/kickermenu_recentdocs.so
+%{tde_tdelibdir}/kickermenu_remotemenu.la
+%{tde_tdelibdir}/kickermenu_remotemenu.so
+%{tde_tdelibdir}/kickermenu_systemmenu.la
+%{tde_tdelibdir}/kickermenu_systemmenu.so
+%{tde_tdelibdir}/kicker.so
+%{tde_tdelibdir}/launcher_panelapplet.la
+%{tde_tdelibdir}/launcher_panelapplet.so
+%{tde_tdelibdir}/lockout_panelapplet.la
+%{tde_tdelibdir}/lockout_panelapplet.so
+%{tde_tdelibdir}/media_panelapplet.la
+%{tde_tdelibdir}/media_panelapplet.so
+%{tde_tdelibdir}/menu_panelapplet.la
+%{tde_tdelibdir}/menu_panelapplet.so
+%{tde_tdelibdir}/minipager_panelapplet.la
+%{tde_tdelibdir}/minipager_panelapplet.so
+%{tde_tdelibdir}/naughty_panelapplet.la
+%{tde_tdelibdir}/naughty_panelapplet.so
+%{tde_tdelibdir}/run_panelapplet.la
+%{tde_tdelibdir}/run_panelapplet.so
+%{tde_tdelibdir}/sidebar_panelextension.la
+%{tde_tdelibdir}/sidebar_panelextension.so
+%{tde_tdelibdir}/systemtray_panelapplet.la
+%{tde_tdelibdir}/systemtray_panelapplet.so
+%{tde_tdelibdir}/taskbar_panelapplet.la
+%{tde_tdelibdir}/taskbar_panelapplet.so
+%{tde_tdelibdir}/taskbar_panelextension.la
+%{tde_tdelibdir}/taskbar_panelextension.so
+%{tde_tdelibdir}/trash_panelapplet.la
+%{tde_tdelibdir}/trash_panelapplet.so
+%{tde_libdir}/libkasbar.so.*
+%{tde_libdir}/libtdeinit_appletproxy.la
+%{tde_libdir}/libtdeinit_appletproxy.so
+%{tde_libdir}/libtdeinit_extensionproxy.la
+%{tde_libdir}/libtdeinit_extensionproxy.so
+%{tde_libdir}/libtdeinit_kicker.la
+%{tde_libdir}/libtdeinit_kicker.so
+%{tde_libdir}/libkickermain.so.*
+%{tde_libdir}/libtaskbar.so.*
+%{tde_libdir}/libtaskmanager.so.*
+%{tde_libdir}/libkickoffsearch_interfaces.so.*
+%{tde_tdeappdir}/kcmkicker.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
+%{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
+%{tde_datadir}/apps/clockapplet/
+%{tde_datadir}/apps/tdeconf_update/kicker-3.1-properSizeSetting.pl
+%{tde_datadir}/apps/tdeconf_update/kicker-3.5-taskbarEnums.pl
+%{tde_datadir}/apps/tdeconf_update/kickerrc.upd
+%{tde_datadir}/apps/kicker/
+%exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
+%exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
+%{tde_datadir}/apps/naughtyapplet/
+%{tde_datadir}/autostart/panel.desktop
+%{tde_datadir}/config.kcfg/kickerSettings.kcfg
+%{tde_datadir}/config.kcfg/launcherapplet.kcfg
+%{tde_datadir}/config.kcfg/pagersettings.kcfg
+%{tde_datadir}/config.kcfg/taskbar.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png
+%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kdisknav.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
+%{tde_datadir}/icons/crystalsvg/*/apps/panel.png
+%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
+%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
+%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
+%{tde_tdedocdir}/HTML/en/kicker/
+%if 0%{?mgaversion} >= 3
+%{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
+%endif
+%{tde_mandir}/man1/appletproxy.1*
+%{tde_mandir}/man1/extensionproxy.1*
+%{tde_mandir}/man1/kasbar.1*
+%{tde_mandir}/man1/kicker.1*
+
+##########
+
+%package -n trinity-kicker-devel
+Summary:	Development files for kicker
+Group:		Development/Libraries/Other
+Requires:	trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
+
+%description -n trinity-kicker-devel
+This package contains the development files for kicker.
+
+%files -n trinity-kicker-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kickoff-search-plugin.h
+%{tde_tdeincludedir}/kickoffsearchinterface.h
+%{tde_libdir}/libkasbar.la
+%{tde_libdir}/libkasbar.so
+%{tde_libdir}/libkickermain.la
+%{tde_libdir}/libkickermain.so
+%{tde_libdir}/libkickoffsearch_interfaces.la
+%{tde_libdir}/libkickoffsearch_interfaces.so
+%{tde_libdir}/libtaskbar.la
+%{tde_libdir}/libtaskbar.so
+%{tde_libdir}/libtaskmanager.la
+%{tde_libdir}/libtaskmanager.so
+
+##########
+
+%package -n trinity-klipper
+Summary:	Clipboard utility for Trinity
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-klipper
+klipper provides standard clipboard functions (cut and paste, history
+saving) plus additional features, like the ability to offer actions to 
+take dependent on the clipboard contents. For example, it can launch a 
+web browser if the clipboard contains a URL.
+
+%files -n trinity-klipper
+%defattr(-,root,root,-)
+%{tde_bindir}/klipper
+%config(noreplace) %{tde_confdir}/klipperrc
+%{tde_tdelibdir}/klipper.la
+%{tde_tdelibdir}/klipper.so
+%{tde_tdelibdir}/klipper_panelapplet.la
+%{tde_tdelibdir}/klipper_panelapplet.so
+%{tde_libdir}/libtdeinit_klipper.la
+%{tde_libdir}/libtdeinit_klipper.so
+%{tde_tdeappdir}/klipper.desktop
+%{tde_datadir}/apps/tdeconf_update/klipper-1-2.pl
+%{tde_datadir}/apps/tdeconf_update/klipper-trinity1.sh
+%{tde_datadir}/apps/tdeconf_update/klipperrc.upd
+%{tde_datadir}/apps/tdeconf_update/klippershortcuts.upd
+%{tde_datadir}/apps/kicker/applets/klipper.desktop
+%{tde_datadir}/autostart/klipper.desktop
+%{tde_datadir}/icons/hicolor/*/apps/klipper.*
+%{tde_tdedocdir}/HTML/en/klipper/
+
+##########
+
+%package -n trinity-kmenuedit
+Summary:	Menu editor for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kmenuedit
+The TDE menu editor allows you to make customisations to the TDE menu
+structure.
+
+%files -n trinity-kmenuedit
+%defattr(-,root,root,-)
+%{tde_bindir}/kcontroledit
+%{tde_bindir}/kmenuedit
+%{tde_tdelibdir}/kcontroledit.la
+%{tde_tdelibdir}/kcontroledit.so
+%{tde_tdelibdir}/kmenuedit.la
+%{tde_tdelibdir}/kmenuedit.so
+%{tde_libdir}/libtdeinit_kcontroledit.la
+%{tde_libdir}/libtdeinit_kcontroledit.so
+%{tde_libdir}/libtdeinit_kmenuedit.la
+%{tde_libdir}/libtdeinit_kmenuedit.so
+%{tde_tdeappdir}/kmenuedit.desktop
+%{tde_datadir}/applnk/System/kmenuedit.desktop
+%{tde_datadir}/apps/kcontroledit/
+%{tde_datadir}/apps/kmenuedit/
+%{tde_tdedocdir}/HTML/en/kmenuedit/
+%{tde_mandir}/man1/kmenuedit.1*
+
+##########
+
+%package -n trinity-konqueror
+Summary:	TDE's advanced file manager, web browser and document viewer
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-konqueror
+Konqueror is the file manager for the Trinity Desktop Environment.
+It supports basic file management on local UNIX filesystems,
+from simple cut/copy and paste operations to advanced remote
+and local network file browsing.
+
+It is also the canvas for all the latest TDE technology,
+from KIO slaves (which provide mechanisms for file access) to
+component embedding via the KParts object interface, and it
+is one of the most customizable applications available.
+
+Konqueror is an Open Source web browser with HTML4.0 compliance,
+supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
+as well as Netscape plugins (for example, Flash or RealVideo plugins).
+
+It is a universal viewing application, capable of embedding
+read-only viewing components in itself to view documents without
+ever launching another application.
+
+%files -n trinity-konqueror
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/konqsidebartng.rc
+%{tde_bindir}/kbookmarkmerger
+%{tde_bindir}/keditbookmarks
+%{tde_bindir}/kfmclient
+%{tde_bindir}/konqueror
+%{tde_tdelibdir}/kcm_history.la
+%{tde_tdelibdir}/kcm_history.so
+%{tde_tdelibdir}/kded_konqy_preloader.la
+%{tde_tdelibdir}/kded_konqy_preloader.so
+%{tde_tdelibdir}/keditbookmarks.la
+%{tde_tdelibdir}/keditbookmarks.so
+%{tde_tdelibdir}/kfmclient.la
+%{tde_tdelibdir}/kfmclient.so
+%{tde_tdelibdir}/konq_aboutpage.la
+%{tde_tdelibdir}/konq_aboutpage.so
+%{tde_tdelibdir}/konq_iconview.la
+%{tde_tdelibdir}/konq_iconview.so
+%{tde_tdelibdir}/konq_listview.la
+%{tde_tdelibdir}/konq_listview.so
+%{tde_tdelibdir}/konq_remoteencoding.la
+%{tde_tdelibdir}/konq_remoteencoding.so
+%{tde_tdelibdir}/konq_shellcmdplugin.la
+%{tde_tdelibdir}/konq_shellcmdplugin.so
+%{tde_tdelibdir}/konq_sidebar.la
+%{tde_tdelibdir}/konq_sidebar.so
+%{tde_tdelibdir}/konq_sidebartree_bookmarks.la
+%{tde_tdelibdir}/konq_sidebartree_bookmarks.so
+%{tde_tdelibdir}/konq_sidebartree_dirtree.la
+%{tde_tdelibdir}/konq_sidebartree_dirtree.so
+%{tde_tdelibdir}/konq_sidebartree_history.la
+%{tde_tdelibdir}/konq_sidebartree_history.so
+%{tde_tdelibdir}/konqsidebar_tree.la
+%{tde_tdelibdir}/konqsidebar_tree.so
+%{tde_tdelibdir}/konqsidebar_web.la
+%{tde_tdelibdir}/konqsidebar_web.so
+%{tde_tdelibdir}/konqueror.la
+%{tde_tdelibdir}/konqueror.so
+%{tde_tdelibdir}/libtdehtmlkttsdplugin.la
+%{tde_tdelibdir}/libtdehtmlkttsdplugin.so
+%{tde_libdir}/libtdeinit_keditbookmarks.la
+%{tde_libdir}/libtdeinit_keditbookmarks.so
+%{tde_libdir}/libtdeinit_kfmclient.la
+%{tde_libdir}/libtdeinit_kfmclient.so
+%{tde_libdir}/libtdeinit_konqueror.la
+%{tde_libdir}/libtdeinit_konqueror.so
+%{tde_libdir}/libkonqsidebarplugin.so.*
+%{tde_tdeappdir}/Home.desktop
+%{tde_tdeappdir}/kcmhistory.desktop
+%{tde_tdeappdir}/kfmclient.desktop
+%{tde_tdeappdir}/kfmclient_dir.desktop
+%{tde_tdeappdir}/kfmclient_html.desktop
+%{tde_tdeappdir}/kfmclient_war.desktop
+%{tde_tdeappdir}/tdehtml_filter.desktop
+%{tde_tdeappdir}/konqbrowser.desktop
+%{tde_tdeappdir}/konquerorsu.desktop
+%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop
+%{tde_datadir}/applnk/Internet/keditbookmarks.desktop
+%{tde_datadir}/applnk/konqueror.desktop
+%{tde_datadir}/apps/tdeconf_update/kfmclient_3_2.upd
+%{tde_datadir}/apps/tdeconf_update/kfmclient_3_2_update.sh
+%{tde_datadir}/apps/tdeconf_update/konqsidebartng.upd
+%{tde_datadir}/apps/tdeconf_update/move_konqsidebartng_entries.sh
+%{tde_datadir}/apps/keditbookmarks/
+%{tde_datadir}/apps/tdehtml/kpartplugins/
+%{tde_datadir}/apps/konqiconview/
+%{tde_datadir}/apps/konqlistview/
+%exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+%{tde_datadir}/apps/konqsidebartng/
+%{tde_datadir}/apps/konqueror/about/
+%dir %{tde_datadir}/apps/konqueror/dirtree
+%dir %{tde_datadir}/apps/konqueror/dirtree/remote
+%{tde_datadir}/apps/konqueror/icons/
+%{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
+%{tde_datadir}/apps/konqueror/konqueror.rc
+%{tde_datadir}/apps/konqueror/pics/indicator_connect.png
+%{tde_datadir}/apps/konqueror/pics/indicator_empty.png
+%{tde_datadir}/apps/konqueror/pics/indicator_noconnect.png
+%{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png
+%{tde_datadir}/apps/konqueror/profiles/
+%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
+%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
+%{tde_datadir}/apps/konqueror/tiles/
+%{tde_datadir}/autostart/konqy_preload.desktop
+%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
+%{tde_datadir}/config.kcfg/konq_listview.kcfg
+%{tde_datadir}/config.kcfg/konqueror.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kfm.png
+%{tde_datadir}/icons/hicolor/*/apps/konqueror.*
+%{tde_datadir}/services/kded/konqy_preloader.desktop
+%{tde_datadir}/services/konq_*.desktop
+%{tde_datadir}/servicetypes/konqaboutpage.desktop
+%{tde_tdedocdir}/HTML/en/konqueror/
+%{tde_tdedocdir}/HTML/en/keditbookmarks/
+%{tde_mandir}/man1/keditbookmarks.1*
+%{tde_mandir}/man1/kfmclient.1*
+%{tde_mandir}/man1/konqueror.1*
+
+%post -n trinity-konqueror
+if [ $1 -eq 1 ]; then
+  update-alternatives --install \
+    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
+    media_safelyremove.desktop_konqueror \
+    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
+    10 || :
+fi
+
+%preun -n trinity-konqueror
+if [ $1 -eq 0 ]; then
+  update-alternatives --remove \
+    media_safelyremove.desktop_konqueror \
+    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
+fi
+
+##########
+
+%package -n trinity-konqueror-devel
+Summary:	Development files for konqueror
+Group:		Development/Libraries/Other
+Requires:	trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-konqueror-devel
+This package contains the development files for konqueror.
+
+%files -n trinity-konqueror-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/konqsidebarplugin.h
+%{tde_tdeincludedir}/KonquerorIface.h
+%{tde_libdir}/libkonqsidebarplugin.la
+%{tde_libdir}/libkonqsidebarplugin.so
+
+##########
+
+%package -n trinity-konqueror-nsplugins
+Summary:	Netscape plugin support for Konqueror
+Group:		System/GUI/Other
+Requires:	trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-konqueror-nsplugins
+This package includes support for Netscape plugins in Konqueror.
+
+%files -n trinity-konqueror-nsplugins
+%defattr(-,root,root,-)
+%{tde_bindir}/nspluginscan
+%{tde_bindir}/nspluginviewer
+%{tde_tdelibdir}/kcm_nsplugins.la
+%{tde_tdelibdir}/kcm_nsplugins.so
+%{tde_tdelibdir}/libnsplugin.la
+%{tde_tdelibdir}/libnsplugin.so
+%{tde_tdeappdir}/tdehtml_plugins.desktop
+%{tde_datadir}/apps/plugin/nspluginpart.rc
+
+##########
+
+%package -n trinity-konsole
+Summary:	X terminal emulator for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-konsole
+Konsole is an X terminal emulation which provides a command-line interface
+(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
+better organize user's desktop by containing multiple sessions in a single
+window (a less cluttered desktop).
+
+Its advanced features include a simple configuration and the ability to use
+multiple terminal shells in a single window
+
+Using Konsole, a user can open:
+* Linux console sessions
+* Midnight Commander file manager sessions
+* Shell sessions
+* Root consoles sessions
+
+%files -n trinity-konsole
+%defattr(-,root,root,-)
+%{tde_bindir}/konsole
+%{tde_bindir}/terminalhere
+%{tde_tdelibdir}/kcm_konsole.la
+%{tde_tdelibdir}/kcm_konsole.so
+%{tde_tdelibdir}/kded_kwrited.la
+%{tde_tdelibdir}/kded_kwrited.so
+%{tde_tdelibdir}/konsole.la
+%{tde_tdelibdir}/konsole.so
+%{tde_tdelibdir}/libkonsolepart.la
+%{tde_tdelibdir}/libkonsolepart.so
+%{tde_libdir}/libtdeinit_konsole.la
+%{tde_libdir}/libtdeinit_konsole.so
+%{tde_tdeappdir}/konsole.desktop
+%{tde_tdeappdir}/konsolesu.desktop
+%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
+%{tde_datadir}/apps/tdeconf_update/konsole.upd
+%{tde_datadir}/apps/tdeconf_update/schemaStrip.pl
+%{tde_datadir}/apps/konsole/
+%{tde_datadir}/icons/hicolor/*/apps/konsole.*
+%{tde_datadir}/mimelnk/application/x-konsole.desktop
+%{tde_datadir}/services/kded/kwrited.desktop
+%{tde_datadir}/services/konsolepart.desktop
+%{tde_datadir}/services/konsole-script.desktop
+%{tde_datadir}/services/kwrited.desktop
+%{tde_datadir}/servicetypes/terminalemulator.desktop
+%{tde_tdedocdir}/HTML/en/konsole/
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
+%config %{_sysconfdir}/fonts/conf.d/99-konsole.conf
+%{tde_mandir}/man1/konsole.1*
+
+##########
+
+%package -n trinity-kpager
+Summary:	Desktop pager for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kpager
+This package contains TDE's desktop pager, which displays your virtual
+desktops iconically in a window, along with icons of any running
+applications. It is used to switch between applications or desktops.
+
+%files -n trinity-kpager
+%defattr(-,root,root,-)
+%{tde_bindir}/kpager
+%{tde_tdeappdir}/kpager.desktop
+%{tde_datadir}/applnk/Utilities/kpager.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kpager.png
+%{tde_tdedocdir}/HTML/en/kpager/
+%{tde_mandir}/man1/kpager.1*
+
+##########
+
+%package -n trinity-kpersonalizer
+Summary:	Installation personalizer for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kpersonalizer
+TDE Personalizer is the application that configures the TDE desktop for you.
+It's a very useful wizard that allows you to quickly change the TDE desktop to
+suit your own needs. When you run TDE for the first time, KPersonalizer is
+automatically started. KPersonalizer can also be called later.
+
+%files -n trinity-kpersonalizer
+%defattr(-,root,root,-)
+%{tde_bindir}/kpersonalizer
+%{tde_tdeappdir}/kpersonalizer.desktop
+%{tde_datadir}/applnk/System/kpersonalizer.desktop
+%{tde_datadir}/apps/kpersonalizer/
+%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
+%{tde_mandir}/man1/kpersonalizer.1*
+
+##########
+
+%package -n trinity-ksmserver
+Summary:	Session manager for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	xmessage
+Requires:	xprop
+
+%description -n trinity-ksmserver
+This package contains the TDE session manager. It is responsible for
+restoring your TDE session on login. It is also needed to properly
+start a TDE session. It registers TDE with X display managers, and
+provides the 'starttde' command, for starting an X session with TDE
+from the console.
+
+If you are running TDE for the first time for a certain user,
+kpersonalizer is used to help with setup. If it is not present,
+TDE will start, but many good defaults will not be set.
+
+%files -n trinity-ksmserver
+%defattr(-,root,root,-)
+%{tde_bindir}/ksmserver
+%{tde_bindir}/%{starttde}
+%{tde_bindir}/migratekde3
+%{tde_bindir}/r14-xdg-update
+%{tde_bindir}/tdeinit_displayconfig
+%{tde_bindir}/tdeinit_phase1
+%{tde_tdelibdir}/ksmserver.la
+%{tde_tdelibdir}/ksmserver.so
+%{tde_libdir}/libtdeinit_ksmserver.la
+%{tde_libdir}/libtdeinit_ksmserver.so
+%{tde_datadir}/apps/tdeconf_update/ksmserver.upd
+%{tde_datadir}/apps/tdeconf_update/move_session_config.sh
+%{tde_datadir}/apps/ksmserver/
+%{tde_mandir}/man1/starttde.1*
+
+%post -n trinity-ksmserver
+%if 0%{?mdkversion} || 0%{?mgaversion}
+fndSession
+%endif
+
+# openSUSE 15.0 alternatives
+%if 0%{?suse_version} >= 1500
+update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || :
+%endif
+
+%postun -n trinity-ksmserver
+%if 0%{?mdkversion} || 0%{?mgaversion}
+fndSession
+%endif
+
+# openSUSE 15.0 alternatives
+%if 0%{?suse_version} >= 1500
+update-alternatives --remove default-xsession.desktop /usr/share/xsessions/tde.desktop || :
+%endif
+
+##########
+
+%package -n trinity-ksplash
+Summary:	The TDE splash screen
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-ksplash
+This package includes the TDE Splash screen, which is seen when
+a TDE session is launched.
+
+%files -n trinity-ksplash
+%defattr(-,root,root,-)
+%{tde_bindir}/ksplash
+%{tde_bindir}/ksplashsimple
+%{tde_tdelibdir}/kcm_ksplashthemes.la
+%{tde_tdelibdir}/kcm_ksplashthemes.so
+%{tde_tdelibdir}/ksplashdefault.la
+%{tde_tdelibdir}/ksplashdefault.so
+%{tde_tdelibdir}/ksplashunified.la
+%{tde_tdelibdir}/ksplashunified.so
+%{tde_tdelibdir}/ksplashredmond.la
+%{tde_tdelibdir}/ksplashredmond.so
+%{tde_tdelibdir}/ksplashstandard.la
+%{tde_tdelibdir}/ksplashstandard.so
+%{tde_libdir}/libksplashthemes.so.*
+%{tde_tdeappdir}/ksplashthememgr.desktop
+%{tde_datadir}/apps/ksplash
+%{tde_datadir}/services/ksplashdefault.desktop
+%{tde_datadir}/services/ksplash.desktop
+%{tde_datadir}/services/ksplashunified.desktop
+%{tde_datadir}/services/ksplashredmond.desktop
+%{tde_datadir}/services/ksplashstandard.desktop
+%{tde_datadir}/servicetypes/ksplashplugins.desktop
+%{tde_tdedocdir}/HTML/en/ksplashml/
+
+##########
+
+%package -n trinity-ksplash-devel
+Summary:	Development files for ksplash
+Group:		Development/Libraries/Other
+Requires:	trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-ksplash-devel
+This package contains the development files for ksplash.
+
+%files -n trinity-ksplash-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/ksplash/
+%{tde_libdir}/libksplashthemes.la
+%{tde_libdir}/libksplashthemes.so
+
+##########
+
+%package -n trinity-ksysguard
+Summary:	System guard for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-ksysguard
+TDE System Guard allows you to monitor various statistics about your
+computer.
+
+%files -n trinity-ksysguard
+%defattr(-,root,root,-)
+%{tde_bindir}/kpm
+%{tde_bindir}/ksysguard
+%{tde_tdelibdir}/sysguard_panelapplet.la
+%{tde_tdelibdir}/sysguard_panelapplet.so
+%{tde_libdir}/libksgrd.so.*
+%{tde_tdeappdir}/ksysguard.desktop
+%{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
+%{tde_datadir}/apps/ksysguard/
+%{tde_datadir}/icons/crystalsvg/*/apps/ksysguard.png
+%{tde_datadir}/mimelnk/application/x-ksysguard.desktop
+%{tde_tdedocdir}/HTML/en/ksysguard/
+
+##########
+
+%package -n trinity-ksysguard-devel
+Summary:	Development files for ksysguard
+Group:		Development/Libraries/Other
+Requires:	trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-ksysguard-devel
+This package contains the development files for ksysguard.
+
+%files -n trinity-ksysguard-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/ksgrd/
+%{tde_libdir}/libksgrd.la
+%{tde_libdir}/libksgrd.so
+
+##########
+
+%package -n trinity-ksysguardd
+Summary:	System guard daemon for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-ksysguardd
+TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
+be installed on a remote machine to enable ksysguard on another machine
+to monitor it through the daemon running there.
+
+%files -n trinity-ksysguardd
+%defattr(-,root,root,-)
+%{tde_bindir}/ksysguardd
+%config(noreplace) %{tde_confdir}/ksysguarddrc
+
+##########
+
+%package -n trinity-ktip
+Summary:	Useful tips for TDE
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-ktip
+ktip provides many useful tips on using TDE when you log in.
+
+%files -n trinity-ktip
+%defattr(-,root,root,-)
+%{tde_bindir}/ktip
+%{tde_tdeappdir}/ktip.desktop
+%{tde_datadir}/applnk/Toys/ktip.desktop
+%{tde_datadir}/apps/tdewizard/
+%{tde_datadir}/autostart/ktip.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ktip.*
+
+##########
+
+%package -n trinity-twin
+Summary:	The TDE window manager
+Group:		System/GUI/Other
+Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-twin
+This package contains the default X window manager for TDE.
+
+%files -n trinity-twin
+%defattr(-,root,root,-)
+%{tde_bindir}/twin
+%{tde_bindir}/twin_killer_helper
+%{tde_bindir}/twin_resumer_helper
+%{tde_bindir}/twin_rules_dialog
+%{tde_libdir}/tdeconf_update_bin/twin_update_default_rules
+%{tde_libdir}/tdeconf_update_bin/twin_update_window_settings
+%{tde_tdelibdir}/kcm_twin*.la
+%{tde_tdelibdir}/kcm_twin*.so
+%{tde_tdelibdir}/twin*.la
+%{tde_tdelibdir}/twin*.so
+%{tde_libdir}/libtdecorations.so.*
+%{tde_libdir}/libtdeinit_twin_rules_dialog.la
+%{tde_libdir}/libtdeinit_twin_rules_dialog.so
+%{tde_libdir}/libtdeinit_twin.la
+%{tde_libdir}/libtdeinit_twin.so
+%{tde_tdeappdir}/showdesktop.desktop
+%{tde_tdeappdir}/twindecoration.desktop
+%{tde_tdeappdir}/twinoptions.desktop
+%{tde_tdeappdir}/twinrules.desktop
+%{tde_datadir}/applnk/.hidden/twinactions.desktop
+%{tde_datadir}/applnk/.hidden/twinadvanced.desktop
+%{tde_datadir}/applnk/.hidden/twinfocus.desktop
+%{tde_datadir}/applnk/.hidden/twinmoving.desktop
+%{tde_datadir}/applnk/.hidden/twintranslucency.desktop
+%{tde_datadir}/apps/tdeconf_update/twin3_plugin.pl
+%{tde_datadir}/apps/tdeconf_update/twin3_plugin.upd
+%{tde_datadir}/apps/tdeconf_update/twin_focus1.sh
+%{tde_datadir}/apps/tdeconf_update/twin_focus1.upd
+%{tde_datadir}/apps/tdeconf_update/twin_focus2.sh
+%{tde_datadir}/apps/tdeconf_update/twin_focus2.upd
+%{tde_datadir}/apps/tdeconf_update/twin_fsp_workarounds_1.upd
+%{tde_datadir}/apps/tdeconf_update/twiniconify.upd
+%{tde_datadir}/apps/tdeconf_update/twinsticky.upd
+%{tde_datadir}/apps/tdeconf_update/twin.upd
+%{tde_datadir}/apps/tdeconf_update/twinupdatewindowsettings.upd
+%{tde_datadir}/apps/tdeconf_update/pluginlibFix.pl
+%{tde_datadir}/apps/twin/
+%{tde_datadir}/config.kcfg/twin.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/twin.png
+%{tde_tdedocdir}/HTML/en/kompmgr/
+
+##########
+
+%package -n trinity-twin-devel
+Summary:	Development files for twin
+Group:		Development/Libraries/Other
+Requires:	trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-twin-devel
+This package contains the development files for twin.
+
+%files -n trinity-twin-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/twin/
+%{tde_tdeincludedir}/kcommondecoration.h
+%{tde_tdeincludedir}/kdecoration.h
+%{tde_tdeincludedir}/kdecoration_p.h
+%{tde_tdeincludedir}/kdecoration_plugins_p.h
+%{tde_tdeincludedir}/kdecorationfactory.h
+%{tde_tdeincludedir}/KWinInterface.h
+%{tde_libdir}/libtdecorations.la
+%{tde_libdir}/libtdecorations.so
+
+##########
+
+%package -n trinity-libkonq
+Summary:	Core libraries for Konqueror
+Group:		System/GUI/Other
+
+%description -n trinity-libkonq
+These libraries are used by several TDE applications, most notably
+Konqueror and the kdesktop package.
+
+%files -n trinity-libkonq
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kded_favicons.la
+%{tde_tdelibdir}/kded_favicons.so
+%{tde_tdelibdir}/konq_sound.la
+%{tde_tdelibdir}/konq_sound.so
+%{tde_libdir}/libkonq.so.*
+%{tde_datadir}/apps/kbookmark/
+%{tde_datadir}/apps/tdeconf_update/favicons.upd
+%{tde_datadir}/apps/tdeconf_update/move_favicons.sh
+%dir %{tde_datadir}/apps/konqueror/pics
+%{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
+%{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
+%{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
+%{tde_datadir}/apps/konqueror/pics/arrow_topright.png
+%{tde_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png
+%{tde_datadir}/services/kded/favicons.desktop
+%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop
+
+##########
+
+%package libtqt3-integration
+Summary:	Integration library between TQt3 and TDE
+Group:		System/GUI/Other
+
+Obsoletes:	tdebase-libtqt3-integration < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdebase-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libtqt3-integration
+These libraries allow you to use TDE dialogs in native TQt3 applications.
+
+%files libtqt3-integration
+%defattr(-,root,root,-)
+%{_libdir}/tqt3/plugins/integration/
+%{tde_tdelibdir}/kded_kdeintegration.la
+%{tde_tdelibdir}/kded_kdeintegration.so
+%{tde_datadir}/services/kded/kdeintegration.desktop
+
+##########
+
+%package -n trinity-libkonq-devel
+Summary:	Development files for Konqueror's core libraries
+Group:		Development/Libraries/Other
+Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?xtst_devel:Requires: %{xtst_devel}}
+
+%description -n trinity-libkonq-devel
+This package contains headers and other development files for the core
+Konqueror libraries.
+
+%files -n trinity-libkonq-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/tdefileivi.h
+%{tde_tdeincludedir}/kivdirectoryoverlay.h
+%{tde_tdeincludedir}/kivfreespaceoverlay.h
+%{tde_tdeincludedir}/knewmenu.h
+%{tde_tdeincludedir}/konqbookmarkmanager.h
+%{tde_tdeincludedir}/konq_*.h
+%{tde_tdeincludedir}/libkonq_export.h
+%{tde_libdir}/libkonq.la
+%{tde_libdir}/libkonq.so
+
+##########
+
+%package tdeio-smb-plugin
+Summary:	Windows Connection Module for TDE
+Group:		System/GUI/Other
+
+%description tdeio-smb-plugin
+This package provides the "smb://" protocol, to connect to and from
+Windows and Samba shares.
+
+%files tdeio-smb-plugin
+%defattr(-,root,root)
+%{tde_tdelibdir}/kcm_samba.la
+%{tde_tdelibdir}/kcm_samba.so
+%{tde_tdelibdir}/tdeio_smb.la
+%{tde_tdelibdir}/tdeio_smb.so
+%{tde_datadir}/services/smb.protocol
+%{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
+%dir %{tde_datadir}/apps/remoteview
+%{tde_datadir}/apps/remoteview/smb-network.desktop
+%{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+# Applies an optional distro-specific graphical theme
+%if "%{?tde_bg}" != ""
+# TDM Background
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \
+	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
+
+# TDE user default background
+%__sed -i "kpersonalizer/keyecandypage.cpp" \
+	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
+%__sed -i "%{starttde}" \
+	-e 's|$TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop|%{tde_bg}|' \
+	-e 's|Wallpaper=Trinity-lineart.svg|Wallpaper=%{tde_bg}|'
+%endif
+
+# TDE default directory and icon in startup script
+%__sed -i "%{starttde}" \
+	-e "s|/opt/trinity|%{tde_prefix}|g"
+
+# Sets default TDE menu icon
+%if "%{tde_starticon}" != ""
+%__sed -i "kicker/libkicker/kickerSettings.kcfg" \
+	-e "s|QString(\"kmenu\")|QString(\"%{tde_starticon}\")|"
+%endif
+
+# Xsession script location may vary on some distro
+%if 0%{?rhel} || 0%{?fedora}
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
+%endif
+%if 0%{?suse_version}
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
+%endif
+%if 0%{?suse_version} >= 1550
+# /etc/X11 moved to /usr/etc/X11 on opensuse TW
+%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \
+       -i "%{tdm}/README" \
+       -i "doc/khelpcenter/adminguide/index.docbook" \
+       -i "doc/khelpcenter/faq/notrelated.docbook" \
+       -e "s|/etc/X11/xdm|/usr/etc/X11/xdm|g" \
+       -e "s|/etc/X11/sessions|/usr/etc/X11/sessions|g"
+%endif
+
+# Reboot command location may vary on some distributions
+if [ -x "/usr/bin/reboot" ]; then
+  POWEROFF="/usr/bin/poweroff"
+  REBOOT="/usr/bin/reboot"
+fi
+if [ -n "${REBOOT}" ]; then
+  %__sed -i \
+    "doc/%{tdm}/%{tdm}rc-ref.docbook" \
+    "kcontrol/%{tdm}/%{tdm}-shut.cpp" \
+    "%{tdm}/config.def" \
+  -e "s|/sbin/poweroff|${POWEROFF}|g" \
+  -e "s|/sbin/reboot|${REBOOT}|g"
+fi
+
+# Update icons for some control center modules
+%__sed -i "kcontrol/componentchooser/componentchooser.desktop"        -e "s|^Icon=.*|Icon=kcmcomponentchooser|"
+%__sed -i "kcontrol/taskbar/kcmtaskbar.desktop"                       -e "s|^Icon=.*|Icon=kcmtaskbar|"
+%__sed -i "kcontrol/nics/nic.desktop"                                 -e "s|^Icon=.*|Icon=kcmnic|"
+%__sed -i "kcontrol/input/mouse.desktop"                              -e "s|^Icon=.*|Icon=kcmmouse|"
+%__sed -i "kcontrol/smserver/kcmsmserver.desktop"                     -e "s|^Icon=.*|Icon=kcmsmserver|"
+%__sed -i "kcontrol/kded/kcmkded.desktop"                             -e "s|^Icon=.*|Icon=kcmkded|"
+%__sed -i "kcontrol/konq/desktop.desktop"                             -e "s|^Icon=.*|Icon=kcmdesktop|"
+%__sed -i "kcontrol/konq/desktopbehavior.desktop"                     -e "s|^Icon=.*|Icon=kcmdesktopbehavior|"
+%__sed -i "kcontrol/privacy/privacy.desktop"                          -e "s|^Icon=.*|Icon=kcmprivacy|"
+%__sed -i "kcontrol/crypto/crypto.desktop"                            -e "s|^Icon=.*|Icon=kcmcrypto|"
+%__sed -i "kcontrol/tdeio/netpref.desktop"                            -e "s|^Icon=.*|Icon=kcmnetpref|"
+%__sed -i "kcontrol/konqhtml/tdehtml_filter.desktop"                  -e "s|^Icon=.*|Icon=kcmkhtml_filter|"
+%__sed -i "kcontrol/joystick/joystick.desktop"                        -e "s|^Icon=.*|Icon=kcmjoystick|"
+%__sed -i "kcontrol/colors/colors.desktop"                            -e "s|^Icon=.*|Icon=kcmcolors|"
+%__sed -i "kcontrol/performance/kcmperformance.desktop"               -e "s|^Icon=.*|Icon=kcmperformance|"
+%__sed -i "kcontrol/launch/kcmlaunch.desktop"                         -e "s|^Icon=.*|Icon=kcmlaunch|"
+%__sed -i "kcontrol/dnssd/kcm_tdednssd.desktop"                       -e "s|^Icon=.*|Icon=kcmkdnssd|"
+%__sed -i "kcontrol/spellchecking/spellchecking.desktop"              -e "s|^Icon=.*|Icon=kcmspellchecking|"
+%__sed -i "konqueror/sidebar/trees/history_module/kcmhistory.desktop" -e "s|^Icon=.*|Icon=kcmhistory|"
+%__sed -i "tdeioslave/cgi/kcmcgi/kcmcgi.desktop"                      -e "s|^Icon=.*|Icon=kcmcgi|"
+%__sed -i "tdeioslave/media/tdecmodule/media.desktop"                 -e "s|^Icon=.*|Icon=kcmmedia|" 
+
+# RHEL 5 does not support 'compton'
+%if 0%{?with_libconfig} == 0
+%__sed -i "twin/CMakeLists.txt" -e "/compton-tde/ s/^/#/"
+%endif
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+export TDEDIR="%{tde_prefix}"
+
+# Samba 4.0 includes (Fedora 18)
+if [ -d "/usr/include/samba-4.0" ]; then
+  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0"
+fi
+
+# openldap 2.4 includes (CentOS 5)
+if [ -d "/usr/include/openldap24" ]; then
+  RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
+fi
+
+# libtirpc (fedora)
+if [ -d "/usr/include/tirpc" ]; then
+  RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}"
+fi
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
+  -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_SASL=ON \
+  -DWITH_LDAP=ON \
+  -DWITH_SAMBA=ON \
+  %{?!with_exr:-DWITH_OPENEXR=OFF} \
+  -DWITH_XCOMPOSITE=ON \
+  -DWITH_XCURSOR=ON \
+  -DWITH_XFIXES=ON \
+  %{?!with_xrandr:-DWITH_XRANDR=OFF} \
+  -DWITH_XRENDER=ON \
+  %{?!with_libconfig:-DWITH_LIBCONFIG=OFF} \
+  -DWITH_PCRE=ON \
+  %{?!with_xtest:-DWITH_XTEST=OFF} \
+  -DWITH_OPENGL=ON \
+  %{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
+  %{?!with_libart:-DWITH_LIBART=OFF} \
+  -DWITH_LIBUSB=ON \
+  -DWITH_LIBRAW1394=ON \
+  -DWITH_SUDO_TDESU_BACKEND=OFF \
+  -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND=OFF \
+  -DWITH_PAM=ON \
+  -DWITH_SHADOW=OFF \
+  -DWITH_XDMCP=ON \
+  -DWITH_XINERAMA=ON \
+  -DWITH_ARTS=ON \
+  -DWITH_I8K=ON \
+  -DWITH_SENSORS=ON \
+  %{?with_hal:-DWITH_HAL=ON} \
+  %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
+  -DWITH_UPOWER=ON \
+  %{?!with_elficon:-DWITH_ELFICON=OFF} \
+  \
+  -DBUILD_ALL=ON \
+%if 0%{?suse_version}
+  -DKCHECKPASS_PAM_SERVICE="xdm" \
+  -DTDM_PAM_SERVICE="xdm" \
+  -DTDESCREENSAVER_PAM_SERVICE="xdm" \
+%else
+  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+  -DTDM_PAM_SERVICE="tdm-trinity" \
+  -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
+%endif
+  %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \
+  %{!?with_tsak:-DBUILD_TSAK=OFF} \
+%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320
+  -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
+%endif
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+# Removes obsolete Beagle-related files
+%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_index.pl
+%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_search.pl
+
+# Adds a GDM/KDM/XDM session called 'TDE'
+
+# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%__install -D -m 644 \
+	"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
+	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
+%endif
+
+# Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
+# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
+cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
+NAME=TDE
+ICON=kde-wmsession.xpm
+DESC=The Trinity Desktop Environment
+EXEC=%{tde_bindir}/%{starttde}
+SCRIPT:
+exec %{tde_bindir}/%{starttde}
+EOF
+
+%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
+cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
+NAME=TDM
+DESCRIPTION=TDM (Trinity Display Manager)
+PACKAGE=trinity-tdm
+EXEC=%{tde_bindir}/%{tdm}
+%if 0%{?pclinuxos}
+FNDSESSION_EXEC="/usr/sbin/chksession -k"
+%else
+%if 0%{?mgaversion} >= 6
+FNDSESSION_EXEC="/usr/sbin/chksession -l"
+%else
+FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
+%endif
+%endif
+EOF
+%endif
+
+# PAM configuration files (except openSUSE)
+%if 0%{?suse_version} == 0
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
+%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
+%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
+%endif
+
+# TDM configuration
+%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
+%else
+	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
+%endif
+
+# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
+if [ -r "/usr/share/usb.ids" ]; then
+  %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+  %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+elif [ -r "/usr/share/hwdata/usb.ids" ]; then
+  %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+  %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
+fi
+
+# Makes 'media_safelyremove.desktop' an alternative.
+# This allows the use of 'tdeio-umountwrapper' package.
+%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
+%__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives"
+%__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop"
+
+# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
+#  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
+%if 0%{?suse_version} >= 1210
+%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"
+%__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
+%endif
+
+# Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM.
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
+%endif
+
+# SELINUX policy for RHEL / Fedora
+%if 0%{?with_selinux_policy}
+%__cp -f "%{SOURCE8}" "tdm.te"
+%__make -f "%{_datadir}/selinux/devel/Makefile"
+%__install -D -m 644 -D "tdm.pp" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp"
+%endif
+
+# Mageia icon for TDE menu
+%if 0%{?mgaversion} >= 3
+%__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/icons/oxygen/scalable/mgabutton.svg"
+%endif
+
+# openSUSE 11.4: tdm startup script
+%if 0%{?suse_version} == 1140
+%__install -D -m 755 "%{SOURCE7}" "%{?buildroot}%{?_sysconfdir}/init.d/xdm.tde"
+%endif
+
+# Console font to fontconfig
+%__mkdir_p "%{buildroot}%{_sysconfdir}/fonts/conf.d"
+cat <<EOF >"%{buildroot}%{_sysconfdir}/fonts/conf.d/99-konsole.conf"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <!-- Font directory list -->
+  <dir>%{tde_datadir}/apps/konsole/fonts</dir>
+</fontconfig>
+EOF
+
+# logrotate configuration
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/trinity-tdm"
+/var/log/tdm.log {
+    weekly
+    notifempty
+    missingok
+    nocompress
+}
+EOF
+
+# Move faces icon to XDG directory '/usr/share/faces'
+if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
+  %__mkdir_p "%{?buildroot}%{_datadir}/faces"
+  %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces" 2>/dev/null
+  rmdir "%{?buildroot}%{tdm_datadir}/pics/users"
+fi
+%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users"
+
+# Adds missing icons in 'hicolor' theme
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/application-vnd.tde.misc.png  hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png  ;done
+for i in {16,22,32,48,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png                      hicolor/"$i"x"$i"/apps/kcmperformance.png       ;done
+for i in 16;                   do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png                    hicolor/"$i"x"$i"/apps/kcmkded.png              ;done
+for i in {16,22,32,48};        do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/system-log-out.png              hicolor/"$i"x"$i"/apps/kcmsmserver.png          ;done
+for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/tools-check-spelling.png        hicolor/"$i"x"$i"/apps/kcmspellchecking.png     ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/desktop.png                      hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png   ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/desktop.png                      hicolor/"$i"x"$i"/apps/kcmdesktop.png           ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png                          hicolor/"$i"x"$i"/apps/kcmtaskbar.png           ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/application-x-kcsrc.png       hicolor/"$i"x"$i"/apps/kcmcolors.png            ;done
+for i in {16,22,32,48,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png                      hicolor/"$i"x"$i"/apps/kcmlaunch.png            ;done
+for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png                      hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png      ;done
+for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/system-run.png                  hicolor/"$i"x"$i"/apps/kcmcgi.png               ;done
+for i in {16,22};              do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png                     hicolor/"$i"x"$i"/apps/kcmhistory.png           ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png                      hicolor/"$i"x"$i"/apps/kcmnetpref.png           ;done
+for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png                 hicolor/"$i"x"$i"/apps/kcmkdnssd.png            ;done
+for i in {16,22,32,48,64};     do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-joystick.png              hicolor/"$i"x"$i"/apps/kcmjoystick.png          ;done
+for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-mouse.png                 hicolor/"$i"x"$i"/apps/kcmmouse.png             ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/computer.png                    hicolor/"$i"x"$i"/apps/kcmmedia.png             ;done
+for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png                   hicolor/"$i"x"$i"/apps/kcmcrypto.png            ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/trashcan_empty.png               hicolor/"$i"x"$i"/apps/kcmprivacy.png           ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png                      hicolor/"$i"x"$i"/apps/kcmnic.png               ;done
+popd
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Help.desktop                       Documentation Viewer
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Home.desktop                       System FileManager core
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kate.desktop                       TextEditor
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/KControl.desktop                   X-SuSE-core
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Kfind.desktop                      System Filesystem core
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop                 PrintingUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop                    System TrayIcon
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop                  Core-Configuration
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/knetattach.desktop                 System Network
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop                WebBrowser
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop                System FileManager
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsole.desktop                    TerminalEmulator
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop                  TerminalEmulator
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpager.desktop                     Utility  DesktopUtility
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop              DesktopUtility
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop                  System Monitor
+%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop                       System Utility
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kwrite.desktop                     TextEditor
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/tdeprintfax.desktop                PrintingUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop                Graphics Viewer
+%{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop               Applet X-TDE-settings-desktop}
+%suse_update_desktop_file    %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop   System FileManager
+%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop                      System Utility
+%endif
+
+# Icons from TDE Control Center should only be displayed in TDE
+for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
+  if grep -q "^Categories=.*X-TDE-settings" "${i}"; then
+    if ! grep -q "OnlyShowIn=TDE" "${i}" ; then
+      echo "OnlyShowIn=TDE;" >>"${i}"
+    fi
+  fi
+done
+
+# Other apps that should stay in TDE
+for i in ksysguard tde-kcontrol tdefontview showdesktop; do
+  echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
+done
+
+# Remove setuid bit on some binaries.
+%{?with_tsak:chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"}
+chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
+%{?with_kbdledsync:chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"}
+
+# Fix permissions on shell scripts
+chmod 0755 "%{?buildroot}%{tde_datadir}/apps/tdeconf_update/move_session_config.sh"
+chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs"
+
+# Removes tderandrtray documentation, if not built.
+%if 0%{?with_tderandrtray} == 0
+%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tderandrtray"
+%endif
+
+# Remove conflicting doc
+%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tdeioslave/gopher"
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%{?with_tsak:%verify_permissions -e %{tde_bindir}/%{tdm}tsak}
+%verify_permissions -e %{tde_bindir}/kcheckpass
+%{?with_kbdledsync:%verify_permissions -e %{tde_bindir}/tdekbdledsync}
+%endif
+
+
+%changelog
diff --git a/redhat/main/tdebase/tdm.el6.te b/redhat/core/tdebase/tdm.el6.te
index 60508ae0d..60508ae0d 100644
--- a/redhat/main/tdebase/tdm.el6.te
+++ b/redhat/core/tdebase/tdm.el6.te
diff --git a/redhat/main/tdebase/tdm.el7.te b/redhat/core/tdebase/tdm.el7.te
index 519ca0506..519ca0506 100644
--- a/redhat/main/tdebase/tdm.el7.te
+++ b/redhat/core/tdebase/tdm.el7.te
diff --git a/redhat/main/tdebase/tdm.el8.te b/redhat/core/tdebase/tdm.el8.te
index 519ca0506..519ca0506 100644
--- a/redhat/main/tdebase/tdm.el8.te
+++ b/redhat/core/tdebase/tdm.el8.te
diff --git a/redhat/core/tdebase/tdm.el9.te b/redhat/core/tdebase/tdm.el9.te
new file mode 120000
index 000000000..034e33247
--- /dev/null
+++ b/redhat/core/tdebase/tdm.el9.te
@@ -0,0 +1 @@
+tdm.el8.te
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.fc34.te b/redhat/core/tdebase/tdm.fc34.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc34.te
+++ b/redhat/core/tdebase/tdm.fc34.te
diff --git a/redhat/main/tdebase/tdm.fc30.te b/redhat/core/tdebase/tdm.fc35.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc30.te
+++ b/redhat/core/tdebase/tdm.fc35.te
diff --git a/redhat/main/tdebase/tdm.fc31.te b/redhat/core/tdebase/tdm.fc36.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc31.te
+++ b/redhat/core/tdebase/tdm.fc36.te
diff --git a/redhat/main/tdebase/tdm.fc32.te b/redhat/core/tdebase/tdm.fc37.te
index afe6de52a..afe6de52a 100644
--- a/redhat/main/tdebase/tdm.fc32.te
+++ b/redhat/core/tdebase/tdm.fc37.te
diff --git a/redhat/main/tdebase/tdm.service.el7 b/redhat/core/tdebase/tdm.service.el7
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.el7
+++ b/redhat/core/tdebase/tdm.service.el7
diff --git a/redhat/main/tdebase/tdm.service.el8 b/redhat/core/tdebase/tdm.service.el8
index 87f56ea08..87f56ea08 120000
--- a/redhat/main/tdebase/tdm.service.el8
+++ b/redhat/core/tdebase/tdm.service.el8
diff --git a/redhat/core/tdebase/tdm.service.el9 b/redhat/core/tdebase/tdm.service.el9
new file mode 120000
index 000000000..87f56ea08
--- /dev/null
+++ b/redhat/core/tdebase/tdm.service.el9
@@ -0,0 +1 @@
+tdm.service.el7
\ No newline at end of file
diff --git a/redhat/main/tdebase/tdm.service.fc34 b/redhat/core/tdebase/tdm.service.fc34
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc34
+++ b/redhat/core/tdebase/tdm.service.fc34
diff --git a/redhat/main/tdebase/tdm.service.fc30 b/redhat/core/tdebase/tdm.service.fc35
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc30
+++ b/redhat/core/tdebase/tdm.service.fc35
diff --git a/redhat/main/tdebase/tdm.service.fc31 b/redhat/core/tdebase/tdm.service.fc36
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc31
+++ b/redhat/core/tdebase/tdm.service.fc36
diff --git a/redhat/main/tdebase/tdm.service.fc32 b/redhat/core/tdebase/tdm.service.fc37
index 9ef7e07ff..9ef7e07ff 100644
--- a/redhat/main/tdebase/tdm.service.fc32
+++ b/redhat/core/tdebase/tdm.service.fc37
diff --git a/redhat/main/tdebase/tdm.service.mga8 b/redhat/core/tdebase/tdm.service.mga8
index eda2906e2..eda2906e2 100644
--- a/redhat/main/tdebase/tdm.service.mga8
+++ b/redhat/core/tdebase/tdm.service.mga8
diff --git a/redhat/main/tdebase/trinity-tdebase-rpmlintrc b/redhat/core/tdebase/trinity-tdebase-rpmlintrc
index 8d22f2fc6..8d22f2fc6 100644
--- a/redhat/main/tdebase/trinity-tdebase-rpmlintrc
+++ b/redhat/core/tdebase/trinity-tdebase-rpmlintrc
diff --git a/redhat/main/tdebase/xdm.oss114 b/redhat/core/tdebase/xdm.oss114
index aabe4afb3..aabe4afb3 100755
--- a/redhat/main/tdebase/xdm.oss114
+++ b/redhat/core/tdebase/xdm.oss114
diff --git a/redhat/main/tdebindings/filter-requires.sh b/redhat/core/tdebindings/filter-requires.sh
index da6c04566..da6c04566 100644
--- a/redhat/main/tdebindings/filter-requires.sh
+++ b/redhat/core/tdebindings/filter-requires.sh
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
new file mode 100644
index 000000000..d0fe72ad7
--- /dev/null
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -0,0 +1,1232 @@
+#
+# spec file for package tdebindings (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/
+#
+
+# Required for PCLinuxOS: removes the ldflag '--no-undefined'
+%if 0%{?pclinuxos}
+%define _disable_ld_no_undefined 1
+%endif
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdebindings
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Special note for RHEL4:
+#  You must create symlink 'libgcj.so' manually because it does not exist by default.
+# E.g:
+#  ln -s /usr/lib/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so
+# or 64 bits:
+#  ln -s /usr/lib64/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so
+
+Name:			trinity-%{tde_pkg}
+Summary:		TDE bindings to non-C++ languages
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:			System/GUI/Other
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	desktop-file-utils
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# ZLIB support
+BuildRequires: zlib-devel
+
+# PERL module support
+BuildRequires: perl(ExtUtils::MakeMaker)
+
+# GTK2 support
+%if 0%{?rhel} == 4
+BuildRequires:	evolution28-gtk2-devel
+Requires:		evolution28-gtk2
+BuildRequires:	evolution28-glib2-devel
+Requires:		evolution28-glib2
+BuildRequires:	evolution28-cairo-devel
+Requires:		evolution28-cairo
+BuildRequires:	evolution28-pango-devel
+Requires:		evolution28-pango
+BuildRequires:	evolution28-atk-devel
+Requires:		evolution28-atk
+%else
+BuildRequires:	gtk2-devel
+%endif
+
+# XULRUNNER support
+%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
+#BuildRequires: xulrunner-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires: mozilla-xulrunner20-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# GTK1 support
+%if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7)
+%define with_gtk1 1
+BuildRequires: glib-devel
+BuildRequires: gtk+-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+%if 0%{?with_gtk1}
+%define with_gtk1 1
+BuildRequires: glib-devel
+BuildRequires: gtk+-devel
+%endif
+%endif
+%if 0%{?mdkversion} == 201100
+%define with_gtk1 1
+BuildRequires: %{_lib}glib1.2-devel
+BuildRequires: %{_lib}gtk+-devel
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:	libgdk_pixbuf2.0-devel
+%else
+BuildRequires:	%{_lib}gdk_pixbuf2.0-devel
+%endif
+%endif
+%if 0%{?fedora}
+%if 0%{?fedora} >= 17
+BuildRequires: gdk-pixbuf2-devel
+%else
+BuildRequires: gdk-pixbuf-devel
+%endif
+%endif
+
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define with_python 0
+%global __python %__python3
+%else
+%define with_python 1
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 7
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+%endif
+
+## ruby
+BuildRequires:	ruby-devel >= 1.8
+BuildRequires:	ruby >= 1.8
+%if 0%{?fedora} >= 19
+BuildRequires:	rubypick
+%endif
+
+# Check for Ruby library directory
+%if "%{?ruby_libarchdir}" != ""
+%define ruby_arch %{?ruby_libarchdir}
+%else
+%if "%{?rb_archdir}" != ""
+%define ruby_arch %{?rb_archdir}
+%else
+%if "%{%ruby_archdir}" != ""
+%define ruby_arch %{?ruby_archdir}
+%else
+%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')}
+%endif
+%endif
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+%define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')
+%endif
+%if 0%{?pclinuxos}
+%define ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')
+%endif
+
+%if "%{?ruby_libdir}" != ""
+%define ruby_rubylibdir %{?ruby_libdir}
+%else
+%if "%{?rb_libdir}" != ""
+%define ruby_rubylibdir %{?rb_libdir}
+%else
+%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubylibdir"]')}
+%endif
+%endif
+
+# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
+%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
+
+## java
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+BuildRequires:	java-1.4.2-gcj-compat-devel
+BuildRequires:	libgcj-devel
+BuildRequires:	gcc-java
+%endif
+
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+
+# PCLinuxOS use SUN's Java
+%if 0%{?pclinuxos}
+BuildRequires:	java-devel
+%else
+
+# Others use OpenJDK
+BuildRequires: java-openjdk
+BuildRequires: java-devel >= 1.4.2
+%if 0%{?suse_version} >= 1320
+BuildRequires:	java-1_8_0-openjdk-devel
+%endif
+%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8
+BuildRequires: java-1.8.0-openjdk-devel
+%endif
+%if 0%{?fedora} == 17 ||  0%{?fedora} == 18 ||  0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7
+BuildRequires: java-1.7.0-openjdk-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+BuildRequires: java-1.6.0-openjdk-devel
+%endif
+
+%endif
+%endif
+
+%if 0%{?suse_version}
+%define java_home %{_usr}/%{_lib}/jvm/java
+%else
+%if 0%{?rhel} == 4
+%define java_home %{_usr}/lib/jvm/java-1.4.2-gcj-1.4.2.0
+%else
+%define java_home %{_usr}/lib/jvm/java
+%endif
+%endif
+%if 0%{?pclinuxos} == 0
+%define with_java 1
+%endif
+
+## Perl
+# There is no 'perl-devel' package on RHEL5
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	perl-devel
+%endif
+%define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
+
+## QScintilla
+BuildRequires:	libtqscintilla-devel >= %{?tde_epoch:%{tde_epoch}:}1.7.1
+%define with_qscintilla 1
+
+Obsoletes:	trinity-kdebindings < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebindings = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# Metapackage requires
+%if 0%{?with_java}
+Requires: trinity-tdebindings-java = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+Requires: trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{with_python}
+Requires: python-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+Requires: trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kjscmd = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkorundum0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+TDE/DCOP bindings to non-C++ languages
+
+%files
+%defattr(-,root,root,-)
+
+##########
+
+%package java
+Summary:	TDE Java bindings metapackage [Trinity]
+Group:		System/Libraries
+Requires:	trinity-libdcop3-java = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libqt3-java = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtrinity-java = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description java
+A metapackage depending on all TDE, Qt and DCOP bindings libraries
+related to the Java language.
+
+This package is part of the official TDE bindings module.
+
+%files java
+%defattr(-,root,root,-)
+
+##########
+
+%if 0%{?with_java}
+
+%package -n trinity-libdcop3-java
+Summary:	DCOP bindings for Java [Trinity]
+Group:		System/Libraries
+
+Requires:	trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libdcop3-java
+This package contains the Java classes necessary to run Java programs
+using the Java DCOP bindings. DCOP is the TDE Desktop COmmunications
+Protocol, used for communicating with running TDE applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libdcop3-java
+%defattr(-,root,root,-)
+%{tde_libdir}/java/org/
+
+%endif
+
+##########
+
+%if 0%{?with_java}
+
+%package -n trinity-libdcop3-java-devel
+Summary:	DCOP bindings for Java (dcopidl2java program) [Trinity]
+Group:		Development/Languages/Java
+Requires:	trinity-libdcop3-java = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libdcop3-java-devel
+This package contains the dcopidl2java program which generates Java 
+stubs from DCOP IDL files, necessary to do development with the DCOP Java
+bindings. DCOP is the TDE Desktop COmmunications Protocol, used for
+communicating with running TDE applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libdcop3-java-devel
+%defattr(-,root,root,-)
+%{tde_bindir}/dcopidl2java
+%{tde_mandir}/man1/dcopidl2java.1*
+
+%endif
+
+##########
+
+%if 0%{?with_java}
+
+%package -n trinity-libdcop3-jni
+Summary:	DCOP bindings for Java ( Native libraries ) [Trinity]
+Group:		System/Libraries
+
+%description -n trinity-libdcop3-jni
+This package contains the shared libraries and scripts necessary to
+run programs using the Java DCOP bindings. DCOP is the TDE Desktop
+COmmunications Protocol, used for communicating with running TDE
+applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libdcop3-jni
+%defattr(-,root,root,-)
+%{tde_libdir}/libjavadcop.la
+%{tde_libdir}/libjavadcop.so
+
+%endif
+
+##########
+
+%if 0%{?with_java}
+
+%package -n trinity-libqt3-java
+Summary:	Java bindings for Qt [Trinity]
+Group:		System/Libraries
+Requires:	trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libqt3-java
+This package contains the Java classes necessary to run Java programs
+using the Java Qt bindings. Qt is a very popular GUI toolkit, used by
+the TDE desktop environment.
+
+It also includes many example programs that make use of these bindings,
+plus many of the Qt Tutorial examples translated into Java.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libqt3-java
+%defattr(-,root,root,-)
+%{tde_libdir}/java/qtjava*.jar
+%{tde_tdedocdir}/HTML/en/javalib/
+
+%endif
+
+##########
+
+%if 0%{?with_java}
+
+%package -n trinity-libtqt3-jni
+Summary:	Java bindings for TQt ( Native libraries ) [Trinity]
+Group:		System/Libraries
+
+Obsoletes:	trinity-libqt3-jni < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libtqt3-jni
+This package contains the shared libraries necessary to run Java
+programs using the Java Qt bindings. Qt is a very popular GUI
+toolkit, used by the TDE desktop environment.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libtqt3-jni
+%defattr(-,root,root,-)
+%{tde_libdir}/lib*qtjavasupport.la
+%{tde_libdir}/lib*qtjavasupport.so.*
+%{tde_libdir}/jni/lib*qtjava.la
+%{tde_libdir}/jni/lib*qtjava.so.*
+%doc qtjava/ChangeLog
+
+%endif
+
+##########
+
+%if 0%{?with_java}
+
+%package -n trinity-libtqt3-jni-devel
+Summary:	Development files fo Java bindings for TQt ( Native libraries ) [Trinity]
+Group:		Development/Languages/Java
+Requires:	trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-libqt3-jni-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libtqt3-jni-devel
+This package contains the development files for trinity-libtqt3-jni.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libtqt3-jni-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/lib*qtjavasupport.so
+%{tde_libdir}/jni/lib*qtjava.so
+
+%endif
+
+##########
+
+%if 0%{?with_java}
+
+%package -n trinity-libtrinity-java
+Summary:	Tdelibs bindings for Java [Trinity]
+Group:		System/Libraries
+
+Requires:	trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libtrinity-java
+This package contains the Java classes necessary to run Java programs
+using the Java tdelibs bindings. TDE is the Trinity Desktop Environment, a
+very popular UNIX Desktop Environment.
+
+It also includes some example applications that use these Java
+classes, and multiple usage samples of the most common TDE classes.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libtrinity-java
+%defattr(-,root,root,-)
+%{tde_libdir}/java/koala*.jar
+
+%endif
+
+##########
+
+%if 0%{?with_java}
+
+%package -n trinity-libtrinity-jni
+Summary:	Tdelibs bindings for java ( Native libraries ) [Trinity]
+Group:		System/Libraries
+
+%description -n trinity-libtrinity-jni
+This package contains the shared libraries necessary to run Java
+programs using the Java tdelibs bindings. TDE is the Trinity Desktop
+Environment, a very popular UNIX Desktop Environment.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libtrinity-jni
+%defattr(-,root,root,-)
+%{tde_libdir}/jni/libtdejava.la
+%{tde_libdir}/jni/libtdejava.so.*
+%doc tdejava/ChangeLog
+
+%endif
+
+##########
+
+%if 0%{?with_java}
+
+%package -n trinity-libtrinity-jni-devel
+Summary:	Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
+Group:		Development/Languages/Java
+Requires:	trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libtrinity-jni-devel
+This package contains the development files for trinity-libtrinity-jni.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libtrinity-jni-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/jni/libtdejava.so
+
+%endif
+
+##########
+
+%package -n trinity-libsmoketqt
+Summary:	SMOKE Binding Library to Qt
+Group:		System/Libraries
+
+Obsoletes:	trinity-libsmokeqt1 < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libsmokeqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libsmoketqt
+The "Scripting Meta Object Kompiler Engine" library is used by
+various TDE language bindings packages to provide interfaces to the
+Qt library.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libsmoketqt
+%defattr(-,root,root,-)
+%{tde_libdir}/libsmoketqt.so.*
+
+##########
+
+%package -n trinity-libsmoketqt-devel
+Summary:	SMOKE Binding Library to TQt - Development Files
+Group:		Development/Languages/Other
+Requires:	trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-libsmokeqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libsmokeqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libsmoketqt-devel
+The "Scripting Meta Object Kompiler Engine" library is used by
+various TDE language bindings packages to provide interfaces to the
+Qt library. This package contains the development files for the
+library.
+
+If you are a normal user, you probably don't need this
+package.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libsmoketqt-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/smoke.h
+%{tde_libdir}/libsmoketqt.so
+%{tde_libdir}/libsmoketqt.la
+
+##########
+
+%package -n trinity-libsmoketde
+Summary:	SMOKE Binding Library to TDE
+Group:		System/Libraries
+
+Obsoletes:	trinity-libsmokekde1 < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libsmokekde1 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libsmoketde
+The "Scripting Meta Object Kompiler Engine" library is used by
+various TDE language bindings packages to provide interfaces to the
+TDE libraries.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libsmoketde
+%defattr(-,root,root,-)
+%{tde_libdir}/libsmoketde.so.*
+
+##########
+
+%package -n trinity-libsmoketde-devel
+Summary:	SMOKE Binding Library to TDE - Development Files
+Group:		Development/Languages/Other
+Requires:	trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-libsmokekde-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libsmokekde-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libsmoketde-devel
+The "Scripting Meta Object Kompiler Engine" library is used by
+various TDE language bindings packages to provide interfaces to the
+Qt and TDE libraries. This package contains the development files for
+the library.
+
+If you are a normal user, you probably don't need this
+package.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libsmoketde-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libsmoketde.so
+%{tde_libdir}/libsmoketde.la
+
+##########
+
+%package -n perl-dcop
+Summary:	DCOP Bindings for Perl 
+Group:		System/Libraries
+%if 0%{?suse_version}
+Requires:	perl-base
+%else
+Requires:	perl
+%endif
+
+Obsoletes:	trinity-kdebindings-dcopperl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebindings-dcopperl = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-perl-dcop < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n perl-dcop
+Perl bindings to the DCOP interprocess communication protocol used by TDE
+
+%files -n perl-dcop
+%defattr(-,root,root,-)
+%{perl_vendorarch}/auto/DCOP/
+%{perl_vendorarch}/DCOP.pm
+%{perl_vendorarch}/DCOP/
+%doc dcopperl/AUTHORS dcopperl/Changes dcopperl/README dcopperl/TODO
+%{tde_mandir}/man3/DCOP.3pm*
+
+##########
+
+%if 0%{with_python}
+
+%package -n python-dcop
+Summary:	DCOP bindings for Python
+Group:		System/Libraries
+Requires:	%{python}
+
+Obsoletes:	trinity-python-dcop < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n python-dcop
+This package contains the shared libraries necessary to run and
+develop Python programs using the Python DCOP bindings
+libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
+communicating with running TDE applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n python-dcop
+%defattr(-,root,root,-)
+%{python_sitearch}/pcop.la
+%{python_sitearch}/pcop.so
+%{python_sitearch}/pydcop.py*
+
+%endif
+
+##########
+
+%package -n trinity-libkjsembed1
+Summary:	Embedded JavaScript library
+Group:		System/Libraries
+
+%description -n trinity-libkjsembed1
+This package contains the shared libraries necessary to run programs
+linked with the KJSEmbed library. This library provides JavaScript
+embedded scripting facilities to TDE applications.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libkjsembed1
+%defattr(-,root,root,-)
+%{tde_libdir}/libkjsembed.so.*
+%{tde_tdelibdir}/libimagefxplugin.la
+%{tde_tdelibdir}/libimagefxplugin.so
+%{tde_datadir}/services/imagefx_plugin.desktop
+%{tde_tdelibdir}/libqprocessplugin.so
+%{tde_tdelibdir}/libqprocessplugin.la
+%{tde_datadir}/services/qprocess_plugin.desktop
+%{tde_tdelibdir}/libfileitemplugin.la
+%{tde_tdelibdir}/libfileitemplugin.so
+%{tde_datadir}/services/tdefileitem_plugin.desktop
+%{tde_datadir}/apps/kjsembed/
+%{tde_datadir}/servicetypes/binding_type.desktop
+%{tde_bindir}/embedjs
+%{tde_datadir}/apps/embedjs/
+%{tde_tdeappdir}/embedjs.desktop
+%{tde_datadir}/icons/hicolor/16x16/apps/embedjs.png
+%{tde_datadir}/icons/hicolor/32x32/apps/embedjs.png
+%{tde_tdelibdir}/libjavascript.la
+%{tde_tdelibdir}/libjavascript.so
+%dir %{tde_datadir}/apps/kate
+%dir %{tde_datadir}/apps/kate/scripts
+%{tde_datadir}/apps/kate/scripts/swaptabs.js
+%{tde_datadir}/apps/kate/scripts/swaptabs.ui
+%{tde_datadir}/apps/kate/scripts/swaptabs.desktop
+%{tde_datadir}/services/javascript.desktop
+%doc kjsembed/docs/ChangeLog
+
+##########
+
+%package -n trinity-libkjsembed-devel
+Summary:	Embedded JavaScript library (Development files)
+Group:		Development/Libraries/Other
+Requires:	trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkjsembed-devel
+This package contains the header files and symbolic links necessary
+to develop and compile programs using the KJSEmbed library. This
+library provides JavaScript embedded scripting facilities to TDE
+applications.
+
+It also includes lots of example programs that make use of these
+bindings, plus comprehensive documentation of the bindings.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libkjsembed-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kjsembed/
+%{tde_libdir}/libkjsembed.so
+%{tde_libdir}/libkjsembed.la
+%{tde_docdir}/trinity-libkjsembed-devel/
+
+##########
+
+%package -n trinity-kjscmd
+Summary:	A script interpreter using the TDE JavaScript library
+Group:		System/Libraries
+Provides:	%{tde_bindir}/kjscmd
+
+%description -n trinity-kjscmd
+This package contains the kjscmd program, which is a standalone
+JavaScript interpreter using the KJSEmbed library.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-kjscmd
+%defattr(-,root,root,-)
+%{tde_bindir}/kjscmd
+%{tde_tdeappdir}/kjscmd.desktop
+%{tde_mandir}/man1/kjscmd.*
+%{tde_tdelibdir}/libjsconsoleplugin.la
+%{tde_tdelibdir}/libjsconsoleplugin.so
+
+##########
+
+%if 0%{?with_java}
+%package -n trinity-juic
+Summary:	The Qt Java UI Compiler
+Group:		Development/Languages/Java
+Requires:	trinity-libqt3-java = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-juic
+This package contains the juic program, which is used to convert
+a UI description file generated by the Qt Designer, and converts
+it into a Qt Java class. It is necessary for compiling and 
+developing programs using the Qt Java bindings together with Qt
+Designer.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-juic
+%defattr(-,root,root,-)
+%{tde_bindir}/juic
+%{tde_datadir}/juic/
+%{tde_mandir}/man1/juic.1*
+%endif
+
+##########
+
+%package -n trinity-libkorundum0-ruby
+Summary:	TDE bindings for Ruby [Trinity]
+Group:		System/Libraries
+Requires:	trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkorundum0-ruby
+This package contains the files necessary for running and developing
+Ruby code using the Korundum TDE Ruby bindings.
+
+It also includes some example programs and templates that make use of
+these bindings.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libkorundum0-ruby
+%defattr(-,root,root,-)
+%{tde_bindir}/rbtdesh
+%{tde_bindir}/rbtdeapi
+%{tde_bindir}/krubyinit
+%{tde_bindir}/rbtdeconfig_compiler
+%{ruby_rubylibdir}/Korundum.rb
+%dir %{ruby_rubylibdir}/TDE
+%{ruby_rubylibdir}/TDE/korundum.rb
+%{ruby_arch}/korundum.la
+%{ruby_arch}/korundum.so*
+%doc korundum/ChangeLog
+%{tde_mandir}/man1/krubyinit.1*
+%{tde_mandir}/man1/rbtdeapi.1*
+%{tde_mandir}/man1/rbtdesh.1*
+
+##########
+
+%package -n trinity-libqt0-ruby
+Summary:	Qt bindings for Ruby [Trinity]
+Group:		System/Libraries
+Requires:	ruby
+
+%description -n trinity-libqt0-ruby
+This package contains the files necessary for running and developing
+Ruby code using the Qt Ruby bindings.
+
+It also includes some example programs that make use of these bindings,
+plus many of the Qt Tutorial examples translated into Ruby.
+
+This package is part of the official TDE bindings module.
+
+%files -n trinity-libqt0-ruby
+%defattr(-,root,root,-)
+%{tde_bindir}/rbqtsh
+%{tde_bindir}/rbqtapi
+%{tde_bindir}/rbuic
+%{tde_bindir}/qtrubyinit
+%dir %{ruby_rubylibdir}/Qt
+%{ruby_rubylibdir}/Qt/qtruby.rb
+%{ruby_rubylibdir}/Qt.rb
+%{ruby_arch}/qtruby.so*
+%{ruby_arch}/qtruby.la
+%{ruby_arch}/tqui.so*
+%{ruby_arch}/tqui.la
+%doc qtruby/ChangeLog
+%{tde_mandir}/man1/qtrubyinit.1*
+%{tde_mandir}/man1/rbqtapi.1*
+%{tde_mandir}/man1/rbqtsh.1*
+%{tde_mandir}/man1/rbuic.1*
+
+##########
+
+%if 0
+%package -n trinity-kmozilla
+Summary:	Kmozilla for TDE
+Group:		System/Libraries
+
+%description -n trinity-kmozilla
+This package contains the kmozilla library fro TDE.
+
+%files -n trinity-kmozilla
+%defattr(-,root,root,-)
+%{tde_bindir}/kmozilla
+%{tde_libdir}/libkmozillapart.so.*
+%{tde_libdir}/libkmozillapart.so
+%{tde_libdir}/libkmozillapart.la
+%{tde_datadir}/services/kmozilla.desktop
+%endif
+
+##########
+
+%package -n trinity-xpart-notepad
+Summary:	A small XPart editor
+Group:		Productivity/Scientific/Math
+
+%description -n trinity-xpart-notepad
+xpart_notepad is a small XPart editor. Use it to understand how to use XPart.
+
+%files -n trinity-xpart-notepad
+%defattr(-,root,root,-)
+%{tde_bindir}/shell_xparthost
+%{tde_bindir}/xp_notepad
+%{tde_libdir}/libxp_notepadpart.la
+%{tde_libdir}/libxp_notepadpart.so
+%{tde_libdir}/libxp_notepadpart.so.*
+%{tde_datadir}/services/xp_notepad.desktop
+%doc xparts/xpart_notepad/README
+
+##########
+
+%if 0%{?with_gtk1}
+%package -n trinity-libgtkxparts1
+Summary:	Xparts library for GTK
+Group:		Development/Languages/Other
+
+%description -n trinity-libgtkxparts1
+This package contains the xparts library for GTK.
+
+%files -n trinity-libgtkxparts1
+%defattr(-,root,root,-)
+%{tde_libdir}/libgtkxparts.so.*
+%{tde_libdir}/libgtkxparts.la
+
+%endif
+
+##########
+
+%package -n trinity-libtdexparts
+Summary:	Xparts library for TDE
+Group:		Development/Languages/Other
+
+Obsoletes:	trinity-libkdexparts1 < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-libkdexparts1 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libtdexparts
+This package contains the xparts library for TDE.
+
+%files -n trinity-libtdexparts
+%defattr(-,root,root,-)
+%{tde_libdir}/libtdexparts.so.*
+%{tde_libdir}/libtdexparts.la
+
+##########
+
+%package -n trinity-libxparts-devel
+Summary:	Xparts development files
+Group:		Development/Languages/Other
+%if 0%{?with_gtk1}
+Requires:	trinity-libgtkxparts1 = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+Requires:	trinity-libtdexparts = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libxparts-devel
+This package contains the development files for Xparts library.
+
+%files -n trinity-libxparts-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/xtdeparts/
+%if 0%{?with_gtk1}
+%{tde_libdir}/libgtkxparts.so
+%endif
+%{tde_libdir}/libtdexparts.so
+
+##########
+
+%package xparts-extras
+Summary:	Extra xparts for TDE [Trinity]
+Group:		Development/Languages/Other
+
+# Metapckage requires
+Requires:	trinity-xpart-notepad = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_gtk1}
+Requires:	trinity-libgtkxparts1 = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+Requires:	trinity-libtdexparts = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libdcop-c = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description xparts-extras
+This package contains extra xparts-based modules for Trinity
+This includes the mozilla-konqueror plugin
+
+This package is part of the official TDE bindings module.
+
+%files xparts-extras
+%defattr(-,root,root,-)
+
+###########
+
+%package -n trinity-libdcop-c
+Summary:	DCOP bindings for C [Trinity]
+Group:		System/Libraries
+
+%description -n trinity-libdcop-c
+This package contains the DCOP bindings for C.
+
+%files -n trinity-libdcop-c
+%defattr(-,root,root,-)
+%{tde_libdir}/libdcopc.so.*
+
+###########
+
+%package -n trinity-libdcop-c-devel
+Summary:	DCOP bindings for C, development files [Trinity]
+Group:		Development/Languages/C and C++
+Requires:	trinity-libdcop-c = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libdcop-c-devel
+This package contains the development files for DCOP bindings for C.
+
+%files -n trinity-libdcop-c-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libdcopc.so
+%{tde_libdir}/libdcopc.la
+%{tde_tdeincludedir}/dcopc/
+
+##########
+
+%package devel
+Summary:	Development files for %{name}
+Group:		Development/Languages/Other
+
+Requires:	trinity-tdelibs-devel >= %{tde_version}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdebindings-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdebindings-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# Metapackage
+Requires:	trinity-libsmoketqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_java}
+Requires:	trinity-libdcop3-java-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+Requires:	trinity-libsmoketde-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkjsembed-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libxparts-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libdcop-c-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_java}
+Requires:	trinity-libtqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtrinity-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%description devel
+This package contains the development files for the TDE bindings.
+
+%files devel
+%defattr(-,root,root,-)
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+%if "%{?perl_vendorarch}" == ""
+exit 1
+%endif
+
+%if "%{?ruby_rubylibdir}" == ""
+exit 2
+%endif
+
+%if "%{?ruby_arch}" == ""
+exit 3
+%endif
+
+# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \
+       -i "korundum/rubylib/korundum/Korundum.cpp" \
+       -e "s|rb_frame_this_func|rb_frame_last_func|g"
+%endif
+
+# Another strange FTBFS in RHEL 5
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+%__sed -i "xparts/xpart_notepad/shell_xparthost.cpp" \
+       -i "xparts/xpart_notepad/xp_notepad.cpp" \
+       -e "/TDEApplication/ s| );|, true, true, true);|"
+%endif
+
+# Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so')
+%__sed -i "xparts/Makefile.am" \
+       -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
+
+# Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd'
+%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
+%__sed -i "kjsembed/tdescript/swaptabs.js" \
+       -i "kjsembed/stdlib/cmdline.js" \
+       -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|"
+%endif
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export TDEDIR=%{tde_prefix}
+
+unset JAVA_HOME ||:
+%{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
+
+# sip/PyQt/PyKDE built separately, not here
+export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
+
+# Ruby headers, strange location ...
+if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then
+  export EXTRA_INCLUDES="/usr/include/%{_normalized_cpu}-linux"
+fi
+
+# Specific path for RHEL4
+if [ -d "/usr/X11R6" ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+if [ -d "/usr/evolution28" ]; then
+  export PATH="/usr/evolution28/bin:${PATH}"
+  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
+fi
+
+# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h
+%if 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320
+EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
+%endif
+%if 0%{?suse_version} >= 1330
+EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
+%endif
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_docdir} \
+  --includedir=%{tde_tdeincludedir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --enable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \
+  --with-extra-libs=%{tde_libdir} \
+%if 0%{with_python}
+  --with-pythondir=%{_usr} \
+%endif
+  \
+  %{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \
+  %{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla}
+
+# Build dcopperl with specific options
+pushd dcopperl
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3
+%__make OPTIMIZE="$RPM_OPT_FLAGS" ||:
+popd
+
+# smoke (not smp-safe)
+%__make -C smoke
+
+# The rest is smp-safe
+%__make %{?_smp_mflags} PYTHON=%{__python}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf $RPM_BUILD_ROOT
+
+%__make install DESTDIR=%{?buildroot} \
+  PYTHON=%{__python}
+
+# Removes some perl files
+find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
+  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+
+%if 0%{?with_java}
+# Installs juic
+%__install -D -m 755 qtjava/designer/juic/bin/juic	%{?buildroot}%{tde_bindir}/juic
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common
+%__install -m 644 qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common
+%__install -m 644 qtjava/designer/juic/common/*.xsl %{?buildroot}%{tde_datadir}/juic/common
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/java
+%__install -m 644 qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java
+%__install -m 644 qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java
+%__install -m 644 qtjava/designer/juic/juic.xsl  %{?buildroot}%{tde_datadir}/juic
+%endif
+
+# kjsembed sample files
+%__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+%__install -m 644 kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
+
+# Move 'embedjs.desktop' to correct location
+%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop"
+%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -u kjscmd  Development 
+%suse_update_desktop_file -u embedjs Development 
+%endif
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
diff --git a/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc b/redhat/core/tdebindings/trinity-tdebindings-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdebindings/trinity-tdebindings-rpmlintrc
+++ b/redhat/core/tdebindings/trinity-tdebindings-rpmlintrc
diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec
new file mode 100644
index 000000000..33cbe2e9e
--- /dev/null
+++ b/redhat/core/tdeedu/tdeedu.spec
@@ -0,0 +1,1228 @@
+#
+# spec file for package tdeedu (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeedu
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Educational/Edutainment applications
+Group:			System/GUI/Other
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires: desktop-file-utils
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	gcc-c++
+BuildRequires:	fdupes
+BuildRequires:	doxygen
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# LIBUSB support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+BuildRequires:	%{_lib}usb1.0-devel
+BuildRequires:	%{_lib}usb-compat0.1-devel
+%else
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
+BuildRequires:	libusb-devel
+%endif
+%endif
+
+# PYTHON3 support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
+# BOOST support
+BuildRequires:	boost-devel
+%if 0%{?mgaversion} >= 7
+BuildRequires:	%{_lib}boost_python3-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libboost_%{python}-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:	boost-%{python}-devel
+%endif
+
+# OCAML support
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+BuildRequires: ocaml(compiler)
+#BuildRequires: ocaml-facile-devel
+%else
+BuildRequires: ocaml
+#BuildRequires: ocaml-facile-devel
+%endif
+
+# KIG python scripting support
+%if 0%{?rhel} != 5
+%define with_kig 1
+%endif
+
+# V4L support
+%if 0%{?rhel} != 5
+%define with_v4l 1
+%endif
+
+Obsoletes:		trinity-kdeedu < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeedu = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdeedu-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdeedu-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# Meta-package
+Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-blinken = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kalzium = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kanagram = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbruch = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-keduca = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgeography = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-khangman = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_kig}
+Requires: trinity-kig = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+Requires: trinity-kiten = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klatin = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klettres = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmplot = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpercentage = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kstars = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktouch = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kturtle = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kverbos = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kvoctrain = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kwordquiz = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+Educational/Edutainment applications, including:
+* blinken: Simon Says Game
+* kalzium: Periodic Table of Elements
+* kanagram: Letter Order Game
+* kbruch: Exercise Fractions
+* keduca: Tests and Exams
+* kgeography: Geography Trainer
+* khangman: Hangman Game
+%if 0%{?with_kig}
+* kig: Interactive Geometry
+%endif
+* kiten: Japanese Reference/Study Tool
+* klatin: Latin Reviser
+* klettres: French alphabet tutor
+* kmplot: Mathematical Function Plotter
+* kpercentage: Excersie Percentages
+* kstars: Desktop Planetarium
+* ktouch: Touch Typing Tutor
+* kturtle: Logo Programming Environment
+* kverbos: Study Spanish Verbforms
+* kvoctrain: Vocabulary Trainer
+* kwordquiz: Vocabulary Trainer
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING README
+
+##########
+
+%package data
+Summary:	Shared data for Trinity educational applications
+Group:		System/GUI/Other
+
+%description data
+This package contains shared data necessary for running the
+educational applications provided with TDE (the Trinity Desktop
+Environment).
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files data
+%defattr(-,root,root,-)
+%{tde_datadir}/applnk/Edutainment/Languages/.directory
+%{tde_datadir}/applnk/Edutainment/Miscellaneous/.directory
+%{tde_datadir}/applnk/Edutainment/Mathematics/.directory
+%{tde_datadir}/applnk/Edutainment/Science/.directory
+%{tde_datadir}/applnk/Edutainment/Tools/.directory
+
+##########
+
+%package -n trinity-blinken
+Summary:	Trinity version of the Simon Says electronic memory game
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-blinken
+Blinken is based on an electronic game released in 1978, which
+challenges players to remember sequences of increasing length.  On
+the face of the device, there are 4 different color buttons, each
+with its own distinctive sound.  These buttons light up randomly,
+creating the sequence that the player must then recall.  If the
+player is successful in remembering the sequence of lights in the
+correct order, they advance to the next stage, where an identical
+sequence with one extra step is presented.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-blinken
+%defattr(-,root,root,-)
+%{tde_bindir}/blinken
+%{tde_tdeappdir}/blinken.desktop
+%{tde_datadir}/apps/blinken/
+%{tde_datadir}/config.kcfg/blinken.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/blinken.png
+%{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz
+%{tde_tdedocdir}/HTML/en/blinken/
+%{tde_mandir}/man1/blinken*
+
+##########
+
+%package -n trinity-kalzium
+Summary:	Chemistry teaching tool for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kalzium
+Kalzium is a program which shows you the Periodic System of Elements
+(PSE).  You can use Kalzium to search for information about the
+elements or to learn facts about the PSE.
+
+Kalzium provides you with all kinds of information about the PSE.
+You can look up lots of information about the elements and also use
+visualisations to show them.
+
+You can visualise the Periodic Table of the Elements by blocks,
+groups, acidic behavior or different states of matter.  You can also
+plot data for a range of elements (weight, mean weight, density, IE1,
+IE2, electronegativity), and you can go back in time to see what
+elements were known at a given date.  In addition, on platforms where
+OCaml supports native code generation, Kalzium includes a chemical
+equation solver.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kalzium
+%defattr(-,root,root,-)
+%{tde_bindir}/kalzium
+%{tde_tdeappdir}/kalzium.desktop
+%{tde_datadir}/config.kcfg/kalzium.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kalzium.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz
+%{tde_tdedocdir}/HTML/en/kalzium/
+%{tde_mandir}/man1/kalzium*
+
+##########
+
+%package -n trinity-kalzium-data
+Summary:	Data files for Kalzium
+Group:		System/GUI/Other
+
+%description -n trinity-kalzium-data
+This package contains architecture-independent data files for
+Kalzium, the TDE periodic table application.  This includes pictures
+of various chemical equipment and of samples of several elements, in
+addition to the actual chemical data.
+
+See the kalzium package for further information.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kalzium-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kalzium/
+
+##########
+
+%package -n trinity-kanagram
+Summary:	Letter order game for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kanagram
+KAnagram is a game that is based on the word/letter puzzles that the
+author played as a child.  A word is picked at random and displayed
+with its letters in a messed order, with difficulty dependent on the
+chosen level.  You have an unlimited number of attempts, and scores
+are kept.
+
+It is a very simply constructed game, with 3 difficulty levels of
+play.  It is fully customizable, allowing you to write in your own
+words and set your own 'look and feel' of the game.  It is aimed for
+children aged 10+ because of the difficulty, but of course everyone
+is welcome to try.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kanagram
+%defattr(-,root,root,-)
+%{tde_bindir}/kanagram
+%{tde_tdeappdir}/kanagram.desktop
+%{tde_datadir}/apps/kanagram/
+%{tde_datadir}/config.kcfg/kanagram.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kanagram.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz
+%{tde_tdedocdir}/HTML/en/kanagram/
+%{tde_mandir}/man1/kanagram*
+
+##########
+
+%package -n trinity-kbruch
+Summary:	Fraction calculation teaching tool for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kbruch
+KBruch is a small program to practice calculating with fractions.
+Different exercises are provided for this purpose.  The program
+checks the user's input and gives feedback.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kbruch
+%defattr(-,root,root,-)
+%{tde_bindir}/kbruch
+%{tde_datadir}/apps/kbruch/
+%{tde_tdeappdir}/kbruch.desktop
+%{tde_datadir}/config.kcfg/kbruch.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kbruch.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kbruch.svgz
+%{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png
+%{tde_tdedocdir}/HTML/en/kbruch/
+%{tde_mandir}/man1/kbruch*
+
+##########
+
+%package -n trinity-keduca
+Summary:	Interactive form-based tests for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-keduca
+KEduca is a flash-card application which allows you to make
+interactive form-based tests.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-keduca
+%defattr(-,root,root,-)
+%{tde_bindir}/keduca
+%{tde_bindir}/keducabuilder
+%{tde_bindir}/keduca-shrinker
+%{tde_tdelibdir}/libkeducapart.la
+%{tde_tdelibdir}/libkeducapart.so
+%{tde_tdeappdir}/keduca.desktop
+%{tde_tdeappdir}/keducabuilder.desktop
+%{tde_datadir}/apps/keduca/
+%{tde_datadir}/config.kcfg/keduca.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/keduca.png
+%{tde_datadir}/mimelnk/application/x-edu.desktop
+%{tde_datadir}/mimelnk/application/x-edugallery.desktop
+%{tde_datadir}/services/keduca_part.desktop
+%{tde_tdedocdir}/HTML/en/keduca/
+%{tde_mandir}/man1/keduca*
+
+##########
+
+%package -n trinity-kgeography
+Summary:	Geography learning tool for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kgeography
+KGeography contains maps allowing you to learn various countries or
+the political divisions of several countries.  It has several modes,
+including a map browser and games involving the names, capitals, or
+flags of the map divisions.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kgeography
+%defattr(-,root,root,-)
+%{tde_bindir}/kgeography
+%{tde_bindir}/kgeography_gen_map.pl
+%{tde_tdeappdir}/kgeography.desktop
+%{tde_datadir}/config.kcfg/kgeography.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/kgeography.png
+%{tde_datadir}/icons/crystalsvg/scalable/apps/kgeography.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kgeography.png
+%{tde_tdedocdir}/HTML/en/kgeography
+%{tde_mandir}/man1/kgeography*
+
+##########
+
+%package -n trinity-kgeography-data
+Summary:	Data files for KGeography
+Group:		System/GUI/Other
+
+%description -n trinity-kgeography-data
+This package contains architecture-independent data files for
+KGeography, the geography learning tool for TDE. This includes map
+and flag images.
+
+See the kgeography package for further information.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kgeography-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kgeography/
+
+##########
+
+%package -n trinity-khangman
+Summary:	The classical hangman game for Trinity
+Group:		System/GUI/Other
+#Requires:	dustin-dustismo-sans-fonts
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-khangman
+KHangMan is a game based on the well known hangman game.  It is aimed
+for children aged 6 and above.  It has four levels of difficulty:
+Animals (animals words), Easy, Medium and Hard.
+
+A word is picked at random and the letters are hidden.  You must
+guess the word by trying one letter after another.  Each time you
+guess a wrong letter, a picture of a hangman is drawn.  You must
+guess the word before getting hanged!  You have 10 tries.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-khangman
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/khangmanrc
+%{tde_bindir}/khangman
+%{tde_tdeappdir}/khangman.desktop
+%{tde_datadir}/apps/khangman/
+%{tde_datadir}/config.kcfg/khangman.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/khangman.png
+%{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz
+%{tde_tdedocdir}/HTML/en/khangman/
+%{tde_mandir}/man1/khangman*
+
+##########
+
+%if 0%{?with_kig}
+%package -n trinity-kig
+Summary:	Interactive geometry program for TDE
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kig
+Kig is an application for interactive geometry.  It is intended to
+serve two purposes:
+
+- to allow students to interactively explore mathematical figures and
+  concepts using the computer;
+- to serve as a WYSIWYG tool for drawing mathematical figures and
+  including them in other documents.
+
+With this program you can do geometry on a computer just like you
+would on a blackboard in a classroom.  However, the program allows
+you to move and change parts of a geometrical drawing so that you can
+see how the other parts change as a result.
+
+Kig supports loci and user-defined macros.  It also supports imports
+and exports to/from foreign file formats including Cabri, Dr. Geo,
+KGeo, KSeg and XFig.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kig
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/magic/cabri.magic
+%config(noreplace) %{tde_confdir}/magic/drgeo.magic
+%{tde_bindir}/kig
+%{tde_bindir}/pykig.py*
+%{tde_tdelibdir}/tdefile_drgeo.la
+%{tde_tdelibdir}/tdefile_drgeo.so
+%{tde_tdelibdir}/tdefile_kig.la
+%{tde_tdelibdir}/tdefile_kig.so
+%{tde_tdelibdir}/libkigpart.la
+%{tde_tdelibdir}/libkigpart.so
+%{tde_tdeappdir}/kig.desktop
+%if 0%{?with_kig}
+%{tde_datadir}/apps/katepart/syntax/python-kig.xml
+%endif
+%{tde_datadir}/apps/kig/
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kig_doc.png
+%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kig_doc.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kig.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kig.svgz
+%{tde_datadir}/mimelnk/application/x-cabri.desktop
+%{tde_datadir}/mimelnk/application/x-drgeo.desktop
+%{tde_datadir}/mimelnk/application/x-kig.desktop
+%{tde_datadir}/mimelnk/application/x-kgeo.desktop
+%{tde_datadir}/mimelnk/application/x-kseg.desktop
+%{tde_datadir}/services/tdefile_drgeo.desktop
+%{tde_datadir}/services/tdefile_kig.desktop
+%{tde_datadir}/services/kig_part.desktop
+%{tde_tdedocdir}/HTML/en/kig/
+%config(noreplace) %{tde_confdir}/magic/cabri.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/drgeo.magic.mgc
+%{tde_mandir}/man1/kig*
+%endif
+
+##########
+
+%package -n trinity-kiten
+Summary:	Japanese reference/study tool for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	ttf-kochi-gothic | ttf-kochi-mincho
+
+%description -n trinity-kiten
+Kiten is a Japanese reference and study tool for TDE.  It is an
+application with multiple functions.  Firstly, it is a convenient
+English to Japanese and Japanese to English dictionary.  Secondly, it
+is a Kanji dictionary, with multiple ways to look up specific
+characters.  Thirdly, it is a tool to help you learn Kanji.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kiten
+%defattr(-,root,root,-)
+%{tde_bindir}/kiten
+%{tde_bindir}/kitengen
+%{tde_tdeappdir}/kiten.desktop
+%{tde_tdedocdir}/HTML/en/kiten/
+%{tde_datadir}/icons/hicolor/*/apps/kiten.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz
+%{tde_mandir}/man1/kiten*
+
+##########
+
+%package -n trinity-klatin
+Summary:	Application to help revise/teach Latin
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-klatin
+KLatin is a program to help revise Latin.  There are three "sections"
+in which different aspects of the language can be revised.  These are
+the vocabulary, grammar and verb testing sections.  In addition there
+is a set of revision notes that can be used for self-guided revision.
+
+In the vocabulary section an XML file is loaded containing various
+words and their local language translations.  KLatin asks you what
+each of these words translate into.  The questions take place in a
+multiple-choice environment.
+
+In the grammar and verb sections KLatin asks for a particular part of
+a noun or a verb, such as the "ablative singular", or the "1st person
+indicative passive plural", and is not multiple choice.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-klatin
+%defattr(-,root,root,-)
+%{tde_bindir}/klatin
+%{tde_tdeappdir}/klatin.desktop
+%{tde_datadir}/apps/klatin/
+%{tde_datadir}/config.kcfg/klatin.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/klatin.png
+%{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz
+%{tde_tdedocdir}/HTML/en/klatin/
+%{tde_mandir}/man1/klatin*
+
+##########
+
+%package -n trinity-klettres
+Summary:	Foreign alphabet tutor for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-klettres
+KLettres is an application specially designed to help the user to
+learn the alphabet in a new language and then to learn to read simple
+syllables.  The user can be a young child aged from two and a half or
+an adult that wants to learn the basics of a foreign language.
+
+Seven languages are currently available: Czech, Danish, Dutch,
+English, French, Italian and Slovak.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-klettres
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/klettresrc
+%{tde_bindir}/klettres
+%{tde_tdeappdir}/klettres.desktop
+%{tde_datadir}/config.kcfg/klettres.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/klettres.png
+%{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz
+%{tde_tdedocdir}/HTML/en/klettres/
+%{tde_mandir}/man1/klettres*
+
+##########
+
+%package -n trinity-klettres-data
+Summary:	Data files for KLettres foreign alphabet tutor
+Group:		System/GUI/Other
+
+%description -n trinity-klettres-data
+This package contains architecture-independent data files for
+KLettres, the foreign alphabet tutor for TDE.  This includes sound
+files and graphics.
+
+See the klettres package for further information.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-klettres-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/klettres/
+
+##########
+
+%package -n trinity-kmplot
+Summary:	Mathematical function plotter for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kmplot
+KmPlot is a mathematical function plotter for TDE.  It has a powerful
+built-in parser.  You can plot different functions simultaneously and
+combine them to build new functions.
+
+KmPlot supports parametric functions and functions in polar
+coordinates.  Several grid modes are supported.  Plots may be printed
+with high precision in the correct scale.
+
+KmPlot also provides some numerical and visual features, like filling
+and calculating the area between the plot and the first axis, finding
+maximum and minimum values, changing function parameters dynamically
+and plotting derivatives and integral functions.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kmplot
+%defattr(-,root,root,-)
+%{tde_bindir}/kmplot
+%{tde_tdelibdir}/libkmplotpart.la
+%{tde_tdelibdir}/libkmplotpart.so
+%{tde_tdeappdir}/kmplot.desktop
+%{tde_datadir}/apps/kmplot/
+%{tde_datadir}/config.kcfg/kmplot.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kmplot.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kmplot.svgz
+%{tde_datadir}/mimelnk/application/x-kmplot.desktop
+%{tde_datadir}/services/kmplot_part.desktop
+%{tde_tdedocdir}/HTML/en/kmplot/
+%{tde_mandir}/man1/kmplot*
+
+##########
+
+%package -n trinity-kpercentage
+Summary:	Percentage calculation teaching tool for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kpercentage
+KPercentage is a small math application that will help pupils to
+improve their skills in calculating percentages.
+
+There is a special training section for the three basic tasks.
+Finally the pupil can select a random mode, in which all three tasks
+are mixed randomly.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kpercentage
+%defattr(-,root,root,-)
+%{tde_bindir}/kpercentage
+%{tde_tdeappdir}/kpercentage.desktop
+%{tde_datadir}/apps/kpercentage/
+%{tde_datadir}/icons/hicolor/*/apps/kpercentage.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz
+%{tde_tdedocdir}/HTML/en/kpercentage/
+%{tde_mandir}/man1/kpercentage*
+
+##########
+
+%package -n trinity-kstars
+Summary:	Desktop planetarium for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kstars
+KStars is a graphical desktop planetarium for TDE.  It depicts an
+accurate simulation of the night sky, including stars,
+constellations, star clusters, nebulae, galaxies, all planets, the
+Sun, the Moon, comets and asteroids.  You can see the sky as it
+appears from any location on Earth, on any date.
+
+The user interface is highly intuitive and flexible.  The display can
+be panned and zoomed with the mouse, and you can easily identify
+objects and track their motion across the sky.  KStars includes many
+powerful features, yet the interface is clean and simple and fun to
+use.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kstars
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/kstarsrc
+%{tde_bindir}/kstars
+%{tde_tdeappdir}/kstars.desktop
+%{tde_datadir}/config.kcfg/kstars.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kstars.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz
+%{tde_tdedocdir}/HTML/en/kstars/
+%{tde_mandir}/man1/kstars*
+
+##########
+
+%package -n trinity-kstars-data
+Summary:	Data files for KStars desktop planetarium
+Group:		System/GUI/Other
+
+%description -n trinity-kstars-data
+This package contains architecture-independent data files for KStars,
+the graphical desktop planetarium for TDE.  This includes star
+catalogues and astronomical images.
+
+See the kstars package for further information.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kstars-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kstars/
+
+##########
+
+%package -n trinity-ktouch
+Summary:	Touch typing tutor for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-ktouch
+KTouch is a program for learning touch typing - it helps you learn to
+type on a keyboard quickly and correctly.  Every finger has its place
+on the keyboard with associated keys to press.
+
+KTouch helps you learn to touch type by providing you with text to
+train on, and adjusts to different levels depending on how good you
+are.  It can display which key to press next, and the correct finger
+to use.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-ktouch
+%defattr(-,root,root,-)
+%{tde_bindir}/ktouch
+%{tde_tdeappdir}/ktouch.desktop
+%{tde_datadir}/apps/ktouch/
+%{tde_datadir}/config.kcfg/ktouch.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/ktouch.png
+%{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz
+%{tde_tdedocdir}/HTML/en/ktouch/
+%{tde_mandir}/man1/ktouch*
+
+##########
+
+%package -n trinity-kturtle
+Summary:	Educational Logo programming environment
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kturtle
+KTurtle is an educational programming environment using the Logo
+programming language.  It tries to make programming as easy and
+accessible as possible.  This makes KTurtle suitable for teaching
+kids the basics of mathematics, geometry and programming.
+
+The commands used to program are in the style of the Logo programming
+language.  The unique feature of Logo is that the commands are often
+translated into the speaking language of the programmer.
+
+KTurtle is named after "the turtle" that plays a central role in the
+programming environment.  The user programs the turtle, using the
+Logo commands, to draw a picture on the canvas.
+
+Note that this version of Logo is only focused on the educational
+qualities of the programming language and will not try to suit
+professional programmers' needs.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kturtle
+%defattr(-,root,root,-)
+%{tde_bindir}/kturtle
+%{tde_tdeappdir}/kturtle.desktop
+%{tde_datadir}/apps/katepart/syntax/logohighlightstyle*
+%{tde_datadir}/apps/kturtle/
+%{tde_datadir}/config.kcfg/kturtle.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kturtle.png
+%{tde_tdedocdir}/HTML/en/kturtle/
+%{tde_mandir}/man1/kturtle*
+
+##########
+
+%package -n trinity-kverbos
+Summary:	Spanish verb form study application for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kverbos
+Kverbos allows the user to learn the forms of Spanish verbs.  The
+program suggests a verb and a time and the user enters the different
+verb forms.  The program corrects the user input and gives feedback.
+
+The user can edit the list of the verbs that can be studied.  The
+program can build regular verb forms by itself.  Irregular verb forms
+have to be entered by the user.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kverbos
+%defattr(-,root,root,-)
+%{tde_bindir}/kverbos
+%{tde_tdeappdir}/kverbos.desktop
+%{tde_datadir}/apps/kverbos/
+%{tde_datadir}/config.kcfg/kverbos.kcfg
+%{tde_datadir}/icons/crystalsvg/16x16/actions/kverbosuser.png
+%{tde_datadir}/icons/hicolor/*/apps/kverbos.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz
+%{tde_tdedocdir}/HTML/en/kverbos/
+%{tde_mandir}/man1/kverbos*
+
+##########
+
+%package -n trinity-kvoctrain
+Summary:	Vocabulary trainer for Trinity
+Group:		System/GUI/Other
+Requires:	perl
+Requires:	perl-libwww-perl
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kvoctrain
+KVocTrain is a little utility to help you train your vocabulary when
+you are trying to learn a foreign language.  You can create your own
+database with the words you need.  It is intended as a replacement
+for index (flash) cards.
+
+You probably remember flashcards from school.  The teacher would
+write the original expression on the front side of the card and the
+translation on the back.  Then look at the cards one after another.
+If you knew the translation, you could put it away.  If you failed,
+you put it back to try again.
+
+KVocTrain is not intended to teach you grammar or other sophisticated
+things.  This is and probably will stay beyond the scope of this
+application.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kvoctrain
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/kvoctrainrc
+%{tde_bindir}/kvoctrain
+%{tde_bindir}/spotlight2kvtml
+%{tde_libdir}/libkvoctraincore.so.*
+%{tde_tdeappdir}/kvoctrain.desktop
+%{tde_datadir}/apps/kvoctrain/
+%{tde_datadir}/mimelnk/text/x-kvtml.desktop
+%{tde_datadir}/config.kcfg/kvoctrain.kcfg
+%{tde_datadir}/config.kcfg/languagesettings.kcfg
+%{tde_datadir}/config.kcfg/presettings.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png
+%{tde_tdedocdir}/HTML/en/kvoctrain/
+%{tde_mandir}/man1/kvoctrain*
+%{tde_mandir}/man1/spotlight2kvtml*
+
+##########
+
+%package -n trinity-kwordquiz
+Summary:	Flashcard and vocabulary learning program for Trinity
+Group:		System/GUI/Other
+Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kwordquiz
+KWordQuiz is a flashcard-based tool that helps you to master new
+vocabularies. It may be a language or any other kind of terminology.
+
+KWordQuiz can open several types of vocabulary data.  Supported are
+kvtml files used by other TDE programs such as KVocTrain, wql files
+used by WordQuiz for Windows, csv files with comma-separated text,
+and xml.gz files created by Pauker (http://pauker.sourceforge.net).
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-kwordquiz
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/kwordquizrc
+%{tde_bindir}/kwordquiz
+%{tde_tdeappdir}/kwordquiz.desktop
+%{tde_datadir}/apps/kwordquiz/
+%{tde_datadir}/config.kcfg/kwordquiz.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kwordquiz.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kwordquiz.svg
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kwordquiz_doc.png
+%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
+%{tde_datadir}/mimelnk/application/x-kwordquiz.desktop
+%{tde_tdedocdir}/HTML/en/kwordquiz/
+%{tde_mandir}/man1/kwordquiz*
+%{tde_mandir}/man1/langen*
+
+##########
+
+%package -n trinity-libtdeedu3
+Summary:	Library for use with Trinity educational apps
+Group:		System/GUI/Other
+
+%description -n trinity-libtdeedu3
+The TDE-based library libtdeedu is used with educational
+applications.  It currently provides support for data plotting and
+vocabulary items (including a parser for kvtml vocabulary files).
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-libtdeedu3
+%defattr(-,root,root,-)
+%{tde_libdir}/libextdate.so.*
+%{tde_libdir}/libtdeeducore.so.*
+%{tde_libdir}/libtdeeduplot.so.*
+%{tde_libdir}/libtdeeduui.so.*
+
+##########
+
+%package -n trinity-libtdeedu-devel
+Summary:	Development files for Trinity educational library
+Group:		Development/Libraries/Other
+Requires:	trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libtdeedu-devel
+The TDE-based library libtdeedu is used with educational
+applications.  It currently provides support for data plotting and
+vocabulary items (including a parser for kvtml vocabulary files).
+
+Development files for libtdeedu are included in this package.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-libtdeedu-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/libtdeedu/
+%{tde_libdir}/libextdate.la
+%{tde_libdir}/libextdate.so
+%{tde_libdir}/libtdeeducore.la
+%{tde_libdir}/libtdeeducore.so
+%{tde_libdir}/libtdeeduui.la
+%{tde_libdir}/libtdeeduui.so
+%{tde_libdir}/libtdeeduplot.la
+%{tde_libdir}/libtdeeduplot.so
+
+##########
+
+%package -n trinity-libkiten1
+Summary:	Library for Kiten Japanese reference/study tool
+Group:		System/GUI/Other
+#Requires:	kanjidic
+
+%description -n trinity-libkiten1
+Kiten is a Japanese reference/study tool for TDE.  The library
+libkiten contains portions of Kiten that may be useful for other
+applications.  These portions include dictionary, character lookup
+and widget classes.
+
+This package contains the libkiten library along with supporting
+data, such as Japanese language data files and GUI resource files.
+For further information, see the kiten package.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-libkiten1
+%defattr(-,root,root,-)
+%{tde_libdir}/libkiten.so.*
+%{tde_datadir}/apps/kiten/
+%{tde_datadir}/config.kcfg/kiten.kcfg
+%{tde_datadir}/icons/crystalsvg/16x16/actions/kanjidic.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_add.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_remove.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/kanjidic.png
+%{tde_datadir}/icons/locolor/16x16/actions/edit_add.png
+%{tde_datadir}/icons/locolor/16x16/actions/edit_remove.png
+
+##########
+
+%package -n trinity-libkiten-devel
+Summary:	Development files for Kiten library
+Group:		Development/Libraries/Other
+Requires:	trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdelibs-devel >= %{version}
+
+%description -n trinity-libkiten-devel
+Kiten is a Japanese reference/study tool for TDE.  The library
+libkiten contains portions of Kiten that may be useful for other
+applications.  These portions include dictionary, character lookup
+and widget classes.
+
+Development files for libkiten are included in this package.  For
+further information, see the kiten package.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-libkiten-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/libkiten/
+%{tde_libdir}/libkiten.la
+%{tde_libdir}/libkiten.so
+
+##########
+
+%package -n trinity-indi
+Summary:	Instrument Neutral Distributed Interface for astronomical devices
+Group:		System/GUI/Other
+
+%description -n trinity-indi
+INDI is an Instrument Neutral Distributed Interface control protocol for
+astronomical devices, which provides a framework that decouples low level
+hardware drivers from high level front end clients. Clients that use the
+device drivers are completely unaware of the device capabilities and
+communicate with the device drivers and build a completely dynamic GUI
+based on the services provided by the device.
+
+This package is part of Trinity, as a component of the TDE education module.
+
+%files -n trinity-indi
+%defattr(-,root,root,-)
+%{tde_bindir}/apmount
+%{tde_bindir}/apogee_ppi
+%{tde_bindir}/celestrongps
+%{tde_bindir}/fliccd
+%{tde_bindir}/fliwheel
+%{tde_bindir}/indiserver
+%{tde_bindir}/lx200_16
+%{tde_bindir}/lx200autostar
+%{tde_bindir}/lx200basic
+%{tde_bindir}/lx200classic
+%{tde_bindir}/lx200generic
+%{tde_bindir}/lx200gps
+%{tde_bindir}/sbigccd
+%{tde_bindir}/skycommander
+%{tde_bindir}/temma
+%if 0%{?with_v4l}
+%{tde_bindir}/meade_lpi
+%{tde_bindir}/v4ldriver
+%{tde_bindir}/v4lphilips
+%endif
+%{tde_mandir}/man1/celestrongps*
+%{tde_mandir}/man1/fliccd*
+%{tde_mandir}/man1/indi*
+%{tde_mandir}/man1/lx200*
+%{tde_mandir}/man1/temma*
+%{tde_mandir}/man1/v4l*
+
+##########
+
+%package devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries/Other
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkiten-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdeedu-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This package contains the development files for tdeedu.
+
+%files devel
+%defattr(-,root,root,-)
+%doc libtdeedu/AUTHORS libtdeedu/README
+# kstars
+%{tde_tdeincludedir}/kstarsinterface.h
+%{tde_tdeincludedir}/simclockinterface.h
+# kvoctrain
+%{tde_libdir}/libkvoctraincore.la
+%{tde_libdir}/libkvoctraincore.so
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
+# Fix shebangs
+sed -i "kig/pykig/pykig.py" \
+    -e "s|env python|env %{python}|"
+%endif
+
+
+%build
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
+  -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  %{?!with_kig:-DBUILD_KIG=OFF} \
+  -DWITH_OCAML_SOLVER=OFF \
+  %{?!with_kig:-DWITH_KIG_PYTHON_SCRIPTING=OFF} \
+  %{?!with_v4l:-DWITH_V4L=OFF} \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r khangman      Education Languages Game KidsGame
+%suse_update_desktop_file    kiten         Education Languages
+%suse_update_desktop_file    klatin        Education Languages
+%suse_update_desktop_file    klettres      Education Languages
+%suse_update_desktop_file    kverbos       Education Languages
+%suse_update_desktop_file    kvoctrain     Education Languages
+%suse_update_desktop_file    kwordquiz     Education Languages
+%suse_update_desktop_file    kbruch        Education Math
+%suse_update_desktop_file    kig           Education Math
+%suse_update_desktop_file    kmplot        Education Math
+%suse_update_desktop_file    kturtle       Education Math
+%suse_update_desktop_file    kpercentage   Education Math
+%suse_update_desktop_file    kalzium       Education Chemistry
+%suse_update_desktop_file    kstars        Education Astronomy
+%suse_update_desktop_file    keduca        Education Teaching
+%suse_update_desktop_file    keducabuilder Education Teaching
+%suse_update_desktop_file    ktouch        Education Teaching
+%suse_update_desktop_file -r blinken       Education Teaching Game KidsGame
+%suse_update_desktop_file    kgeography    Education Teaching
+%suse_update_desktop_file -r kanagram      Education Languages Game KidsGame
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc b/redhat/core/tdeedu/trinity-tdeedu-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdeedu/trinity-tdeedu-rpmlintrc
+++ b/redhat/core/tdeedu/trinity-tdeedu-rpmlintrc
diff --git a/redhat/core/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec
new file mode 100644
index 000000000..c8799b131
--- /dev/null
+++ b/redhat/core/tdegames/tdegames.spec
@@ -0,0 +1,1266 @@
+#
+# spec file for package tdegames (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdegames
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Trinity Desktop Environment - Games
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:			System/GUI/Other
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	desktop-file-utils
+BuildRequires:	fdupes
+BuildRequires:	libtool
+
+# AVAHI support
+%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_avahi 1
+BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}avahi-client-devel
+Requires:		%{_lib}avahi-client3
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	avahi-devel
+Requires:		avahi
+%endif
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# ATTR support
+BuildRequires:	libattr-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# GLIB2 support
+BuildRequires:	glib2-devel
+
+Obsoletes:		trinity-kdegames < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdegames = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdegames-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdegames-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdegames-card-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kasteroids = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-katomic = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbackgammon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbattleship = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kblackbox = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbounce = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kenolaba = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfouleggs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgoldrunner = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kjumpingcube = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klickety = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klines = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmahjongg = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmines = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knetwalk = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-konquest = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpat = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpoker = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kreversi = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksame = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kshisen = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksirtet = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksmiletris = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksnake = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksokoban = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kspaceduel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktron = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktuberling = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-twin4 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-lskat = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdefifteen = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+Games and gaming libraries for the Trinity Desktop Environment.
+Included with this package are: kenolaba, kasteroids, kblackbox, kmahjongg,
+kmines, konquest, kpat, kpoker, kreversi, ksame, kshisen, ksmiletris,
+ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
+
+%files
+
+##########
+
+%package devel
+Summary:	Development files for %{name} 
+Group:		Amusements/Games/Other
+
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdelibs-devel >= %{tde_version}
+Requires:	trinity-libtdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-atlantik-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kolf-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:		trinity-kdegames-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+Install %{name}-devel if you wish to develop or compile games for the
+TDE desktop.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_datadir}/cmake/libtdegames.cmake
+%{tde_libdir}/pkgconfig/libtdegames.pc
+
+##########
+
+%package -n trinity-libtdegames1
+Summary:	Trinity games library and common files
+Group:		Amusements/Games/Other
+
+%description -n trinity-libtdegames1
+This library provides a common infrastructure for several of the
+games in the TDE distribution. Features include standardized menu
+items, high score handling, card display, and network connections
+including chat capabilities.
+
+This package is part of TDE, and a component of the TDE games module.
+
+%files -n trinity-libtdegames1
+%defattr(-,root,root,-)
+%{tde_libdir}/libtdegames.so.*
+%dir %{tde_datadir}/apps/tdegames
+%dir %{tde_datadir}/apps/tdegames/pics
+%{tde_datadir}/apps/tdegames/pics/star.png
+%{tde_datadir}/icons/crystalsvg/*/actions/roll.png
+%{tde_datadir}/icons/crystalsvg/*/actions/highscore.png
+
+##########
+
+%package -n trinity-libtdegames-devel
+Summary:	Trinity games library headers
+Group:		Development/Libraries/Other
+Requires:	trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libtdegames-devel
+This package is necessary if you want to develop your own games using
+the TDE games library.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-libtdegames-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*.h
+%{tde_tdeincludedir}/kgame
+%{tde_libdir}/libtdegames.so
+%{tde_libdir}/libtdegames.la
+
+##########
+
+%package card-data
+Summary:	Card decks for Trinity games
+Group:		Amusements/Games/Other
+
+%description card-data
+Several different collections of card images for use by TDE games.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files card-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/carddecks/
+
+##########
+
+%package -n trinity-atlantik
+Summary:	TDE client for Monopoly-like network games
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-atlantik
+This is a TDE client for playing Monopoly-like boardgames on the
+monopd network.  It can play any board supported by the network
+server, including the classic Monopoly game, as well as the Atlantik
+game in which the property includes several major cities in North
+America and Europe.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-atlantik
+%defattr(-,root,root,-)
+%{tde_bindir}/atlantik
+%{tde_libdir}/libatlantic.so.*
+%{tde_libdir}/libatlantikclient.so.*
+%{tde_libdir}/libatlantikui.so.*
+%{tde_tdelibdir}/tdeio_atlantik.la
+%{tde_tdelibdir}/tdeio_atlantik.so
+%{tde_datadir}/services/atlantik.protocol
+%{tde_tdeappdir}/atlantik.desktop
+%{tde_datadir}/icons/hicolor/*/apps/atlantik.png
+%{tde_datadir}/apps/atlantik/
+%{tde_tdedocdir}/HTML/en/atlantik/
+%{tde_mandir}/man*/atlantik.*
+
+##########
+
+%package -n trinity-atlantik-devel
+Summary:	Development files for Atlantik
+Group:		Development/Libraries/Other
+Requires:	trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-atlantik-devel
+This package contains header files for compiling programs against the
+libraries which come with Atlantik.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-atlantik-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/atlantik
+%{tde_tdeincludedir}/atlantic
+%{tde_libdir}/libatlantic.so
+%{tde_libdir}/libatlantic.la
+%{tde_libdir}/libatlantikclient.so
+%{tde_libdir}/libatlantikclient.la
+%{tde_libdir}/libatlantikui.so
+%{tde_libdir}/libatlantikui.la
+
+##########
+
+%package -n trinity-kasteroids
+Summary:	Asteroids for Trinity
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-kasteroids
+You know this game.  It is based on Warwick Allison's QwSpriteField
+widget.
+
+The objective of kasteroids is to destroy all the asteroids on the
+screen to advance to the next level. Your ship is destroyed if it
+makes contact with an asteroid.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kasteroids
+%defattr(-,root,root,-)
+%{tde_bindir}/kasteroids
+%{tde_datadir}/icons/hicolor/*/apps/kasteroids.png
+%{tde_tdeappdir}/kasteroids.desktop
+%{tde_datadir}/apps/kasteroids/
+%{tde_datadir}/config.kcfg/kasteroids.kcfg
+%{tde_tdedocdir}/HTML/en/kasteroids/
+%{tde_mandir}/man*/kasteroids.*
+
+##########
+
+%package -n trinity-katomic
+Summary:	Atomic Entertainment game for Trinity
+Group:		Amusements/Games/Strategy/Other
+
+%description -n trinity-katomic
+This is a puzzle game, in which the object is to assemble a molecule
+from its atoms on a Sokoban-like board.  On each move, an atom goes
+as far as it can in a specified direction before being stopped by a
+wall or another atom.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-katomic
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/katomic/
+%{tde_datadir}/icons/hicolor/*/apps/katomic.png
+%{tde_tdeappdir}/katomic.desktop
+%{tde_bindir}/katomic
+%{tde_tdedocdir}/HTML/en/katomic/
+%{tde_mandir}/man*/katomic.*
+
+##########
+
+%package -n trinity-kbackgammon
+Summary:	A Backgammon game for Trinity
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-kbackgammon
+KBackgammon is a backgammon program for Trinity. It is based on the
+code, ideas and concepts of KFibs (which is a FIBS client for
+TDE1). For a short time, KBackgammon was called bacKgammon (if you
+know somebody who is still using bacKgammon, please force them to
+upgrade :-)).
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kbackgammon
+%defattr(-,root,root,-)
+%{tde_bindir}/kbackgammon
+%{tde_tdeappdir}/kbackgammon.desktop
+%{tde_datadir}/apps/kbackgammon/
+%{tde_datadir}/icons/hicolor/*/apps/kbackgammon.png
+%{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png
+%{tde_tdedocdir}/HTML/en/kbackgammon/
+%{tde_mandir}/man*/kbackgammon.*
+
+##########
+
+%package -n trinity-kbattleship
+Summary:	Battleship game for Trinity
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-kbattleship
+This is an implementation of the Battleship game.  Each player tries
+to be the first to sink all the opponent's ships by firing "blindly"
+at them.  The game has options to play over a network connection or
+against the computer.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kbattleship
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kbattleship/
+%{tde_datadir}/apps/zeroconf/_kbattleship._tcp
+%{tde_datadir}/icons/hicolor/*/apps/kbattleship.png
+%{tde_tdeappdir}/kbattleship.desktop
+%{tde_bindir}/kbattleship
+%{tde_tdedocdir}/HTML/en/kbattleship/
+%{tde_mandir}/man*/kbattleship.*
+
+##########
+
+%package -n trinity-kblackbox
+Summary:	A simple logical game for the Trinity project
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-kblackbox
+KBlackBox is a game of hide and seek played on an grid of boxes. Your
+opponent (Random number generator, in this case) has hidden several
+balls within this box. By shooting rays into the box and observing
+where they emerge it is possible to deduce the positions of the
+hidden balls. The fewer rays you use to find the balls, the lower
+your score.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kblackbox
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kblackbox/
+%{tde_datadir}/icons/hicolor/*/apps/kblackbox.png
+%{tde_tdeappdir}/kblackbox.desktop
+%{tde_bindir}/kblackbox
+%{tde_tdedocdir}/HTML/en/kblackbox/
+%{tde_mandir}/man*/kblackbox.*
+
+##########
+
+%package -n trinity-kbounce
+Summary:	Jezzball clone for the K Desktop Environment
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-kbounce
+This is a clone of the popular Jezzball game originally created by
+Microsoft. Jezzball is one of the rare and simple games requiring
+skill, timing, and patience in order to be successful.  A ball begins
+to bounce off of an area enclosed by four borders (like a
+square). You must move your pointer to certain areas within the
+square. Upon clicking, a new border is constructed at a relatively
+quick pace. You can change the direction of the borders by 90 degrees
+as well. Ultimately, you must force the ball to bounce around in a
+smaller, and smaller area as time goes by without the ball ever
+touching the borders as they are being constructed. If a ball touches
+a certain part of the border as it is being built, the game is over.
+After 75% of the original space has been blocked off from the moving
+ball, you advance one level, and one more ball is added to the mix in
+the following level.
+
+This game was previously known as kjezz.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kbounce
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kbounce/
+%{tde_tdeappdir}/kbounce.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kbounce.png
+%{tde_bindir}/kbounce
+%{tde_tdedocdir}/HTML/en/kbounce/
+%{tde_mandir}/man*/kbounce.*
+
+##########
+
+%package -n trinity-kenolaba
+Summary:	Enolaba board game for Trinity
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-kenolaba
+kenolaba is a simple board strategy game that is played by two
+players. There are red and yellow pieces for each player. Beginning
+from a start position where each player has 14 pieces, moves are
+drawn until one player has pushed 6 pieces of his opponent out of the
+board.
+
+This game was previously known as kabalone, and was inspired by the
+board game Abalone by Abalone SA, France.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kenolaba
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kenolaba/
+%{tde_datadir}/icons/hicolor/*/apps/kenolaba.png
+%{tde_tdeappdir}/kenolaba.desktop
+%{tde_bindir}/kenolaba
+%{tde_tdedocdir}/HTML/en/kenolaba/
+%{tde_mandir}/man*/kenolaba.*
+
+##########
+
+%package -n trinity-kfouleggs
+Summary:	A TDE clone of the Japanese PuyoPuyo game
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-kfouleggs
+KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
+features such as multiplayer games against human or AI, and network
+play.  If you have played Tetris or one of its many clones, you will
+find KFouleggs easy to learn.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kfouleggs
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/kfouleggs.desktop
+%{tde_datadir}/apps/kfouleggs/
+%{tde_datadir}/config.kcfg/kfouleggs.kcfg
+%{tde_bindir}/kfouleggs
+%{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png
+%{tde_tdedocdir}/HTML/en/kfouleggs/
+%{tde_mandir}/man*/kfouleggs.*
+
+##########
+
+%package -n trinity-kgoldrunner
+Summary:	A Trinity clone of the Loderunner arcade game
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-kgoldrunner
+KGoldrunner, a game of action and puzzle solving.  Run through the
+maze, dodge your enemies, collect all the gold and climb up to the
+next level.
+
+You must guide the hero with the mouse or keyboard and collect all
+the gold nuggets, then you can climb up into the next level.  Your
+enemies are also after the gold and they will kill you if they catch
+you!
+
+The problem is you have no weapon to kill them.  All you can do is
+run away, dig holes in the floor to trap them or lure them into some
+area where they cannot hurt you.  After a short time a trapped enemy
+climbs out of his hole, but if it closes before that, he will die and
+reappear somewhere else.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kgoldrunner
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kgoldrunner/
+%{tde_datadir}/icons/hicolor/*/apps/kgoldrunner.png
+%{tde_tdeappdir}/KGoldrunner.desktop
+%{tde_bindir}/kgoldrunner
+%{tde_tdedocdir}/HTML/en/kgoldrunner/
+%{tde_mandir}/man*/kgoldrunner.*
+
+##########
+
+%package -n trinity-kjumpingcube
+Summary:	Tactical one or two player game
+Group:		Amusements/Games/Strategy/Other
+
+%description -n trinity-kjumpingcube
+KJumpingCube is a simple tactical game. You can play it against the
+computer or against a friend. The playing field consists of squares
+that contains points.  By clicking on the squares you can increase
+the points and if the points reach a maximum the points will jump to
+the squares neighbours and take them over. Winner is the one, who
+owns all squares.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kjumpingcube
+%defattr(-,root,root,-)
+%{tde_bindir}/kjumpingcube
+%{tde_datadir}/icons/hicolor/*/apps/kjumpingcube.png
+%{tde_datadir}/apps/kjumpingcube/
+%{tde_tdeappdir}/kjumpingcube.desktop
+%{tde_datadir}/config.kcfg/kjumpingcube.kcfg
+%{tde_tdedocdir}/HTML/en/kjumpingcube/
+%{tde_mandir}/man*/kjumpingcube.*
+
+##########
+
+%package -n trinity-klickety
+Summary:	A Clickomania-like game for Trinity
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-klickety
+Klickety is an adaptation of the (perhaps) well-known Clickomania
+game; it is very similar to the "same" game.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-klickety
+%defattr(-,root,root,-)
+%{tde_bindir}/klickety
+%{tde_tdeappdir}/klickety.desktop
+%{tde_datadir}/icons/hicolor/*/apps/klickety.png
+%{tde_datadir}/icons/crystalsvg/*/actions/endturn.png
+%{tde_datadir}/apps/klickety/
+%{tde_tdedocdir}/HTML/en/klickety/
+%{tde_mandir}/man*/klickety.*
+
+##########
+
+%package -n trinity-klines
+Summary:	Color lines for Trinity
+Group:		Amusements/Games/Strategy/Other
+
+%description -n trinity-klines
+KLines is a simple game. It is played by one player, so there is only
+one winner :-). You play for fun and against the high score. It was
+inspired by a well known game - "Color lines", written for DOS by
+Olga Demina, Igor Demina, Igor Ivkin and Gennady Denisov back in
+1992.
+
+The main rules of the game are as simple as possible: you move (using
+the mouse) marbles from cell to cell and build lines (horizontal,
+vertical or diagonal). When a line contains 5 or more marbles, they
+are removed and your score grows. After each turn the computer drops
+three more marbles.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-klines
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/klines/
+%{tde_tdeappdir}/klines.desktop
+%{tde_bindir}/klines
+%{tde_datadir}/config.kcfg/klines.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/klines.png
+%{tde_tdedocdir}/HTML/en/klines/
+%{tde_mandir}/man*/klines.*
+
+##########
+
+%package -n trinity-kmahjongg
+Summary:	The classic mahjongg game for Trinity project
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-kmahjongg
+Your mission in this game is to remove all tiles from the game board. A
+matching pair of tiles can be removed, if they are 'free', which means that
+no other tiles block them on the left or right side.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kmahjongg
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kmahjongg/
+%{tde_datadir}/icons/hicolor/*/apps/kmahjongg.png
+%{tde_tdeappdir}/kmahjongg.desktop
+%{tde_bindir}/kmahjongg
+%{tde_datadir}/config.kcfg/kmahjongg.kcfg
+%{tde_tdedocdir}/HTML/en/kmahjongg/
+%{tde_mandir}/man*/kmahjongg.*
+
+##########
+
+%package -n trinity-kmines
+Summary:	Minesweeper for Trinity
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-kmines
+KMines is the classic Minesweeper game. You must uncover all the
+empty cases without blowing on a mine.
+
+When you uncover a case, a number appears : it indicates how many
+mines surround this case. If there is no number the neighbour cases
+are automatically uncovered. In your process of uncovering secure
+cases, it is very useful to put a flag on the cases which contain a
+mine.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kmines
+%defattr(-,root,root,-)
+%{tde_datadir}/icons/hicolor/*/apps/kmines.png
+%{tde_tdeappdir}/kmines.desktop
+%{tde_datadir}/apps/kmines/
+%{tde_bindir}/kmines
+%{tde_tdedocdir}/HTML/en/kmines/
+%{tde_mandir}/man*/kmines.*
+
+##########
+
+%package -n trinity-knetwalk
+Summary:	A game for system administrators
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-knetwalk
+This game presents the player with a rectangular field consisting of
+a server, several clients, and pieces of wire.  The object is to
+rotate these elements until every client is connected to the server,
+and no wires are left unconnected.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-knetwalk
+%defattr(-,root,root,-)
+%{tde_bindir}/knetwalk
+%{tde_datadir}/apps/knetwalk
+%{tde_datadir}/icons/hicolor/*/apps/knetwalk.png
+%{tde_tdeappdir}/knetwalk.desktop
+%{tde_tdedocdir}/HTML/en/knetwalk/
+%{tde_mandir}/man*/knetwalk.*
+
+##########
+
+%package -n trinity-kolf
+Summary:	Minigolf game for TDE
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-kolf
+This is a minigolf game for TDE that allows you to go through different
+golf courses and waste an exorbitant amount of time.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kolf
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/magic/kolf.magic
+%{tde_datadir}/apps/kolf/
+%{tde_bindir}/kolf
+%{tde_tdeappdir}/kolf.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kolf.png
+%{tde_datadir}/mimelnk/application/x-kolf.desktop
+%{tde_datadir}/mimelnk/application/x-kourse.desktop
+%{tde_libdir}/libtdeinit_kolf.so
+%{tde_libdir}/libtdeinit_kolf.la
+%{tde_tdelibdir}/kolf.la
+%{tde_tdelibdir}/kolf.so
+%{tde_libdir}/libkolf.so.1
+%{tde_libdir}/libkolf.so.1.2.0
+%{tde_tdedocdir}/HTML/en/kolf/
+%config(noreplace) %{tde_confdir}/magic/kolf.magic.mgc
+%{tde_mandir}/man*/kolf.*
+
+##########
+
+%package -n trinity-kolf-devel
+Summary:	Development files for Kolf
+Group:		Development/Libraries/Other
+Requires:	trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kolf-devel
+This package contains headers and development libraries for compiling
+Kolf plugins.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kolf-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kolf
+%{tde_libdir}/libkolf.la
+%{tde_libdir}/libkolf.so
+
+##########
+
+%package -n trinity-konquest
+Summary:	TDE based GNU-Lactic Konquest game
+Group:		Amusements/Games/Strategy/Other
+
+%description -n trinity-konquest
+This the TDE version of Gnu-Lactic Konquest, a multi-player strategy
+game. The goal of the game is to expand your interstellar empire
+across the galaxy and, of course, crush your rivals in the process.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-konquest
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/konquest/
+%{tde_datadir}/icons/hicolor/*/apps/konquest.png
+%{tde_tdeappdir}/konquest.desktop
+%{tde_bindir}/konquest
+%{tde_tdedocdir}/HTML/en/konquest/
+%{tde_mandir}/man*/konquest.*
+
+##########
+
+%package -n trinity-kpat
+Summary:	Trinity solitaire patience game
+Group:		Amusements/Games/Board/Card
+
+%description -n trinity-kpat
+KPatience is a collection of 14 card games. All the games are single
+player games.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kpat
+%defattr(-,root,root,-)
+%{tde_datadir}/icons/hicolor/*/apps/kpat.png
+%{tde_datadir}/apps/kpat/
+%{tde_tdeappdir}/kpat.desktop
+%{tde_bindir}/kpat
+%{tde_tdedocdir}/HTML/en/kpat/
+%{tde_mandir}/man*/kpat.*
+
+##########
+
+%package -n trinity-kpoker
+Summary:	Trinity based Poker clone
+Group:		Amusements/Games/Board/Card
+
+%description -n trinity-kpoker
+KPoker is a TDE compliant clone of those highly addictive pocket
+video poker games which are sometimes called "Videopoker" as well.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kpoker
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kpoker/
+%{tde_datadir}/icons/hicolor/*/apps/kpoker.png
+%{tde_tdeappdir}/kpoker.desktop
+%{tde_bindir}/kpoker
+%{tde_tdedocdir}/HTML/en/kpoker/
+%{tde_mandir}/man*/kpoker.*
+
+##########
+
+%package -n trinity-kreversi
+Summary:	Reversi for Trinity
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-kreversi
+Reversi is a simple strategy game that is played by two
+players. There is only one type of piece - one side of it is black,
+the other white. If a player captures a piece on the board, that
+piece is turned and belongs to that player. The winner is the person
+that has more pieces of his own color on the board and if there are
+no more moves possible.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kreversi
+%defattr(-,root,root,-)
+%{tde_bindir}/kreversi
+%{tde_tdeappdir}/kreversi.desktop
+%{tde_datadir}/apps/kreversi/
+%{tde_datadir}/config.kcfg/kreversi.kcfg
+%{tde_datadir}/icons/crystalsvg/*/actions/lastmoves.png
+%{tde_datadir}/icons/crystalsvg/*/actions/legalmoves.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/lastmoves.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/legalmoves.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kreversi.png
+%{tde_tdedocdir}/HTML/en/kreversi/
+%{tde_mandir}/man*/kreversi.*
+
+##########
+
+%package -n trinity-ksame
+Summary:	SameGame for Trinity
+Group:		Amusements/Games/Strategy/Other
+
+%description -n trinity-ksame
+KSame is a simple game. It's played by one player, so there is only
+one winner :-) You play for fun and against the high score. It has
+been inspired by SameGame, that is only famous on the Macintosh
+platform.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksame
+%defattr(-,root,root,-)
+%{tde_bindir}/ksame
+%{tde_datadir}/icons/hicolor/*/apps/ksame.png
+%{tde_datadir}/apps/ksame/
+%{tde_tdeappdir}/ksame.desktop
+%{tde_tdedocdir}/HTML/en/ksame/
+%{tde_mandir}/man*/ksame.*
+
+##########
+
+%package -n trinity-kshisen
+Summary:	Shisen-Sho for Trinity
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-kshisen
+KShisen-Sho is a single-player-game similar to Mahjongg and uses the
+same set of tiles as Mahjongg.
+
+The object of the game is to remove all tiles from the field.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kshisen
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kshisen/
+%{tde_datadir}/config.kcfg/kshisen.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kshisen.png
+%{tde_tdeappdir}/kshisen.desktop
+%{tde_bindir}/kshisen
+%{tde_tdedocdir}/HTML/en/kshisen/
+%{tde_mandir}/man*/kshisen.*
+
+##########
+
+%package -n trinity-ksirtet
+Summary:	Tetris and Puyo-Puyo games for Trinity
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-ksirtet
+This program is a clone of the well known game Tetris. You must fit
+the falling pieces to form full lines. You can rotate and translate
+the falling piece. The game ends when no more piece can fall ie when
+your incomplete lines reach the top of the board.
+
+Every time you have destroyed 10 lines, you gain a level and the
+pieces fall quicker (exactly the piece falls from a line each
+1/(1+level) second).
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksirtet
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/ksirtet.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ksirtet.png
+%{tde_datadir}/apps/ksirtet/
+%{tde_bindir}/ksirtet
+%{tde_datadir}/config.kcfg/ksirtet.kcfg
+%{tde_tdedocdir}/HTML/en/ksirtet/
+%{tde_mandir}/man*/ksirtet.*
+
+##########
+
+%package -n trinity-ksmiletris
+Summary:	Tetris like game for Trinity
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-ksmiletris
+This is a game with falling blocks composed of different types of
+smilies. The object of the game is to "crack a smile" by guiding
+blocks so there are two or more of the same symbol vertically.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksmiletris
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/ksmiletris/
+%{tde_datadir}/icons/hicolor/*/apps/ksmiletris.png
+%{tde_tdeappdir}/ksmiletris.desktop
+%{tde_bindir}/ksmiletris
+%{tde_tdedocdir}/HTML/en/ksmiletris/
+%{tde_mandir}/man*/ksmiletris.*
+
+##########
+
+%package -n trinity-ksnake
+Summary:	Snake Race for Trinity
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-ksnake
+Snake Race is a game of speed and agility. You are a hungry snake and
+are trying to eat all the apples in the room before getting out!
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksnake
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/ksnake/
+%{tde_datadir}/config.kcfg/ksnake.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/ksnake.png
+%{tde_tdeappdir}/ksnake.desktop
+%{tde_bindir}/ksnake
+%{tde_tdedocdir}/HTML/en/ksnake/
+%{tde_mandir}/man*/ksnake.*
+
+##########
+
+%package -n trinity-ksokoban
+Summary:	Sokoban game for Trinity
+Group:		Amusements/Games/Strategy/Other
+
+%description -n trinity-ksokoban
+The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
+the Japanese company Thinking Rabbit, Inc. "Sokoban" is japanese for
+"warehouse keeper". The idea is that you are a warehouse keeper
+trying to push crates to their proper locations in a warehouse.
+
+The problem is that you cannot pull the crates or step over them. If
+you are not careful, some of the crates can get stuck in wrong places
+and/or block your way.
+
+It can be rather difficult just to solve a level. But if you want to
+make it even harder, you can try to minimise the number of moves
+and/or pushes you use to solve the level.
+
+To make the game more fun for small kids (below 10 years or so), some
+collections with easier levels are also included in KSokoban. These
+are marked (easy) in the level collection menu. Of course, these
+levels can be fun for adults too, for example if you don't want to
+expose yourself to too much mental strain.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ksokoban
+%defattr(-,root,root,-)
+%{tde_tdeappdir}/ksokoban.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ksokoban.png
+%{tde_bindir}/ksokoban
+%{tde_tdedocdir}/HTML/en/ksokoban/
+%{tde_mandir}/man*/ksokoban.*
+
+##########
+
+%package -n trinity-kspaceduel
+Summary:	Arcade two-player space game for Trinity
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-kspaceduel
+KSpaceduel is an space arcade game for two players.
+
+Each player controls a ship that flies around the sun and tries to
+shoot at the other ship. You can play KSpaceduel with another person,
+against the computer, or you can have the computer control both ships
+and play each other.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-kspaceduel
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kspaceduel/
+%{tde_datadir}/icons/hicolor/*/apps/kspaceduel.png
+%{tde_tdeappdir}/kspaceduel.desktop
+%{tde_bindir}/kspaceduel
+%{tde_datadir}/config.kcfg/kspaceduel.kcfg
+%{tde_tdedocdir}/HTML/en/kspaceduel/
+%{tde_mandir}/man*/kspaceduel.*
+
+##########
+
+%package -n trinity-ktron
+Summary:	Tron clone for the K Desktop Environment
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-ktron
+The object of the game is to avoid running into walls, your own tail,
+and that of your opponent.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ktron
+%defattr(-,root,root,-)
+%{tde_bindir}/ktron
+%{tde_datadir}/icons/hicolor/*/apps/ktron.png
+%{tde_tdeappdir}/ktron.desktop
+%{tde_datadir}/apps/ktron/
+%{tde_datadir}/config.kcfg/ktron.kcfg
+%{tde_tdedocdir}/HTML/en/ktron/
+%{tde_mandir}/man*/ktron.*
+
+##########
+
+%package -n trinity-ktuberling
+Summary:	Potato Guy for Trinity
+Group:		Amusements/Games/Action/Arcade
+
+%description -n trinity-ktuberling
+KTuberling is a game intended for small children. Of course, it may
+be suitable for adults who have remained young at heart.
+
+It is a potato editor. That means that you can drag and drop eyes,
+mouths, moustache, and other parts of face and goodies onto a
+potato-like guy.  Similarly, you have a penguin on which you can drop
+other stuff.
+
+There is no winner for the game. The only purpose is to make the
+funniest faces you can.
+
+There is a museum (like a "Madame Tusseau" gallery) where you can
+find many funny examples of decorated potatoes. Of course, you can
+send your own creations to the programmer, Eric Bischoff, who will
+include them in the museum if he gets some spare time.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-ktuberling
+%defattr(-,root,root,-)
+%{tde_bindir}/ktuberling
+%{tde_datadir}/icons/hicolor/*/apps/ktuberling.png
+%{tde_tdeappdir}/ktuberling.desktop
+%{tde_datadir}/apps/ktuberling/
+%{tde_datadir}/mimelnk/application/x-tuberling.desktop
+%{tde_tdedocdir}/HTML/en/ktuberling/
+%{tde_mandir}/man*/ktuberling.*
+
+##########
+
+%package -n trinity-twin4
+Summary:	Connect Four clone for Trinity
+Group:		Amusements/Games/Board/Other
+
+%description -n trinity-twin4
+Four wins is a game for two players. Each player is represented by a
+colour (yellow and red). The goal of the game is to get four
+connected pieces of your colour into a row, column or any
+diagonal. This is done by placing one of your pieces into any of the
+seven columns. A piece will begin to fill a column from the bottom,
+i.e. it will fall down until it reaches the ground level or another
+stone. After a move is done it is the turn of the other player. This
+is repeated until the game is over, i.e. one of the players has four
+pieces in a row, column or diagonal or no more moves are possible
+because the board is filled.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-twin4
+%defattr(-,root,root,-)
+%{tde_bindir}/twin4
+%{tde_bindir}/twin4proc
+%{tde_datadir}/apps/twin4/
+%{tde_datadir}/config.kcfg/twin4.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/twin4.png
+%{tde_tdeappdir}/twin4.desktop
+%{tde_tdedocdir}/HTML/en/twin4/
+%{tde_mandir}/man*/twin4.*
+%{tde_mandir}/man*/twin4proc.*
+
+##########
+
+%package -n trinity-lskat
+Summary:	Lieutnant Skat card game for Trinity
+Group:		Amusements/Games/Board/Card
+
+%description -n trinity-lskat
+Lieutnant Skat (from German Offiziersskat) is a card game for two
+players. It is roughly played according to the rules of Skat but with
+only two players and simplified rules.
+
+Every player has a set of cards in front of him/her, half of them
+covered and half of them open. Both players try to win more than 60
+of the 120 possible points. After 16 moves all cards are played and
+the game ends.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-lskat
+%defattr(-,root,root,-)
+%{tde_bindir}/lskat
+%{tde_bindir}/lskatproc
+%{tde_datadir}/apps/lskat/
+%{tde_datadir}/icons/hicolor/*/apps/lskat.png
+%{tde_tdeappdir}/lskat.desktop
+%{tde_tdedocdir}/HTML/en/lskat/
+%{tde_mandir}/man*/lskat.*
+%{tde_mandir}/man*/lskatproc.*
+
+##########
+
+%package -n trinity-tdefifteen
+Summary:	Puzzle-solving game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-tdefifteen
+TDEFifteen is a sliding puzzle that consists of a frame of numbered square
+tiles in random order with one tile missing.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-tdefifteen
+%defattr(-,root,root,-)
+%{tde_bindir}/tdefifteen
+%{tde_tdeappdir}/tdefifteen.desktop
+%{tde_datadir}/icons/hicolor/*/apps/tdefifteen.png
+%{tde_mandir}/man*/tdefifteen.*
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Specific path for RHEL4
+if [ -d "/usr/X11R6" ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kasteroids      Game ArcadeGame
+%suse_update_desktop_file -r KGoldrunner     Game ArcadeGame
+%suse_update_desktop_file -r ksnake          Game ArcadeGame
+%suse_update_desktop_file -r kspaceduel      Game ArcadeGame
+%suse_update_desktop_file -r ktron           Game ArcadeGame
+%suse_update_desktop_file -r kfouleggs       Game BlocksGame
+%suse_update_desktop_file -r ksirtet         Game BlocksGame
+%suse_update_desktop_file -r klickety        Game BoardGame
+%suse_update_desktop_file -r ksmiletris      Game BlocksGame
+%suse_update_desktop_file -r ktuberling      Game KidsGame
+%suse_update_desktop_file -r atlantik        Game BoardGame
+%suse_update_desktop_file -r kbackgammon     Game BoardGame
+%suse_update_desktop_file -r kbattleship     Game BoardGame
+%suse_update_desktop_file -r kblackbox       Game BoardGame
+%suse_update_desktop_file -r kenolaba        Game BoardGame
+%suse_update_desktop_file -r kmahjongg       Game BoardGame
+%suse_update_desktop_file -r kreversi        Game BoardGame
+%suse_update_desktop_file -r kshisen         Game BoardGame
+%suse_update_desktop_file -r twin4           Game BoardGame
+%suse_update_desktop_file -r kpat            Game CardGame
+%suse_update_desktop_file -r kpoker          Game CardGame
+%suse_update_desktop_file -r lskat           Game CardGame
+%suse_update_desktop_file -r katomic         Game LogicGame
+%suse_update_desktop_file -r kjumpingcube    Game LogicGame
+%suse_update_desktop_file -r klines          Game LogicGame
+%suse_update_desktop_file -r -G "Tactical Game" knetwalk Game LogicGame
+%suse_update_desktop_file -r kmines          Game LogicGame
+%suse_update_desktop_file -r konquest        Game LogicGame
+%suse_update_desktop_file -r ksame           Game LogicGame
+%suse_update_desktop_file -r ksokoban        Game LogicGame
+%suse_update_desktop_file -r kbounce         Game LogicGame
+%suse_update_desktop_file -r kolf            Game SportsGame
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdegames/trinity-tdegames-rpmlintrc b/redhat/core/tdegames/trinity-tdegames-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdegames/trinity-tdegames-rpmlintrc
+++ b/redhat/core/tdegames/trinity-tdegames-rpmlintrc
diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec
new file mode 100644
index 000000000..623855117
--- /dev/null
+++ b/redhat/core/tdegraphics/tdegraphics.spec
@@ -0,0 +1,1138 @@
+#
+# spec file for package tdegraphics (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdegraphics
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:    Trinity Desktop Environment - Graphics Applications
+Group:      Productivity/Graphics/Viewers
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:		GPL-2.0+
+%else
+License:		GPLv2+
+%endif
+
+#Vendor:			Trinity Desktop
+#Packager:		Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	gettext
+BuildRequires:	libtool
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# LIBUSB support
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
+BuildRequires:	libusb-devel
+%endif
+
+# MNG support
+BuildRequires: libmng-devel
+
+# TIFF support
+BuildRequires: libtiff-devel
+
+# PCRE support
+BuildRequires: pcre-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# GIF support
+%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
+BuildRequires: giflib-devel
+%else
+BuildRequires: libungif-devel
+%endif
+
+# GPHOTO2 support
+%if 0%{?suse_version}
+BuildRequires: libgphoto2-devel
+%else
+BuildRequires: gphoto2-devel
+%endif
+
+# PAPER support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_paper 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}paper-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	libpaper-devel
+%endif
+%endif
+
+# T1LIB support
+%if 0%{?suse_version} && 0%{?suse_version} <= 1230
+%define with_t1lib 1
+BuildRequires:	t1lib-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) || 0%{?fedora}
+%define with_t1lib 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}t1lib-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	t1lib-devel
+%endif
+%endif
+
+# SANE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}sane1-devel
+%else
+BuildRequires:	sane-backends-devel
+%endif
+
+# LIBXXF86VM support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xxf86vm-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires:	libXxf86vm-devel
+%endif
+
+# XMU support
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXmu-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
+BuildRequires: libxmu-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
+%endif
+
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-Mesa-libGLU
+%endif
+
+# DRM support
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%else
+BuildRequires: libdrm-devel
+%endif
+
+# OPENEXR support
+BuildRequires:	OpenEXR-devel
+
+# POPPLER support
+%define with_pdf 1
+%if 0%{?with_pdf}
+%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} >= 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
+BuildRequires: poppler-devel >= 0.12
+%endif
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}poppler-devel
+%endif
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
+BuildRequires:	trinity-poppler-devel >= 0.12
+%endif
+%endif
+
+# LCMS support
+%if 0%{?suse_version} || 0%{?rhel} >= 7
+BuildRequires: liblcms-devel
+%else
+BuildRequires: lcms-devel
+%endif
+
+# FRIBIDI support
+BuildRequires: fribidi-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# kamera
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+%define build_kamera 1
+%endif
+
+# kmrml (deprecated)
+#define build_kmrml 1
+%if 0%{?build_kmrml}
+#Requires:		gift
+%else
+Obsoletes:		trinity-kmrml < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+Obsoletes:	trinity-kdegraphics < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdegraphics-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdegraphics-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%{?build_kamera:Requires: trinity-kamera = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-kcoloredit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdvi = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfax = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfaxview = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgamma = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kghostview = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_kmrml:Requires: trinity-kmrml = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-kolourpaint = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kooka = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpdf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpovmodeler = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kruler = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksnapshot = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksvg = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kview = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kviewshell = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_pdf}
+Requires: trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%description
+Graphics applications for the Trinity Desktop Environment, including
+%if 0%{?build_kamera}
+* kamera (digital camera support)
+%endif
+* kcoloredit (palette editor and color chooser)
+* kdvi (displays TeX .dvi files)
+* kfax
+* kfaxview
+* kghostview (displays postscript files)
+* kiconedit (icon editor)
+* kooka (scanner application)
+* kpdf (displays PDF files)
+* kpovmodler
+* kruler (screen ruler and color measurement tool)
+* ksnapshot (screen capture utility)
+* kview (image viewer for GIF, JPEG, TIFF, etc.)
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog README
+
+##########
+
+%if 0%{?build_kamera}
+
+%package -n trinity-kamera
+Summary:	Digital camera io_slave for Konqueror
+Group:		Hardware/Camera
+
+%description -n trinity-kamera
+This is a digital camera io_slave for TDE which uses gphoto2 and libgpio
+to allow access to your camera's pictures with the URL camera:/
+
+%files -n trinity-kamera
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_kamera.la
+%{tde_tdelibdir}/kcm_kamera.so
+%{tde_tdelibdir}/tdeio_kamera.la
+%{tde_tdelibdir}/tdeio_kamera.so
+%{tde_tdeappdir}/kamera.desktop
+%{tde_datadir}/services/camera.protocol
+%{tde_tdedocdir}/HTML/en/kamera/
+%{tde_tdedocdir}/HTML/en/tdeioslave/camera/
+
+%endif
+
+##########
+
+%package -n trinity-kcoloredit
+Summary:	A color palette editor and color picker for TDE
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kcoloredit
+This package contains two programs, a color palette editor and also a color
+picker.
+
+%files -n trinity-kcoloredit
+%defattr(-,root,root,-)
+%{tde_bindir}/kcolorchooser
+%{tde_bindir}/kcoloredit
+%{tde_tdeappdir}/kcolorchooser.desktop
+%{tde_tdeappdir}/kcoloredit.desktop
+%{tde_datadir}/apps/kcoloredit/
+%{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
+%{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
+%{tde_tdedocdir}/HTML/en/kcoloredit/
+%{tde_mandir}/man1/kcolorchooser.1*
+%{tde_mandir}/man1/kcoloredit.1*
+
+##########
+
+%package kfile-plugins
+Summary:	TDE metainfo plugins for graphic files
+Group:		System/GUI/Other
+ 
+%description kfile-plugins
+This packages provides meta information for graphic files (file sizes,
+tags, etc. all from within the file manager).
+
+%files kfile-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/gsthumbnail.la
+%{tde_tdelibdir}/gsthumbnail.so
+%{tde_tdelibdir}/tdefile_bmp.la
+%{tde_tdelibdir}/tdefile_bmp.so
+%{tde_tdelibdir}/tdefile_dds.la
+%{tde_tdelibdir}/tdefile_dds.so
+%{tde_tdelibdir}/tdefile_dvi.la
+%{tde_tdelibdir}/tdefile_dvi.so
+%{tde_tdelibdir}/tdefile_exr.la
+%{tde_tdelibdir}/tdefile_exr.so
+%{tde_tdelibdir}/tdefile_gif.la
+%{tde_tdelibdir}/tdefile_gif.so
+%{tde_tdelibdir}/tdefile_ico.la
+%{tde_tdelibdir}/tdefile_ico.so
+%{tde_tdelibdir}/tdefile_jpeg.la
+%{tde_tdelibdir}/tdefile_jpeg.so
+%{tde_tdelibdir}/tdefile_pcx.la
+%{tde_tdelibdir}/tdefile_pcx.so
+%if 0%{?with_pdf}
+%{tde_tdelibdir}/tdefile_pdf.la
+%{tde_tdelibdir}/tdefile_pdf.so
+%endif
+%{tde_tdelibdir}/tdefile_png.la
+%{tde_tdelibdir}/tdefile_png.so
+%{tde_tdelibdir}/tdefile_pnm.la
+%{tde_tdelibdir}/tdefile_pnm.so
+%{tde_tdelibdir}/tdefile_ps.la
+%{tde_tdelibdir}/tdefile_ps.so
+%{tde_tdelibdir}/tdefile_raw.la
+%{tde_tdelibdir}/tdefile_raw.so
+%{tde_tdelibdir}/tdefile_rgb.la
+%{tde_tdelibdir}/tdefile_rgb.so
+%{tde_tdelibdir}/tdefile_tga.la
+%{tde_tdelibdir}/tdefile_tga.so
+%{tde_tdelibdir}/tdefile_tiff.la
+%{tde_tdelibdir}/tdefile_tiff.so
+%{tde_tdelibdir}/tdefile_xbm.la
+%{tde_tdelibdir}/tdefile_xbm.so
+%{tde_tdelibdir}/tdefile_xpm.la
+%{tde_tdelibdir}/tdefile_xpm.so
+%{tde_datadir}/services/gsthumbnail.desktop
+%{tde_datadir}/services/tdefile_bmp.desktop
+%{tde_datadir}/services/tdefile_dds.desktop
+%{tde_datadir}/services/tdefile_dvi.desktop
+%{tde_datadir}/services/tdefile_exr.desktop
+%{tde_datadir}/services/tdefile_gif.desktop
+%{tde_datadir}/services/tdefile_ico.desktop
+%{tde_datadir}/services/tdefile_jpeg.desktop
+%{tde_datadir}/services/tdefile_pcx.desktop
+%if 0%{?with_pdf}
+%{tde_datadir}/services/tdefile_pdf.desktop
+%endif
+%{tde_datadir}/services/tdefile_png.desktop
+%{tde_datadir}/services/tdefile_pnm.desktop
+%{tde_datadir}/services/tdefile_ps.desktop
+%{tde_datadir}/services/tdefile_raw.desktop
+%{tde_datadir}/services/tdefile_rgb.desktop
+%{tde_datadir}/services/tdefile_tga.desktop
+%{tde_datadir}/services/tdefile_tiff.desktop
+%{tde_datadir}/services/tdefile_xbm.desktop
+%{tde_datadir}/services/tdefile_xpm.desktop
+
+##########
+
+%package -n trinity-kdvi
+Summary:	Dvi viewer for TDE
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kdvi
+This program and KPart allow the user to display *.DVI files from TeX.
+
+%files -n trinity-kdvi
+%defattr(-,root,root,-)
+%{tde_bindir}/kdvi
+%{tde_tdelibdir}/kdvipart.la
+%{tde_tdelibdir}/kdvipart.so
+%{tde_tdeappdir}/kdvi.desktop
+%{tde_datadir}/apps/kdvi/
+%{tde_datadir}/config.kcfg/kdvi.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kdvi.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
+%{tde_datadir}/services/kdvimultipage.desktop
+%{tde_tdedocdir}/HTML/en/kdvi/
+%{tde_mandir}/man1/kdvi.1*
+
+##########
+
+%package -n trinity-kfax
+Summary:	G3/G4 fax viewer for Trinity
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kfax
+A fax viewer for Trinity, supporting the display of raw and tiffed fax images
+(g3, g3-2d, g4).
+
+%files -n trinity-kfax
+%defattr(-,root,root,-)
+%{tde_bindir}/kfax
+%{tde_tdeappdir}/kfax.desktop
+%{tde_datadir}/apps/kfax/
+%{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
+%{tde_tdedocdir}/HTML/en/kfax/
+%{tde_mandir}/man1/kfax.1*
+
+##########
+
+%package -n trinity-kfaxview
+Summary:	G3/G4 fax viewer for Trinity using kviewshell
+Group:		Productivity/Publishing/TeX/Frontends
+
+%description -n trinity-kfaxview
+A fax viewer for Trinity, supporting the display of raw and tiffed fax images
+(g3, g3-2d, g4).
+
+This faxviewer uses kviewshell and is intended to replace the standalone
+kfax application once it reproduces all of kfax's features.
+
+%files -n trinity-kfaxview
+%defattr(-,root,root,-)
+%{tde_bindir}/kfaxview
+%{tde_libdir}/libkfaximage.so.*
+%{tde_tdelibdir}/kfaxviewpart.*
+%{tde_tdeappdir}/kfaxview.desktop
+%{tde_datadir}/apps/kfaxview/
+%{tde_datadir}/icons/hicolor/??x??/apps/kfaxview.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
+%{tde_datadir}/services/kfaxmultipage.desktop
+%{tde_datadir}/services/kfaxmultipage_tiff.desktop
+%{tde_tdedocdir}/HTML/en/kfaxview/
+%{tde_mandir}/man1/kfaxview.1*
+
+##########
+
+%package -n trinity-kgamma
+Summary:	Gamma correction module for the Trinity Control Center
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kgamma
+KGamma is a Trinity Control Center module for gamma calibration/correction
+of XFree86. With proper gamma settings, your display (websites, images,
+etc.) will look the same on your monitor as on other monitors.
+
+Homepage: http://kgamma.berlios.de/index2.php
+
+%files -n trinity-kgamma
+%defattr(-,root,root,-)
+%{tde_bindir}/xf86gammacfg
+%{tde_tdelibdir}/kcm_kgamma.la
+%{tde_tdelibdir}/kcm_kgamma.so
+%{tde_datadir}/applnk/.hidden/kgamma.desktop
+%{tde_datadir}/apps/kgamma/
+%{tde_datadir}/icons/hicolor/*/apps/kgamma.png
+%{tde_tdedocdir}/HTML/en/kgamma/
+
+##########
+
+%package -n trinity-kghostview
+Summary:	PostScript viewer for Trinity
+Group:		Productivity/Graphics/Viewers
+Requires:	ghostscript
+
+%description -n trinity-kghostview
+KGhostview is Trinity's PostScript viewer. It is a port of Tim Theisen's
+Ghostview program which is used to view documents prepared in Adobe's
+PostScript page description language. PostScript is the major page
+description language for printing on UNIX systems, and this application is
+useful to preview material intended for printing, or for reading documents
+online.
+
+%files -n trinity-kghostview
+%defattr(-,root,root,-)
+%{tde_bindir}/kghostview
+%{tde_tdelibdir}/libkghostviewpart.la
+%{tde_tdelibdir}/libkghostviewpart.so
+%{tde_libdir}/libkghostviewlib.so.*
+%{tde_tdeappdir}/kghostview.desktop
+%{tde_datadir}/apps/tdeconf_update/kghostview.upd
+%{tde_datadir}/apps/tdeconf_update/update-to-xt-names.pl
+%{tde_datadir}/apps/kghostview/
+%{tde_datadir}/config.kcfg/kghostview.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kghostview.png
+%{tde_datadir}/services/kghostview_part.desktop
+%{tde_tdedocdir}/HTML/en/kghostview/
+%{tde_mandir}/man1/kghostview.1*
+
+##########
+
+%package -n trinity-tdeiconedit
+Summary:	An icon editor for Trinity
+Group:		Productivity/Graphics/Viewers
+
+Obsoletes:	trinity-kiconedit < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdeiconedit
+TDEIconedit allows you easily to create and edit icons.
+
+%files -n trinity-tdeiconedit
+%defattr(-,root,root,-)
+%{tde_bindir}/tdeiconedit
+%{tde_tdeappdir}/tdeiconedit.desktop
+%{tde_datadir}/apps/tdeiconedit/
+%{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png
+%{tde_tdedocdir}/HTML/en/tdeiconedit/
+%{tde_mandir}/man1/tdeiconedit.1*
+
+##########
+
+%if 0%{?build_kmrml}
+
+%package -n trinity-kmrml
+Summary: 	A Konqueror plugin for searching pictures
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kmrml
+MRML is short for Multimedia Retrieval Markup Language, which defines a
+protocol for querying a server for images based on their content. See 
+http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an 
+MRML server.
+
+%files -n trinity-kmrml
+%defattr(-,root,root,-)
+%{tde_bindir}/mrmlsearch
+%{tde_tdelibdir}/kcm_kmrml.la
+%{tde_tdelibdir}/kcm_kmrml.so
+%{tde_tdelibdir}/kded_daemonwatcher.la
+%{tde_tdelibdir}/kded_daemonwatcher.so
+%{tde_tdelibdir}/tdeio_mrml.la
+%{tde_tdelibdir}/tdeio_mrml.so
+%{tde_tdelibdir}/libkmrmlpart.la
+%{tde_tdelibdir}/libkmrmlpart.so
+%{tde_tdelibdir}/mrmlsearch.la
+%{tde_tdelibdir}/mrmlsearch.so
+%{tde_libdir}/libtdeinit_mrmlsearch.so
+%{tde_tdeappdir}/kcmkmrml.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
+%{tde_datadir}/mimelnk/text/mrml.desktop
+%{tde_datadir}/services/kded/daemonwatcher.desktop
+%{tde_datadir}/services/mrml.protocol
+%{tde_datadir}/services/mrml_part.desktop
+
+%endif
+
+##########
+
+%package -n trinity-kolourpaint
+Summary:	A simple paint program for Trinity
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kolourpaint
+KolourPaint is a very simple paint program for Trinity. It aims to be
+conceptually simple to understand; providing a level of functionality
+targeted towards the average user. It's designed for daily tasks like:
+
+* Painting - drawing diagrams and "finger painting" 
+* Image Manipulation - editing screenshots and photos; applying effects 
+* Icon Editing - drawing clipart and logos with transparency 
+
+It's not an unusable and monolithic program where simple tasks like
+drawing lines become near impossible. Nor is it so simple that it lacks
+essential features like Undo/Redo.
+
+Homepage: http://kolourpaint.sourceforge.net
+
+%files -n trinity-kolourpaint
+%defattr(-,root,root,-)
+%{tde_bindir}/kolourpaint
+%{tde_tdeappdir}/kolourpaint.desktop
+%{tde_datadir}/apps/kolourpaint/
+%{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
+%{tde_tdedocdir}/HTML/en/kolourpaint/
+%{tde_mandir}/man1/kolourpaint.1*
+
+##########
+
+%package -n trinity-kooka
+Summary:	Scanner program for Trinity
+Group:		Hardware/Scanner
+
+%description -n trinity-kooka
+Kooka is an open source GNU/Linux scan program based on SANE and
+KScan library.
+
+Kooka helps you to handle the most important scan parameters, find the
+correct image file format to save and manage your scanned images. It
+offers support for different OCR modules. Libkscan, a autonomous part
+of Kooka, provides a scan service for easy and consistent use to all
+KDE applications.
+
+Install ocrad or gocr if you wish to enable optical character recognition
+in kooka.
+
+Homepage: http://kooka.kde.org/
+
+%files -n trinity-kooka
+%defattr(-,root,root,-)
+%{tde_bindir}/kooka
+%{tde_tdeappdir}/kooka.desktop
+%{tde_datadir}/apps/kooka/
+%config(noreplace) %{tde_confdir}/kookarc
+%{tde_datadir}/icons/hicolor/*/apps/kooka.png
+%{tde_tdedocdir}/HTML/en/kooka/
+%{tde_mandir}/man1/kooka.1*
+
+##########
+
+%package -n trinity-kpdf
+Summary:	PDF viewer for Trinity
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kpdf
+KPDF allows you to view PDF (Portable Document Format) files. This package
+includes kpdfpart so you can embed in konqueror or run as a standalone
+application.
+
+%files -n trinity-kpdf
+%defattr(-,root,root,-)
+%{tde_bindir}/kpdf
+%{tde_tdelibdir}/libkpdfpart.la
+%{tde_tdelibdir}/libkpdfpart.so
+%{tde_tdeappdir}/kpdf.desktop
+%{tde_datadir}/apps/kpdf/
+%{tde_datadir}/apps/kpdfpart/
+%{tde_datadir}/config.kcfg/kpdf.kcfg
+%{tde_tdedocdir}/HTML/en/kpdf/
+%{tde_datadir}/icons/hicolor/*/apps/kpdf.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
+%{tde_datadir}/services/kpdf_part.desktop
+%{tde_mandir}/man1/kpdf.1*
+
+##########
+
+%package -n trinity-kpovmodeler
+Summary:	A graphical editor for povray scenes
+Group:		Productivity/Graphics/Viewers
+#Requires:	povray
+
+%description -n trinity-kpovmodeler
+KPovmodeler is KDE's graphical editor for povray scenes. KPovModeler is a
+modeling and composition program for creating POV-Ray scenes in KDE.
+
+For most modelers, POV-Ray is nothing but a rendering engine. This greatly
+limits the innate possibilities of the POV-Ray scripted language. This
+is not the case for KPovModeler, which allows you to use all the features
+of POV-Ray through the translation of POV-Ray language into a graphical
+tree.
+
+kpovmodeler uses the povray package, currently available only in Debian's
+non-free, unsupported repository.
+
+Homepage: http://www.kpovmodeler.org
+
+%files -n trinity-kpovmodeler
+%defattr(-,root,root,-)
+%{tde_bindir}/kpovmodeler
+%{tde_libdir}/libkpovmodeler.so.*
+%{tde_tdelibdir}/libkpovmodelerpart.*
+%{tde_tdeappdir}/kpovmodeler.desktop
+%{tde_datadir}/apps/kpovmodeler/
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
+%{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
+%doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
+%{tde_mandir}/man1/kpovmodeler.1*
+
+##########
+
+%package -n trinity-kruler
+Summary:	A screen ruler and color measurement tool for Trinity
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kruler
+Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
+
+%files -n trinity-kruler
+%defattr(-,root,root,-)
+%{tde_bindir}/kruler
+%{tde_tdeappdir}/kruler.desktop
+%{tde_datadir}/applnk/Graphics/kruler.desktop
+%{tde_datadir}/apps/kruler/
+%{tde_datadir}/icons/hicolor/*/apps/kruler.png
+%{tde_tdedocdir}/HTML/en/kruler/
+%{tde_mandir}/man1/kruler.1*
+
+##########
+
+%package -n trinity-ksnapshot
+Summary:	Screenshot utility for Trinity
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-ksnapshot
+KSnapshot is a simple applet for taking screenshots. It is capable of 
+capturing images of either the whole desktop or just a single window. 
+The images can then be saved in a variety of formats.
+
+%files -n trinity-ksnapshot
+%defattr(-,root,root,-)
+%{tde_bindir}/ksnapshot
+%{tde_tdeappdir}/ksnapshot.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
+%{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
+%{tde_tdedocdir}/HTML/en/ksnapshot/
+%{tde_mandir}/man1/ksnapshot.1*
+
+##########
+
+%package -n trinity-ksvg
+Summary:	SVG viewer for Trinity
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-ksvg
+KSVG allows you view SVG (scalable vector graphics) files. This package
+includes kpart so you can embed it in konqueror and a standalone
+application.
+
+%files -n trinity-ksvg
+%defattr(-,root,root,-)
+%{tde_bindir}/printnodetest
+%{tde_bindir}/svgdisplay
+%{tde_tdelibdir}/libksvgplugin.la
+%{tde_tdelibdir}/libksvgplugin.so
+%{tde_tdelibdir}/libksvgrendererlibart.la
+%{tde_tdelibdir}/libksvgrendererlibart.so
+%{tde_tdelibdir}/svgthumbnail.la
+%{tde_tdelibdir}/svgthumbnail.so
+%{tde_libdir}/libksvg.so.0
+%{tde_libdir}/libksvg.so.0.0.1
+%{tde_libdir}/libtext2path.so.0
+%{tde_libdir}/libtext2path.so.0.0.0
+%{tde_datadir}/apps/ksvg/
+%{tde_datadir}/services/ksvglibartcanvas.desktop
+%{tde_datadir}/services/ksvgplugin.desktop
+%{tde_datadir}/services/svgthumbnail.desktop
+%{tde_datadir}/servicetypes/ksvgrenderer.desktop
+
+##########
+
+%package -n trinity-kview
+Summary:	Simple image viewer/converter for Trinity
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kview
+KView is a simple image viewer and converter application. It supports
+a number of plugins, which add an array of basic editing capabilities
+as well.
+
+%files -n trinity-kview
+%defattr(-,root,root,-)
+%{tde_bindir}/kview
+%{tde_tdelibdir}/kcm_kviewcanvasconfig.la
+%{tde_tdelibdir}/kcm_kviewcanvasconfig.so
+%{tde_tdelibdir}/kcm_kviewgeneralconfig.la
+%{tde_tdelibdir}/kcm_kviewgeneralconfig.so
+%{tde_tdelibdir}/kcm_kviewpluginsconfig.la
+%{tde_tdelibdir}/kcm_kviewpluginsconfig.so
+%{tde_tdelibdir}/kcm_kviewpresenterconfig.la
+%{tde_tdelibdir}/kcm_kviewpresenterconfig.so
+%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.la
+%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.so
+%{tde_tdelibdir}/kview.la
+%{tde_tdelibdir}/kview.so
+%{tde_tdelibdir}/kview_browserplugin.la
+%{tde_tdelibdir}/kview_browserplugin.so
+%{tde_tdelibdir}/kview_effectsplugin.la
+%{tde_tdelibdir}/kview_effectsplugin.so
+%{tde_tdelibdir}/kview_presenterplugin.la
+%{tde_tdelibdir}/kview_presenterplugin.so
+%{tde_tdelibdir}/kview_scannerplugin.la
+%{tde_tdelibdir}/kview_scannerplugin.so
+%{tde_tdelibdir}/libkviewcanvas.la
+%{tde_tdelibdir}/libkviewcanvas.so
+%{tde_tdelibdir}/libkviewviewer.la
+%{tde_tdelibdir}/libkviewviewer.so
+%{tde_libdir}/libtdeinit_kview.so
+%{tde_libdir}/libkimageviewer.so.*
+%{tde_tdelibdir}/libphotobook.la
+%{tde_tdelibdir}/libphotobook.so
+%{tde_tdeappdir}/kview.desktop
+%{tde_datadir}/apps/kview/
+%{tde_datadir}/apps/kviewviewer/
+%{tde_datadir}/apps/photobook/
+%{tde_datadir}/icons/crystalsvg/*/apps/photobook.png
+%{tde_datadir}/icons/hicolor/*/apps/kview.png
+%{tde_datadir}/services/tdeconfiguredialog/
+%{tde_datadir}/services/kviewcanvas.desktop
+%{tde_datadir}/services/kviewviewer.desktop
+%{tde_datadir}/services/photobook.desktop
+%{tde_datadir}/servicetypes/kimageviewer.desktop
+%{tde_datadir}/servicetypes/kimageviewercanvas.desktop
+%{tde_tdedocdir}/HTML/en/kview/
+%{tde_mandir}/man1/kview.1*
+
+##########
+
+%package -n trinity-kviewshell
+Summary:	Generic framework for viewer applications in Trinity
+Group:		Productivity/Graphics/Viewers
+
+%description -n trinity-kviewshell
+KViewShell is a generic viewing framework that allows the graphical
+applications, such as the kview image viewer, to be embedded in other
+KDE applications, such as Konqueror.
+
+KViewShell comes with a djvuviewpart plugin included, for viewing
+DjVu images.
+
+%files -n trinity-kviewshell
+%defattr(-,root,root,-)
+%{tde_bindir}/kviewshell
+%{tde_libdir}/libdjvu.la
+%{tde_libdir}/libdjvu.so
+%{tde_tdelibdir}/djvuviewpart.so
+%{tde_tdelibdir}/djvuviewpart.la
+%{tde_tdelibdir}/emptymultipagepart.la
+%{tde_tdelibdir}/emptymultipagepart.so
+%{tde_tdelibdir}/kviewerpart.la
+%{tde_tdelibdir}/kviewerpart.so
+%{tde_libdir}/libtdemultipage.so.*
+%{tde_datadir}/apps/djvumultipage.rc
+%{tde_datadir}/apps/kviewerpart/
+%{tde_datadir}/apps/kviewshell/
+%{tde_datadir}/config.kcfg/djvumultipage.kcfg
+%{tde_datadir}/config.kcfg/kviewshell.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/kviewshell.png
+%{tde_datadir}/services/emptymultipage.desktop
+%{tde_datadir}/services/djvumultipage.desktop
+%{tde_datadir}/servicetypes/tdemultipage.desktop
+%{tde_mandir}/man1/kviewshell.1*
+
+##########
+
+%package -n trinity-libkscan
+Summary:	Scanner library for Trinity
+Group:		Hardware/Scanner
+
+%description -n trinity-libkscan
+KScan is TDE's scanner library. It's used by kooka and by koffice currently.
+It provides an easy-to-use library, which allows you to access your scanner
+(as long as it's sane compatible).
+
+%files -n trinity-libkscan
+%defattr(-,root,root,-)
+%{tde_libdir}/libkscan.so.*
+%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_color.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png
+%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
+%{tde_datadir}/services/scanservice.desktop
+
+##########
+
+%package -n trinity-libkscan-devel
+Summary:	Development files for the Trinity scanner library
+Group:		Development/Libraries/Other
+Requires:	trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkscan-devel
+This package contains development files for Trinity's scanner library.
+
+%files -n trinity-libkscan-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkscan.la
+%{tde_libdir}/libkscan.so
+
+##########
+
+%if 0%{?with_pdf}
+%package -n trinity-libpoppler-tqt
+Summary:	TQt support for Poppler
+Group:		Productivity/Graphics/Viewers
+Obsoletes:	poppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	poppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	%{name}-libpoppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	%{name}-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libpoppler-tqt
+TQt support library for Poppler.
+This library is used by the Trinity graphics file plugins for PDF support.
+
+%files -n trinity-libpoppler-tqt
+%defattr(-,root,root,-)
+%{tde_libdir}/libpoppler-tqt.so.*
+%endif
+
+##########
+
+%if 0%{?with_pdf}
+%package -n trinity-libpoppler-tqt-devel
+Summary:	Development files for TQt support for Poppler
+Group:		Development/Libraries/Other
+Requires:	trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	poppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	poppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	%{name}-libpoppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	%{name}-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libpoppler-tqt-devel
+Development files of TQt support library for Poppler.
+This package contains the development files needed to compile applications against poppler-tqt.
+
+%files -n trinity-libpoppler-tqt-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/poppler-link-qt3.h
+%{tde_tdeincludedir}/poppler-page-transition.h
+%{tde_tdeincludedir}/poppler-qt.h
+%{tde_libdir}/libpoppler-tqt.la
+%{tde_libdir}/libpoppler-tqt.so
+%{tde_libdir}/pkgconfig/poppler-tqt.pc
+%endif
+
+##########
+
+%package devel
+Summary:	Development files for tdegraphics
+Group:		Development/Libraries/Other
+
+Obsoletes:	trinity-kdegraphics-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdegraphics-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libkscan-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_pdf}
+Requires: trinity-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%description devel
+This package contains the development files needed to compile 
+applications against tdegraphics libraries.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/dom/
+%{tde_tdeincludedir}/kfaximage.h
+%{tde_tdeincludedir}/tdemultipageInterface.h
+%{tde_tdeincludedir}/ksvg/
+%{tde_tdeincludedir}/kviewshell/
+%{tde_tdeincludedir}/libtext2path-0.1/
+%{tde_libdir}/libtdeinit_kview.la
+%if 0%{?build_kmrml}
+%{tde_libdir}/libtdeinit_mrmlsearch.la
+%endif
+%{tde_libdir}/libkghostviewlib.la
+%{tde_libdir}/libkghostviewlib.so
+%{tde_libdir}/libkimageviewer.la
+%{tde_libdir}/libkimageviewer.so
+%{tde_libdir}/libtdemultipage.la
+%{tde_libdir}/libtdemultipage.so
+%{tde_libdir}/libkpovmodeler.la
+%{tde_libdir}/libkpovmodeler.so
+%{tde_libdir}/libksvg.la
+%{tde_libdir}/libksvg.so
+%{tde_libdir}/libtext2path.la
+%{tde_libdir}/libtext2path.so
+# kfaxview
+%{tde_libdir}/libkfaximage.so
+%{tde_libdir}/libkfaximage.la
+# cmake
+%{tde_datadir}/cmake/*
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+%if 0%{?build_kamera} == 0
+%__rm -rf doc/kamera/
+%endif
+
+# Fix applications icons
+%__sed -i "kooka/kooka.desktop" -e "s|^Icon=.*|Icon=kooka|"
+
+# Fix FTBFS in RHEL 5
+%if 0%{?rhel} && 0%{?rhel} <= 5
+%__sed -i "kpdf/xpdf/aconf.h" \
+       -e "s|#define HAVE_MKSTEMPS 1|#define HAVE_MKSTEMPS 0|"
+%__sed -i "tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt" \
+       -e "/link_directories/ s|$|\n  \${POPPLER_LIBRARY_DIRS}|" \
+       -e "/{POPPLER_INCLUDE_DIRS/ s|$|\n  \${POPPLER_INCLUDE_DIRS}/..|"
+%endif
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+# Specific path for RHEL4
+if [ -d /usr/X11R6 ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  \
+  %{?with_t1lib:-DWITH_T1LIB=ON} \
+  %{?with_paper:-DWITH_LIBPAPER=ON} \
+  -DWITH_TIFF=ON \
+  -DWITH_OPENEXR=ON \
+  -DWITH_PDF=%{?with_pdf:ON}%{?!with_pdf:OFF} \
+  -DBUILD_ALL=ON \
+  -DBUILD_KUICKSHOW=OFF \
+  %{!?build_kmrml:-DBUILD_KMRML=OFF} \
+  %{!?build_kamera:-DBUILD_KAMERA=OFF} \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Adds missing icons in 'hicolor' theme
+%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,32x32,48x48,64x64}"/apps/"
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,32,48,64}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/scanner.png %{buildroot}%{tde_datadir}/icons/hicolor/"$i"x"$i"/apps/kooka.png; done
+popd
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpovmodeler.desktop    Graphics 3DGraphics
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kolourpaint.desktop    Graphics RasterGraphics
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/tdeiconedit.desktop    Graphics RasterGraphics
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kview.desktop          Graphics Viewer
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kooka.desktop          Graphics Scanning
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kruler.desktop         Utility DesktopUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/ksnapshot.desktop      Utility DesktopUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kcolorchooser.desktop  Utility DesktopUtility
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kcoloredit.desktop     Utility DesktopUtility
+%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kfax.desktop           Office Viewer
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kghostview.desktop     Office Viewer
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kdvi.desktop           Office Viewer
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpdf.desktop           Office Viewer
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kfaxview.desktop       Office Viewer
+%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kamera.desktop
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc b/redhat/core/tdegraphics/trinity-tdegraphics-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc
+++ b/redhat/core/tdegraphics/trinity-tdegraphics-rpmlintrc
diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec
new file mode 100644
index 000000000..501b7e9ae
--- /dev/null
+++ b/redhat/core/tdelibs/tdelibs.spec
@@ -0,0 +1,763 @@
+#
+# spec file for package tdelibs (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdelibs
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		TDE Libraries
+Group:			System/GUI/Other
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:		GPL-2.0+
+%else
+License:		GPLv2+
+%endif
+
+#Vendor:			Trinity Desktop
+#Packager:		Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+Obsoletes:		tdelibs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		tdelibs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdelibs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdelibs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdelibs-apidocs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdelibs-apidocs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
+
+# Trinity dependencies
+BuildRequires:	libtqt4-devel = %{tde_epoch}:4.2.0
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
+BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
+BuildRequires:	trinity-filesystem >= %{tde_version}
+
+Requires:		trinity-arts >= %{tde_epoch}:1.5.10
+Requires:		trinity-filesystem >= %{tde_version}
+%if 0%{?mgaversion} >= 6
+%else
+Requires:		fileshareset >= 2.0
+%endif
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# KRB5 support
+BuildRequires:	krb5-devel
+
+# XSLT support
+BuildRequires:	libxslt-devel
+
+# ALSA support
+BuildRequires:	alsa-lib-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# CUPS support
+BuildRequires:	cups-devel
+
+# TIFF support
+BuildRequires:	libtiff-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# GLIB2 support
+BuildRequires:	glib2-devel
+
+# LUA support are not ready yet
+#BuildRequires:	lua-devel
+
+# LIBART_LGPL support
+BuildRequires:	libart_lgpl-devel
+
+# ASPELL support
+BuildRequires:	aspell
+BuildRequires:	aspell-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# PCRE support
+%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_pcre 1
+BuildRequires:	pcre-devel
+%endif
+
+# INOTIFY support
+%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_inotify 1
+%endif
+
+# BZIP2 support
+%if 0%{?suse_version}
+BuildRequires:	libbz2-devel
+%else
+BuildRequires:	bzip2-devel
+%endif
+
+# UTEMPTER support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}utempter-devel
+%endif
+%if 0%{?rhel} >=5 || 0%{?fedora}
+BuildRequires:	libutempter-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	utempter
+%endif
+%if 0%{?suse_version}
+BuildRequires:	utempter-devel
+%endif
+
+# HSPELL support
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_hspell 1
+BuildRequires:	hspell-devel
+%endif
+
+# JASPER support
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_jasper 1
+%if 0%{?suse_version}
+BuildRequires:	libjasper-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}jasper-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	jasper-devel
+%endif
+%endif
+
+# AVAHI support
+%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_avahi 1
+BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}avahi-client-devel
+Requires:		%{_lib}avahi-client3
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	avahi-devel
+Requires:		avahi
+%endif
+%endif
+
+# OPENEXR support
+%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_openexr 1
+BuildRequires:	OpenEXR-devel
+%if 0%{?pclinuxos}
+BuildRequires:  libpthread-stubs
+%endif
+%endif
+
+# LIBTOOL
+BuildRequires:	libtool
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}ltdl-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libtool-ltdl-devel
+%endif
+
+# X11 support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	x11-proto-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	xorg-x11-proto-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+
+# ICEAUTH
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
+Requires:		iceauth
+BuildRequires:	iceauth
+%endif
+%if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 )
+Requires:		xorg-x11-server-utils
+BuildRequires:	xorg-x11-server-utils
+%endif
+%if 0%{?rhel} == 4
+Requires:		xorg-x11
+BuildRequires:	xorg-x11
+%endif
+
+# XZ support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+%define with_lzma 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}lzma-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	xz-devel
+%endif
+%endif
+
+# Certificates support
+%if 0%{?fedora} || 0%{?rhel} >= 6
+BuildRequires:	ca-certificates
+Requires:		ca-certificates
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6
+%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+%endif
+%if 0%{?fedora} == 18 || 0%{?fedora} == 19
+%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
+%endif
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8
+Requires:		rootcerts
+%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+%else
+%define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
+Requires:		openssl
+%endif
+%endif
+%if 0%{?rhel} == 5
+%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+Requires:		openssl
+%endif
+%if 0%{?suse_version}
+%define cacert	%{_sysconfdir}/ssl/ca-bundle.pem
+BuildRequires:	ca-certificates
+Requires:		ca-certificates
+%endif
+%if "%{cacert}" != ""
+Requires:		%{cacert}
+%endif
+
+# XRANDR support
+#  On RHEL5, xrandr library is too old.
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%define with_xrandr 1
+%endif
+
+# XCOMPOSITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+%define xcomposite_devel %{_lib}xcomposite-devel
+%else
+%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+%define xcomposite_devel libXcomposite-devel
+%endif
+%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
+
+# XT support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%define xt_devel libXt-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define xt_devel libxt-devel
+%endif
+%{?xt_devel:BuildRequires: %{xt_devel}}
+
+### New features in TDE R14
+
+# LIBMAGIC support
+%if 0%{?rhel} != 5
+BuildRequires:	file-devel
+%endif
+
+# NETWORKMANAGER support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
+%define with_nm 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} != 8
+BuildRequires:	%{_lib}nm-util-devel
+%endif
+%endif
+%if 0%{?rhel} >= 6 || 0%{?fedora}
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+BuildRequires:	NetworkManager-libnm-devel
+%else
+BuildRequires:	NetworkManager-glib-devel
+%endif
+%endif
+%if 0%{?suse_version}
+BuildRequires:	NetworkManager-devel
+%endif
+%endif
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_tdehwlib 1
+BuildRequires:	libudev-devel
+%endif
+
+# HAL support
+%if 0%{?rhel} == 5
+%define with_hal 1
+%endif
+
+# UDISKS support
+%if 0%{?rhel} == 6
+%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310
+%define with_udisks 1
+BuildRequires:	udisks-devel
+Requires:		udisks
+%endif
+%endif
+
+# UDISKS2 support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
+%define with_udisks2 1
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+BuildRequires:	libudisks2-devel
+%else
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
+BuildRequires:	libudisks2-0-devel
+%else
+BuildRequires:	udisks2-devel
+%endif
+%endif
+Requires:		udisks2
+%endif
+
+# DEVICEKIT POWER support
+%if 0%{?rhel} == 6
+%define with_devkitpower 1
+Requires:		DeviceKit-power
+%endif
+
+# UPOWER support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
+%define with_upower 1
+Requires:		upower
+%endif
+
+# SYSTEMD support
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
+%define with_systemd 1
+%endif
+
+# PCSCLITE support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}pcsclite-devel
+%else
+BuildRequires:	pcsc-lite-devel
+%endif
+
+# PKCS11 support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}pkcs11-helper-devel
+%else
+BuildRequires:	pkcs11-helper-devel
+%endif
+
+# OPENSC support
+BuildRequires:	opensc
+
+# CRYPTSETUP support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}cryptsetup-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libcryptsetup-devel
+%endif
+%if 0%{?rhel} >= 7 || 0%{?fedora}
+BuildRequires:	cryptsetup-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+BuildRequires:	cryptsetup-luks-devel
+%endif
+
+# ELFICON support
+%if 0
+%define with_elficon 1
+BuildRequires:		libr-devel >= 0.6.0
+%endif
+
+# ATTR support
+BuildRequires:	libattr-devel
+
+# INTLTOOL support
+BuildRequires:	intltool
+
+
+%description
+Libraries for the Trinity Desktop Environment:
+TDE Libraries included: tdecore (TDE core library), tdeui (user interface),
+kfm (file manager), tdehtmlw (HTML widget), tdeio (Input/Output, networking),
+kspell (spelling checker), jscript (javascript), kab (addressbook),
+kimgio (image manipulation).
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
+%{tde_bindir}/artsmessage
+%{tde_bindir}/cupsdconf
+%{tde_bindir}/cupsdoprint
+%{tde_bindir}/dcop
+%{tde_bindir}/dcopclient
+%{tde_bindir}/dcopfind
+%{tde_bindir}/dcopobject
+%{tde_bindir}/dcopquit
+%{tde_bindir}/dcopref
+%{tde_bindir}/dcopserver
+%{tde_bindir}/dcopserver_shutdown
+%{tde_bindir}/dcopstart
+%{tde_bindir}/imagetops
+%{tde_bindir}/tdeab2tdeabc
+%{tde_bindir}/kaddprinterwizard
+%{tde_bindir}/tdebuildsycoca
+%{tde_bindir}/tdecmshell
+%{tde_bindir}/tdeconf_update
+%{tde_bindir}/kcookiejar
+%{tde_bindir}/tde-config
+%{tde_bindir}/tde-menu
+%{tde_bindir}/kded
+%{tde_bindir}/tdeinit
+%{tde_bindir}/tdeinit_shutdown
+%{tde_bindir}/tdeinit_wrapper
+%{tde_bindir}/tdesu_stub
+%{tde_bindir}/kdetcompmgr
+%{tde_bindir}/kdontchangethehostname
+%{tde_bindir}/tdedostartupconfig
+%{tde_bindir}/tdefile
+%{tde_bindir}/kfmexec
+%{tde_bindir}/tdehotnewstuff
+%{tde_bindir}/kinstalltheme
+%{tde_bindir}/tdeio_http_cache_cleaner
+%{tde_bindir}/tdeio_uiserver
+%{tde_bindir}/tdeioexec
+%{tde_bindir}/tdeioslave
+%{tde_bindir}/tdeiso_info
+%{tde_bindir}/tdelauncher
+%if 0%{?with_elficon}
+%{tde_bindir}/tdelfeditor
+%endif
+%{tde_bindir}/tdemailservice
+%{tde_bindir}/tdemimelist
+%{tde_bindir}/tdesendbugmail
+%{tde_bindir}/kshell
+%{tde_bindir}/tdestartupconfig
+%{tde_bindir}/tdetelnetservice
+%{tde_bindir}/tdetradertest
+%{tde_bindir}/kwrapper
+%{tde_bindir}/lnusertemp
+%{tde_bindir}/make_driver_db_cups
+%{tde_bindir}/make_driver_db_lpr
+%{tde_bindir}/meinproc
+%{tde_bindir}/networkstatustestservice
+%{tde_bindir}/start_tdeinit_wrapper
+%{tde_bindir}/checkXML
+%{tde_bindir}/ksvgtopng
+%{tde_bindir}/tdeunittestmodrunner
+%{tde_bindir}/preparetips
+%{tde_tdelibdir}/*
+%{tde_libdir}/lib*.so.*
+%{tde_libdir}/libtdeinit_*.la
+%{tde_libdir}/libtdeinit_*.so
+%{tde_datadir}/applications/tde/*.desktop
+%{tde_datadir}/autostart/tdeab2tdeabc.desktop
+%{tde_datadir}/applnk/tdeio_iso.desktop
+%{tde_datadir}/apps/*
+%exclude %{tde_datadir}/apps/ksgmltools2/
+%{tde_datadir}/emoticons/*
+%{tde_datadir}/icons/crystalsvg/
+%{tde_datadir}/icons/default.tde
+%{tde_datadir}/icons/hicolor/index.theme
+%{tde_datadir}/locale/all_languages
+%{tde_datadir}/mimelnk/*/*.desktop
+%{tde_datadir}/services/*
+%{tde_datadir}/servicetypes/*
+%{tde_tdedocdir}/HTML/en/common/*
+%{tde_tdedocdir}/HTML/en/tdespell/
+
+# Global Trinity configuration
+%config(noreplace) %{tde_confdir}
+
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%verify(not mode) %{tde_bindir}/kgrantpty
+%verify(not mode) %{tde_bindir}/kpac_dhcp_helper
+%verify(not mode) %{tde_bindir}/start_tdeinit
+%else
+%attr(4755,root,root) %{tde_bindir}/kgrantpty
+%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
+%attr(4711,root,root) %{tde_bindir}/start_tdeinit
+%endif
+
+%config %{_sysconfdir}/xdg/menus/tde-applications.menu
+%config %{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde
+
+# DBUS stuff, related to TDE hwlib
+%if 0%{?with_tdehwlib}
+%{tde_bindir}/tde_dbus_hardwarecontrol
+%config %{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf
+%{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service
+%endif
+
+%pre
+# TDE Bug #1074
+if [ -d "%{tde_datadir}/locale/all_languages" ]; then
+  rm -rf "%{tde_datadir}/locale/all_languages"
+fi
+
+%post
+%if 0%{?suse_version}
+# Sets permissions on setuid files (openSUSE specific)
+%set_permissions %{tde_bindir}/kgrantpty
+%set_permissions %{tde_bindir}/kpac_dhcp_helper
+%set_permissions %{tde_bindir}/start_tdeinit
+%endif
+
+##########
+
+%package devel
+Summary:	TDE Libraries (Development files)
+Group:		Development/Libraries/X11
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	tdelibs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdelibs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdelibs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdelibs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	libtqt3-mt-devel >= 3.5.0
+Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
+Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+Requires:	libart_lgpl-devel
+Requires:	libattr-devel
+Requires:	intltool
+%{?xcomposite_devel:Requires: %{xcomposite_devel}}
+%{?xt_devel:Requires: %{xt_devel}}
+
+%description devel
+This package includes the header files you will need to compile
+applications for TDE.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_bindir}/dcopidl*
+%{tde_bindir}/*config_compiler
+%{tde_bindir}/maketdewidgets
+%{tde_datadir}/apps/ksgmltools2/
+%{tde_tdeincludedir}/*
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/*.a
+%exclude %{tde_libdir}/libtdeinit_*.la
+%exclude %{tde_libdir}/libtdeinit_*.so
+%{tde_datadir}/cmake/tdelibs.cmake
+%{tde_libdir}/pkgconfig/tdelibs.pc
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+# RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings
+%if 0%{?rhel} == 5
+%__sed -i "tdecore/kinstance.h" \
+       -i "tdecore/tdeglobal.h" \
+       -e "/#ifdef __TDE_HAVE_TDEHWLIB/,/#endif/d"
+%endif
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if [ -d "/usr/X11R6" ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
+fi
+
+export TDEDIR="%{tde_prefix}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_ARTS=ON \
+  -DWITH_ALSA=ON \
+  -DWITH_LIBART=ON \
+  -DWITH_LIBIDN=ON \
+  -DWITH_SSL=ON \
+  -DWITH_CUPS=ON \
+  -DWITH_LUA=OFF \
+  -DWITH_TIFF=ON \
+  %{?!with_jasper:-DWITH_JASPER=OFF} \
+  %{?!with_openexr:-DWITH_OPENEXR=OFF} \
+  -DWITH_UTEMPTER=ON \
+  %{?!with_avahi:-DWITH_AVAHI=OFF} \
+  %{?!with_elficon:-DWITH_ELFICON=OFF} \
+  %{?!with_pcre:-DWITH_PCRE=OFF} \
+  %{?!with_inotify:-DWITH_INOTIFY=OFF} \
+  %{?!with_gamin:-DWITH_GAMIN=OFF} \
+  %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
+  %{?!with_tdehwlib:-DWITH_TDEHWLIB_DAEMONS=OFF} \
+  %{?with_hal:-DWITH_HAL=ON} \
+  %{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \
+  %{?with_systemd:-DWITH_LOGINDPOWER=ON} \
+  %{?!with_upower:-DWITH_UPOWER=OFF} \
+  %{?!with_udisks:-DWITH_UDISKS=OFF} \
+  %{?!with_udisks2:-DWITH_UDISKS2=OFF} \
+  -DWITH_UDEVIL=OFF \
+  -DWITH_CONSOLEKIT=ON \
+  %{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \
+  -DWITH_SUDO_TDESU_BACKEND=OFF \
+  -DWITH_OLD_XDG_STD=OFF \
+  -DWITH_PCSC=ON \
+  -DWITH_PKCS=ON \
+  -DWITH_CRYPTSETUP=ON \
+  %{?!with_lzma:-DWITH_LZMA=OFF} \
+  -DWITH_LIBBFD=OFF \
+  %{?!with_xrandr:-DWITH_XRANDR=OFF} \
+  -DWITH_XCOMPOSITE=ON \
+  -DWITH_KDE4_MENU_SUFFIX=OFF \
+  \
+  -DWITH_ASPELL=ON \
+  %{?!with_hspell:-DWITH_HSPELL=OFF} \
+  -DWITH_TDEICONLOADER_DEBUG=OFF \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf "%{?buildroot}"
+%__make install DESTDIR="%{?buildroot}" -C build
+
+# Use system-wide CA certificates
+%if "%{?cacert}" != ""
+%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
+%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
+%endif
+
+# Symlinks duplicate files (mostly under 'ksgmltools2')
+%fdupes -s "%{?buildroot}"
+
+# Fix 'tderesources.desktop' (openSUSE only)
+%if 0%{?suse_version}
+%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
+%endif
+
+# Remove setuid bit on some binaries.
+chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty"
+chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
+chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
+
+# fileshareset 2.0 is provided separately.
+# Remove integrated fileshareset 1.0 .
+%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
+%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
+
+
+%clean
+%__rm -rf "%{?buildroot}"
+
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%verify_permissions -e %{tde_bindir}/kgrantpty
+%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper
+%verify_permissions -e %{tde_bindir}/start_tdeinit
+%endif
+
+
+%changelog
diff --git a/redhat/core/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/core/tdelibs/trinity-tdelibs-rpmlintrc
new file mode 100644
index 000000000..c65feac8b
--- /dev/null
+++ b/redhat/core/tdelibs/trinity-tdelibs-rpmlintrc
@@ -0,0 +1,5 @@
+setBadness('suse-dbus-unauthorized-service', 0)
+setBadness('permissions-file-setuid-bit', 0)
+setBadness('non-position-independent-executable', 0)
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('binary-or-shlib-defines-rpath', 0)
diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
new file mode 100644
index 000000000..2f1f338fe
--- /dev/null
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -0,0 +1,1160 @@
+#
+# spec file for package tdemultimedia (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdemultimedia
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Summary:	Multimedia applications for the Trinity Desktop Environment
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:		Productivity/Multimedia/Sound/Utilities
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
+
+Obsoletes:	trinity-kdemultimedia < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdemultimedia-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	fdupes
+BuildRequires:	desktop-file-utils
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# TAGLIB support
+%define with_taglib 1
+BuildRequires: taglib-devel
+
+# AKODE support
+%define with_akode 1
+BuildRequires: trinity-akode-devel
+
+# MAD support
+%ifarch %{ix86} x86_64
+%define with_libmad 1
+%{?with_libmad:BuildRequires: libakode_mpeg_decoder}
+%endif
+
+# ZLIB support
+BuildRequires:	zlib-devel
+
+# MUSICBRAINZ support
+## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
+#define with_musicbrainz 1
+#BuildRequires: libmusicbrainz-devel libtunepimp-devel
+
+# Audio libraries
+BuildRequires:	libvorbis-devel
+BuildRequires:	audiofile-devel
+BuildRequires:	libtheora-devel
+BuildRequires:	alsa-lib-devel 
+BuildRequires:	cdparanoia
+#BuildRequires:	libmpg123-devel
+
+# CDDA support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libcdda-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	cdparanoia-devel
+%endif
+
+# FLAC support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:	libflac-devel
+%else
+BuildRequires:	%{_lib}flac-devel
+%endif
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	flac-devel
+%endif
+
+# GSTREAMER support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}gstreamer1.0-devel
+BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version}
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-base-devel
+%endif
+%if 0%{?rhel} >= 7 || 0%{?fedora}
+BuildRequires:	gstreamer1-devel >= 1.0
+BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
+%endif
+
+# X11 Libraries
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xxf86dga-devel
+BuildRequires:	%{_lib}xxf86vm-devel
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xtst-devel
+%else
+BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXxf86dga-devel
+BuildRequires:	libXxf86vm-devel
+%endif
+
+# XINE support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
+%define with_xine 1
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
+%endif
+%endif
+
+# LAME support
+%if 0%{?opensuse_bs} == 0
+%define with_lame 1
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:		liblame-devel
+%else
+%if 0%{?mgaversion} >= 6
+BuildRequires:		%{_lib}mp3lame-devel
+%else
+BuildRequires:		%{_lib}lame-devel
+%endif
+%endif
+%endif
+%if 0%{?suse_version}
+BuildRequires:		libmp3lame-devel
+%endif
+%endif
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# ATTR support
+BuildRequires:	libattr-devel
+
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:		lame-devel
+%endif
+
+
+Requires: trinity-artsbuilder = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-juk = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kaboodle = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kaudiocreator = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kappfinder-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdemid = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmix = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-krec = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kscd = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_akode:Requires: trinity-libarts-akode = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-libarts-audiofile = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?with_xine:Requires: trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-libkcddb = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_mpeg:Requires: trinity-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-noatun = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window
+System. The tdemultimedia package contains multimedia applications for
+TDE, including:
+  artsbuilder, Synthesizer designer for aRts
+  juk, a media player
+  tdemid, a midi player
+  kmix, an audio mixer
+  arts, additional functionality for the aRts sound system
+  krec, a recording tool
+  kscd, an Audio-CD player
+  kaudiocreator, a graphical frontend for audio file creation 
+  kaboodle, a media player
+  noatun, a media player
+
+%files
+
+##########
+
+%package -n trinity-artsbuilder
+Summary:	Synthesizer designer for aRts
+Group:		Productivity/Multimedia/Sound/Mixers
+Requires:	trinity-kicker >= %{tde_version}
+
+%description -n trinity-artsbuilder
+This is the analog Realtime synthesizer's graphical design tool.
+
+%files -n trinity-artsbuilder
+%defattr(-,root,root,-)
+%{tde_bindir}/artsbuilder
+%{tde_bindir}/artscontrol
+%{tde_bindir}/midisend
+%{tde_libdir}/libartsbuilder.la
+%{tde_libdir}/libartsbuilder.so.*
+%{tde_libdir}/libartscontrolapplet.la
+%{tde_libdir}/libartscontrolapplet.so.*
+%{tde_libdir}/libartscontrolsupport.la
+%{tde_libdir}/libartscontrolsupport.so.*
+%{tde_libdir}/libartsgui_idl.la
+%{tde_libdir}/libartsgui_idl.so.*
+%{tde_libdir}/libartsgui_kde.la
+%{tde_libdir}/libartsgui_kde.so.*
+%{tde_libdir}/libartsgui.la
+%{tde_libdir}/libartsgui.so.*
+%{tde_libdir}/libartsmidi_idl.la
+%{tde_libdir}/libartsmidi_idl.so.*
+%{tde_libdir}/libartsmidi.la
+%{tde_libdir}/libartsmidi.so.*
+%{tde_libdir}/libartsmodulescommon.la
+%{tde_libdir}/libartsmodulescommon.so.*
+%{tde_libdir}/libartsmoduleseffects.la
+%{tde_libdir}/libartsmoduleseffects.so.*
+%{tde_libdir}/libartsmodulesmixers.la
+%{tde_libdir}/libartsmodulesmixers.so.*
+%{tde_libdir}/libartsmodules.la
+%{tde_libdir}/libartsmodules.so.*
+%{tde_libdir}/libartsmodulessynth.la
+%{tde_libdir}/libartsmodulessynth.so.*
+%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
+%{tde_libdir}/mcop/artsbuilder.mcopclass
+%{tde_libdir}/mcop/artsbuilder.mcoptype
+%{tde_libdir}/mcop/Arts/Button.mcopclass
+%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
+%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
+%{tde_libdir}/mcop/Arts/Fader.mcopclass
+%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
+%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/GraphLine.mcopclass
+%{tde_libdir}/mcop/artsgui.mcopclass
+%{tde_libdir}/mcop/artsgui.mcoptype
+%{tde_libdir}/mcop/Arts/HBox.mcopclass
+%{tde_libdir}/mcop/Arts/Label.mcopclass
+%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass
+%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass
+%{tde_libdir}/mcop/Arts/LineEdit.mcopclass
+%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
+%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass
+%{tde_libdir}/mcop/Arts/MidiManager.mcopclass
+%{tde_libdir}/mcop/artsmidi.mcopclass
+%{tde_libdir}/mcop/artsmidi.mcoptype
+%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
+%{tde_libdir}/mcop/artsmodulescommon.mcopclass
+%{tde_libdir}/mcop/artsmodulescommon.mcoptype
+%{tde_libdir}/mcop/artsmoduleseffects.mcopclass
+%{tde_libdir}/mcop/artsmoduleseffects.mcoptype
+%{tde_libdir}/mcop/artsmodules.mcopclass
+%{tde_libdir}/mcop/artsmodules.mcoptype
+%{tde_libdir}/mcop/artsmodulesmixers.mcopclass
+%{tde_libdir}/mcop/artsmodulesmixers.mcoptype
+%{tde_libdir}/mcop/artsmodulessynth.mcopclass
+%{tde_libdir}/mcop/artsmodulessynth.mcoptype
+%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
+%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass
+%{tde_libdir}/mcop/Arts/PopupBox.mcopclass
+%{tde_libdir}/mcop/Arts/Poti.mcopclass
+%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
+%{tde_libdir}/mcop/Arts/SpinBox.mcopclass
+%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass
+%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass
+%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
+%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass
+%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
+%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass
+%{tde_libdir}/mcop/Arts/VBox.mcopclass
+%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
+%{tde_libdir}/mcop/Arts/Widget.mcopclass
+%{tde_tdeappdir}/artsbuilder.desktop
+%{tde_tdeappdir}/artscontrol.desktop
+%{tde_datadir}/apps/artsbuilder/
+%{tde_datadir}/apps/artscontrol/
+%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop
+%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
+%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
+%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png
+%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png
+%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
+%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
+%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop
+%{tde_tdedocdir}/HTML/en/artsbuilder/
+
+##########
+
+%package -n trinity-juk
+Summary:	Music organizer and player for Trinity
+Group:		Productivity/Multimedia/Sound/Players
+
+%description -n trinity-juk
+JuK (pronounced "jook") is a jukebox and music manager for the TDE
+desktop similar to jukebox software on other platforms such as
+iTunes or RealOne.
+
+Some of JuK's features include:
+* Support for Ogg Vorbis and MP3 formats
+* Tag editing support for both formats, including ID3v2 for MP3 files.
+  Multitagging or editing a selection of multiple files at once is also
+  supported
+* Output to either the aRts, default KDE sound system, or GStreamer
+* Management of your "collection" and multiple playlists
+* Import and export to m3u playlists
+* Binary caching of audio meta-data and playlist information for faster
+  load times (starting with the second time you run JuK)
+* Integration into TDE that allows drag-and-drop and clipboard usage
+  with other TDE and X apps
+
+%files -n trinity-juk
+%defattr(-,root,root,-)
+%{tde_bindir}/juk
+%{tde_tdeappdir}/juk.desktop
+%{tde_datadir}/apps/juk/
+%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
+%{tde_datadir}/icons/hicolor/*/apps/juk.png
+%{tde_tdedocdir}/HTML/en/juk/
+%{tde_mandir}/man1/juk.1*
+
+##########
+
+%package -n trinity-kaboodle
+Summary:	Light, embedded media player for Trinity
+Group:		System/GUI/Other
+
+%if 0%{?with_xine}
+Requires:	trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%description -n trinity-kaboodle
+Kaboodle is a light, embedded media player, supporting both video and audio,
+for TDE. It uses the aRts framework for playing media files.
+
+%files -n trinity-kaboodle
+%defattr(-,root,root,-)
+%{tde_bindir}/kaboodle
+%{tde_tdelibdir}/libkaboodlepart.la
+%{tde_tdelibdir}/libkaboodlepart.so
+%{tde_tdeappdir}/kaboodle.desktop
+%{tde_datadir}/apps/kaboodle/
+%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png
+%{tde_datadir}/services/kaboodle_component.desktop
+%{tde_datadir}/services/kaboodleengine.desktop
+%{tde_tdedocdir}/HTML/en/kaboodle/
+%{tde_mandir}/man1/kaboodle.1*
+
+##########
+
+%package -n trinity-kaudiocreator
+Summary:	CD ripper and audio encoder frontend for Trinity
+Group:		Productivity/Multimedia/CD/Grabbers
+
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	vorbis-tools
+Requires:	flac
+
+%description -n trinity-kaudiocreator
+KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
+keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
+searches CDDB to retrieve the information of the disk.
+
+%files -n trinity-kaudiocreator
+%defattr(-,root,root,-)
+%{tde_bindir}/kaudiocreator
+%{tde_tdeappdir}/kaudiocreator.desktop
+%{tde_datadir}/apps/kaudiocreator/
+%{tde_datadir}/apps/tdeconf_update/kaudiocreator-libkcddb.upd
+%{tde_datadir}/apps/tdeconf_update/kaudiocreator-meta.upd
+%{tde_datadir}/apps/tdeconf_update/upgrade-kaudiocreator-metadata.sh
+%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
+%{tde_datadir}/config.kcfg/kaudiocreator.kcfg
+%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
+%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
+%{tde_tdedocdir}/HTML/en/kaudiocreator/
+%{tde_mandir}/man1/kaudiocreator.1*
+
+##########
+
+%package kfile-plugins
+Summary:	An au/avi/m3u/mp3/ogg/wav plugins for kfile
+Group:		Productivity/Multimedia/Sound/Utilities
+
+%description kfile-plugins
+au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
+
+%files kfile-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/tdefile_au.la
+%{tde_tdelibdir}/tdefile_au.so
+%{tde_tdelibdir}/tdefile_avi.la
+%{tde_tdelibdir}/tdefile_avi.so
+%{tde_tdelibdir}/tdefile_flac.la
+%{tde_tdelibdir}/tdefile_flac.so
+%{tde_tdelibdir}/tdefile_m3u.la
+%{tde_tdelibdir}/tdefile_m3u.so
+%{tde_tdelibdir}/tdefile_mp3.la
+%{tde_tdelibdir}/tdefile_mp3.so
+%{tde_tdelibdir}/tdefile_mpc.la
+%{tde_tdelibdir}/tdefile_mpc.so
+%{tde_tdelibdir}/tdefile_mpeg.la
+%{tde_tdelibdir}/tdefile_mpeg.so
+%{tde_tdelibdir}/tdefile_ogg.la
+%{tde_tdelibdir}/tdefile_ogg.so
+%{tde_tdelibdir}/tdefile_sid.la
+%{tde_tdelibdir}/tdefile_sid.so
+%{tde_tdelibdir}/tdefile_theora.la
+%{tde_tdelibdir}/tdefile_theora.so
+%{tde_tdelibdir}/tdefile_wav.la
+%{tde_tdelibdir}/tdefile_wav.so
+%{tde_datadir}/services/tdefile_au.desktop
+%{tde_datadir}/services/tdefile_avi.desktop
+%{tde_datadir}/services/tdefile_flac.desktop
+%{tde_datadir}/services/tdefile_m3u.desktop
+%{tde_datadir}/services/tdefile_mp3.desktop
+%{tde_datadir}/services/tdefile_mpc.desktop
+%{tde_datadir}/services/tdefile_mpeg.desktop
+%{tde_datadir}/services/tdefile_ogg.desktop
+%{tde_datadir}/services/tdefile_sid.desktop
+%{tde_datadir}/services/tdefile_theora.desktop
+%{tde_datadir}/services/tdefile_wav.desktop
+
+##########
+
+%package kappfinder-data
+Summary:	Multimedia data for kappfinder
+Group:		Productivity/Multimedia/Sound/Utilities
+
+Requires: 	trinity-kappfinder >= %{tde_version}
+Requires:	trinity-tdebase-runtime-data-common >= %{tde_version}
+
+%description kappfinder-data
+This package provides data on multimedia applications for kappfinder.
+
+%files kappfinder-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kappfinder/
+%{tde_datadir}/desktop-directories/tde-multimedia-music.directory
+%config %{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
+
+##########
+
+%package tdeio-plugins
+Summary:	Enables the browsing of audio CDs under Konqueror
+Group:		Productivity/Multimedia/Sound/Utilities
+Requires:	trinity-tdebase-tdeio-plugins >= %{tde_version}
+
+Obsoletes:	trinity-tdemultimedia-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdemultimedia-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tdeio-plugins
+This package allow audio CDs to be browsed like a file system using
+Konqueror and the audiocd:/ URL.
+
+%files tdeio-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_audiocd.la
+%{tde_tdelibdir}/kcm_audiocd.so
+%{tde_tdelibdir}/tdeio_audiocd.la
+%{tde_tdelibdir}/tdeio_audiocd.so
+%{tde_tdelibdir}/libaudiocd_encoder_flac.la
+%{tde_tdelibdir}/libaudiocd_encoder_flac.so
+%{tde_tdelibdir}/libaudiocd_encoder_lame.la
+%{tde_tdelibdir}/libaudiocd_encoder_lame.so
+%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la
+%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so
+%{tde_tdelibdir}/libaudiocd_encoder_wav.la
+%{tde_tdelibdir}/libaudiocd_encoder_wav.so
+%{tde_libdir}/libaudiocdplugins.so.*
+%{tde_tdeappdir}/audiocd.desktop
+%{tde_datadir}/apps/tdeconf_update/audiocd.upd
+%{tde_datadir}/apps/tdeconf_update/upgrade-metadata.sh
+%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
+%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
+%{tde_datadir}/services/audiocd.protocol
+%{tde_tdedocdir}/HTML/en/tdeioslave/audiocd/
+%{tde_tdedocdir}/HTML/en/kcontrol/audiocd/
+
+##########
+
+%package -n trinity-tdemid
+Summary:	MIDI/karaoke player for Trinity
+Group:		Productivity/Multimedia/Sound/Midi
+
+Obsoletes:	trinity-kmid < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kmid = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdemid
+This package provides a MIDI and karaoke player for TDE.
+
+%files -n trinity-tdemid
+%defattr(-,root,root,-)
+%{tde_bindir}/tdemid
+%{tde_tdelibdir}/libtdemidpart.la
+%{tde_tdelibdir}/libtdemidpart.so
+%{tde_libdir}/libtdemidlib.so.*
+%{tde_tdeappdir}/tdemid.desktop
+%{tde_datadir}/apps/tdemid/
+%{tde_datadir}/icons/hicolor/*/apps/tdemid.png
+%{tde_datadir}/mimelnk/audio/x-karaoke.desktop
+%{tde_datadir}/servicetypes/audiomidi.desktop
+%{tde_tdedocdir}/HTML/en/tdemid/
+
+##########
+
+%package -n trinity-kmix
+Summary:	Sound mixer applet for Trinity
+Group:		Productivity/Multimedia/Sound/Mixers
+Requires:	trinity-kicker >= %{tde_version}
+
+%description -n trinity-kmix
+This package includes TDE's dockable sound mixer applet.
+
+%files -n trinity-kmix
+%defattr(-,root,root,-)
+%{tde_bindir}/kmix
+%{tde_bindir}/kmixctrl
+%{tde_tdelibdir}/kmix.la
+%{tde_tdelibdir}/kmix.so
+%{tde_tdelibdir}/kmix_panelapplet.la
+%{tde_tdelibdir}/kmix_panelapplet.so
+%{tde_tdelibdir}/kmixctrl.la
+%{tde_tdelibdir}/kmixctrl.so
+%{tde_libdir}/libtdeinit_kmix.so
+%{tde_libdir}/libtdeinit_kmixctrl.so
+%{tde_tdeappdir}/kmix.desktop
+%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
+%{tde_datadir}/apps/kmix/
+%{tde_datadir}/autostart/kmix.desktop
+%{tde_datadir}/autostart/restore_kmix_volumes.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kmix.png
+%{tde_datadir}/services/kmixctrl_restore.desktop
+%{tde_tdedocdir}/HTML/en/kmix/
+%{tde_mandir}/man1/kmix.1*
+%{tde_mandir}/man1/kmixctrl.1*
+
+##########
+
+%package -n trinity-krec
+Summary:	Sound recorder utility for Trinity
+Group:		Productivity/Multimedia/CD/Record
+
+%description -n trinity-krec
+This is a sound recording utility for Trinity.
+
+%files -n trinity-krec
+%defattr(-,root,root,-)
+%{tde_bindir}/krec
+%{tde_tdelibdir}/kcm_krec.la
+%{tde_tdelibdir}/kcm_krec.so
+%{tde_tdelibdir}/kcm_krec_files.la
+%{tde_tdelibdir}/kcm_krec_files.so
+%{tde_tdelibdir}/krec.la
+%{tde_tdelibdir}/krec.so
+%if 0%{?with_lame}
+%{tde_tdelibdir}/libkrecexport_mp3.la
+%{tde_tdelibdir}/libkrecexport_mp3.so
+%{tde_datadir}/services/krec_exportmp3.desktop
+%endif
+%{tde_tdelibdir}/libkrecexport_ogg.la
+%{tde_tdelibdir}/libkrecexport_ogg.so
+%{tde_tdelibdir}/libkrecexport_wave.la
+%{tde_tdelibdir}/libkrecexport_wave.so
+%{tde_libdir}/libtdeinit_krec.so
+%{tde_tdeappdir}/krec.desktop
+%{tde_datadir}/apps/krec/
+%{tde_datadir}/icons/hicolor/*/apps/krec.png
+%{tde_datadir}/services/kcm_krec.desktop
+%{tde_datadir}/services/kcm_krec_files.desktop
+%{tde_datadir}/services/krec_exportogg.desktop
+%{tde_datadir}/services/krec_exportwave.desktop
+%{tde_datadir}/servicetypes/krec_exportitem.desktop
+%{tde_tdedocdir}/HTML/en/krec/
+%{tde_mandir}/man1/krec.1*
+
+##########
+
+%package -n trinity-kscd
+Summary:	Audio CD player for Trinity
+Group:		Productivity/Multimedia/CD/Players
+
+%description -n trinity-kscd
+This is Trinity's audio CD player.
+
+%files -n trinity-kscd
+%defattr(-,root,root,-)
+%{tde_bindir}/kscd
+%{tde_bindir}/workman2cddb.pl
+%{tde_tdeappdir}/kscd.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
+%{tde_datadir}/apps/kscd/
+%{tde_datadir}/apps/profiles/kscd.profile.xml
+%{tde_datadir}/config.kcfg/kscd.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kscd.png
+%{tde_datadir}/mimelnk/text/xmcd.desktop
+%{tde_tdedocdir}/HTML/en/kscd/
+
+##########
+
+%if 0%{?with_akode}
+%package -n trinity-libarts-akode
+Summary:	Akode plugin for aRts
+Group:		Productivity/Multimedia/Other
+
+%description -n trinity-libarts-akode
+This package contains akode plugins for aRts.
+
+%files -n trinity-libarts-akode
+%defattr(-,root,root,-)
+%{tde_libdir}/libarts_akode.so.*
+%{tde_libdir}/libarts_akode.la
+%{tde_libdir}/mcop/akodearts.mcoptype
+%{tde_libdir}/mcop/akodearts.mcopclass
+%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass
+%{tde_libdir}/mcop/akodePlayObject.mcopclass
+%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
+%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
+%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
+
+# Requires MAD support
+%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
+
+%endif
+
+##########
+
+%package -n trinity-libarts-audiofile
+Summary:	Audiofile plugin for aRts
+Group:		Productivity/Multimedia/Other
+
+%description -n trinity-libarts-audiofile
+This package contains audiofile plugins for aRts.
+
+%files -n trinity-libarts-audiofile
+%defattr(-,root,root,-)
+%{tde_libdir}/libarts_audiofile.so.*
+%{tde_libdir}/libarts_audiofile.la
+%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
+%{tde_libdir}/mcop/audiofilearts.mcopclass
+%{tde_libdir}/mcop/audiofilearts.mcoptype
+
+##########
+
+%if 0%{?with_mpeg}
+%package -n trinity-libarts-mpeglib
+Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
+Group:		Productivity/Multimedia/Other
+
+%description -n trinity-libarts-mpeglib
+This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
+audio and video.
+
+This is the arts (TDE Sound daemon) plugin.
+
+%files -n trinity-libarts-mpeglib
+%defattr(-,root,root,-)
+%{tde_bindir}/mpeglibartsplay
+%{tde_libdir}/libarts_mpeglib-0.3.0.so*
+%{tde_libdir}/libarts_mpeglib.la
+%{tde_libdir}/libarts_splay.so.*
+%{tde_libdir}/libarts_splay.la
+%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
+%{tde_libdir}/mcop/MP3PlayObject.mcopclass
+%{tde_libdir}/mcop/NULLPlayObject.mcopclass
+%{tde_libdir}/mcop/OGGPlayObject.mcopclass
+%{tde_libdir}/mcop/SplayPlayObject.mcopclass
+%{tde_libdir}/mcop/WAVPlayObject.mcopclass
+
+%endif
+
+##########
+
+%if 0%{?with_xine}
+%package -n trinity-libarts-xine
+Summary:	ARTS plugin enabling xine support
+Group:		Productivity/Multimedia/Other
+
+%description -n trinity-libarts-xine
+This package contains aRts' xine plugin, allowing the use of the xine
+multimedia engine though aRts.
+
+%files -n trinity-libarts-xine
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/videothumbnail.la
+%{tde_tdelibdir}/videothumbnail.so
+%{tde_libdir}/libarts_xine.so.*
+%{tde_libdir}/libarts_xine.la
+%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass
+%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass
+%{tde_datadir}/apps/videothumbnail/sprocket-large.png
+%{tde_datadir}/apps/videothumbnail/sprocket-medium.png
+%{tde_datadir}/apps/videothumbnail/sprocket-small.png
+%{tde_datadir}/services/videothumbnail.desktop
+
+%endif
+
+##########
+
+%package -n trinity-libkcddb
+Summary:	CDDB library for Trinity
+Group:		Productivity/Multimedia/Other
+Requires:	trinity-kcontrol >= %{tde_version}
+
+%description -n trinity-libkcddb
+The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
+CD meta-information (track titles, artist information, etc.) from on-line
+databases, for TDE applications.
+
+%files -n trinity-libkcddb
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_cddb.la
+%{tde_tdelibdir}/kcm_cddb.so
+%{tde_libdir}/libkcddb.so.*
+%{tde_tdeappdir}/libkcddb.desktop
+%{tde_datadir}/apps/tdeconf_update/kcmcddb-emailsettings.upd
+%{tde_datadir}/config.kcfg/libkcddb.kcfg
+%{tde_tdedocdir}/HTML/en/kcontrol/cddb/
+
+##########
+
+%if 0%{?with_mpeg}
+
+%package -n trinity-mpeglib
+Summary:	MP3 and MPEG-1 audio and video library
+Group:		Productivity/Multimedia/Other
+%if 0%{?with_mpeg}
+Requires:	trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%description -n trinity-mpeglib
+mpeglib is a MPEG-1 and MP3 audio and video library. It supports
+MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
+and WAV playback
+
+%files -n trinity-mpeglib
+%defattr(-,root,root,-)
+%{tde_bindir}/yaf-cdda
+%{tde_bindir}/yaf-mpgplay
+%{tde_bindir}/yaf-splay
+%{tde_bindir}/yaf-tplay
+%{tde_bindir}/yaf-vorbis
+%{tde_bindir}/yaf-yuv
+%{tde_libdir}/libmpeg-0.3.0.so
+%{tde_libdir}/libyafcore.so
+%{tde_libdir}/libyafxplayer.so
+
+%endif
+
+##########
+
+%package -n trinity-noatun
+Summary:	Media player for Trinity
+Group:		Productivity/Multimedia/Video/Players
+Requires:	trinity-tdebase-bin >= %{tde_version}
+
+# 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Provides:	devel(libnoatunarts)
+Provides:	devel(libnoatunarts(64bit))
+%endif
+
+%description -n trinity-noatun
+Noatun is an aRts-based audio and video player for Trinity. It supports all
+formats supported by your installation of aRts (including aRts plugins).
+
+%files -n trinity-noatun
+%defattr(-,root,root,-)
+%{tde_bindir}/noatun
+%{tde_libdir}/tdeconf_update_bin/noatun20update
+%{tde_tdelibdir}/noatun.la
+%{tde_tdelibdir}/noatun.so
+%{tde_tdelibdir}/noatun_dcopiface.la
+%{tde_tdelibdir}/noatun_dcopiface.so
+%{tde_tdelibdir}/noatun_excellent.la
+%{tde_tdelibdir}/noatun_excellent.so
+%{tde_tdelibdir}/noatun_htmlexport.la
+%{tde_tdelibdir}/noatun_htmlexport.so
+%{tde_tdelibdir}/noatun_infrared.la
+%{tde_tdelibdir}/noatun_infrared.so
+%{tde_tdelibdir}/noatun_kaiman.la
+%{tde_tdelibdir}/noatun_kaiman.so
+%{tde_tdelibdir}/noatun_keyz.la
+%{tde_tdelibdir}/noatun_keyz.so
+%{tde_tdelibdir}/noatun_kjofol.la
+%{tde_tdelibdir}/noatun_kjofol.so
+%{tde_tdelibdir}/noatun_marquis.la
+%{tde_tdelibdir}/noatun_marquis.so
+%{tde_tdelibdir}/noatun_metatag.la
+%{tde_tdelibdir}/noatun_metatag.so
+%{tde_tdelibdir}/noatun_monoscope.la
+%{tde_tdelibdir}/noatun_monoscope.so
+%{tde_tdelibdir}/noatun_net.la
+%{tde_tdelibdir}/noatun_net.so
+%{tde_tdelibdir}/noatun_splitplaylist.la
+%{tde_tdelibdir}/noatun_splitplaylist.so
+%{tde_tdelibdir}/noatun_systray.la
+%{tde_tdelibdir}/noatun_systray.so
+%{tde_tdelibdir}/noatun_ui.la
+%{tde_tdelibdir}/noatun_ui.so
+%{tde_tdelibdir}/noatun_voiceprint.la
+%{tde_tdelibdir}/noatun_voiceprint.so
+%{tde_tdelibdir}/noatun_winskin.la
+%{tde_tdelibdir}/noatun_winskin.so
+%{tde_tdelibdir}/noatunsimple.la
+%{tde_tdelibdir}/noatunsimple.so
+%{tde_libdir}/libartseffects.la
+%{tde_libdir}/libartseffects.so
+%{tde_libdir}/libtdeinit_noatun.so
+%{tde_libdir}/libnoatun.so.*
+%{tde_libdir}/libnoatunarts.la
+%{tde_libdir}/libnoatunarts.so
+%{tde_libdir}/libnoatuncontrols.so.*
+%{tde_libdir}/libnoatuntags.so.*
+%{tde_libdir}/libwinskinvis.la
+%{tde_libdir}/libwinskinvis.so
+%{tde_libdir}/mcop/ExtraStereo.mcopclass
+%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
+%{tde_libdir}/mcop/Noatun/
+%{tde_libdir}/mcop/RawWriter.mcopclass
+%{tde_libdir}/mcop/VoiceRemoval.mcopclass
+%{tde_libdir}/mcop/artseffects.mcopclass
+%{tde_libdir}/mcop/artseffects.mcoptype
+%{tde_libdir}/mcop/noatunarts.mcopclass
+%{tde_libdir}/mcop/noatunarts.mcoptype
+%{tde_libdir}/mcop/winskinvis.mcopclass
+%{tde_libdir}/mcop/winskinvis.mcoptype
+%{tde_tdeappdir}/noatun.desktop
+%{tde_datadir}/apps/tdeconf_update/noatun.upd
+%{tde_datadir}/apps/noatun/
+%{tde_datadir}/icons/hicolor/*/apps/noatun.png
+%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
+%{tde_tdedocdir}/HTML/en/noatun/
+%{tde_mandir}/man1/noatun.1*
+
+##########
+
+%package devel
+Summary:	Development files for %{name}, aRts and noatun plugins
+Group:		Development/Libraries/Other
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdelibs-devel >= %{tde_version}
+
+Obsoletes:	trinity-kdemultimedia-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdemultimedia-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+{summary}.
+
+Install %{name}-devel if you wish to develop or compile any
+applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
+noatun plugins.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/*
+%if 0%{?with_akode}
+%{tde_libdir}/libarts_akode.so
+%endif
+%{tde_libdir}/libarts_audiofile.so
+%if 0%{?with_mpeg}
+%{tde_libdir}/libarts_mpeglib.so
+%{tde_libdir}/libarts_splay.so
+%endif
+%if 0%{?with_xine}
+%{tde_libdir}/libarts_xine.so
+%endif
+%{tde_libdir}/libartsbuilder.so
+%{tde_libdir}/libartscontrolapplet.so
+%{tde_libdir}/libartscontrolsupport.so
+%{tde_libdir}/libartsgui.so
+%{tde_libdir}/libartsgui_idl.so
+%{tde_libdir}/libartsgui_kde.so
+%{tde_libdir}/libartsmidi.so
+%{tde_libdir}/libartsmidi_idl.so
+%{tde_libdir}/libartsmodules.so
+%{tde_libdir}/libartsmodulescommon.so
+%{tde_libdir}/libartsmoduleseffects.so
+%{tde_libdir}/libartsmodulesmixers.so
+%{tde_libdir}/libartsmodulessynth.so
+%{tde_libdir}/libaudiocdplugins.la
+%{tde_libdir}/libaudiocdplugins.so
+%{tde_libdir}/libkcddb.la
+%{tde_libdir}/libkcddb.so
+%{tde_libdir}/libtdeinit_kmix.la
+%{tde_libdir}/libtdeinit_kmixctrl.la
+%{tde_libdir}/libtdeinit_krec.la
+%{tde_libdir}/libtdeinit_noatun.la
+%{tde_libdir}/libtdemidlib.la
+%{tde_libdir}/libtdemidlib.so
+%if 0%{?with_mpeg}
+%{tde_libdir}/libmpeg.la
+%{tde_libdir}/libmpeg.so
+%endif
+%{tde_libdir}/libnoatun.la
+%{tde_libdir}/libnoatun.so
+%{tde_libdir}/libnoatuncontrols.la
+%{tde_libdir}/libnoatuncontrols.so
+%{tde_libdir}/libnoatuntags.la
+%{tde_libdir}/libnoatuntags.so
+%if 0%{?with_mpeg}
+%{tde_libdir}/libyafcore.la
+%{tde_libdir}/libyafxplayer.la
+%endif
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+# Update icons for some control center modules
+%__sed -i "tdeioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_ALSA=ON \
+  -DWITH_ARTS_AKODE=ON \
+  -DWITH_ARTS_AUDIOFILE=ON \
+  -DWITH_ARTS_MPEGLIB=ON \
+  -DWITH_ARTS_XINE=ON \
+  -DWITH_CDPARANOIA=ON \
+  -DWITH_FLAC=ON \
+  -DWITH_GSTREAMER=ON \
+  -DWITH_KSCD_CDDA=ON \
+  -DWITH_LAME=%{?with_lame:ON}%{!?with_lame:OFF} \
+  -DWITH_MUSICBRAINZ=%{?with_musicbrainz:ON}%{!?with_musicbrainz:OFF} \
+  -DWITH_TAGLIB=%{?with_taglib:ON}%{!?with_taglib:OFF} \
+  -DWITH_THEORA=ON \
+  -DWITH_VORBIS=ON \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{?buildroot} 
+%__make install DESTDIR="%{?buildroot}" -C build
+
+# Disable MPEG support entirely
+%if 0%{?with_mpeg} == 0
+%__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
+%__rm %{?buildroot}%{tde_bindir}/yaf-*
+%__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
+%__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
+%__rm %{?buildroot}%{tde_libdir}/libmpeg*
+%__rm %{?buildroot}%{tde_libdir}/libyaf*
+%__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass
+%__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass
+%endif
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file krec           AudioVideo Recorder
+%suse_update_desktop_file tdemid         AudioVideo Midi
+%suse_update_desktop_file artsbuilder    AudioVideo AudioVideoEditing
+%suse_update_desktop_file artscontrol    AudioVideo AudioVideoEditing
+%suse_update_desktop_file kmix           AudioVideo Mixer
+%suse_update_desktop_file kaboodle       AudioVideo Player
+%suse_update_desktop_file kaudiocreator  AudioVideo CD
+%suse_update_desktop_file kscd           AudioVideo Player CD
+%suse_update_desktop_file noatun         AudioVideo Player Video
+%suse_update_desktop_file juk            AudioVideo Player Jukebox
+%suse_update_desktop_file audiocd
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc b/redhat/core/tdemultimedia/trinity-tdemultimedia-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdemultimedia/trinity-tdemultimedia-rpmlintrc
+++ b/redhat/core/tdemultimedia/trinity-tdemultimedia-rpmlintrc
diff --git a/redhat/main/tdenetwork/kppp.pamd b/redhat/core/tdenetwork/kppp.pamd
index c7d67e332..c7d67e332 100644
--- a/redhat/main/tdenetwork/kppp.pamd
+++ b/redhat/core/tdenetwork/kppp.pamd
diff --git a/redhat/main/tdenetwork/ktalk b/redhat/core/tdenetwork/ktalk
index 4458a0964..4458a0964 100644
--- a/redhat/main/tdenetwork/ktalk
+++ b/redhat/core/tdenetwork/ktalk
diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec
new file mode 100644
index 000000000..9a0c44a16
--- /dev/null
+++ b/redhat/core/tdenetwork/tdenetwork.spec
@@ -0,0 +1,1243 @@
+%if 0%{?fedora} >= 23
+%define _hardened_ldflags %nil
+%endif
+
+#
+# spec file for package tdenetwork (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdenetwork
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_sbindir %{tde_prefix}/sbin
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
+
+# Disable AIM support
+%define with_aim 1
+
+Name:			trinity-%{tde_pkg}
+Summary:		Trinity Desktop Environment - Network Applications
+Group:			Applications/Internet
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	kppp.pamd
+Source2:	ktalk
+Source3:	trinity-tdenetwork-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gettext
+BuildRequires:	coreutils 
+BuildRequires:	gcc-c++
+BuildRequires:	desktop-file-utils
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
+
+# AVAHI support
+%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define with_avahi 1
+BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}avahi-client-devel
+Requires:		%{_lib}avahi-client3
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	avahi-devel
+Requires:		avahi
+%endif
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# TLS support
+BuildRequires:	gnutls-devel
+
+# SQLITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	sqlite3-devel
+%else
+BuildRequires:	sqlite-devel
+%endif
+
+# GADU support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_gadu 1
+BuildRequires:	libgadu-devel
+%endif
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# XTST support
+%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210
+BuildRequires:	libXtst-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	libxtst-devel
+%endif
+
+# XMU support
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXmu-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
+BuildRequires: libxmu-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
+%endif
+
+# Other stuff
+%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	libXxf86vm-devel
+%endif
+
+# Fedora review:  http://bugzilla.redhat.com/195486
+
+## Conditional build:
+# RHEL6: xmms is outdated !
+#define _with_xmms --with-xmms
+
+# Wifi support
+%define with_wifi 1
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+BuildRequires: wireless-tools-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
+BuildRequires:	%{_lib}iw29-devel
+%endif
+%if 0%{?rhel} == 5 || 0%{?suse_version}
+BuildRequires: wireless-tools
+%endif
+%if 0%{?suse_version} || 0%{?mgaversion} >= 3
+BuildRequires:	libiw-devel
+%endif
+
+# OpenSLP support
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_openslp 1
+BuildRequires: openslp-devel
+%endif
+
+%ifarch %{ix86}
+# BR: /usr/include/valgrind/valgrind.h
+BuildRequires: valgrind
+%endif
+
+%{?_with_xmms:BuildRequires: xmms-devel}
+
+# V4L support
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+BuildRequires:	libv4l-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}v4l-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires:	kernel-headers
+%endif
+
+# XML support
+BuildRequires:	libxml2-devel
+BuildRequires:	libxslt-devel
+
+#jabber
+BuildRequires:	libidn-devel
+#jabber/jingle
+%if 0%{?suse_version}
+BuildRequires:	libexpat-devel
+%else
+BuildRequires:	expat-devel
+%endif
+BuildRequires:	glib2-devel
+BuildRequires:	speex-devel
+# jabber/ssl
+#{?fedora:Requires(hint): qca-tls}
+#Requires:		jasper
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# MEANWHILE support
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%define with_meanwhile 1
+BuildRequires:	meanwhile-devel
+%endif
+
+# SPEEX support
+%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
+%define with_speex 1
+BuildRequires:	speex-devel
+%endif
+
+# CONSOLEHELPER (usermode) support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_consolehelper 1
+
+# XINETD support
+%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
+# No xinetd
+%else
+%define with_xinetd 1
+Requires:		xinetd
+%endif
+
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
+%endif
+
+# Build kopete motionaway plugin
+%if 0%{?rhel} != 5
+%define build_kopete_motionaway 1
+%endif
+
+Obsoletes:	trinity-kdenetwork < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdenetwork-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdenetwork-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdenetwork < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdenetwork = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-dcoprss = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-filesharing = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-tdefile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kget = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-knewsticker = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kopete-nowlistening = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kpf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kppp = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-krdc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-krfb = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktalkd = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_wifi}
+Requires: trinity-kwifimanager = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+Requires: trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-lisa = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+This metapackage includes a collection of network and networking related
+applications provided with the official release of Trinity.
+
+Networking applications, including:
+* dcoprss: RSS utilities for Trinity
+* filesharing: Network filesharing configuration module for Trinity
+* kdict: Dictionary client for Trinity
+* tdefile-plugins: Torrent metainfo plugin for Trinity
+* kget: downloader manager
+* knewsticker: RDF newsticker applet
+* kopete: chat client
+* kopete-nowlistening: (xmms) plugin for Kopete.
+* kpf: Public fileserver for Trinity
+* kppp: dialer and front end for pppd
+* krdc: a client for Desktop Sharing and other VNC servers
+* krfb: Desktop Sharing server, allow others to access your desktop via VNC
+* ksirc: IRC client for Trinity
+* ktalkd: Talk daemon for Trinity
+%if 0%{?with_wifi}
+* kwifimanager: Wireless lan manager for Trinity
+%endif
+* librss: RSS library for Trinity
+* lisa: lan information server
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+
+
+##########
+
+%package -n trinity-dcoprss
+Summary:		RSS utilities for Trinity
+Group:			Applications/Internet
+
+%description -n trinity-dcoprss
+dcoprss is a RSS to DCOP bridge, allowing all
+DCOP aware applications to access RSS news feeds. There is also
+a few sample utilities provided.
+RSS is a standard for publishing news headlines.
+DCOP is the TDE interprocess communication protocol.
+
+%files -n trinity-dcoprss
+%defattr(-,root,root,-)
+%{tde_bindir}/feedbrowser
+%{tde_bindir}/rssclient
+%{tde_bindir}/rssservice
+%{tde_datadir}/services/rssservice.desktop
+
+##########
+
+%package devel
+Summary:		Development files for the Trinity network module
+Group:			Development/Libraries/Other
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-tdelibs-devel >= %{tde_version}
+
+Obsoletes:	trinity-kdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This is the development package which contains the headers for the TDE RSS
+library as well as the Kopete chat client, as well as miscellaneous
+development-related files for the TDE network module.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kopete/
+%{tde_tdeincludedir}/rss/
+%{tde_libdir}/libkopete.la
+%{tde_libdir}/libkopete.so
+%if 0%{?with_aim}
+%{tde_libdir}/libkopete_msn_shared.la
+%{tde_libdir}/libkopete_msn_shared.so
+%endif
+%{tde_libdir}/libkopete_oscar.la
+%{tde_libdir}/libkopete_oscar.so
+%{tde_libdir}/libkopete_videodevice.la
+%{tde_libdir}/libkopete_videodevice.so
+%{tde_libdir}/librss.la
+%{tde_libdir}/librss.so
+
+##########
+
+%package filesharing
+#Recommends:	perl-suid
+Summary:		Network filesharing configuration module for Trinity
+Group:   		Applications/Internet
+
+Obsoletes:		tdenetwork-filesharing < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		tdenetwork-filesharing = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description filesharing
+This package provides a Trinity Control Center module to configure
+NFS and Samba.
+
+%files filesharing
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/fileshare_propsdlgplugin.la
+%{tde_tdelibdir}/fileshare_propsdlgplugin.so
+%{tde_tdelibdir}/kcm_fileshare.la
+%{tde_tdelibdir}/kcm_fileshare.so
+%{tde_tdelibdir}/kcm_kcmsambaconf.la
+%{tde_tdelibdir}/kcm_kcmsambaconf.so
+%{tde_tdeappdir}/fileshare.desktop
+%{tde_tdeappdir}/kcmsambaconf.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kcmfileshare.png
+%{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png
+%{tde_datadir}/services/fileshare_propsdlgplugin.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/fileshare/
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmsambaconf/
+
+##########
+
+%package -n trinity-kdict
+Summary:		Dictionary client for Trinity
+Group:			Applications/Internet
+Requires:		trinity-kicker >= %{tde_version}
+
+%description -n trinity-kdict
+KDict is an advanced TDE graphical client for the DICT Protocol, with full
+Unicode support. It enables you to search through dictionary databases for a
+word or phrase, then displays suitable definitions. KDict tries to ease
+basic as well as advanced queries.
+
+%files -n trinity-kdict
+%defattr(-,root,root,-)
+%{tde_bindir}/kdict
+%{tde_tdelibdir}/kdict.*
+%{tde_tdelibdir}/kdict_panelapplet.*
+%{tde_libdir}/libtdeinit_kdict.*
+%{tde_tdeappdir}/kdict.desktop
+%{tde_datadir}/apps/kdict
+%{tde_datadir}/apps/kicker/applets/kdictapplet.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kdict.*
+%{tde_tdedocdir}/HTML/en/kdict
+%{tde_mandir}/man1/kdict.1*
+
+##########
+
+%package tdefile-plugins
+Summary:		Torrent metainfo plugin for Trinity
+Group:			Applications/Internet
+
+Obsoletes:		tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tdefile-plugins
+This package provides a metainformation plugin for bittorrent files.
+TDE uses tdefile-plugins to provide metainfo tab in the files properties
+dialog in konqueror and other file-handling applications.
+
+%files tdefile-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/tdefile_torrent.la
+%{tde_tdelibdir}/tdefile_torrent.so
+%{tde_datadir}/services/tdefile_torrent.desktop
+
+##########
+
+%package -n trinity-kget
+Summary:		Download manager for Trinity
+Group:			Applications/Internet
+Requires:		trinity-tdebase-data >= %{tde_version}
+Requires:		trinity-konqueror >= %{tde_version}
+
+%description -n trinity-kget
+KGet is a a download manager similar to GetRight or Go!zilla. It keeps
+all your downloads in one dialog and you can add and remove transfers.
+Transfers can be paused, resumed, queued or scheduled.
+Dialogs display info about status of transfers - progress, size, speed
+and remaining time. Program supports drag & drop from TDE
+applications and Netscape.
+
+%files -n trinity-kget
+%defattr(-,root,root,-)
+%{tde_bindir}/kget
+%{tde_tdelibdir}/tdehtml_kget.la
+%{tde_tdelibdir}/tdehtml_kget.so
+%{tde_tdeappdir}/kget.desktop
+%{tde_datadir}/apps/kget
+%{tde_datadir}/apps/tdehtml/kpartplugins/kget_plug_in.desktop
+%{tde_datadir}/apps/tdehtml/kpartplugins/kget_plug_in.rc
+%{tde_datadir}/apps/konqueror/servicemenus/kget_download.desktop
+%{tde_datadir}/icons/crystalsvg/*/actions/tdehtml_kget.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kget.png
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kget_list.png
+%{tde_datadir}/icons/hicolor/*/apps/kget.png
+%{tde_datadir}/mimelnk/application/x-kgetlist.desktop
+%{tde_datadir}/sounds/KGet_Added.ogg
+%{tde_datadir}/sounds/KGet_Finished.ogg
+%{tde_datadir}/sounds/KGet_Finished_All.ogg
+%{tde_datadir}/sounds/KGet_Started.ogg
+%{tde_tdedocdir}/HTML/en/kget
+%{tde_mandir}/man1/kget.1*
+
+##########
+
+%package -n trinity-knewsticker
+Summary:		News ticker applet for Trinity
+Group:			Applications/Internet
+Requires:		trinity-kicker >= %{tde_version}
+
+%description -n trinity-knewsticker
+This is a news ticker applet for the Trinity panel. It can scroll news from
+your favorite news sites, such as lwn.net, /. and freshmeat.net.
+To achieve this, KNewsTicker requires the news sites to provide a
+RSS feed to newsitems. KNewsTicker already comes with a selection of
+good news sources which provide such files.
+
+%files -n trinity-knewsticker
+%defattr(-,root,root,-)
+%{tde_bindir}/knewstickerstub
+%{tde_tdelibdir}/knewsticker_panelapplet.la
+%{tde_tdelibdir}/knewsticker_panelapplet.so
+%{tde_tdelibdir}/libkntsrcfilepropsdlg.la
+%{tde_tdelibdir}/libkntsrcfilepropsdlg.so
+%{tde_tdeappdir}/knewsticker-standalone.desktop
+%{tde_datadir}/applnk/.hidden/knewstickerstub.desktop
+%{tde_datadir}/apps/tdeconf_update/knewsticker.upd
+%{tde_datadir}/apps/tdeconf_update/knt-0.1-0.2.pl
+%{tde_datadir}/apps/kicker/applets/knewsticker.desktop
+%{tde_datadir}/apps/knewsticker/
+%{tde_datadir}/icons/hicolor/*/apps/knewsticker.png
+%{tde_datadir}/services/kntsrcfilepropsdlg.desktop
+%{tde_tdedocdir}/HTML/en/knewsticker
+
+##########
+
+%package -n trinity-kopete
+Summary:		Instant messenger for Trinity
+Group:			Applications/Internet
+Requires:		trinity-tdebase-bin >= %{tde_version}
+Requires:		trinity-tdebase-data >= %{tde_version}
+Requires:		trinity-filesystem >= %{tde_version}
+
+%description -n trinity-kopete
+Kopete is an instant messenger program which can communicate with a variety
+of IM systems, such as Yahoo, ICQ, IRC and Jabber.
+
+Support for more IM protocols can be added through a plugin system.
+
+%files -n trinity-kopete
+%defattr(-,root,root,-)
+# nowlistening support
+%exclude %{tde_datadir}/apps/kopete/*nowlisteningchatui*
+%exclude %{tde_datadir}/apps/kopete/*nowlisteningui*
+%exclude %{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg
+%exclude %{tde_datadir}/services/tdeconfiguredialog/*nowlistening*
+%exclude %{tde_datadir}/services/*nowlistening*
+%exclude %{tde_tdelibdir}/*nowlistening*
+# Main kopete package
+%{tde_bindir}/kopete
+%{tde_bindir}/kopete_latexconvert.sh
+%{tde_libdir}/tdeconf_update_bin/kopete-account-tdeconf_update
+%{tde_libdir}/tdeconf_update_bin/kopete-nameTracking-tdeconf_update
+%{tde_libdir}/tdeconf_update_bin/kopete-pluginloader2-tdeconf_update
+%{tde_tdelibdir}/kcm_kopete_*.so
+%{tde_tdelibdir}/kcm_kopete_*.la
+%{tde_tdelibdir}/tdeio_jabberdisco.la
+%{tde_tdelibdir}/tdeio_jabberdisco.so
+%{tde_tdelibdir}/kopete_*.la
+%{tde_tdelibdir}/kopete_*.so
+%{tde_tdelibdir}/libkrichtexteditpart.la
+%{tde_tdelibdir}/libkrichtexteditpart.so
+%{tde_libdir}/libkopete_oscar.so.*
+%{tde_libdir}/libkopete.so.*
+%{tde_libdir}/libkopete_videodevice.so.*
+%{tde_tdeappdir}/kopete.desktop
+%{tde_datadir}/apps/tdeconf_update/kopete-*
+%{tde_datadir}/apps/kopete/
+%{tde_datadir}/apps/kopete_*/
+%{tde_datadir}/apps/kopeterichtexteditpart/
+%{tde_datadir}/config.kcfg/historyconfig.kcfg
+%{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg
+%{tde_datadir}/config.kcfg/kopete.kcfg
+%{tde_datadir}/config.kcfg/latexconfig.kcfg
+%{tde_datadir}/icons/crystalsvg/*/actions/voicecall.png
+%{tde_datadir}/icons/crystalsvg/*/actions/webcamreceive.png
+%{tde_datadir}/icons/crystalsvg/*/actions/webcamsend.png
+%{tde_datadir}/icons/crystalsvg/*/actions/account_offline_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/add_user.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_away_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_busy_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_food_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_invisible_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_phone_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/contact_xa_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/delete_user.png
+%{tde_datadir}/icons/crystalsvg/*/actions/edit_user.png
+%{tde_datadir}/icons/crystalsvg/*/actions/emoticon.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_chatty.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_connecting.mng
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_group.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_invisible.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_na.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_offline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_online.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_raw.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png
+%{tde_datadir}/icons/crystalsvg/*/actions/jabber_xa.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kopeteavailable.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kopeteaway.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kopeteeditstatusmessage.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kopetestatusmessage.png
+%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_offline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_online.png
+%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_unknown.png
+%{tde_datadir}/icons/crystalsvg/*/actions/newmsg.png
+%{tde_datadir}/icons/crystalsvg/*/actions/search_user.png
+%{tde_datadir}/icons/crystalsvg/*/actions/show_offliners.png
+%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown_overlay.png
+%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_aim.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_gadu.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_http-ws.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_icq.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_irc.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_msn.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_qq.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_smtp.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_tlen.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_yahoo.png
+%{tde_datadir}/icons/crystalsvg/*/apps/jabber_protocol.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kopete_all_away.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kopete_offline.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_away.png
+%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_online.png
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/kopete_emoticons.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz
+%{tde_datadir}/icons/hicolor/*/apps/kopete.png
+%{tde_datadir}/icons/hicolor/*/actions/emoticon.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_away.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_chatty.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_connecting.mng
+%{tde_datadir}/icons/hicolor/*/actions/jabber_group.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_invisible.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_na.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_offline.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_online.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_raw.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_off.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_on.png
+%{tde_datadir}/icons/hicolor/*/actions/jabber_xa.png
+%{tde_datadir}/icons/hicolor/*/actions/kopeteavailable.png
+%{tde_datadir}/icons/hicolor/*/actions/kopeteaway.png
+%{tde_datadir}/icons/hicolor/*/actions/newmsg.png
+%{tde_datadir}/icons/hicolor/*/actions/status_unknown_overlay.png
+%{tde_datadir}/icons/hicolor/*/actions/status_unknown.png
+%{tde_datadir}/icons/hicolor/*/apps/jabber_protocol.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz
+%{tde_datadir}/icons/crystalsvg/*/actions/newmessage.mng
+%{tde_datadir}/icons/hicolor/*/actions/newmessage.mng
+%{tde_datadir}/icons/crystalsvg/*/apps/icq_protocol.png
+%{tde_datadir}/icons/crystalsvg/*/apps/irc_protocol.png
+%{tde_datadir}/icons/crystalsvg/*/actions/icq_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/icq_connecting.mng
+%{tde_datadir}/icons/crystalsvg/*/actions/icq_dnd.png
+%{tde_datadir}/icons/crystalsvg/*/actions/icq_ffc.png
+%{tde_datadir}/icons/crystalsvg/*/actions/icq_invisible.png
+%{tde_datadir}/icons/crystalsvg/*/actions/icq_na.png
+%{tde_datadir}/icons/crystalsvg/*/actions/icq_occupied.png
+%{tde_datadir}/icons/crystalsvg/*/actions/icq_offline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/icq_online.png
+%{tde_datadir}/icons/crystalsvg/*/actions/irc_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/irc_channel.png
+%{tde_datadir}/icons/crystalsvg/*/actions/irc_connecting.mng
+%{tde_datadir}/icons/crystalsvg/*/actions/irc_normal.png
+%{tde_datadir}/icons/crystalsvg/*/actions/irc_online.png
+%{tde_datadir}/icons/crystalsvg/*/actions/irc_op.png
+%{tde_datadir}/icons/crystalsvg/*/actions/irc_server.png
+%{tde_datadir}/icons/crystalsvg/*/actions/irc_voice.png
+%{tde_datadir}/icons/hicolor/*/actions/icq_away.png
+%{tde_datadir}/icons/hicolor/*/actions/icq_connecting.mng
+%{tde_datadir}/icons/hicolor/*/actions/icq_dnd.png
+%{tde_datadir}/icons/hicolor/*/actions/icq_ffc.png
+%{tde_datadir}/icons/hicolor/*/actions/icq_invisible.png
+%{tde_datadir}/icons/hicolor/*/actions/icq_na.png
+%{tde_datadir}/icons/hicolor/*/actions/icq_occupied.png
+%{tde_datadir}/icons/hicolor/*/actions/icq_offline.png
+%{tde_datadir}/icons/hicolor/*/actions/icq_online.png
+%{tde_datadir}/icons/hicolor/*/apps/icq_protocol.png
+%{tde_datadir}/mimelnk/application/x-icq.desktop
+%{tde_datadir}/mimelnk/application/x-kopete-emoticons.desktop
+%{tde_datadir}/services/chatwindow.desktop
+%{tde_datadir}/services/emailwindow.desktop
+%{tde_datadir}/services/jabberdisco.protocol
+%{tde_datadir}/services/tdeconfiguredialog/kopete_*.desktop
+%{tde_datadir}/services/kopete_*.desktop
+%{tde_datadir}/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png
+%{tde_datadir}/servicetypes/kopete*.desktop
+%{tde_datadir}/sounds/Kopete_*.ogg
+%{tde_tdedocdir}/HTML/en/kopete
+# jingle support for kopete
+%{tde_bindir}/relayserver
+%{tde_bindir}/stunserver
+# winpopup support for kopete
+%{tde_bindir}/winpopup-install.sh
+%{tde_bindir}/winpopup-send.sh
+%if 0%{?build_kopete_motionaway}
+# motionaway plugin for kopete
+%{tde_datadir}/config.kcfg/motionawayconfig.kcfg
+%endif
+# smpp plugin for kopete
+%{tde_datadir}/config.kcfg/smpppdcs.kcfg
+# aim support is deprecated in TDE 14.1.0
+%if 0%{?with_aim}
+%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_away.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng
+%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_online.png
+%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png
+%{tde_datadir}/services/aim.protocol
+%{tde_libdir}/libkopete_msn_shared.so.0
+%{tde_libdir}/libkopete_msn_shared.so.0.0.0
+%endif
+%{tde_mandir}/man1/kopete.1*
+
+##########
+
+%package -n trinity-kopete-nowlistening
+Summary:		Nowlistening (xmms) plugin for Kopete
+Group:			Applications/Internet
+Requires:		trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		trinity-filesystem >= %{tde_version}
+
+%description -n trinity-kopete-nowlistening
+Kopete includes the "Now Listening" plug-in that can report what music you
+are currently listening to, in a number of different players, including
+noatun, kscd, juk, kaffeine and amarok.
+
+%files -n trinity-kopete-nowlistening
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/kopete/*nowlisteningchatui*
+%{tde_datadir}/apps/kopete/*nowlisteningui*
+%{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg
+%{tde_datadir}/services/tdeconfiguredialog/*nowlistening*
+%{tde_datadir}/services/*nowlistening*
+%{tde_tdelibdir}/*nowlistening*
+
+##########
+
+%package -n trinity-kpf
+Summary:		Public fileserver for Trinity
+Group:			Applications/Internet
+Requires:		trinity-kicker >= %{tde_version}
+
+%description -n trinity-kpf
+kpf provides simple file sharing using HTTP. kpf is strictly a public
+fileserver, which means that there are no access restrictions to shared
+files. Whatever you select for sharing is available to anyone. kpf is
+designed to be used for sharing files with friends.
+
+%files -n trinity-kpf
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kpf*
+%{tde_datadir}/apps/kicker/applets/kpfapplet.desktop
+%{tde_datadir}/icons/crystalsvg/*/apps/kpf.*
+%{tde_datadir}/services/kpfpropertiesdialogplugin.desktop
+%{tde_tdedocdir}/HTML/en/kpf
+
+##########
+
+%package -n trinity-kppp
+Summary:		Modem dialer and ppp frontend for Trinity
+Group:			Applications/Internet
+BuildRequires:	ppp
+Requires:		ppp
+
+%if 0%{?with_consolehelper}
+# package 'usermode' provides '/usr/bin/consolehelper-gtk'
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	usermode-gtk
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	usermode
+%endif
+%endif
+
+%description -n trinity-kppp
+KPPP is a dialer and front end for pppd. It allows for interactive
+script generation and network setup. It will automate the dialing in
+process to your ISP while letting you conveniently monitor the entire
+process.
+
+Once connected KPPP will provide a rich set of statistics and keep
+track of the time spent online for you.
+
+%files -n trinity-kppp
+%defattr(-,root,root,-)
+%if 0%{?with_consolehelper} == 0
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%verify(not mode) %{tde_bindir}/kppp
+%else
+%attr(4711,root,root) %{tde_bindir}/kppp
+%endif
+%endif
+%{tde_bindir}/kppplogview
+%{tde_tdeappdir}/Kppp.desktop
+%{tde_tdeappdir}/kppplogview.desktop
+%{tde_datadir}/apps/kppp/
+%{tde_datadir}/icons/hicolor/*/apps/kppp.png
+%{tde_tdedocdir}/HTML/en/kppp/
+%dir %{_sysconfdir}/ppp/peers
+%{_sysconfdir}/ppp/peers/kppp-options
+
+%if 0%{?with_consolehelper}
+%config(noreplace) /etc/security/console.apps/kppp3
+%config(noreplace) /etc/pam.d/kppp3
+%{_sbindir}/kppp3
+%{tde_bindir}/kppp3
+%{tde_sbindir}/kppp3
+%endif
+
+%post -n trinity-kppp
+%if 0%{?suse_version}
+# Sets permissions on setuid files (openSUSE specific)
+%set_permissions %{tde_bindir}/kppp
+%endif
+
+##########
+
+%package -n trinity-krdc
+Summary:		Remote Desktop Connection for Trinity
+Group:			Applications/Internet
+Requires:		rdesktop
+
+%description -n trinity-krdc
+krdc is an TDE graphical client for the rfb protocol, used by VNC,
+and if rdesktop is installed, krdc can connect to Windows Terminal
+Servers using RDP.
+
+%files -n trinity-krdc
+%defattr(-,root,root,-)
+%{tde_bindir}/krdc
+%{tde_tdeappdir}/krdc.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop
+%{tde_datadir}/apps/krdc/
+%{tde_datadir}/icons/crystalsvg/*/apps/krdc.png
+%{tde_datadir}/icons/hicolor/*/apps/krdc.png
+%{tde_datadir}/services/rdp.protocol
+%{tde_datadir}/services/vnc.protocol
+%{tde_tdedocdir}/HTML/en/krdc/
+%{tde_tdedocdir}/HTML/en/tdeioslave/rdp/
+%{tde_tdedocdir}/HTML/en/tdeioslave/vnc/
+
+##########
+
+%package -n trinity-krfb
+Summary:		Desktop Sharing for Trinity
+Group:			Applications/Internet
+
+%description -n trinity-krfb
+Desktop Sharing (krfb) is a server application that allows you to share
+your current session with a user on another machine, who can use a
+VNC client like krdc to view or even control the desktop. It doesn't
+require you to start a new X session - it can share the current session.
+This makes it very useful when you want someone to help you perform a
+task.
+
+%files -n trinity-krfb
+%defattr(-,root,root,-)
+%{tde_bindir}/krfb
+%{tde_bindir}/krfb_httpd
+%{tde_tdelibdir}/kcm_krfb.la
+%{tde_tdelibdir}/kcm_krfb.so
+%{tde_tdelibdir}/kded_kinetd.la
+%{tde_tdelibdir}/kded_kinetd.so
+%{tde_tdeappdir}/kcmkrfb.desktop
+%{tde_tdeappdir}/krfb.desktop
+%{tde_datadir}/apps/kinetd/
+%{tde_datadir}/apps/krfb
+%{tde_datadir}/icons/crystalsvg/*/apps/krfb.png
+%{tde_datadir}/icons/hicolor/*/apps/krfb.png
+%{tde_datadir}/icons/locolor/*/apps/krfb.png
+%{tde_datadir}/services/kded/kinetd.desktop
+%{tde_datadir}/services/kinetd_krfb.desktop
+%{tde_datadir}/services/kinetd_krfb_httpd.desktop
+%{tde_datadir}/servicetypes/kinetdmodule.desktop
+%{tde_tdedocdir}/HTML/en/krfb/
+
+##########
+
+%package -n trinity-ksirc
+Summary:		IRC client for Trinity
+Group:			Applications/Internet
+
+%description -n trinity-ksirc
+KSirc is an IRC chat client for TDE. It supports scripting with Perl and has a
+lot of compatibility with mIRC for general use.
+
+If you want to connect to an IRC server via SSL, you will need to install the
+recommended package libio-socket-ssl-perl.
+
+%files -n trinity-ksirc
+%defattr(-,root,root,-)
+%{tde_bindir}/dsirc
+%{tde_bindir}/ksirc
+%{tde_libdir}/libtdeinit_ksirc.*
+%{tde_tdelibdir}/ksirc.*
+%{tde_tdeappdir}/ksirc.desktop
+%{tde_datadir}/apps/ksirc/
+%config(noreplace) %{tde_confdir}/ksircrc
+%{tde_datadir}/icons/hicolor/*/apps/ksirc.*
+%{tde_tdedocdir}/HTML/??/ksirc/
+
+##########
+
+%package -n trinity-ktalkd
+Summary:		Talk daemon for Trinity
+Group:			Applications/Internet
+Requires:		trinity-kcontrol >= %{tde_version}
+Requires:		trinity-tdebase-data >= %{tde_version}
+%if 0%{?with_xinetd}
+Requires:		xinetd
+%endif
+
+%description -n trinity-ktalkd
+KTalkd is an enhanced talk daemon - a program to handle incoming talk
+requests, announce them and allow you to respond to it using a talk
+client. Note that KTalkd is designed to run on a single-user workstation,
+and shouldn't be run on a multi-user machine.
+
+%files -n trinity-ktalkd
+%defattr(-,root,root,-)
+%{tde_bindir}/ktalkd*
+%{tde_bindir}/mail.local
+%{tde_tdelibdir}/kcm_ktalkd.*
+%{tde_tdeappdir}/kcmktalkd.desktop
+%config(noreplace) %{tde_confdir}/ktalkdrc
+%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
+%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
+%{tde_datadir}/sounds/ktalkd.wav
+%if 0%{?with_xinetd}
+%dir %{_sysconfdir}/xinetd.d
+%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
+%endif
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
+%{tde_tdedocdir}/HTML/en/ktalkd
+
+##########
+
+%if 0%{?with_wifi}
+
+%package -n trinity-kwifimanager
+Summary:		Wireless lan manager for Trinity
+Group:			Applications/Internet
+Requires:		trinity-kicker >= %{tde_version}
+
+%description -n trinity-kwifimanager
+KWiFiManager suite is a set of tools which allows you to manage your
+wireless LAN connection under the K Desktop Environment. It provides
+information about your current connection. KWiFiManager supports every
+wavelan card that uses the wireless extensions interface.
+
+%files -n trinity-kwifimanager
+%defattr(-,root,root,-)
+%{tde_bindir}/kwifimanager
+%{tde_tdelibdir}/kcm_wifi.*
+%{tde_libdir}/libkwireless.la
+%{tde_libdir}/libkwireless.so
+%{tde_tdeappdir}/kcmwifi.desktop
+%{tde_tdeappdir}/kwifimanager.desktop
+%{tde_datadir}/apps/kicker/applets/kwireless.desktop
+%{tde_datadir}/apps/kwifimanager
+%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png
+%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
+%{tde_tdedocdir}/HTML/en/kwifimanager/
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/
+%{tde_mandir}/man1/kwifimanager.1*
+
+%endif
+
+##########
+
+%package -n trinity-librss
+Summary:		RSS library for Trinity
+Group:			Environment/Libraries
+
+%description -n trinity-librss
+This is the runtime package for programs that use the TDE RSS library.
+End users should not need to install this, it should get installed
+automatically when needed.
+
+%files -n trinity-librss
+%defattr(-,root,root,-)
+%{tde_libdir}/librss.so.*
+%{tde_datadir}/cmake/librss.cmake
+
+##########
+
+%package -n trinity-lisa
+Summary:			LAN information server for Trinity
+Group:				Applications/Internet
+Requires:		trinity-konqueror >= %{tde_version}
+Requires:		trinity-tdebase-data >= %{tde_version}
+
+%description -n trinity-lisa
+LISa is intended to provide TDE with a kind of "network neighborhood"
+but relying only on the TCP/IP protocol.
+
+%files -n trinity-lisa
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_lanbrowser.la
+%{tde_tdelibdir}/kcm_lanbrowser.so
+%{tde_tdelibdir}/tdeio_lan.la
+%{tde_tdelibdir}/tdeio_lan.so
+%{tde_datadir}/applnk/.hidden/kcmtdeiolan.desktop
+%{tde_datadir}/applnk/.hidden/kcmlisa.desktop
+%{tde_datadir}/applnk/.hidden/kcmreslisa.desktop
+%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop
+%{tde_datadir}/apps/konqueror/dirtree/remote/lan.desktop
+%{tde_datadir}/apps/lisa/
+%{tde_datadir}/apps/remoteview/lan.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/
+%{tde_tdedocdir}/HTML/en/lisa/
+%{tde_datadir}/services/lan.protocol
+%{tde_datadir}/services/rlan.protocol
+%{tde_bindir}/lisa
+%{tde_bindir}/reslisa
+%{tde_mandir}/man8/lisa.8*
+%{tde_mandir}/man8/reslisa.8*
+
+##########
+
+%package -n trinity-kdnssd
+Summary: Zeroconf support for TDE
+Group:			Applications/Internet
+
+%description -n trinity-kdnssd
+A tdeioslave and tded module that provide Zeroconf support. Try
+"zeroconf:/" in Konqueror.
+
+%files -n trinity-kdnssd
+%defattr(-,root,root,-)
+%{tde_datadir}/services/zeroconf.protocol
+%{tde_datadir}/services/invitation.protocol
+%{tde_datadir}/services/kded/dnssdwatcher.desktop
+%{tde_datadir}/apps/remoteview/zeroconf.desktop
+%{tde_datadir}/apps/zeroconf/_http._tcp
+%{tde_datadir}/apps/zeroconf/_ftp._tcp
+%{tde_datadir}/apps/zeroconf/_ldap._tcp
+%{tde_datadir}/apps/zeroconf/_webdav._tcp
+%{tde_datadir}/apps/zeroconf/_nfs._tcp
+%{tde_datadir}/apps/zeroconf/_ssh._tcp
+%{tde_datadir}/apps/zeroconf/_rfb._tcp
+%{tde_tdelibdir}/tdeio_zeroconf.so
+%{tde_tdelibdir}/tdeio_zeroconf.la
+%{tde_tdelibdir}/kded_dnssdwatcher.so
+%{tde_tdelibdir}/kded_dnssdwatcher.la
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+# Workaround libiw detection failure on opensuse
+%if 0%{?suse_version}
+%if 0%{?with_wifi}
+%__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|"
+%endif
+%endif
+
+# Update icons for some control center modules
+%__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Specific path for RHEL4
+if [ -d /usr/X11R6 ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_JINGLE=ON \
+  %{?with_speex:-DWITH_SPEEX=ON} \
+  -DWITH_WEBCAM=ON \
+  -DWITH_GSM=OFF \
+  -DWITH_XMMS=OFF \
+  -DWITH_ARTS=ON \
+  %{!?with_openslp:-DWITH_SLP=OFF} \
+  -DBUILD_ALL=ON \
+  -DBUILD_KOPETE_PLUGIN_ALL=ON \
+  -DBUILD_KOPETE_PROTOCOL_ALL=ON \
+  %{!?build_kopete_motionaway:-DBUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY=OFF} \
+  %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \
+  %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \
+  %{!?with_wifi:-DBUILD_WIFI=OFF} \
+  ..
+
+# Tdenetwork is not smp safe !
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Adds missing icons in 'hicolor' theme
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p %{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
+pushd %{buildroot}%{tde_datadir}/icons
+for i in {16,22,32,48}; do        %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kget.png    hicolor/"$i"x"$i"/apps/kget.png          ;done
+for i in {32,48}; do              %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krdc.png    hicolor/"$i"x"$i"/apps/krdc.png          ;done
+for i in {16,32,48}; do           %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krfb.png    hicolor/"$i"x"$i"/apps/krfb.png          ;done
+for i in {16,22,32,48,128}; do    %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/ktalkd.png  hicolor/"$i"x"$i"/apps/ktalkd.png        ;done
+for i in {16,22,32,48,64,128}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/share.png  hicolor/"$i"x"$i"/apps/kcmfileshare.png  ;done
+popd
+
+%if 0%{?with_consolehelper}
+# Run kppp through consolehelper, and rename it to 'kppp3'
+%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
+%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir}
+%__mv %{buildroot}%{tde_bindir}/kppp %{buildroot}%{tde_sbindir}/kppp3
+%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kppp3
+%if "%{tde_prefix}" != "/usr"
+%__ln_s %{tde_sbindir}/kppp3 %{?buildroot}%{_sbindir}/kppp3
+%endif
+%__mkdir_p %{buildroot}%{_sysconfdir}/security/console.apps
+cat > %{buildroot}%{_sysconfdir}/security/console.apps/kppp3 <<EOF
+USER=root
+PROGRAM=%{tde_sbindir}/kppp3
+SESSION=true
+EOF
+
+# Renames 'kppp' as 'kppp3' in launch icon
+%__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|"
+%endif
+
+# Remove setuid bit on some binaries.
+if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then
+  chmod 0755 "%{?buildroot}%{tde_bindir}/kppp"
+fi
+
+%if 0%{?with_xinetd}
+# ktalk
+%__install -p -m 0644 -D  %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
+%endif
+
+# Avoids conflict with trinity-kvirc
+%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
+
+# Icons from TDE Control Center should only be displayed in TDE
+for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
+  if grep -q "^Categories=.*X-TDE-settings" "${i}"; then
+    if ! grep -q "OnlyShowIn=TDE" "${i}" ; then
+      echo "OnlyShowIn=TDE;" >>"${i}"
+    fi
+  fi
+done
+
+# Remove unwanted doc
+%if 0%{?with_wifi} == 0
+%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/"
+%__rm -rf "%{buildroot}%{tde_tdedocdir}/HTML/en/kwifimanager/"
+%endif
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file    kcmkrfb
+%suse_update_desktop_file    fileshare
+%suse_update_desktop_file    kopete        Network  InstantMessaging
+%suse_update_desktop_file    ksirc         Network  IRCClient
+%suse_update_desktop_file    Kppp          Network  Dialup
+%suse_update_desktop_file -r kppplogview   System   Monitor
+%suse_update_desktop_file    kdict         Office   Dictionary
+%suse_update_desktop_file -r krdc          System   RemoteAccess
+%suse_update_desktop_file -r krfb          System   RemoteAccess
+%suse_update_desktop_file -r kget          System   TrayIcon
+%if 0%{?with_wifi}
+%suse_update_desktop_file -r kwifimanager  System   Network
+%suse_update_desktop_file    kcmwifi
+%endif
+%suse_update_desktop_file -u knewsticker-standalone Network  News
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%verify_permissions -e %{tde_bindir}/kppp
+%endif
+
+
+%changelog
diff --git a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc b/redhat/core/tdenetwork/trinity-tdenetwork-rpmlintrc
index 8d22f2fc6..8d22f2fc6 100644
--- a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc
+++ b/redhat/core/tdenetwork/trinity-tdenetwork-rpmlintrc
diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec
new file mode 100644
index 000000000..683e79837
--- /dev/null
+++ b/redhat/core/tdepim/tdepim.spec
@@ -0,0 +1,1937 @@
+#
+# spec file for package tdepim (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdepim
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# TDEPIM optional features
+#define		with_kitchensync 1
+
+Name:		trinity-%{tde_pkg}
+Summary:	Personal Information Management apps from the official Trinity release
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:		Applications/Productivity
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
+
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	libcaldav-devel >= %{tde_epoch}:0.6.5
+BuildRequires:	libcarddav-devel >= %{tde_epoch}:0.6.2
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	fdupes
+BuildRequires:	desktop-file-utils
+BuildRequires:	make
+
+BuildRequires:	gpgme-devel
+BuildRequires:	libgpg-error-devel
+BuildRequires:	flex
+BuildRequires:	libical-devel
+BuildRequires:	boost-devel
+BuildRequires:	pcre-devel
+BuildRequires:	libidn-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# KDEPIM specific features
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
+%define with_gnokii 1
+BuildRequires:	gnokii-devel
+%endif
+%endif
+
+
+# FLEX support
+%if 0%{?fedora} >= 15
+BuildRequires:	flex-static
+%endif
+
+# BISON support
+BuildRequires:	bison
+
+# CURL support
+BuildRequires:	curl-devel
+
+# GLIB2 support
+BuildRequires:	glib2-devel
+
+# SASL support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}sasl2-devel
+%else
+BuildRequires:	cyrus-sasl-devel
+%endif
+
+# XCOMPOSITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xcomposite-devel
+%else
+BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires:	libXcomposite-devel
+%endif
+
+# XSCREENSAVER support
+#  RHEL 4: disabled
+#  RHEL 6: available in EPEL
+#  RHEL 7: available in NUX
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 8 ) || 0%{?suse_version}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+BuildRequires:	xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires:	xscreensaver-extras-base
+%endif
+BuildRequires:	xscreensaver-gl-base
+BuildRequires:	xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-data
+BuildRequires:	xscreensaver-data-extra
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xscrnsaver-devel
+%else
+BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+%if 0%{?pclinuxos} == 0
+BuildRequires:	xscreensaver-extrusion
+%endif
+BuildRequires:	xscreensaver-gl
+%endif
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+
+Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-wizards = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kalarm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kandy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-karm = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmailcvt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmobile = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-konsolekalendar = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korn = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-ktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdepim < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdepim < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+This metapackage includes a collection of Personal Information Management
+(PIM) applications provided with the official release of Trinity.
+
+%files
+%defattr(-,root,root,-)
+
+##########
+
+%package devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries/Other
+
+Obsoletes:	tdepim-cmake < %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-akregator-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kaddressbook-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-karm-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmail-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knode-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knotes-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kode-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kontact-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korganizer-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libindex-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkgantt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkleopatra-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkmime-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimexchange-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimidentities-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libksieve-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libmimelib-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This metapackage includes all development files for TDE PIM.
+It also contains the CMAKE macros.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_datadir}/cmake/*
+
+##########
+
+%package -n trinity-akregator
+Summary:	RSS feed aggregator for TDE
+Group:		Applications/Internet
+Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-akregator
+aKregator is a fast, lightweight, and intuitive feed reader program
+for TDE.  It allows you to quickly browse through hundreds of
+thousands of internet feeds in a quick, efficient, and familiar way.
+
+%files -n trinity-akregator
+%defattr(-,root,root,-)
+%{tde_bindir}/akregator
+%{tde_tdelibdir}/libakregatorpart.la
+%{tde_tdelibdir}/libakregatorpart.so
+%{tde_tdelibdir}/libakregator_mk4storage_plugin.la
+%{tde_tdelibdir}/libakregator_mk4storage_plugin.so
+%{tde_libdir}/libakregatorprivate.so.*
+%{tde_tdeappdir}/akregator.desktop
+%{tde_datadir}/apps/akregator
+%{tde_datadir}/config.kcfg/akregator.kcfg
+%{tde_datadir}/config.kcfg/mk4config.kcfg
+%{tde_datadir}/icons/crystalsvg/*/actions/rss_tag.png
+%{tde_datadir}/icons/crystalsvg/16x16/apps/akregator_empty.png
+%{tde_datadir}/icons/hicolor/*/apps/akregator.png
+%{tde_datadir}/icons/hicolor/scalable/apps/akregator.svgz
+%{tde_datadir}/services/akregator_mk4storage_plugin.desktop
+%{tde_datadir}/services/akregator_part.desktop
+%{tde_datadir}/services/feed.protocol
+%{tde_datadir}/services/kontact/akregatorplugin*.desktop
+%{tde_datadir}/servicetypes/akregator_plugin.desktop
+%{tde_tdedocdir}/HTML/en/akregator/
+%{tde_tdedocdir}/HTML/en/tdeioslave/feed/
+
+##########
+
+%package -n trinity-akregator-devel
+Summary:	Development files for trinity-akregator
+Group:		Development/Libraries/Other
+Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-akregator-devel
+%{summary}
+
+%files -n trinity-akregator-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/akregator/
+%{tde_libdir}/libakregatorprivate.la
+%{tde_libdir}/libakregatorprivate.so
+
+##########
+
+%package -n trinity-kaddressbook
+Summary:	TDE addressbook application
+Group:		Applications/Communications
+Requires:	trinity-tdebase-tdeio-pim-plugins
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kaddressbook
+KAddressBook is the main address book application for TDE; it enables you
+to manage your contacts efficiently and comfortably. It can load and save
+your contacts to many different locations, including the local file system,
+LDAP servers, and SQL databases.
+
+%files -n trinity-kaddressbook
+%defattr(-,root,root,-)
+%{tde_bindir}/tdeabc2mutt
+%{tde_bindir}/kaddressbook
+%{tde_bindir}/tdeabcdistlistupdater
+%{tde_tdelibdir}/kcm_kabconfig.la
+%{tde_tdelibdir}/kcm_kabconfig.so
+%{tde_tdelibdir}/kcm_kabcustomfields.la
+%{tde_tdelibdir}/kcm_kabcustomfields.so
+%{tde_tdelibdir}/kcm_kabldapconfig.la
+%{tde_tdelibdir}/kcm_kabldapconfig.so
+%{tde_tdelibdir}/ldifvcardthumbnail.la
+%{tde_tdelibdir}/ldifvcardthumbnail.so
+%{tde_tdelibdir}/libkaddrbk_*.la
+%{tde_tdelibdir}/libkaddrbk_*.so
+%{tde_tdelibdir}/libkaddressbookpart.la
+%{tde_tdelibdir}/libkaddressbookpart.so
+%{tde_libdir}/libkabinterfaces.so.*
+%{tde_libdir}/libkaddressbook.so.*
+%{tde_tdeappdir}/kaddressbook.desktop
+%{tde_datadir}/apps/kaddressbook
+%{tde_datadir}/icons/hicolor/*/apps/kaddressbook.png
+%{tde_datadir}/services/kabconfig.desktop
+%{tde_datadir}/services/kabcustomfields.desktop
+%{tde_datadir}/services/kabldapconfig.desktop
+%{tde_datadir}/services/kaddressbook
+%{tde_datadir}/services/kontact/kaddressbookplugin.desktop
+%{tde_datadir}/services/tderesources/tdeabc/imap.desktop
+%{tde_datadir}/services/ldifvcardthumbnail.desktop
+%{tde_datadir}/servicetypes/dcopaddressbook.desktop
+%{tde_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop
+%{tde_datadir}/servicetypes/kaddressbookimprotocol.desktop
+%{tde_datadir}/servicetypes/kaddressbook_extension.desktop
+%{tde_datadir}/servicetypes/kaddressbook_view.desktop
+%{tde_datadir}/servicetypes/kaddressbook_xxport.desktop
+%{tde_tdedocdir}/HTML/en/kaddressbook/
+%{tde_datadir}/autostart/tdeabcdistlistupdater.desktop
+%{tde_tdeincludedir}/kaddressbook/
+%{tde_tdeincludedir}/tdeabc/
+
+##########
+
+%package -n trinity-kaddressbook-devel
+Summary:	Development files for trinity-kaddressbook
+Group:		Development/Libraries/Other
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kaddressbook-devel
+%{summary}
+
+%files -n trinity-kaddressbook-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkabinterfaces.la
+%{tde_libdir}/libkabinterfaces.so
+%{tde_libdir}/libkaddressbook.la
+%{tde_libdir}/libkaddressbook.so
+
+##########
+
+%package -n trinity-kalarm
+Summary:	Trinity alarm message, command and email scheduler
+Group:		Applications/Communications
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kalarm
+KAlarm provides a graphical interface to schedule personal timed events -
+pop-up alarm messages, command execution and sending emails. There is a
+range of options for configuring recurring events.
+
+A pop-up alarm can show either a simple text message, or the contents of a
+text or image file, It can optionally be spoken, or play a sound file. You
+can choose its appearance, and set reminders. Among KAlarm's other
+facilities, you can set up templates to allow KAlarm to be used as a 'tea
+timer'.
+
+As an alternative to using the graphical interface, alarms can be scheduled
+from the command line or via DCOP calls from other programs. KAlarm is
+TDE-based, but will also run on other desktops.
+
+%files -n trinity-kalarm
+%defattr(-,root,root,-)
+%{tde_bindir}/kalarm
+%{tde_bindir}/kalarmd
+%{tde_tdeappdir}/kalarm.desktop
+%{tde_datadir}/applnk/.hidden/kalarmd.desktop
+%{tde_datadir}/applnk/Applications/kalarm.desktop
+%{tde_datadir}/apps/kalarm
+%{tde_datadir}/autostart/kalarm.tray.desktop
+%{tde_datadir}/autostart/kalarmd.autostart.desktop
+%{tde_datadir}/icons/crystalsvg/*/actions/kalarm.png
+%{tde_datadir}/icons/hicolor/*/apps/kalarm.png
+%{tde_tdedocdir}/HTML/en/kalarm/
+
+##########
+
+%package -n trinity-kandy
+Summary:	Trinity mobile phone utility
+Group:		Applications/Communications
+
+%description -n trinity-kandy
+At the moment Kandy is more or less a terminal program with some special
+features to store commands and their parameters, but is also has a simple GUI
+to access the phone book of a mobile phone and it is able to save this phone
+book to the TDE address book.
+
+Kandy is aimed at mobile phones with integrated (GSM) modems.
+
+%files -n trinity-kandy
+%defattr(-,root,root,-)
+%{tde_bindir}/kandy
+%{tde_bindir}/kandy_client
+%{tde_tdeappdir}/kandy.desktop
+%{tde_datadir}/applnk/Utilities/kandy.desktop
+%{tde_datadir}/apps/kandy/
+%{tde_datadir}/icons/crystalsvg/*/apps/kandy.png
+%{tde_datadir}/icons/hicolor/*/apps/kandy.png
+%{tde_datadir}/config.kcfg/kandy.kcfg
+%{tde_tdedocdir}/HTML/en/kandy/
+
+##########
+
+%package -n trinity-karm
+Summary:	Trinity time tracker tool
+Group:		Applications/Productivity
+
+%description -n trinity-karm
+KArm is a time tracker for busy people who need to keep track of the amount of
+time they spend on various tasks.
+
+%files -n trinity-karm
+%defattr(-,root,root,-)
+%{tde_bindir}/karm
+%{tde_libdir}/libkarm.so.*
+%{tde_tdelibdir}/libkarmpart.la
+%{tde_tdelibdir}/libkarmpart.so
+%{tde_tdeappdir}/karm.desktop
+%{tde_datadir}/applnk/Utilities/karm.desktop
+%{tde_datadir}/apps/karm/
+%{tde_datadir}/apps/karmpart/
+%{tde_datadir}/icons/hicolor/*/apps/karm.png
+%{tde_datadir}/services/karm_part.desktop
+%{tde_datadir}/services/kontact/karmplugin.desktop
+%{tde_tdedocdir}/HTML/en/karm/
+
+##########
+
+%package -n trinity-karm-devel
+Summary:	Development files for karm
+Group:		Development/Libraries/Other
+
+%description -n trinity-karm-devel
+%{summary}
+
+%files -n trinity-karm-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkarm.so
+%{tde_libdir}/libkarm.la
+
+##########
+
+%package kfile-plugins
+Summary:	TDE File dialog plugins for palm and vcf files
+Group:		Environment/Libraries
+
+Obsoletes:	tdepim-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description kfile-plugins
+File dialog plugins for palm and vcf files.
+
+%files kfile-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/tdefile_ics.la
+%{tde_tdelibdir}/tdefile_ics.so
+%{tde_tdelibdir}/tdefile_vcf.la
+%{tde_tdelibdir}/tdefile_vcf.so
+%{tde_datadir}/services/tdefile_ics.desktop
+%{tde_datadir}/services/tdefile_vcf.desktop
+
+##########
+
+%package tdeio-plugins
+Summary:	Trinity PIM I/O Slaves
+Group:		Environment/Libraries
+
+Obsoletes:	tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdepim-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tdeio-plugins
+This package includes the pim kioslaves. This includes imap4, sieve,
+and mbox.
+
+%files tdeio-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/tdeio_groupwise.la
+%{tde_tdelibdir}/tdeio_groupwise.so
+%{tde_tdelibdir}/tdeio_imap4.la
+%{tde_tdelibdir}/tdeio_imap4.so
+%{tde_tdelibdir}/tdeio_mbox.la
+%{tde_tdelibdir}/tdeio_mbox.so
+%{tde_tdelibdir}/tdeio_scalix.la
+%{tde_tdelibdir}/tdeio_scalix.so
+%{tde_tdelibdir}/tdeio_sieve.la
+%{tde_tdelibdir}/tdeio_sieve.so
+%{tde_datadir}/services/groupwise.protocol
+%{tde_datadir}/services/groupwises.protocol
+%{tde_datadir}/services/imap4.protocol
+%{tde_datadir}/services/imaps.protocol
+%{tde_datadir}/services/mbox.protocol
+%{tde_datadir}/services/scalix.protocol
+%{tde_datadir}/services/scalixs.protocol
+%{tde_datadir}/services/sieve.protocol
+%{tde_tdedocdir}/HTML/en/tdeioslave/groupwise/
+%{tde_tdedocdir}/HTML/en/tdeioslave/mbox/
+%{tde_tdedocdir}/HTML/en/tdeioslave/scalix/
+
+##########
+
+%package tderesources
+Summary:	Trinity pim resource plugins
+Group:		Environment/Libraries
+#Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libcaldav
+Requires:	libcarddav
+
+Obsoletes:	tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdepim-kresources = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tderesources
+This package includes several plugins needed to interface with groupware
+servers. It also includes plugins for features such as blogging and
+tracking feature plans.
+
+%files tderesources
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcal_caldav.la
+%{tde_tdelibdir}/kcal_caldav.so
+%{tde_tdelibdir}/kcal_groupdav.la
+%{tde_tdelibdir}/kcal_groupdav.so
+%{tde_tdelibdir}/kcal_groupwise.la
+%{tde_tdelibdir}/kcal_groupwise.so
+%{tde_tdelibdir}/kcal_kolab.la
+%{tde_tdelibdir}/kcal_kolab.so
+%{tde_tdelibdir}/kcal_scalix.la
+%{tde_tdelibdir}/kcal_scalix.so
+%{tde_tdelibdir}/kcal_newexchange.la
+%{tde_tdelibdir}/kcal_newexchange.so
+%{tde_tdelibdir}/kcal_resourcefeatureplan.la
+%{tde_tdelibdir}/kcal_resourcefeatureplan.so
+%{tde_tdelibdir}/kcal_slox.la
+%{tde_tdelibdir}/kcal_slox.so
+%{tde_tdelibdir}/kcal_xmlrpc.la
+%{tde_tdelibdir}/kcal_xmlrpc.so
+%{tde_tdelibdir}/knotes_kolab.la
+%{tde_tdelibdir}/knotes_kolab.so
+%{tde_tdelibdir}/knotes_scalix.la
+%{tde_tdelibdir}/knotes_scalix.so
+%{tde_tdelibdir}/knotes_xmlrpc.la
+%{tde_tdelibdir}/knotes_xmlrpc.so
+%{tde_libdir}/libtdeabckolab.so.*
+%{tde_libdir}/libtdeabcscalix.so.*
+%{tde_libdir}/libtdeabc_groupdav.so.*
+%{tde_libdir}/libtdeabc_groupwise.so.*
+%{tde_libdir}/libtdeabc_newexchange.so.*
+%{tde_libdir}/libtdeabc_slox.so.*
+%{tde_libdir}/libtdeabc_xmlrpc.so.*
+%{tde_libdir}/libkcalkolab.so.*
+%{tde_libdir}/libkcalscalix.so.*
+%{tde_libdir}/libkcal_caldav.so.*
+%{tde_libdir}/libtdeabc_carddav.so.*
+%{tde_libdir}/libkcal_groupdav.so.*
+%{tde_libdir}/libkcal_groupwise.so.*
+%{tde_libdir}/libkcal_newexchange.so.*
+%{tde_libdir}/libkcal_resourcefeatureplan.so.*
+%{tde_libdir}/libkcal_slox.so.*
+%{tde_libdir}/libkcal_xmlrpc.so.*
+%{tde_libdir}/libkgroupwarebase.so.*
+%{tde_libdir}/libkgroupwaredav.so.*
+%{tde_libdir}/libknoteskolab.so.*
+%{tde_libdir}/libknotesscalix.so.*
+%{tde_libdir}/libknotes_xmlrpc.so.*
+%{tde_libdir}/libkslox.so.*
+%{tde_libdir}/libgwsoap.so.*
+%{tde_datadir}/services/tderesources/tdeabc/tdeabc_groupdav.desktop
+%{tde_datadir}/services/tderesources/tdeabc/tdeabc_groupwise.desktop
+%{tde_datadir}/services/tderesources/tdeabc/tdeabc_newexchange.desktop
+%{tde_datadir}/services/tderesources/tdeabc/tdeabc_opengroupware.desktop
+%{tde_datadir}/services/tderesources/tdeabc/tdeabc_ox.desktop
+%{tde_datadir}/services/tderesources/tdeabc/tdeabc_slox.desktop
+%{tde_datadir}/services/tderesources/tdeabc/tdeabc_xmlrpc.desktop
+%{tde_datadir}/services/tderesources/tdeabc/kolab.desktop
+%{tde_datadir}/services/tderesources/tdeabc/scalix.desktop
+%dir %{tde_datadir}/services/tderesources/kcal
+%{tde_datadir}/services/tderesources/kcal/exchange.desktop
+%{tde_datadir}/services/tderesources/kcal/kcal_caldav.desktop
+%{tde_datadir}/services/tderesources/tdeabc/tdeabc_carddav.desktop
+%{tde_datadir}/services/tderesources/kcal/kcal_groupdav.desktop
+%{tde_datadir}/services/tderesources/kcal/kcal_groupwise.desktop
+%{tde_datadir}/services/tderesources/kcal/kcal_newexchange.desktop
+%{tde_datadir}/services/tderesources/kcal/kcal_opengroupware.desktop
+%{tde_datadir}/services/tderesources/kcal/kcal_ox.desktop
+%{tde_datadir}/services/tderesources/kcal/kcal_resourcefeatureplan.desktop
+%{tde_datadir}/services/tderesources/kcal/kcal_slox.desktop
+%{tde_datadir}/services/tderesources/kcal/kcal_xmlrpc.desktop
+%{tde_datadir}/services/tderesources/kcal/kolab.desktop
+%{tde_datadir}/services/tderesources/kcal/scalix.desktop
+%dir %{tde_datadir}/services/tderesources/knotes
+%{tde_datadir}/services/tderesources/knotes/knotes_xmlrpc.desktop
+%{tde_datadir}/services/tderesources/knotes/kolabresource.desktop
+%{tde_datadir}/services/tderesources/knotes/scalix.desktop
+
+%{tde_datadir}/apps/tdeconf_update/upgrade-resourcetype.pl
+%{tde_datadir}/apps/tdeconf_update/kolab-resource.upd
+
+%{tde_tdelibdir}/tdeabc_carddav.la
+%{tde_tdelibdir}/tdeabc_carddav.so
+%{tde_tdelibdir}/tdeabc_groupdav.la
+%{tde_tdelibdir}/tdeabc_groupdav.so
+%{tde_tdelibdir}/tdeabc_groupwise.la
+%{tde_tdelibdir}/tdeabc_groupwise.so
+%{tde_tdelibdir}/tdeabc_kolab.la
+%{tde_tdelibdir}/tdeabc_kolab.so
+%{tde_tdelibdir}/tdeabc_newexchange.la
+%{tde_tdelibdir}/tdeabc_newexchange.so
+%{tde_tdelibdir}/tdeabc_scalix.la
+%{tde_tdelibdir}/tdeabc_scalix.so
+%{tde_tdelibdir}/tdeabc_slox.la
+%{tde_tdelibdir}/tdeabc_slox.so
+%{tde_tdelibdir}/tdeabc_xmlrpc.la
+%{tde_tdelibdir}/tdeabc_xmlrpc.so
+
+##########
+
+%package tderesources-devel
+Summary:	Development files for tderesources
+Group:		Development/Libraries/Other
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libcaldav
+Requires:	libcarddav
+
+Obsoletes:	tdepim-tderesources-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-tdepim-kresources-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdepim-kresources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tderesources-devel
+%{summary}
+
+%files tderesources-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkslox.la
+%{tde_libdir}/libkslox.so
+%{tde_libdir}/libtdeabc_groupdav.la
+%{tde_libdir}/libtdeabc_groupdav.so
+%{tde_libdir}/libtdeabc_groupwise.la
+%{tde_libdir}/libtdeabc_groupwise.so
+%{tde_libdir}/libgwsoap.la
+%{tde_libdir}/libgwsoap.so
+%{tde_libdir}/libtdeabc_carddav.la
+%{tde_libdir}/libtdeabc_carddav.so
+%{tde_libdir}/libtdeabc_newexchange.la
+%{tde_libdir}/libtdeabc_newexchange.so
+%{tde_libdir}/libtdeabc_slox.la
+%{tde_libdir}/libtdeabc_slox.so
+%{tde_libdir}/libtdeabc_xmlrpc.la
+%{tde_libdir}/libtdeabc_xmlrpc.so
+%{tde_libdir}/libtdeabckolab.la
+%{tde_libdir}/libtdeabckolab.so
+%{tde_libdir}/libtdeabcscalix.la
+%{tde_libdir}/libtdeabcscalix.so
+%{tde_libdir}/libkcal_caldav.la
+%{tde_libdir}/libkcal_caldav.so
+%{tde_libdir}/libkcal_groupdav.la
+%{tde_libdir}/libkcal_groupdav.so
+%{tde_libdir}/libkcal_groupwise.la
+%{tde_libdir}/libkcal_groupwise.so
+%{tde_libdir}/libkcal_newexchange.la
+%{tde_libdir}/libkcal_newexchange.so
+%{tde_libdir}/libkcal_resourcefeatureplan.la
+%{tde_libdir}/libkcal_resourcefeatureplan.so
+%{tde_libdir}/libkcal_slox.la
+%{tde_libdir}/libkcal_slox.so
+%{tde_libdir}/libkcal_xmlrpc.la
+%{tde_libdir}/libkcal_xmlrpc.so
+%{tde_libdir}/libkcalkolab.la
+%{tde_libdir}/libkcalkolab.so
+%{tde_libdir}/libkcalscalix.la
+%{tde_libdir}/libkcalscalix.so
+%{tde_libdir}/libkgroupwarebase.la
+%{tde_libdir}/libkgroupwarebase.so
+%{tde_libdir}/libkgroupwaredav.la
+%{tde_libdir}/libkgroupwaredav.so
+%{tde_libdir}/libknotes_xmlrpc.la
+%{tde_libdir}/libknotes_xmlrpc.so
+%{tde_libdir}/libknoteskolab.la
+%{tde_libdir}/libknoteskolab.so
+%{tde_libdir}/libknotesscalix.la
+%{tde_libdir}/libknotesscalix.so
+%{tde_tdeincludedir}/kpimprefs.h
+
+##########
+
+%package wizards
+Summary:	Trinity server configuration wizards
+Group:		Applications/Communications
+
+Obsoletes:	tdepim-wizards < %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description wizards
+This package contains TDE-based wizards for configuring eGroupware,
+Kolab, and SUSE Linux Openexchange servers.
+
+%files wizards
+%defattr(-,root,root,-)
+%{tde_bindir}/egroupwarewizard
+%{tde_bindir}/exchangewizard
+%{tde_bindir}/groupwarewizard
+%{tde_bindir}/groupwisewizard
+%{tde_bindir}/kolabwizard
+%{tde_bindir}/scalixadmin
+%{tde_bindir}/scalixwizard
+%{tde_bindir}/sloxwizard
+%{tde_tdelibdir}/libegroupwarewizard.la
+%{tde_tdelibdir}/libegroupwarewizard.so
+%{tde_tdelibdir}/libexchangewizard.la
+%{tde_tdelibdir}/libexchangewizard.so
+%{tde_tdelibdir}/libgroupwisewizard.la
+%{tde_tdelibdir}/libgroupwisewizard.so
+%{tde_tdelibdir}/libkolabwizard.la
+%{tde_tdelibdir}/libkolabwizard.so
+%{tde_tdelibdir}/libscalixwizard.la
+%{tde_tdelibdir}/libscalixwizard.so
+%{tde_tdelibdir}/libsloxwizard.la
+%{tde_tdelibdir}/libsloxwizard.so
+%{tde_tdeappdir}/groupwarewizard.desktop
+%{tde_datadir}/config.kcfg/egroupware.kcfg
+%{tde_datadir}/config.kcfg/groupwise.kcfg
+%{tde_datadir}/config.kcfg/kolab.kcfg
+%{tde_datadir}/config.kcfg/scalix.kcfg
+%{tde_datadir}/config.kcfg/slox.kcfg
+
+##########
+
+%if 0%{?with_kitchensync}
+%package -n trinity-kitchensync
+Summary:	Synchronization framework
+Group:		Applications/Communications
+BuildRequires:	opensync-devel
+#Suggests: konqueror-trinity
+#Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity
+
+%description -n trinity-kitchensync
+This package contains a synchronization framework, still under heavy
+development (?).  Kitchensync uses opensync.
+
+%files -n trinity-kitchensync
+%defattr(-,root,root,-)
+%{tde_bindir}/kitchensync
+%{tde_tdelibdir}/libkitchensyncpart.la
+%{tde_tdelibdir}/libkitchensyncpart.so
+%{tde_datadir}/apps/kitchensync
+%{tde_libdir}/libkitchensync.so.*
+%{tde_libdir}/libqopensync.so.*
+%{tde_tdeappdir}/kitchensync.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kitchensync.png
+%endif
+
+##########
+
+%package -n trinity-kleopatra
+Summary:	Trinity Certificate Manager
+Group:		Applications/Communications
+
+# GPG support
+%if 0%{?suse_version}
+Requires:	gpg2
+%endif
+%if 0%{?rhel} == 4
+Requires:	gnupg
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+Requires:	gnupg2
+%endif
+
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+Requires:	pinentry
+Requires:	dirmngr
+%endif
+
+%description -n trinity-kleopatra
+Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
+keybox and for retrieving certificates from LDAP servers.
+
+%files -n trinity-kleopatra
+%defattr(-,root,root,-)
+%{tde_bindir}/kleopatra
+%{tde_bindir}/kwatchgnupg
+%{tde_tdelibdir}/kcm_kleopatra.la
+%{tde_tdelibdir}/kcm_kleopatra.so
+%{tde_tdeappdir}/kleopatra_import.desktop
+%{tde_datadir}/apps/kleopatra
+%{tde_datadir}/apps/kwatchgnupg
+%{tde_datadir}/services/kleopatra_config_*.desktop
+%{tde_tdeappdir}/kleopatra.desktop
+%{tde_tdedocdir}/HTML/en/kleopatra/
+%{tde_tdedocdir}/HTML/en/kwatchgnupg/
+%{tde_datadir}/icons/hicolor/*/apps/kleopatra.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kleopatra.svgz
+
+##########
+
+%package -n trinity-kmail
+Summary:	Trinity Email client
+Group:		Applications/Communications
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
+
+# GPG support
+%if 0%{?suse_version}
+Requires:	gpg2
+%endif
+%if 0%{?rhel} == 4
+Requires:	gnupg
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+Requires:	gnupg2
+%endif
+
+# Pinentry
+%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+Requires:	pinentry
+%endif
+
+Requires:	procmail
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
+
+Provides: imap-client, mail-reader
+
+%description -n trinity-kmail
+KMail is a fully-featured email client that fits nicely into the TDE
+desktop. It has features such as support for IMAP, POP3, multiple accounts,
+mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
+
+You need to install %{name}-tdeio-plugins if you want to use IMAP or
+mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3.
+
+%files -n trinity-kmail
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/kmail.antispamrc
+%config(noreplace) %{tde_confdir}/kmail.antivirusrc
+%{tde_bindir}/kmail
+%{tde_bindir}/kmail_*.sh
+%{tde_tdelibdir}/kcm_kmail.la
+%{tde_tdelibdir}/kcm_kmail.so
+%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.la
+%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.so
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.la
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.so
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.la
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.so
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.la
+%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.so
+%{tde_tdelibdir}/libkmailpart.la
+%{tde_tdelibdir}/libkmailpart.so
+%{tde_tdeappdir}/KMail.desktop
+%{tde_tdeappdir}/kmail_view.desktop
+%{tde_datadir}/apps/tdeconf_update/kmail-3.1-update-new-mail-notification-settings.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.1-use-UOID-for-identities.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.2-misc.sh
+%{tde_datadir}/apps/tdeconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
+%{tde_datadir}/apps/tdeconf_update/kmail-3.3-aegypten.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.3-misc.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.3-move-identities.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.3-split-sign-encr-keys.sh
+%{tde_datadir}/apps/tdeconf_update/kmail-3.3-use-ID-for-accounts.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.3b1-misc.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.4-misc.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.4.1-update-status-filters.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.5-trigger-flag-migration.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-3.5-filter-icons.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-pgpidentity.pl
+%{tde_datadir}/apps/tdeconf_update/kmail-upd-identities.pl
+%{tde_datadir}/apps/tdeconf_update/kmail.upd
+%{tde_datadir}/apps/tdeconf_update/upgrade-signature.pl
+%{tde_datadir}/apps/tdeconf_update/upgrade-transport.pl
+%{tde_datadir}/apps/kmail
+%{tde_datadir}/apps/konqueror/servicemenus/email.desktop
+%{tde_datadir}/config.kcfg/custommimeheader.kcfg
+%{tde_datadir}/config.kcfg/kmail.kcfg
+%{tde_datadir}/config.kcfg/customtemplates_kfg.kcfg
+%{tde_datadir}/config.kcfg/replyphrases.kcfg
+%{tde_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/kmaillight.png
+%{tde_datadir}/icons/hicolor/*/apps/kmail.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kmail.svgz
+%{tde_datadir}/services/kmail_config_*.desktop
+%{tde_datadir}/services/kontact/kmailplugin.desktop
+%{tde_datadir}/servicetypes/dcopimap.desktop
+%{tde_datadir}/servicetypes/dcopmail.desktop
+# 'libkmailprivate.so' is required at runtime, not devel !
+%{tde_libdir}/libkmailprivate.so
+%{tde_libdir}/libkmailprivate.la
+%{tde_tdedocdir}/HTML/en/kmail/
+
+##########
+
+%package -n trinity-kmail-devel
+Summary:	Development files for kmail
+Group:		Development/Libraries/Other
+
+%description -n trinity-kmail-devel
+%{summary}
+
+%files -n trinity-kmail-devel
+%defattr(-,root,root,-)
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kmail/
+%{tde_tdeincludedir}/kmail*.h
+
+##########
+ 
+%package -n trinity-kmailcvt
+Summary:	Trinity KMail mail folder converter
+Group:		Applications/Communications
+Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kmailcvt
+Converts mail folders to KMail format.  Formats supported for import
+include Outlook Express, Evolution, and plain mbox.
+
+%files -n trinity-kmailcvt
+%defattr(-,root,root,-)
+%{tde_bindir}/kmailcvt
+%{tde_datadir}/applnk/Utilities/kmailcvt.desktop
+%{tde_datadir}/apps/kmailcvt
+%{tde_datadir}/icons/crystalsvg/*/apps/kmailcvt.png
+
+##########
+
+%package -n trinity-knode
+Summary:	Trinity news reader
+Group:		Applications/Internet
+
+%description -n trinity-knode
+KNode is an easy-to-use, convenient newsreader. It is intended to be usable
+by inexperienced users, but also includes support for such features as
+MIME attachments, article scoring, and creating and verifying GnuPG
+signatures.
+
+%files -n trinity-knode
+%defattr(-,root,root,-)
+%{tde_bindir}/knode
+%{tde_tdelibdir}/kcm_knode.la
+%{tde_tdelibdir}/kcm_knode.so
+%{tde_tdelibdir}/libknodepart.la
+%{tde_tdelibdir}/libknodepart.so
+%{tde_libdir}/libknodecommon.so.*
+%{tde_tdeappdir}/KNode.desktop
+%{tde_datadir}/apps/knode/
+%{tde_datadir}/icons/hicolor/*/apps/knode.png
+%{tde_datadir}/icons/hicolor/*/apps/knode2.png
+%{tde_datadir}/services/knewsservice.protocol
+%{tde_datadir}/services/knode_config_*.desktop
+%{tde_datadir}/services/kontact/knodeplugin.desktop
+%{tde_tdedocdir}/HTML/en/knode/
+
+##########
+
+%package -n trinity-knode-devel
+Summary:	Development files for trinity-knode
+Group:		Development/Libraries/Other
+Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-knode-devel
+%{summary}
+
+%files -n trinity-knode-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libknodecommon.la
+%{tde_libdir}/libknodecommon.so
+
+##########
+
+%package -n trinity-knotes
+Summary:	Trinity sticky notes
+Group:		Applications/Utilities
+Requires:	trinity-tdepim-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-knotes
+KNotes is a program that lets you write sticky notes. The notes are saved
+automatically when you exit the program, and they display when you open the
+program.  The program supports printing and mailing your notes.
+
+%files -n trinity-knotes
+%defattr(-,root,root,-)
+%{tde_bindir}/knotes
+%{tde_tdelibdir}/knotes_local.la
+%{tde_tdelibdir}/knotes_local.so
+%{tde_libdir}/libknotes.so.*
+%{tde_tdeappdir}/knotes.desktop
+%{tde_datadir}/apps/knotes/
+%{tde_datadir}/config.kcfg/knoteconfig.kcfg
+%{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/knotes.png
+%{tde_datadir}/services/tderesources/knotes/imap.desktop
+%{tde_datadir}/services/tderesources/knotes/local.desktop
+%{tde_datadir}/services/tderesources/knotes_manager.desktop
+%{tde_datadir}/services/kontact/knotesplugin.desktop
+%{tde_tdedocdir}/HTML/en/knotes/
+
+##########
+
+%package -n trinity-knotes-devel
+Summary:	Development files for knots
+Group:		Development/Libraries/Other
+Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-knotes-devel
+%{summary}
+
+%files -n trinity-knotes-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libknotes.so
+%{tde_libdir}/libknotes.la
+%{tde_tdeincludedir}/KNotesAppIface.h
+%{tde_tdeincludedir}/KNotesIface.h
+
+##########
+
+%package -n trinity-kode
+Summary:	Helper library for programmatic generation of C++ code
+Group:		Development/Libraries
+
+%description -n trinity-kode
+This package includes a program kode for generation of C++ template files
+and kxml_compiler for generation of C++ classes representing XML data
+described by RelaxNG schemes.
+
+%files -n trinity-kode
+%defattr(-,root,root,-)
+%{tde_bindir}/kode
+%{tde_bindir}/kxml_compiler
+%{tde_libdir}/libkode.so.*
+
+##########
+
+%package -n trinity-kode-devel
+Summary:	Development files for trinity-kode
+Group:		Development/Libraries/Other
+Requires:	trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kode-devel
+%{summary}
+
+%files -n trinity-kode-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkode.la
+%{tde_libdir}/libkode.so
+
+##########
+
+%package -n trinity-konsolekalendar
+Summary:	Trinity konsole personal organizer
+Group:		Applications/Productivity
+
+%description -n trinity-konsolekalendar
+KonsoleKalendar is a command-line interface to TDE calendars.
+Konsolekalendar complements the TDE KOrganizer by providing a console
+frontend to manage your calendars.
+
+%files -n trinity-konsolekalendar
+%defattr(-,root,root,-)
+%{tde_bindir}/konsolekalendar
+%{tde_tdeappdir}/konsolekalendar.desktop
+%{tde_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png
+%{tde_tdedocdir}/HTML/en/konsolekalendar/
+
+##########
+
+%package -n trinity-kontact
+Summary:	Trinity pim application
+Group:		Applications/Communications
+Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kontact
+Kontact is the integrated solution to your personal information management
+needs. It combines TDE applications like KMail, KOrganizer, and
+KAddressBook into a single interface to provide easy access to mail,
+scheduling, address book and other PIM functionality.
+
+%files -n trinity-kontact
+%defattr(-,root,root,-)
+%{tde_bindir}/kontact
+%{tde_tdelibdir}/kcm_kmailsummary.la
+%{tde_tdelibdir}/kcm_kmailsummary.so
+%{tde_tdelibdir}/kcm_kontact.la
+%{tde_tdelibdir}/kcm_kontact.so
+%{tde_tdelibdir}/kcm_kontactknt.la
+%{tde_tdelibdir}/kcm_kontactknt.so
+%{tde_tdelibdir}/kcm_kontactsummary.la
+%{tde_tdelibdir}/kcm_kontactsummary.so
+%{tde_tdelibdir}/kcm_korgsummary.la
+%{tde_tdelibdir}/kcm_korgsummary.so
+%{tde_tdelibdir}/kcm_sdsummary.la
+%{tde_tdelibdir}/kcm_sdsummary.so
+%{tde_tdelibdir}/libkontact_*.la
+%{tde_tdelibdir}/libkontact_*.so
+%{tde_libdir}/libkontact.so.*
+%{tde_libdir}/libkpinterfaces.so.*
+%{tde_tdeappdir}/Kontact.desktop
+%{tde_tdeappdir}/kontactdcop.desktop
+%{tde_datadir}/apps/kontact/
+%{tde_datadir}/apps/kontactsummary/
+%{tde_datadir}/config.kcfg/kontact.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kontact.png
+%{tde_datadir}/icons/crystalsvg/*/actions/kontact_*.png
+%{tde_datadir}/services/kcmkmailsummary.desktop
+%{tde_datadir}/services/kcmkontactknt.desktop
+%{tde_datadir}/services/kcmkontactsummary.desktop
+%{tde_datadir}/services/kcmkorgsummary.desktop
+%{tde_datadir}/services/kcmsdsummary.desktop
+%dir %{tde_datadir}/services/kontact
+%{tde_datadir}/services/kontact/newstickerplugin.desktop
+%{tde_datadir}/services/kontact/specialdatesplugin.desktop
+%{tde_datadir}/services/kontact/summaryplugin.desktop
+%{tde_datadir}/services/kontact/weatherplugin.desktop
+%{tde_datadir}/services/kontactconfig.desktop
+%{tde_datadir}/servicetypes/kontactplugin.desktop
+%{tde_tdedocdir}/HTML/en/kontact/
+
+##########
+
+%package -n trinity-kontact-devel
+Summary:	Development files for kontact
+Group:		Development/Libraries/Other
+Requires:	trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kontact-devel
+%{summary}
+
+%files -n trinity-kontact-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkontact.la
+%{tde_libdir}/libkontact.so
+%{tde_libdir}/libkpinterfaces.la
+%{tde_libdir}/libkpinterfaces.so
+%{tde_tdeincludedir}/kontact/
+
+##########
+
+%package -n trinity-korganizer
+Summary:	Trinity personal organizer
+Group:		Applications/Productivity
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	perl
+
+%description -n trinity-korganizer
+This package contains KOrganizer, a calendar and scheduling program.
+
+KOrganizer aims to be a complete program for organizing appointments,
+contacts, projects, etc. KOrganizer natively supports information interchange
+with other calendar applications, through the industry standard vCalendar
+personal data interchange file format. This eases the move from other
+modern PIMs to KOrganizer.
+
+KOrganizer offers full synchronization with Palm Pilots, if kpilot is
+installed.
+
+%files -n trinity-korganizer
+%defattr(-,root,root,-)
+%{tde_bindir}/ical2vcal
+%{tde_bindir}/korgac
+%{tde_bindir}/korganizer
+%{tde_tdelibdir}/kcm_korganizer.la
+%{tde_tdelibdir}/kcm_korganizer.so
+%{tde_tdelibdir}/libkorg_*.la
+%{tde_tdelibdir}/libkorg_*.so
+%{tde_tdelibdir}/libkorganizerpart.la
+%{tde_tdelibdir}/libkorganizerpart.so
+%{tde_libdir}/libkocorehelper.so.*
+%{tde_libdir}/libkorg_stdprinting.so.*
+%{tde_libdir}/libkorganizer.so.*
+%{tde_libdir}/libkorganizer_calendar.so.*
+%{tde_libdir}/libkorganizer_eventviewer.so.*
+%{tde_tdeappdir}/korganizer.desktop
+%{tde_datadir}/apps/tdeconf_update/korganizer.upd
+%{tde_datadir}/apps/korgac/
+%{tde_datadir}/apps/korganizer/
+%{tde_datadir}/autostart/korgac.desktop
+%{tde_datadir}/config.kcfg/korganizer.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/korganizer.png
+%dir %{tde_datadir}/services/kontact
+%{tde_datadir}/services/kontact/korganizerplugin.desktop
+%{tde_datadir}/services/kontact/journalplugin.desktop
+%{tde_datadir}/services/kontact/todoplugin.desktop
+%{tde_datadir}/services/korganizer_*.desktop
+%{tde_datadir}/services/korganizer
+%{tde_datadir}/services/webcal.protocol
+%{tde_datadir}/servicetypes/calendardecoration.desktop
+%{tde_datadir}/servicetypes/calendarplugin.desktop
+%{tde_datadir}/servicetypes/dcopcalendar.desktop
+%{tde_datadir}/servicetypes/korganizerpart.desktop
+%{tde_datadir}/servicetypes/korgprintplugin.desktop
+%{tde_tdedocdir}/HTML/en/korganizer/
+%{tde_tdedocdir}/HTML/en/tdeioslave/webcal/
+
+##########
+
+%package -n trinity-korganizer-devel
+Summary:	Development files for korganizer
+Group:		Development/Libraries/Other
+Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-korganizer-devel
+%{summary}
+
+%files -n trinity-korganizer-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/korganizer/
+%{tde_tdeincludedir}/calendar/
+%{tde_libdir}/libkocorehelper.la
+%{tde_libdir}/libkocorehelper.so
+%{tde_libdir}/libkorg_stdprinting.la
+%{tde_libdir}/libkorg_stdprinting.so
+%{tde_libdir}/libkorganizer.la
+%{tde_libdir}/libkorganizer.so
+%{tde_libdir}/libkorganizer_calendar.la
+%{tde_libdir}/libkorganizer_calendar.so
+%{tde_libdir}/libkorganizer_eventviewer.la
+%{tde_libdir}/libkorganizer_eventviewer.so
+
+##########
+
+%package -n trinity-korn
+Summary:	Trinity mail checker
+Group:		Applications/Communications
+Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-korn
+Korn is a TDE mail checker that can display a small summary in the Kicker
+tray.  It supports checking mbox, pop3, imap4, and nntp sources.
+
+Once mail is received you can have Korn run a third party program or change
+the color/icon of the Kicker display.  In addition to this you can have
+Korn run a program once you click on the docked icon in Kicker.
+
+%files -n trinity-korn
+%defattr(-,root,root,-)
+%{tde_bindir}/korn
+%{tde_libdir}/tdeconf_update_bin/korn-3-4-config_change
+%{tde_tdeappdir}/KOrn.desktop
+%{tde_datadir}/apps/tdeconf_update/korn-3-4-config_change.upd
+%{tde_datadir}/apps/tdeconf_update/korn-3-5-metadata-update.pl
+%{tde_datadir}/apps/tdeconf_update/korn-3-5-ssl-update.pl
+%{tde_datadir}/apps/tdeconf_update/korn-3-5-update.upd
+%{tde_datadir}/icons/hicolor/*/apps/korn.png
+%{tde_tdedocdir}/HTML/en/korn/
+
+##########
+
+%package -n trinity-ktnef
+Summary:	Trinity TNEF viewer
+Group:		Applications/Communications
+
+%description -n trinity-ktnef
+The TNEF File Viewer allows you to handle mail attachments using the TNEF
+format. These attachments are usually found in mails coming from Microsoft
+mail servers and embed the mail properties as well as the actual attachments.
+
+%files -n trinity-ktnef
+%defattr(-,root,root,-)
+%{tde_bindir}/ktnef
+%{tde_tdeappdir}/ktnef.desktop
+%{tde_datadir}/apps/ktnef
+%{tde_datadir}/icons/hicolor/*/apps/ktnef.png
+%{tde_datadir}/icons/locolor/*/apps/ktnef.png
+%{tde_datadir}/mimelnk/application/ms-tnef.desktop
+%{tde_tdedocdir}/HTML/en/ktnef/
+
+##########
+
+%package -n trinity-libindex
+Summary:	Trinity indexing library
+Group:		Environment/Libraries
+
+%description -n trinity-libindex
+This library provides text indexing and is currently used by KMail
+to implement fast searches in mail bodies.
+
+This is the runtime package for programs that use the libindex library.
+
+%files -n trinity-libindex
+%defattr(-,root,root,-)
+%{tde_libdir}/libindex.so.*
+
+##########
+
+%package -n trinity-libindex-devel
+Summary:	Trinity indexing library [development]
+Group:		Development/Libraries/Other
+Requires:	trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libindex-devel
+This library provides text indexing and is currently used by KMail
+to implement searching through mail text.
+
+This is the development package which contains the headers for the libindex-trinity
+library.
+
+%files -n trinity-libindex-devel
+%defattr(-,root,root,-)
+%{tde_bindir}/indexlib-config
+%{tde_tdeincludedir}/index
+%{tde_libdir}/libindex.la
+%{tde_libdir}/libindex.so
+
+##########
+
+%package -n trinity-libkcal
+Summary:	Trinity calendaring library
+Group:		Environment/Libraries
+#Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkcal
+This library provides a C++ API for handling the vCalendar and iCalendar
+formats.
+
+This is the runtime package for programs that use the libkcal-trinity library.
+
+%files -n trinity-libkcal
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcal_tdeabc.la
+%{tde_tdelibdir}/kcal_tdeabc.so
+%{tde_tdelibdir}/kcal_localdir.la
+%{tde_tdelibdir}/kcal_localdir.so
+%{tde_tdelibdir}/kcal_local.la
+%{tde_tdelibdir}/kcal_local.so
+%{tde_tdelibdir}/kcal_remote.la
+%{tde_tdelibdir}/kcal_remote.so
+%{tde_libdir}/libkcal.so.*
+%{tde_libdir}/libkcal_resourceremote.so.*
+%{tde_libdir}/libkholidays.so.*
+%{tde_datadir}/apps/libkholidays/
+%dir %{tde_datadir}/services/tderesources/kcal
+%{tde_datadir}/services/tderesources/kcal/imap.desktop
+%{tde_datadir}/services/tderesources/kcal/tdeabc.desktop
+%{tde_datadir}/services/tderesources/kcal/local.desktop
+%{tde_datadir}/services/tderesources/kcal/localdir.desktop
+%{tde_datadir}/services/tderesources/kcal/remote.desktop
+%{tde_datadir}/services/tderesources/kcal_manager.desktop
+
+##########
+
+%package -n trinity-libkcal-devel
+Summary:	Trinity calendaring library [development]
+Group:		Development/Libraries/Other
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkcal-devel
+This library provides a C++ API for handling the vCalendar and iCalendar
+formats.
+
+This is the development package which contains the headers for the libkcal-trinity
+library.
+
+%files -n trinity-libkcal-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/libemailfunctions/
+%{tde_tdeincludedir}/libkcal
+%{tde_libdir}/libkcal.la
+%{tde_libdir}/libkcal.so
+%{tde_libdir}/libkcal_resourceremote.la
+%{tde_libdir}/libkcal_resourceremote.so
+%{tde_libdir}/libkholidays.la
+%{tde_libdir}/libkholidays.so
+
+##########
+
+%package -n trinity-libtdepim
+Summary:	Trinity PIM library
+Group:		Environment/Libraries
+Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	libtdepim < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libtdepim
+This is the runtime package for programs that use the trinity-libtdepim library.
+
+%files -n trinity-libtdepim
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/plugins/designer/tdepimwidgets.la
+%{tde_tdelibdir}/plugins/designer/tdepimwidgets.so
+%{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.la
+%{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.so
+%{tde_libdir}/libtdepim.so.*
+%{tde_datadir}/apps/tdepimwidgets
+%{tde_datadir}/apps/libtdepim
+%{tde_datadir}/apps/tdepim
+%{tde_datadir}/config.kcfg/pimemoticons.kcfg
+%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
+%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
+
+##########
+
+%package -n trinity-libtdepim-devel
+Summary:	Trinity PIM library [development]
+Group:		Development/Libraries/Other
+Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdelibs-devel >= %{version}
+
+Obsoletes:	libtdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libtdepim-devel
+This is the development package which contains the headers for the libtdepim-trinity
+library.
+
+%files -n trinity-libtdepim-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libtdepim.la
+%{tde_libdir}/libtdepim.so
+
+##########
+
+%package -n trinity-libkgantt
+Summary:	Trinity gantt charting library
+Group:		Environment/Libraries
+
+%description -n trinity-libkgantt
+This is the runtime package for programs that use the libkgantt-trinity library.
+
+%files -n trinity-libkgantt
+%defattr(-,root,root,-)
+%{tde_libdir}/libkgantt.so.*
+%{tde_datadir}/apps/kgantt
+
+##########
+
+%package -n trinity-libkgantt-devel
+Summary:	Trinity gantt charting library [development]
+Group:		Development/Libraries/Other
+Requires:	trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkgantt-devel
+This is the development package which contains the headers for the libkgantt-trinity
+library.
+
+%files -n trinity-libkgantt-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kgantt
+%{tde_libdir}/libkgantt.la
+%{tde_libdir}/libkgantt.so
+
+##########
+
+%package -n trinity-libkleopatra
+Summary:	TDE GnuPG interface libraries
+Group:		Environment/Libraries
+Requires:	gnupg
+
+%description -n trinity-libkleopatra
+This library is used by several TDE applications to interface to the
+GnuPG program.
+
+This is the runtime package for programs that use the libkleopatra-trinity library.
+
+%files -n trinity-libkleopatra
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/libkleopatrarc
+%{tde_libdir}/libgpgme++.so.*
+%{tde_libdir}/libkleopatra.so.*
+%{tde_libdir}/libkpgp.so.*
+%{tde_libdir}/libqgpgme.so.*
+%{tde_datadir}/apps/tdeconf_update/kpgp-3.1-upgrade-address-data.pl
+%{tde_datadir}/apps/tdeconf_update/kpgp.upd
+%{tde_datadir}/apps/libkleopatra/
+%{tde_datadir}/icons/crystalsvg/*/apps/dirmngr.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gpg.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gpg_agent.png
+%{tde_datadir}/icons/crystalsvg/*/apps/gpgsm.png
+%{tde_datadir}/icons/crystalsvg/*/apps/pinentry.png
+%{tde_datadir}/icons/crystalsvg/*/apps/scdaemon.png
+
+##########
+
+%package -n trinity-libkleopatra-devel
+Summary:	Trinity GnuPG interface libraries [development]
+Group:		Development/Libraries/Other
+Requires:	trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkleopatra-devel
+This library is used by several TDE applications to interface to the
+GnuPG program.
+
+This is the development package which contains the headers for the
+libkleopatra-trinity library.
+
+%files -n trinity-libkleopatra-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/gpgme++/
+%{tde_tdeincludedir}/kleo/
+%{tde_tdeincludedir}/qgpgme/
+%{tde_libdir}/libgpgme++.la
+%{tde_libdir}/libgpgme++.so
+%{tde_libdir}/libkleopatra.la
+%{tde_libdir}/libkleopatra.so
+%{tde_libdir}/libkpgp.la
+%{tde_libdir}/libkpgp.so
+%{tde_libdir}/libqgpgme.la
+%{tde_libdir}/libqgpgme.so
+
+##########
+
+%package -n trinity-libkmime
+Summary:	Trinity MIME interface library
+Group:		Environment/Libraries
+#Conflicts:	trinity-libmimelib
+
+%description -n trinity-libkmime
+This library provides a C++ interface to MIME messages, parsing them into
+an object tree.
+
+%files -n trinity-libkmime
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmime.so.*
+
+##########
+
+%package -n trinity-libkmime-devel
+Summary:	Development files for libkmime
+Group:		Development/Libraries/Other
+Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkmime-devel
+%{summary}
+
+%files -n trinity-libkmime-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmime.la
+%{tde_libdir}/libkmime.so
+
+##########
+
+%package -n trinity-libkpimexchange
+Summary:	Trinity PIM Exchange library
+Group:		Development/Libraries/Other
+
+%description -n trinity-libkpimexchange
+This is the runtime package for programs that use the libkpimexchange-trinity
+library. 
+
+%files -n trinity-libkpimexchange
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/resourcecalendarexchange.la
+%{tde_tdelibdir}/resourcecalendarexchange.so
+%{tde_libdir}/libkpimexchange.so.*
+
+##########
+
+%package -n trinity-libkpimexchange-devel
+Summary:	Trinity PIM Exchange library [development]
+Group:		Development/Libraries/Other
+Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkpimexchange-devel
+This is the development package which contains the headers for the
+libkpimexchange-trinity library.
+
+%files -n trinity-libkpimexchange-devel
+%defattr(-,root,root,-)
+%dir %{tde_tdeincludedir}/tdepim
+%{tde_tdeincludedir}/tdepim/exchangeaccount.h
+%{tde_tdeincludedir}/tdepim/exchangeclient.h
+%{tde_libdir}/libkpimexchange.la
+%{tde_libdir}/libkpimexchange.so
+
+##########
+
+%package -n trinity-libkpimidentities
+Summary:	Trinity PIM user identity information library
+Group:		Environment/Libraries
+
+%description -n trinity-libkpimidentities
+This library provides information to TDE programs about user identity,
+such as email address, organization, etc.
+
+This is the runtime package for programs that use the libkpimidentities-trinity
+library.
+
+%files -n trinity-libkpimidentities
+%defattr(-,root,root,-)
+%{tde_libdir}/libkpimidentities.so.*
+
+##########
+
+%package -n trinity-libkpimidentities-devel
+Summary:	Development files for libkpimidentities
+Group:		Development/Libraries/Other
+Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libkpimidentities-devel
+%{summary}
+
+%files -n trinity-libkpimidentities-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkpimidentities.la
+%{tde_libdir}/libkpimidentities.so
+
+##########
+
+%package -n trinity-libksieve
+Summary:	Trinity mail/news message filtering library
+Group:		Environment/Libraries
+
+%description -n trinity-libksieve
+This is the runtime package for programs that use the libksieve-trinity library.
+
+%files -n trinity-libksieve
+%defattr(-,root,root,-)
+%{tde_libdir}/libksieve.so.*
+%{tde_tdedocdir}/HTML/en/tdeioslave/sieve/
+
+##########
+
+%package -n trinity-libksieve-devel
+Summary:	Trinity mail/news message filtering library [development]
+Group:		Development/Libraries/Other
+Requires:	trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libksieve-devel
+This is the development package which contains the headers for the libksieve-trinity
+library.
+
+%files -n trinity-libksieve-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/ksieve
+%{tde_libdir}/libksieve.la
+%{tde_libdir}/libksieve.so
+
+##########
+
+%package -n trinity-libktnef
+Summary:	Library for handling KTNEF email attachments
+Group:		Environment/Libraries
+
+%description -n trinity-libktnef
+This library handles mail attachments using the TNEF format. These
+attachments are usually found in mails coming from Microsoft mail
+servers and embed the mail properties as well as the actual
+attachments.
+.
+This is the runtime library for packages using the ktnef-trinity library.
+
+%files -n trinity-libktnef
+%defattr(-,root,root,-)
+%{tde_libdir}/libktnef.so.*
+
+##########
+
+%package -n trinity-libktnef-devel
+Summary:	KTNEF handler library [development]
+Group:		Development/Libraries/Other
+Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libktnef-devel
+This library handles mail attachments using the TNEF format. These
+attachments are usually found in mails coming from Microsoft mail
+servers and embed the mail properties as well as the actual
+attachments.
+
+This is the development package which contains the headers for the
+ktnef-trinity library.
+
+%files -n trinity-libktnef-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/ktnef
+%{tde_libdir}/libktnef.la
+%{tde_libdir}/libktnef.so
+
+##########
+
+%package -n trinity-libmimelib
+Summary:	Trinity mime library
+Group:		Environment/Libraries
+
+%description -n trinity-libmimelib
+This library is used by several Trinity applications to handle mime types.
+
+This is the runtime package for programs that use the libmimelib-trinity library.
+
+%files -n trinity-libmimelib
+%defattr(-,root,root,-)
+%{tde_libdir}/libmimelib.so.*
+
+##########
+
+%package -n trinity-libmimelib-devel
+Summary:	Trinity mime library [development]
+Group:		Development/Libraries/Other
+Requires:	trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libmimelib-devel
+This library is used by several TDE applications to handle mime types.
+
+This is the development package which contains the headers for the
+libmimelib library.
+
+%files -n trinity-libmimelib-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/mimelib/
+%{tde_libdir}/libmimelib.la
+%{tde_libdir}/libmimelib.so
+
+##########
+
+%package -n trinity-kmobile
+Summary:	Synchronize and manage mobile phone with your PC.
+Group:		Applications/Communications
+
+%description -n trinity-kmobile
+KMobileTools is a nice TDE-based application that allows to synchronize 
+and manage mobile phones with your PC. It handles full SMS control, 
+dialing calls, phonebook, and phone status monitoring.
+
+%files -n trinity-kmobile
+%defattr(-,root,root,-)
+%{tde_bindir}/kmobile
+%{tde_datadir}/icons/default.tde/32x32/devices/mobile_camera.png
+%{tde_datadir}/icons/default.tde/32x32/devices/mobile_musicplayer.png
+%{tde_datadir}/icons/default.tde/32x32/devices/mobile_organizer.png
+%{tde_datadir}/icons/default.tde/32x32/devices/mobile_phone.png
+%{tde_datadir}/icons/default.tde/32x32/devices/mobile_unknown.png
+%{tde_datadir}/icons/hicolor/*/apps/kmobile.png
+%{tde_datadir}/services/libkmobile_digicam.desktop
+%{tde_datadir}/services/libkmobile_gammu.desktop
+%{tde_datadir}/services/libkmobile_skeleton.desktop
+%{tde_datadir}/servicetypes/libkmobile.desktop
+%{tde_datadir}/apps/kmobile/
+%{tde_tdeappdir}/kmobile.desktop
+%{tde_tdelibdir}/libkmobile_skeleton.la
+%{tde_tdelibdir}/libkmobile_skeleton.so
+%{tde_libdir}/libkmobileclient.la
+%{tde_libdir}/libkmobileclient.so
+%{tde_libdir}/libkmobiledevice.la
+%{tde_libdir}/libkmobiledevice.so
+%{tde_tdedocdir}/HTML/en/kmobile/
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+# Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl'
+if [ -x /usr/bin/perl ]; then
+  %__sed -i "korganizer/ical2vcal.in" -e "s|@PERL@|/usr/bin/perl|"
+fi
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Specific path for RHEL4
+if [ -d "/usr/X11R6" ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_ARTS=ON \
+  -DWITH_SASL=ON \
+  -DWITH_NEWDISTRLISTS=ON  \
+  %{?with_gnokii:-DWITH_GNOKII=ON} \
+  -DWITH_EXCHANGE=ON \
+  -DWITH_EGROUPWARE=ON \
+  -DWITH_KOLAB=ON \
+  -DWITH_SLOX=ON \
+  -DWITH_GROUPWISE=ON \
+  -DWITH_FEATUREPLAN=ON \
+  -DWITH_GROUPDAV=ON \
+  -DWITH_BIRTHDAYS=ON \
+  -DWITH_NEWEXCHANGE=ON \
+  -DWITH_SCALIX=ON \
+  -DWITH_CALDAV=ON \
+  -DWITH_CARDDAV=ON \
+  -DWITH_INDEXLIB=ON \
+  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
+  %{?with_kitchensync:-DBUILD_KITCHENSYNC=ON} \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/akregator.desktop       Network  RSS-News
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/groupwarewizard.desktop Utility  DesktopSettings X-TDE-Utilities-PIM
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kaddressbook.desktop
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kalarm.desktop          Utility  TimeUtility X-TDE-Utilities-PIM
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kandy.desktop           Utility  Telephony X-TDE-Utilities-Peripherals
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/karm.desktop            Utility  TimeUtility X-TDE-Utilities-PIM
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kleopatra.desktop       Network  System
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KNode.desktop
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/knotes.desktop          Utility  DesktopUtility X-TDE-Utilities-Desktop
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KMail.desktop
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/Kontact.desktop         Office   Core-Office
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/korganizer.desktop      Office   Calendar
+%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/KOrn.desktop            Utility  Applet X-TDE-More
+%suse_update_desktop_file -u    %{?buildroot}%{tde_tdeappdir}/ktnef.desktop           Network  Email
+%if 0%{?with_kitchensync}
+%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kitchensync.desktop     Utility  X-SuSE-SyncUtility
+%endif
+%endif
+
+# Adds missing icons in 'hicolor' theme
+pushd "%{?buildroot}%{tde_datadir}/icons"
+for i in {16,32,48};           do %__cp crystalsvg/"$i"x"$i"/apps/kandy.png                           hicolor/"$i"x"$i"/apps/kandy.png      ;done
+for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png  hicolor/"$i"x"$i"/apps/kleopatra.png  ;done
+popd
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{?buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdepim/trinity-tdepim-rpmlintrc b/redhat/core/tdepim/trinity-tdepim-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdepim/trinity-tdepim-rpmlintrc
+++ b/redhat/core/tdepim/trinity-tdepim-rpmlintrc
diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec
new file mode 100644
index 000000000..aa4454eb6
--- /dev/null
+++ b/redhat/core/tdesdk/tdesdk.spec
@@ -0,0 +1,1188 @@
+#
+# spec file for package tdesdk (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdesdk
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		The Trinity Software Development Kit (SDK)
+Group:			Development/Tools/Other
+Version:		%{tde_version}
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+URL:			http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:		GPL-2.0+
+%else
+License:		GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:		Francois Andriot <francois.andriot@free.fr>
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-perl-dcop >= %{tde_version}
+BuildRequires:	trinity-tdepim-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	libtool
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# for kbugbuster/libkcal
+BuildRequires:	desktop-file-utils
+
+# DB5 support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 33
+BuildRequires:	libdb-devel
+
+# DB4 support
+%else
+%if 0%{?mgaversion} || 0%{?mdkversion}
+#BuildRequires:	%{_lib}db4.8-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	db4-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libdb-4_8-devel
+%endif
+%endif
+
+# kbabel,  F-7+: flex >= 2.5.33-9
+BuildRequires:	flex
+# umbrello
+BuildRequires:	libxslt-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	subversion-devel
+BuildRequires:	neon-devel
+
+# PERL support
+BuildRequires:	perl
+%if 0%{?fedora} >= 19
+BuildRequires:	perl-podlators
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
+%define python python3
+%else
+%define python python
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}ltdl-devel
+BuildRequires:	%{_lib}binutils-devel
+%endif
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires:	binutils-devel
+%endif
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
+BuildRequires:	libtool-ltdl-devel
+%endif
+
+# KIOSLAVE
+# Does not build on RHEL4
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define build_kioslave 1
+%endif
+
+Obsoletes:		trinity-kdesdk < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdesdk = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-kdesdk-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdesdk-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-cervisia = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kapptemplate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kbugbuster = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdecachegrind = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdecachegrind-converters = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kuiviewer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-poxml = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-umbrello = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+A collection of applications and tools used by developers, including:
+* cervisia: a CVS frontend
+* kbabel: PO file management
+* kbugbuster: a tool to manage the TDE bug report system
+* tdecachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
+* kompare: diff tool
+* kuiviewer: displays designer's UI files
+* umbrello: UML modeller and UML diagram tool
+
+%files
+%defattr(-,root,root,-)
+
+##########
+
+%package -n trinity-cervisia
+Summary:	A graphical CVS front end for Trinity
+Group:		Development/Tools/Version Control
+
+%description -n trinity-cervisia
+Cervisia is a TDE-based graphical front end for the CVS client.
+
+As well as providing both common and advanced CVS operations, it offers
+a variety of methods for graphically viewing information about the CVS
+repository, your own sandbox and the relationships between different
+versions of files.  A Changelog editor is also included and is coupled
+with the commit dialog.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-cervisia
+%defattr(-,root,root,-)
+%{tde_bindir}/cervisia
+%{tde_libdir}/libtdeinit_cervisia.la
+%{tde_libdir}/libtdeinit_cervisia.so
+%{tde_tdelibdir}/cervisia.la
+%{tde_tdelibdir}/cervisia.so
+%{tde_tdelibdir}/libcervisiapart.la
+%{tde_tdelibdir}/libcervisiapart.so
+%{tde_tdeappdir}/cervisia.desktop
+%{tde_datadir}/apps/cervisia/
+%{tde_datadir}/apps/cervisiapart/
+%{tde_datadir}/apps/tdeconf_update/cervisia.upd
+%{tde_datadir}/apps/tdeconf_update/cervisia-change_repos_list.pl
+%{tde_datadir}/apps/tdeconf_update/cervisia-normalize_cvsroot.pl
+%{tde_datadir}/apps/tdeconf_update/move_repositories.pl
+%{tde_datadir}/apps/tdeconf_update/change_colors.pl
+%{tde_datadir}/config.kcfg/cervisiapart.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/cervisia.png
+%{tde_datadir}/icons/crystalsvg/*/actions/vcs_*.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/vcs_*.svgz
+%{tde_mandir}/man1/cervisia.1*
+%{tde_tdedocdir}/HTML/en/cervisia/
+
+##########
+
+%package -n trinity-kapptemplate
+Summary:	Creates a framework to develop a Trinity application
+Group:		Development/Languages/Other
+
+%description -n trinity-kapptemplate
+KAppTemplate is a shell script that will create the necessary
+framework to develop various TDE applications.  It takes care of the
+autoconf/automake code as well as providing a skeleton and example of
+what the code typically looks like.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kapptemplate
+%defattr(-,root,root,-)
+%{tde_bindir}/kapptemplate
+%{tde_datadir}/apps/kapptemplate/
+%{tde_mandir}/man1/kapptemplate.1*
+
+%pre -n trinity-kapptemplate
+if [ -d "%{tde_bindir}/kapptemplate" ]; then
+  rm -rf "%{tde_bindir}/kapptemplate"
+fi
+
+##########
+
+%package -n trinity-kbabel
+Summary:	PO-file editing suite for Trinity
+Group:		Development/Languages/Other
+
+%description -n trinity-kbabel
+This is a suite of programs for editing gettext message files (PO-files).
+It is designed to help you translate fast and consistently.
+
+This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
+advanced and easy to use PO-file editor with full navigational and editing
+capabilities, syntax checking and statistics.  CatalogManager is a multi
+functional catalog manager which allows you to keep track of many
+PO-files at once.  KBabelDict is a dictionary to assist with searching
+for common translations.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kbabel
+%defattr(-,root,root,-)
+%{tde_bindir}/catalogmanager
+%{tde_bindir}/kbabel
+%{tde_bindir}/kbabeldict
+%{tde_libdir}/libkbabelcommon.so.*
+%{tde_libdir}/libkbabeldictplugin.so.*
+%{tde_tdelibdir}/tdefile_po.la
+%{tde_tdelibdir}/tdefile_po.so
+%{tde_tdelibdir}/pothumbnail.la
+%{tde_tdelibdir}/pothumbnail.so
+%{tde_tdelibdir}/kbabel_accelstool.la
+%{tde_tdelibdir}/kbabel_accelstool.so
+%{tde_tdelibdir}/kbabel_argstool.la
+%{tde_tdelibdir}/kbabel_argstool.so
+%{tde_tdelibdir}/kbabel_contexttool.la
+%{tde_tdelibdir}/kbabel_contexttool.so
+%{tde_tdelibdir}/kbabel_equationstool.la
+%{tde_tdelibdir}/kbabel_equationstool.so
+%{tde_tdelibdir}/kbabel_gettextexport.la
+%{tde_tdelibdir}/kbabel_gettextexport.so
+%{tde_tdelibdir}/kbabel_gettextimport.la
+%{tde_tdelibdir}/kbabel_gettextimport.so
+%{tde_tdelibdir}/kbabel_lengthtool.la
+%{tde_tdelibdir}/kbabel_lengthtool.so
+%{tde_tdelibdir}/kbabel_linguistexport.la
+%{tde_tdelibdir}/kbabel_linguistexport.so
+%{tde_tdelibdir}/kbabel_linguistimport.la
+%{tde_tdelibdir}/kbabel_linguistimport.so
+%{tde_tdelibdir}/kbabel_nottranslatedtool.la
+%{tde_tdelibdir}/kbabel_nottranslatedtool.so
+%{tde_tdelibdir}/kbabel_pluraltool.la
+%{tde_tdelibdir}/kbabel_pluraltool.so
+%{tde_tdelibdir}/kbabel_punctuationtool.la
+%{tde_tdelibdir}/kbabel_punctuationtool.so
+%{tde_tdelibdir}/kbabel_regexptool.la
+%{tde_tdelibdir}/kbabel_regexptool.so
+%{tde_tdelibdir}/kbabel_setfuzzytool.la
+%{tde_tdelibdir}/kbabel_setfuzzytool.so
+%{tde_tdelibdir}/kbabel_whitespacetool.la
+%{tde_tdelibdir}/kbabel_whitespacetool.so
+%{tde_tdelibdir}/kbabel_xliffexport.la
+%{tde_tdelibdir}/kbabel_xliffexport.so
+%{tde_tdelibdir}/kbabel_xliffimport.la
+%{tde_tdelibdir}/kbabel_xliffimport.so
+%{tde_tdelibdir}/kbabel_xmltool.la
+%{tde_tdelibdir}/kbabel_xmltool.so
+%{tde_tdelibdir}/kbabeldict_dbsearchengine.la
+%{tde_tdelibdir}/kbabeldict_dbsearchengine.so
+%{tde_tdelibdir}/kbabeldict_poauxiliary.la
+%{tde_tdelibdir}/kbabeldict_poauxiliary.so
+%{tde_tdelibdir}/kbabeldict_pocompendium.la
+%{tde_tdelibdir}/kbabeldict_pocompendium.so
+%{tde_tdelibdir}/kbabeldict_tmxcompendium.la
+%{tde_tdelibdir}/kbabeldict_tmxcompendium.so
+%{tde_tdeappdir}/catalogmanager.desktop
+%{tde_tdeappdir}/kbabel.desktop
+%{tde_tdeappdir}/kbabeldict.desktop
+%{tde_datadir}/apps/catalogmanager/
+%{tde_datadir}/apps/kbabel/
+%{tde_datadir}/apps/tdeconf_update/kbabel-difftoproject.upd
+%{tde_datadir}/apps/tdeconf_update/kbabel-project.upd
+%{tde_datadir}/apps/tdeconf_update/kbabel-projectrename.upd
+%{tde_datadir}/config.kcfg/kbabel.kcfg
+%{tde_datadir}/config.kcfg/kbprojectsettings.kcfg
+%{tde_tdedocdir}/HTML/en/kbabel/
+%{tde_datadir}/icons/hicolor/*/apps/catalogmanager.png
+%{tde_datadir}/icons/hicolor/*/apps/kbabel.png
+%{tde_datadir}/icons/hicolor/*/apps/kbabeldict.png
+%{tde_datadir}/icons/locolor/*/apps/catalogmanager.png
+%{tde_datadir}/icons/locolor/*/apps/kbabel.png
+%{tde_datadir}/icons/locolor/*/apps/kbabeldict.png
+%{tde_datadir}/services/dbsearchengine.desktop
+%{tde_datadir}/services/tdefile_po.desktop
+%{tde_datadir}/services/pothumbnail.desktop
+%{tde_datadir}/services/kbabel_accelstool.desktop
+%{tde_datadir}/services/kbabel_argstool.desktop
+%{tde_datadir}/services/kbabel_contexttool.desktop
+%{tde_datadir}/services/kbabel_equationstool.desktop
+%{tde_datadir}/services/kbabel_gettext_export.desktop
+%{tde_datadir}/services/kbabel_gettext_import.desktop
+%{tde_datadir}/services/kbabel_lengthtool.desktop
+%{tde_datadir}/services/kbabel_linguist_export.desktop
+%{tde_datadir}/services/kbabel_linguist_import.desktop
+%{tde_datadir}/services/kbabel_nottranslatedtool.desktop
+%{tde_datadir}/services/kbabel_pluralformstool.desktop
+%{tde_datadir}/services/kbabel_punctuationtool.desktop
+%{tde_datadir}/services/kbabel_regexptool.desktop
+%{tde_datadir}/services/kbabel_setfuzzytool.desktop
+%{tde_datadir}/services/kbabel_whitespacetool.desktop
+%{tde_datadir}/services/kbabel_xliff_export.desktop
+%{tde_datadir}/services/kbabel_xliff_import.desktop
+%{tde_datadir}/services/kbabel_xmltool.desktop
+%{tde_datadir}/services/pocompendium.desktop
+%{tde_datadir}/services/poauxiliary.desktop
+%{tde_datadir}/services/tmxcompendium.desktop
+%{tde_datadir}/servicetypes/kbabel_tool.desktop
+%{tde_datadir}/servicetypes/kbabel_validator.desktop
+%{tde_datadir}/servicetypes/kbabeldict_module.desktop
+%{tde_datadir}/servicetypes/kbabelfilter.desktop
+%{tde_mandir}/man1/catalogmanager.1*
+%{tde_mandir}/man1/kbabel.1*
+%{tde_mandir}/man1/kbabeldict.1*
+
+##########
+
+%package -n trinity-kbabel-devel
+Summary:	PO-file editing suite for Trinity (development files)
+Group:		Development/Libraries/Other
+Requires:	trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kbabel-devel
+This is a suite of programs for editing gettext message files (PO-files).
+It is designed to help you translate fast and consistently.
+
+This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
+advanced and easy to use PO-file editor with full navigational and editing
+capabilities, syntax checking and statistics.  CatalogManager is a multi
+functional catalog manager which allows you to keep track of many
+PO-files at once.  KBabelDict is a dictionary to assist with searching
+for common translations.
+
+This package contains the KBabel development files.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kbabel-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kbabel/
+%{tde_libdir}/libkbabelcommon.la
+%{tde_libdir}/libkbabelcommon.so
+%{tde_libdir}/libkbabeldictplugin.la
+%{tde_libdir}/libkbabeldictplugin.so
+
+##########
+
+%package -n trinity-kbugbuster
+Summary:	A front end for the Trinity bug tracking system
+Group:		Development/Languages/Other
+Requires:	trinity-libkcal >= %{tde_version}
+
+%description -n trinity-kbugbuster
+KBugBuster is a GUI front end for the TDE bug tracking system.
+It allows the user to view and manipulate bug reports and provides a
+variety of options for searching through reports.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kbugbuster
+%defattr(-,root,root,-)
+%{tde_bindir}/kbugbuster
+%{tde_tdelibdir}/kcal_bugzilla.la
+%{tde_tdelibdir}/kcal_bugzilla.so
+%{tde_tdeappdir}/kbugbuster.desktop
+%{tde_datadir}/apps/kbugbuster/
+%{tde_datadir}/icons/hicolor/*/apps/kbugbuster.png
+%{tde_datadir}/icons/locolor/*/apps/kbugbuster.png
+%{tde_datadir}/services/tderesources/kcal/bugzilla.desktop
+%{tde_tdedocdir}/HTML/en/kbugbuster/
+%{tde_mandir}/man1/kbugbuster.1*
+
+##########
+
+%package -n trinity-tdecachegrind
+Summary:	Visualisation tool for valgrind profiling output
+Group:		Development/Languages/Other
+
+%description -n trinity-tdecachegrind
+tdecachegrind is a visualisation tool for the profiling data generated
+by calltree, a profiling skin for valgrind.  Applications can be
+profiled using calltree without being recompiled, and shared libraries
+and plugin architectures are supported.
+
+For visualising the output from other profiling tools, several converters
+can be found in the tdecachegrind-converters package.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-tdecachegrind
+%defattr(-,root,root,-)
+%{tde_bindir}/tdecachegrind
+%{tde_tdeappdir}/tdecachegrind.desktop
+%{tde_datadir}/apps/tdecachegrind/
+%{tde_datadir}/icons/locolor/*/apps/tdecachegrind.png
+%{tde_datadir}/icons/hicolor/*/apps/tdecachegrind.png
+%{tde_datadir}/mimelnk/application/x-tdecachegrind.desktop
+%{tde_tdedocdir}/HTML/en/tdecachegrind/
+%{tde_mandir}/man1/tdecachegrind.1*
+
+##########
+
+%package -n trinity-tdecachegrind-converters
+Summary:	Format converters for tdecachegrind profiling visualisation tool
+Group:		Development/Languages/Other
+Requires:	%{python}
+%if 0%{?suse_version} || 0%{?rhel} == 4
+Requires:	php
+%else
+Requires:	php-cli
+%endif
+
+%description -n trinity-tdecachegrind-converters
+This is a collection of scripts for converting the output from
+different profiling tools into a format that tdecachegrind can use.
+
+tdecachegrind is a visualisation tool for the profiling data generated
+by calltree, a profiling skin for valgrind.  Applications can be
+profiled using calltree without being recompiled, and shared libraries
+and plugin architectures are supported.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-tdecachegrind-converters
+%defattr(-,root,root,-)
+%{tde_bindir}/dprof2calltree
+%{tde_bindir}/hotshot2calltree
+%{tde_bindir}/memprof2calltree
+%{tde_bindir}/op2calltree
+%{tde_bindir}/pprof2calltree
+%{tde_mandir}/man1/dprof2calltree.1*
+%{tde_mandir}/man1/hotshot2calltree.1*
+%{tde_mandir}/man1/memprof2calltree.1*
+%{tde_mandir}/man1/op2calltree.1*
+%{tde_mandir}/man1/pprof2calltree.1*
+
+##########
+
+%package kfile-plugins
+Summary:	Trinity file dialog plugins for software development files
+Group:		Development/Languages/Other
+
+%description kfile-plugins
+This is a collection of plugins for the TDE file dialog.  These plugins
+extend the file dialog to offer advanced meta-information for source files,
+patch files and Qt Linguist data.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files kfile-plugins
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/tdefile_cpp.so
+%{tde_tdelibdir}/tdefile_cpp.la
+%{tde_tdelibdir}/tdefile_diff.so
+%{tde_tdelibdir}/tdefile_diff.la
+%{tde_tdelibdir}/tdefile_ts.so
+%{tde_tdelibdir}/tdefile_ts.la
+%{tde_datadir}/services/tdefile_cpp.desktop
+%{tde_datadir}/services/tdefile_diff.desktop
+%{tde_datadir}/services/tdefile_h.desktop
+%{tde_datadir}/services/tdefile_ts.desktop
+
+##########
+
+%package misc
+Summary:	Various goodies from the Trinity Software Development Kit
+Group:		Development/Languages/Other
+
+%description misc
+This package contains miscellaneous goodies provided with the official
+TDE release to assist with TDE software development.
+
+Included are:
+- headers to assist with profiling TDE code;
+- a widget style for checking conformity with the TDE/Qt style guide;
+- palettes that match the KDE standard colour palette;
+- a TDE address book plugin that reads the list of TDE CVS accounts.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files misc
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/tdeabcformat_kdeaccounts.la
+%{tde_tdelibdir}/tdeabcformat_kdeaccounts.so
+%{tde_tdelibdir}/plugins/styles/scheck.so
+%{tde_tdelibdir}/plugins/styles/scheck.la
+%{tde_datadir}/apps/tdeabc/formats/kdeaccountsplugin.desktop
+%{tde_datadir}/apps/tdestyle/themes/scheck.themerc
+%{tde_datadir}/kdepalettes/
+
+%{tde_libdir}/libkstartperf.so.*
+%{tde_libdir}/libkstartperf.la
+%{tde_bindir}/kstartperf
+
+##########
+
+%package scripts
+Summary:	a set of useful development scripts for Trinity
+Group:		Development/Languages/Other
+Requires:	%{python}
+
+%description scripts
+This package contains a number of scripts which can be used to help in
+developing TDE-based applications.  Many of these scripts however are
+not specific to TDE, and in particular there are several general-use
+scripts to help users in working with SVN and CVS repositories.
+
+In addition to these scripts, this package provides:
+- gdb macros for Qt/TDE programming;
+- vim and emacs helper files for Qt/TDE programming;
+- bash and zsh completion controls for TDE apps;
+- valgrind error suppressions for TDE apps.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files scripts
+%defattr(-,root,root,-)
+%{tde_bindir}/adddebug
+%{tde_bindir}/build-progress.sh
+%{tde_bindir}/cheatmake
+%{tde_bindir}/create_cvsignore
+%{tde_bindir}/create_makefile
+%{tde_bindir}/create_makefiles
+%{tde_bindir}/cvs-clean
+%{tde_bindir}/cvs2dist
+%{tde_bindir}/cvsbackport
+%{tde_bindir}/cvsblame
+%{tde_bindir}/cvscheck
+%{tde_bindir}/cvsforwardport
+%{tde_bindir}/cvslastchange
+%{tde_bindir}/cvslastlog
+%{tde_bindir}/cvsrevertlast
+%{tde_bindir}/cvsversion
+%{tde_bindir}/cxxmetric
+%{tde_bindir}/extend_dmalloc
+%{tde_bindir}/extractattr
+%{tde_bindir}/extractrc
+%{tde_bindir}/findmissingcrystal
+%{tde_bindir}/fixkdeincludes
+%{tde_bindir}/fixuifiles
+%{tde_bindir}/includemocs
+%{tde_bindir}/kde-build
+%{tde_bindir}/kdedoc
+%{tde_bindir}/tdekillall
+%{tde_bindir}/kdelnk2desktop.py*
+%{tde_bindir}/kdemangen.pl
+%{tde_bindir}/makeobj
+%{tde_bindir}/noncvslist
+%{tde_bindir}/package_crystalsvg
+%{tde_bindir}/png2mng.pl
+%{tde_bindir}/pruneemptydirs
+%{tde_bindir}/qtdoc
+%{tde_bindir}/zonetab2pot.py*
+%{tde_bindir}/svn2dist
+%{tde_bindir}/svnrevertlast
+%{tde_bindir}/svnforwardport
+%{tde_bindir}/nonsvnlist
+%{tde_bindir}/tdesvn-build
+%{tde_bindir}/svnlastlog
+%{tde_bindir}/svnversions
+%{tde_bindir}/create_svnignore
+%{tde_bindir}/svnlastchange
+%{tde_bindir}/colorsvn
+%{tde_bindir}/svnaddcurrentdir
+%{tde_bindir}/svnbackport
+%{tde_bindir}/svngettags
+%{tde_bindir}/svnchangesince
+%{tde_bindir}/svn-clean
+%{tde_datadir}/apps/katepart/syntax/tdesvn-buildrc.xml
+%{tde_mandir}/man1/adddebug.1*
+%{tde_mandir}/man1/build-progress.sh.1*
+%{tde_mandir}/man1/cheatmake.1*
+%{tde_mandir}/man1/create_cvsignore.1*
+%{tde_mandir}/man1/create_makefile.1*
+%{tde_mandir}/man1/create_makefiles.1*
+%{tde_mandir}/man1/cvsblame.1*
+%{tde_mandir}/man1/cvscheck.1*
+%{tde_mandir}/man1/cvs-clean.1*
+%{tde_mandir}/man1/cvs2dist.1*
+%{tde_mandir}/man1/cvsaskpass.1*
+%{tde_mandir}/man1/cvsbackport.1*
+%{tde_mandir}/man1/cvsforwardport.1*
+%{tde_mandir}/man1/cvslastchange.1*
+%{tde_mandir}/man1/cvslastlog.1*
+%{tde_mandir}/man1/cvsrevertlast.1*
+%{tde_mandir}/man1/cvsservice.1*
+%{tde_mandir}/man1/cvsversion.1*
+%{tde_mandir}/man1/cxxmetric.1*
+%{tde_mandir}/man1/extend_dmalloc.1*
+%{tde_mandir}/man1/extractattr.1*
+%{tde_mandir}/man1/extractrc.1*
+%{tde_mandir}/man1/findmissingcrystal.1*
+%{tde_mandir}/man1/fixkdeincludes.1*
+%{tde_mandir}/man1/fixuifiles.1*
+%{tde_mandir}/man1/includemocs.1*
+%{tde_mandir}/man1/kde-build.1*
+%{tde_mandir}/man1/kdedoc.1*
+%{tde_mandir}/man1/kdelnk2desktop.py.1*
+%{tde_mandir}/man1/kdemangen.pl.1*
+%{tde_mandir}/man1/licensecheck.1*
+%{tde_mandir}/man1/noncvslist.1*
+%{tde_mandir}/man1/makeobj.1*
+%{tde_mandir}/man1/package_crystalsvg.1*
+%{tde_mandir}/man1/png2mng.pl.1
+%{tde_mandir}/man1/pruneemptydirs.1
+%{tde_mandir}/man1/qtdoc.1*
+%{tde_mandir}/man1/tdekillall.1*
+%{tde_mandir}/man1/tdesvn-build.1*
+%{tde_mandir}/man1/zonetab2pot.py.1*
+%{tde_tdedocdir}/HTML/en/tdesvn-build/
+#scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
+#scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
+#scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
+#scripts/kde.supp /opt/trinity/lib/valgrind
+#scripts/completions /opt/trinity/share/tdesdk-scripts
+
+#debian/desktop-i18n/createdesktop.pl /opt/trinity/lib/kubuntu-desktop-i18n/
+#debian/desktop-i18n/findfiles /opt/trinity/lib/kubuntu-desktop-i18n/
+#debian/desktop-i18n/msgsplit /opt/trinity/lib/kubuntu-desktop-i18n/
+
+%if "%{?tde_prefix}" != "/usr"
+%{tde_bindir}/licensecheck
+%else
+%exclude %{tde_bindir}/licensecheck
+%endif
+
+##########
+
+%package -n trinity-kmtrace
+Summary:	A Trinity memory leak tracer
+Group:		Development/Languages/Other
+Requires:	less
+
+%description -n trinity-kmtrace
+KMtrace is a TDE tool to assist with malloc debugging using glibc's
+"mtrace" functionality.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kmtrace
+%defattr(-,root,root,-)
+%{tde_bindir}/demangle
+%{tde_bindir}/kminspector
+%{tde_bindir}/kmmatch
+%{tde_bindir}/kmtrace
+%dir %{tde_libdir}/kmtrace
+%{tde_libdir}/kmtrace/libktrace.la
+%{tde_libdir}/kmtrace/libktrace.so
+%{tde_datadir}/apps/kmtrace/
+%{tde_mandir}/man1/demangle.1*
+%{tde_mandir}/man1/kminspector.1*
+%{tde_mandir}/man1/kmmatch.1*
+%{tde_mandir}/man1/kmtrace.1*
+
+##########
+
+%package -n trinity-kompare
+Summary:	A Trinity GUI for viewing differences between files
+Group:		Development/Languages/Other
+
+%description -n trinity-kompare
+Kompare is a graphical user interface for viewing the differences between
+files.  It can compare two documents, create a diff file, display a diff
+file and/or blend a diff file back into the original documents.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kompare
+%defattr(-,root,root,-)
+%{tde_bindir}/kompare
+%{tde_libdir}/libkompareinterface.la
+%{tde_libdir}/libkompareinterface.so.*
+%{tde_tdelibdir}/libkomparenavtreepart.la
+%{tde_tdelibdir}/libkomparenavtreepart.so
+%{tde_tdelibdir}/libkomparepart.la
+%{tde_tdelibdir}/libkomparepart.so
+%{tde_tdeappdir}/kompare.desktop
+%{tde_datadir}/apps/kompare/
+%{tde_datadir}/services/komparenavtreepart.desktop
+%{tde_datadir}/services/komparepart.desktop
+%{tde_datadir}/servicetypes/komparenavigationpart.desktop
+%{tde_datadir}/servicetypes/kompareviewpart.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kompare.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz
+%{tde_tdedocdir}/HTML/en/kompare/
+%{tde_mandir}/man1/kompare.1*
+
+##########
+
+%package -n trinity-kspy
+Summary:	Examines the internal state of a Qt/TDE app
+Group:		Development/Languages/Other
+Requires:	trinity-tdelibs-devel
+
+%description -n trinity-kspy
+KSpy is a tiny library which can be used to graphically display
+the QObjects in use by a Qt/TDE app.  In addition to the object tree,
+you can also view the properties, signals and slots of any QObject.
+
+Basically it provides much the same info as QObject::dumpObjectTree() and
+QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
+minimal overhead for the application, because the kspy library is
+loaded dynamically using KLibLoader.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kspy
+%defattr(-,root,root,-)
+%{tde_libdir}/libkspy.la
+%{tde_libdir}/libkspy.so.*
+%{tde_mandir}/man1/testkspy.1*
+
+##########
+
+%package -n trinity-kuiviewer
+Summary:	Viewer for Qt Designer user interface files
+Group:		Development/Languages/Other
+
+%description -n trinity-kuiviewer
+KUIViewer is a utility to display and test the user interface (.ui) files
+generated by Qt Designer.  The interfaces can be displayed in a variety of
+different widget styles.
+
+The Qt Designer itself is in the package qt3-designer.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-kuiviewer
+%defattr(-,root,root,-)
+%{tde_bindir}/kuiviewer
+%{tde_tdelibdir}/libkuiviewerpart.so
+%{tde_tdelibdir}/libkuiviewerpart.la
+%{tde_tdelibdir}/quithumbnail.so
+%{tde_tdelibdir}/quithumbnail.la
+%{tde_tdeappdir}/kuiviewer.desktop
+%{tde_datadir}/apps/kuiviewer/
+%{tde_datadir}/apps/kuiviewerpart/
+%{tde_datadir}/icons/hicolor/*/apps/kuiviewer.png
+%{tde_datadir}/icons/locolor/*/apps/kuiviewer.png
+%{tde_datadir}/services/designerthumbnail.desktop
+%{tde_datadir}/services/kuiviewer_part.desktop
+%{tde_tdedocdir}/HTML/en/kuiviewer/
+%{tde_mandir}/man1/kuiviewer.1*
+
+##########
+
+%package -n trinity-libcvsservice0
+Summary:	DCOP service for accessing CVS repositories
+Group:		Development/Languages/Other
+Requires:	cvs
+
+%description -n trinity-libcvsservice0
+This library provides a DCOP service for accessing and working with
+remote CVS repositories.  Applications may link with this library to
+access the DCOP service directly from C++.  Alternatively, scripts may
+access the service using the standard "dcop" command-line tool.
+
+DCOP is the Desktop Communication Protocol used throughout TDE.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-libcvsservice0
+%defattr(-,root,root,-)
+%{tde_bindir}/cvsaskpass
+%{tde_bindir}/cvsservice
+%{tde_libdir}/libcvsservice.so.*
+%{tde_libdir}/libtdeinit_cvsaskpass.so
+%{tde_libdir}/libtdeinit_cvsservice.so
+%{tde_tdelibdir}/cvsaskpass.la
+%{tde_tdelibdir}/cvsaskpass.so
+%{tde_tdelibdir}/cvsservice.la
+%{tde_tdelibdir}/cvsservice.so
+%{tde_datadir}/services/cvsservice.desktop
+
+##########
+
+%package -n trinity-libcvsservice-devel
+Summary:	Development files for CVS DCOP service
+Group:		Development/Libraries/Other
+Requires:	trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-libcvsservice-devel
+The library libcvsservice provides a DCOP service for accessing and
+working with remote CVS repositories.  Applications may link with this
+library to access the DCOP service directly from C++.  Alternatively,
+scripts may access the service using the standard "dcop" command-line
+tool.
+
+Development files for libcvsservice are included in this package.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-libcvsservice-devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/cvsjob_stub.h
+%{tde_tdeincludedir}/cvsservice_stub.h
+%{tde_tdeincludedir}/repository_stub.h
+%{tde_libdir}/libcvsservice.la
+%{tde_libdir}/libcvsservice.so
+%{tde_libdir}/libtdeinit_cvsaskpass.la
+%{tde_libdir}/libtdeinit_cvsservice.la
+%{tde_datadir}/cmake/cervisia.cmake
+
+##########
+
+%package -n trinity-poxml
+Summary:	Tools for using PO-files to translate DocBook XML files
+Group:		Development/Languages/Other
+
+%description -n trinity-poxml
+This is a collection of tools that facilitate translating DocBook XML
+files using gettext message files (PO-files).
+
+Also included are some miscellaneous command-line utilities for
+manipulating DocBook XML files, PO-files and PO-template files.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-poxml
+%defattr(-,root,root,-)
+%{tde_bindir}/po2xml
+%{tde_bindir}/split2po
+%{tde_bindir}/swappo
+%{tde_bindir}/transxx
+%{tde_bindir}/xml2pot
+%{tde_mandir}/man1/po2xml.1*
+%{tde_mandir}/man1/split2po.1*
+%{tde_mandir}/man1/swappo.1*
+%{tde_mandir}/man1/transxx.1*
+%{tde_mandir}/man1/xml2pot.1*
+
+##########
+
+%package -n trinity-umbrello
+Summary:	UML modelling tool and code generator
+Group:		Development/Languages/Other
+
+%description -n trinity-umbrello
+Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
+With UML you can create diagrams of software and other systems in an
+industry standard format.  Umbrello can also generate code from your
+UML diagrams in a number of programming languages.
+
+The program supports class diagrams, sequence diagrams, collaboration
+diagrams, use case diagrams, state diagrams, activity diagrams, component
+diagrams and deployment diagrams.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-umbrello
+%defattr(-,root,root,-)
+%{tde_bindir}/umbodoc
+%{tde_bindir}/umbrello
+%{tde_tdeappdir}/umbrello.desktop
+%{tde_datadir}/apps/umbrello/
+%{tde_datadir}/icons/crystalsvg/*/actions/umbrello_*.png
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/umbrellofile.png
+%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz
+%{tde_datadir}/icons/hicolor/*/apps/umbrello.png
+%{tde_datadir}/icons/hicolor/scalable/apps/umbrello.svgz
+%{tde_datadir}/icons/hicolor/*/mimetypes/umbrellofile.png
+%{tde_datadir}/mimelnk/application/x-umbrello.desktop
+%{tde_tdedocdir}/HTML/en/umbrello/
+%{tde_mandir}/man1/umbrello.1*
+
+##########
+
+%if 0%{?build_kioslave}
+
+%package tdeio-plugins
+Summary:	Subversion ioslave for Trinity
+Group:		Development/Languages/Other
+Requires:	subversion
+
+Obsoletes:	trinity-tdesdk-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tdesdk-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description tdeio-plugins
+This package provides easy access to remote SVN repositories from within
+Konqueror, and TDE generally, by browsing them as if they were a
+filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files tdeio-plugins
+%defattr(-,root,root,-)
+%{tde_bindir}/tdeio_svn_helper
+%{tde_tdelibdir}/kded_ksvnd.la
+%{tde_tdelibdir}/kded_ksvnd.so
+%{tde_tdelibdir}/tdeio_svn.la
+%{tde_tdelibdir}/tdeio_svn.so
+%{tde_datadir}/apps/konqueror/servicemenus/subversion_toplevel.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/subversion.desktop
+%{tde_datadir}/services/kded/ksvnd.desktop
+%{tde_datadir}/services/svn+file.protocol_tdesdk
+%{tde_datadir}/services/svn+http.protocol_tdesdk
+%{tde_datadir}/services/svn+https.protocol_tdesdk
+%{tde_datadir}/services/svn+ssh.protocol_tdesdk
+%{tde_datadir}/services/svn.protocol_tdesdk
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_remove.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_add.png
+%{tde_datadir}/icons/crystalsvg/*/actions/svn_status.png
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_add.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_status.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_remove.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_switch.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_branch.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_merge.svgz
+
+%post tdeio-plugins
+for proto in svn+file svn+http svn+https svn+ssh svn; do
+  update-alternatives --install \
+    %{tde_datadir}/services/${proto}.protocol \
+    ${proto}.protocol \
+    %{tde_datadir}/services/${proto}.protocol_tdesdk \
+    10
+done
+
+%preun tdeio-plugins
+if [ $1 -eq 0 ]; then
+  for proto in svn+file svn+http svn+https svn+ssh svn; do
+    update-alternatives --remove \
+      ${proto}.protocol \
+      %{tde_datadir}/services/${proto}.protocol_tdesdk || :
+  done
+fi
+
+%endif
+
+##########
+
+%package -n trinity-tdeunittest
+Summary:	Unit testing library for Trinity
+Group:		Development/Languages/Other
+
+Obsoletes:	trinity-kunittest < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kunittest = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdeunittest
+tdeunittest is a small library that facilitates the writing of tests for
+TDE developers. There are two ways to use the tdeunittest library. One is
+to create dynamically loadable modules and use the tdeunittestmodrunner or
+tdeunittestguimodrunner programs to run the tests. The other is to use the
+libraries to create your own testing application.
+
+This package is part of Trinity, and a component of the TDE SDK module.
+
+%files -n trinity-tdeunittest
+%defattr(-,root,root,-)
+%{tde_bindir}/tdeunittest
+%{tde_bindir}/tdeunittest_debughelper
+%{tde_bindir}/tdeunittestmod
+%{tde_bindir}/tdeunittestguimodrunner
+%{tde_libdir}/libtdeunittestgui.la
+%{tde_libdir}/libtdeunittestgui.so.*
+
+##########
+
+%package devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries/Other
+
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kbabel-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-libcvsservice-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdesdk-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdesdk-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This package contains the development files for tdesdk.
+
+%files devel
+%defattr(-,root,root,-)
+# misc
+%{tde_tdeincludedir}/kprofilemethod.h
+%{tde_libdir}/libkstartperf.so
+# kspy
+%{tde_tdeincludedir}/kspy.h
+%{tde_libdir}/libkspy.so
+# kmtrace
+%{tde_libdir}/kmtrace/libktrace_s.a
+%{tde_tdeincludedir}/ktrace.h
+# tdeunittest
+%{tde_libdir}/libtdeunittestgui.so
+%{tde_tdeincludedir}/tdeunittest/runnergui.h
+# kompare
+%{tde_libdir}/libkompareinterface.so
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
+# Fix shebangs
+sed -i "scripts/kdelnk2desktop.py" \
+       "scripts/zonetab2pot.py" \
+       "tdecachegrind/converters/hotshot2calltree" \
+       "umbrello/umbrello/headings/heading.py" \
+    -e "s|env python|env %{python}|"
+%endif
+
+
+%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
+
+# FIXME PCLinuxOS: '/usr/bin/ld: cannot find -ltdeabc'
+%if 0%{?pclinuxos}
+export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L%{tde_libdir}"
+%endif
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DMAN_INSTALL_DIR=%{tde_mandir} \
+  -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_DBSEARCHENGINE=ON \
+  -DWITH_KCAL=ON \
+  -DBUILD_ALL=ON \
+  %{!?build_kioslave:-DBUILD_KIOSLAVE=OFF} \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot} 
+
+%__make install DESTDIR=%{?buildroot} -C build
+
+
+# Installs kdepalettes
+%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes/kde_xpaintrc
+%__install -D -m 644 kdepalettes/KDE_Gimp %{?buildroot}%{tde_datadir}/kdepalettes/KDE_Gimp
+%__install -D -m 644 kdepalettes/README %{?buildroot}%{tde_datadir}/kdepalettes/README
+
+# Installs SVN protocols as alternatives
+%if 0%{?build_kioslave}
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesdk
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesdk
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk
+%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk
+%endif
+
+# Removes useless stuff
+%__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules
+
+# Fix permissions
+chmod 644 %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/Doxyfile.global
+
+# Make kapptemplate archive
+pushd  %{?buildroot}%{tde_datadir}/apps/kapptemplate
+mkdir kapptemplate
+mv admin appframework bin existing include kapp kpartapp kpartplugin kapptemplate/
+tar cfz kapptemplate.tar.gz kapptemplate
+rm -rf kapptemplate
+popd
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file    kuiviewer      Development GUIDesigner
+%suse_update_desktop_file    umbrello       Development Design
+%suse_update_desktop_file    kbugbuster     Development Debugger
+%suse_update_desktop_file -u catalogmanager Development Translation
+%suse_update_desktop_file    kbabel         Development Translation
+%suse_update_desktop_file -u kbabeldict     Development Translation
+%suse_update_desktop_file    cervisia       Development RevisionControl
+%suse_update_desktop_file    kompare        Development RevisionControl
+%suse_update_desktop_file    tdecachegrind  Development Profiling
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc b/redhat/core/tdesdk/trinity-tdesdk-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdesdk/trinity-tdesdk-rpmlintrc
+++ b/redhat/core/tdesdk/trinity-tdesdk-rpmlintrc
diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec
new file mode 100644
index 000000000..4767ad8f1
--- /dev/null
+++ b/redhat/core/tdetoys/tdetoys.spec
@@ -0,0 +1,450 @@
+#
+# spec file for package tdetoys (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdetoys
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Summary:	Trinity Desktop Environment - Toys and Amusements
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:		Amusements/Graphics
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+
+# Trinity dependencies
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-kdesktop >= %{tde_version}
+BuildRequires: trinity-kicker >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+
+Obsoletes:		trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-kdetoys = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# Metapackage
+Requires: trinity-amor = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-eyesapplet = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-fifteenapplet = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmoon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kodo = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kteatime = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktux = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kweather = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kworldclock = %{?epoch:%{epoch}:}%{version}-%{release}
+
+
+%description
+Includes: 
+* amor: Amusing Misuse Of Resources put's comic figures above your windows
+* eyesapplet: a kicker applet similar to XEyes
+* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them
+* kmoon: system tray applet showing the moon phase
+* kodo: mouse movement meter
+* kteatime: system tray applet that makes sure your tea doesn't get too strong
+* ktux: Tux-in-a-Spaceship screen saver
+* kweather: kicker applet that will display the current weather outside
+* kworldwatch: application and kicker applet showing daylight area on the world
+               globe
+
+NOTE: kicker applets and screen savers require tdebase to be installed, 
+and user to be logged-in to TDE.
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+
+##########
+
+%package -n trinity-amor
+Summary:	a Trinity creature for your desktop
+Group:		Amusements/Graphics
+
+%description -n trinity-amor
+AMOR stands for Amusing Misuse Of Resources. It provides several different
+characters who prance around your X screen doing tricks and giving you tips.
+
+Note that AMOR will only work with some window managers. Both TWin (the
+TDE window manager) and Metacity (a GTK2 window manager) are supported.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-amor
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_bindir}/amor
+%{tde_datadir}/apps/amor/
+%{tde_tdeappdir}/amor.desktop
+%{tde_datadir}/icons/hicolor/*/apps/amor.png
+%{tde_tdedocdir}/HTML/en/amor/
+%{tde_mandir}/man*/amor.*
+
+##########
+
+%package -n trinity-eyesapplet
+Summary:	eyes applet for Trinity
+Group:		Amusements/Graphics
+
+Requires:	trinity-kicker >= %{tde_version}
+
+%description -n trinity-eyesapplet
+An applet for the TDE panel containing a pair of eyes that follow your mouse
+around the screen.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-eyesapplet
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_tdelibdir}/eyes_panelapplet.la
+%{tde_tdelibdir}/eyes_panelapplet.so
+%{tde_datadir}/apps/kicker/applets/eyesapplet.desktop
+
+##########
+
+%package -n trinity-fifteenapplet
+Summary:	fifteen pieces puzzle for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-fifteenapplet
+An applet for the TDE panel that lets you play the Fifteen Pieces
+sliding block puzzle. You have to order 15 pieces in a 4x4 square by
+moving them around.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-fifteenapplet
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_tdelibdir}/fifteen_panelapplet.la
+%{tde_tdelibdir}/fifteen_panelapplet.so
+%{tde_datadir}/apps/kicker/applets/kfifteenapplet.desktop
+
+##########
+
+%package -n trinity-kmoon
+Summary:	moon phase indicator for Trinity
+Group:		Amusements/Graphics
+
+Requires:	trinity-kicker >= %{tde_version}
+
+%description -n trinity-kmoon
+An applet for the TDE panel that displays the current phase of the moon.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kmoon
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_tdelibdir}/kmoon_panelapplet.la
+%{tde_tdelibdir}/kmoon_panelapplet.so
+%{tde_datadir}/apps/kicker/applets/kmoonapplet.desktop
+%{tde_datadir}/apps/kmoon/
+%{tde_datadir}/icons/hicolor/*/apps/kmoon.png
+%{tde_tdedocdir}/HTML/en/kmoon/
+
+##########
+
+%package -n trinity-kodo
+Summary:	mouse odometer for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-kodo
+KOdometer measures your desktop mileage. It tracks the movement of your mouse
+pointer across your desktop and renders it in inches/feet/miles! It can
+do cm/metres/km too. Its most exciting feature is the tripometer.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kodo
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_bindir}/kodo
+%{tde_tdeappdir}/kodo.desktop
+%{tde_datadir}/apps/kodo/
+%{tde_datadir}/icons/hicolor/*/apps/kodo.png
+%{tde_tdedocdir}/HTML/en/kodo/
+%{tde_mandir}/man*/kodo.*
+
+##########
+
+%package -n trinity-kteatime
+Summary:	Trinity utility for making a fine cup of tea
+Group:		Amusements/Graphics
+
+%description -n trinity-kteatime
+KTeaTime is a handy timer for steeping tea. No longer will you have to
+guess at how long it takes for your tea to be ready. Simply select the
+type of tea you have, and it will alert you when the tea is ready to
+drink.
+
+KTeaTime sits in the Trinity system tray.
+
+Please note that KTeaTime is written explicitly for Trinity. If you are
+using a non-TDE window manager or desktop environment then it is quite
+possible that KTeaTime will not work on your system.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kteatime
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_bindir}/kteatime
+%{tde_tdeappdir}/kteatime.desktop
+%{tde_datadir}/apps/kteatime/
+%{tde_datadir}/icons/hicolor/*/apps/kteatime.png
+%{tde_tdedocdir}/HTML/en/kteatime/
+%{tde_mandir}/man*/kteatime.*
+
+##########
+
+%package -n trinity-ktux
+Summary:	Tux screensaver for Trinity
+Group:		Amusements/Graphics
+
+%description -n trinity-ktux
+A neat Tux-in-a-spaceship screensaver for the Trinity Desktop Environment (TDE).
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-ktux
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_bindir}/ktux
+%{tde_datadir}/apps/ktux/
+%{tde_datadir}/applnk/System/ScreenSavers/ktux.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ktux.png
+%{tde_mandir}/man*/ktux.*
+
+##########
+
+%package -n trinity-kweather
+Summary:	weather display applet for Trinity
+Group:		Amusements/Graphics
+
+Requires:	trinity-kicker >= %{tde_version}
+
+%description -n trinity-kweather
+An applet for the TDE panel that displays your area's current weather.
+Information shown includes the temperature, wind speed, air pressure
+and more. By pressing a button a full weather report can be obtained.
+
+KWeather also provides a weather service that can track multiple weather
+stations and provide this information to other applications, including
+Konqueror's sidebar and Kontact's summary page.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kweather
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_bindir}/kweatherservice
+%{tde_bindir}/kweatherreport
+%{tde_libdir}/libtdeinit_kweatherreport.so
+%{tde_libdir}/libtdeinit_kweatherreport.la
+%{tde_tdelibdir}/kcm_weather.so
+%{tde_tdelibdir}/kcm_weather.la
+%{tde_tdelibdir}/kcm_weatherservice.so
+%{tde_tdelibdir}/kcm_weatherservice.la
+%{tde_tdelibdir}/kweatherreport.so
+%{tde_tdelibdir}/kweatherreport.la
+%{tde_tdelibdir}/weather_panelapplet.la
+%{tde_tdelibdir}/weather_panelapplet.so
+%{tde_tdelibdir}/weather_sidebar.la
+%{tde_tdelibdir}/weather_sidebar.so
+%{tde_datadir}/apps/kicker/applets/kweather.desktop
+%{tde_datadir}/apps/konqsidebartng/
+%{tde_datadir}/apps/kweather/
+%{tde_datadir}/apps/kweatherservice/
+%{tde_datadir}/icons/hicolor/*/apps/kweather.png
+%{tde_datadir}/services/kweatherservice.desktop
+%{tde_datadir}/services/kcmweather.desktop
+%{tde_datadir}/services/kcmweatherservice.desktop
+%{tde_tdedocdir}/HTML/en/kweather/
+%{tde_mandir}/man*/kweatherreport.*
+%{tde_mandir}/man*/kweatherservice.*
+
+##########
+
+%package -n trinity-kworldclock
+Summary:	earth watcher for Trinity
+Group:		Amusements/Graphics
+
+Requires:	trinity-kdesktop >= %{tde_version}
+Requires:	trinity-kicker >= %{tde_version}
+
+%description -n trinity-kworldclock
+Displays where in the world it is light and dark depending on time, as
+well as offering the time in all of the major cities of the world.
+This can be run standalone, as an applet in the TDE panel or as a
+desktop background.
+
+Additional kworldclock themes are available in the tdeartwork-misc package.
+
+This package is part of Trinity, and a component of the TDE toys module.
+
+%files -n trinity-kworldclock
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{tde_bindir}/kworldclock
+%{tde_tdelibdir}/ww_panelapplet.la
+%{tde_tdelibdir}/ww_panelapplet.so
+%{tde_tdeappdir}/kworldclock.desktop
+%{tde_datadir}/apps/kdesktop/programs/kdeworld.desktop
+%{tde_datadir}/apps/kicker/applets/kwwapplet.desktop
+%{tde_datadir}/apps/kworldclock/
+%{tde_datadir}/icons/hicolor/*/apps/kworldclock.png
+%{tde_tdedocdir}/HTML/en/kworldclock/
+%{tde_mandir}/man*/kworldclock.*
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf "%{buildroot}"
+%__make install DESTDIR=%{buildroot} -C build
+
+# Useless include file from Amor
+%__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r kworldclock Utility Clock
+%suse_update_desktop_file -r kteatime    Applet
+%suse_update_desktop_file -r amor        Amusement
+%suse_update_desktop_file -r kodo        Amusement 
+%suse_update_desktop_file ktux        Screensaver
+%endif
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdeutils/kcmlaptoprc b/redhat/core/tdeutils/kcmlaptoprc
index 66d400f5d..66d400f5d 100644
--- a/redhat/main/tdeutils/kcmlaptoprc
+++ b/redhat/core/tdeutils/kcmlaptoprc
diff --git a/redhat/main/tdeutils/klaptop_acpi_helper.console b/redhat/core/tdeutils/klaptop_acpi_helper.console
index 6a738ec88..6a738ec88 100644
--- a/redhat/main/tdeutils/klaptop_acpi_helper.console
+++ b/redhat/core/tdeutils/klaptop_acpi_helper.console
diff --git a/redhat/main/tdeutils/klaptop_acpi_helper.pam b/redhat/core/tdeutils/klaptop_acpi_helper.pam
index 321c2eefb..321c2eefb 100644
--- a/redhat/main/tdeutils/klaptop_acpi_helper.pam
+++ b/redhat/core/tdeutils/klaptop_acpi_helper.pam
diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec
new file mode 100644
index 000000000..38004b45f
--- /dev/null
+++ b/redhat/core/tdeutils/tdeutils.spec
@@ -0,0 +1,1040 @@
+#
+# spec file for package tdeutils (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdeutils
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_sbindir %{tde_prefix}/sbin
+%define tde_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Summary:	TDE Utilities
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:		Applications/System
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	klaptop_acpi_helper.pam
+Source2:	klaptop_acpi_helper.console
+Source3:	kcmlaptoprc
+Source4:	%{name}-rpmlintrc
+
+Obsoletes:	trinity-kdeutils < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeutils = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdeutils-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeutils-extras = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdeutils < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdeutils = %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	trinity-filesystem >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+BuildRequires:	gettext
+BuildRequires:	net-snmp-devel
+BuildRequires:	gmp-devel
+
+# PYTHON support
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%else
+%define python python
+%endif
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# XTST support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+%define xtst_devel %{_lib}xtst-devel
+%else
+%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+%define xtst_devel libXtst-devel
+%endif
+%{?xtst_devel:BuildRequires: %{xtst_devel}}
+
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# XMMS support
+#if 0#{?fedora}
+#BuildRequires:	xmms-devel
+#endif
+
+# KLAPTOPDAEMON
+#  Not for RHEL 4!
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%define build_klaptopdaemon 1
+%endif
+
+# ACL support
+BuildRequires:	libacl-devel
+
+# XSCREENSAVER support
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_xscreensaver 1
+%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xscrnsaver-devel
+%else
+BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+%endif
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# CONSOLEHELPER (usermode) support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_consolehelper 1
+
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
+%endif
+
+%if "%{?tde_version}" == "14.1.0"
+%define build_tdefilereplace 1
+%endif
+
+Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kcharselect = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdelirc = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdessh = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kdf = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kedit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kfloppy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kgpg = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-khexedit = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kjots = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires: trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kmilo-legacy = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?build_tdefilereplace}
+Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
+%description
+Utilities for the Trinity Desktop Environment, including:
+* ark (tar/gzip archive manager)
+* kcalc (scientific calculator)
+* kcharselect (character selector)
+* tdelirc (infrared control)
+* tdessh (ssh front end)
+* kdf (view disk usage)
+* kedit (simple text editor)
+* kfloppy (floppy formatting tool)
+* kgpg (gpg gui)
+* khexedit (hex editor)
+* kjots (note taker)
+%if 0%{?build_klaptopdaemon}
+* klaptopdaemon (battery monitoring and management for laptops);
+%endif
+* kmilo
+* kregexpeditor (regular expression editor)
+* ksim (system information monitor);
+* ktimer (task scheduler)
+* kwikdisk (removable media utility)
+* tdefilereplace: batch search and replace tool
+
+%files
+
+##########
+
+%package -n trinity-ark
+Summary:	Graphical archiving tool for Trinity
+Group:		Applications/Utilities
+#Requires:	ncompress
+Requires:	unzip
+Requires:	zip
+#Requires:	zoo
+Requires:	bzip2
+#Requires:	p7zip
+#Requires:	xz
+#Requires:	lzma
+#Requires:	rar, unrar
+
+%description -n trinity-ark
+Ark is a graphical program for managing various archive formats within the
+TDE environment. Archives can be viewed, extracted, created and modified
+from within Ark.
+
+The program can handle various formats such as tar, gzip, bzip2, zip, rar and
+lha (if appropriate command-line programs are installed).
+
+Ark can work closely with Konqueror in the TDE environment to handle archives,
+if you install the Konqueror Integration plugin available in the konq-plugins
+package.
+
+%files -n trinity-ark
+%defattr(-,root,root,-)
+%{tde_bindir}/ark
+%{tde_tdelibdir}/ark.la
+%{tde_tdelibdir}/ark.so
+%{tde_tdelibdir}/libarkpart.la
+%{tde_tdelibdir}/libarkpart.so
+%{tde_libdir}/libtdeinit_ark.so
+%{tde_tdeappdir}/ark.desktop
+%{tde_datadir}/apps/ark/
+%{tde_datadir}/config.kcfg/ark.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/ark.png
+%{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz
+%{tde_datadir}/services/ark_part.desktop
+%{tde_tdedocdir}/HTML/en/ark/
+%{tde_mandir}/man1/ark.1*
+
+##########
+
+%package -n trinity-kcalc
+Summary:	Calculator for Trinity
+Group:		Applications/Utilities
+
+%description -n trinity-kcalc
+KCalc is TDE's scientific calculator.
+
+It provides:
+* trigonometric functions, logic operations, and statistical calculations
+* easy cut and paste of numbers from/into its display
+* a results-stack which lets you conveniently recall previous results
+* configurable precision, and number of digits after the period
+
+%files -n trinity-kcalc
+%defattr(-,root,root,-)
+%{tde_bindir}/kcalc
+%{tde_tdelibdir}/kcalc.la
+%{tde_tdelibdir}/kcalc.so
+%{tde_libdir}/libtdeinit_kcalc.so
+%{tde_tdeappdir}/kcalc.desktop
+%{tde_datadir}/apps/kcalc/
+%{tde_datadir}/apps/tdeconf_update/kcalcrc.upd
+%{tde_datadir}/config.kcfg/kcalc.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kcalc.png
+%{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
+%{tde_tdedocdir}/HTML/en/kcalc/
+%{tde_mandir}/man1/kcalc.1*
+
+##########
+
+%package -n trinity-kcharselect
+Summary:	Character selector for Trinity
+Group:		Applications/Utilities
+Requires:	trinity-kicker
+
+%description -n trinity-kcharselect
+This package contains kcharselect, a character set selector for TDE.
+
+%files -n trinity-kcharselect
+%defattr(-,root,root,-)
+%{tde_bindir}/kcharselect
+%{tde_tdelibdir}/kcharselect_panelapplet.la
+%{tde_tdelibdir}/kcharselect_panelapplet.so
+%{tde_tdeappdir}/KCharSelect.desktop
+%{tde_datadir}/apps/kcharselect/
+%{tde_datadir}/apps/tdeconf_update/kcharselect.upd
+%{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kcharselect.png
+%{tde_tdedocdir}/HTML/en/kcharselect/
+%{tde_mandir}/man1/kcharselect.1*
+
+##########
+
+%package -n trinity-tdelirc
+Summary:	Infrared control for Trinity
+Group:		Applications/Utilities
+Requires:	trinity-filesystem
+
+Obsoletes:	trinity-kdelirc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdelirc = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdelirc
+This is a frontend for the LIRC suite to use infrared devices with TDE.
+
+%files -n trinity-tdelirc
+%defattr(-,root,root,-)
+%{tde_bindir}/irkick
+%{tde_tdelibdir}/irkick.la
+%{tde_tdelibdir}/irkick.so
+%{tde_tdelibdir}/kcm_kcmlirc.la
+%{tde_tdelibdir}/kcm_kcmlirc.so
+%{tde_libdir}/libtdeinit_irkick.so
+%{tde_tdeappdir}/irkick.desktop
+%{tde_tdeappdir}/kcmlirc.desktop
+%{tde_datadir}/apps/irkick/
+%{tde_datadir}/apps/profiles/tdelauncher.profile.xml
+%{tde_datadir}/apps/profiles/konqueror.profile.xml
+%{tde_datadir}/apps/profiles/noatun.profile.xml
+%{tde_datadir}/apps/profiles/profile.dtd
+%dir %{tde_datadir}/apps/remotes
+%{tde_datadir}/apps/remotes/RM-0010.remote.xml
+%{tde_datadir}/apps/remotes/cimr100.remote.xml
+%{tde_datadir}/apps/remotes/hauppauge.remote.xml
+%{tde_datadir}/apps/remotes/remote.dtd
+%{tde_datadir}/apps/remotes/sherwood.remote.xml
+%{tde_datadir}/apps/remotes/sonytv.remote.xml
+%{tde_datadir}/autostart/irkick.desktop
+%{tde_datadir}/icons/hicolor/*/apps/irkick.png
+%{tde_datadir}/icons/locolor/*/apps/irkick.png
+%{tde_tdedocdir}/HTML/en/irkick/
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmlirc/
+
+##########
+
+%package -n trinity-tdessh
+Summary:	Ssh frontend for Trinity
+Group:		Applications/Utilities
+%if 0%{?suse_version}
+Requires:	openssh
+%else
+Requires:	openssh-clients
+%endif
+
+Obsoletes:	trinity-kdessh < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdessh = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdessh
+This package contains TDE's frontend for ssh.
+
+%files -n trinity-tdessh
+%defattr(-,root,root,-)
+%{tde_bindir}/tdessh
+
+##########
+
+%package -n trinity-kdf
+Summary:	Disk space utility for Trinity
+Group:		Applications/Utilities
+Requires:	trinity-kcontrol
+
+%description -n trinity-kdf
+KDiskFree displays the available file devices (hard drive partitions, floppy
+and CD drives, etc.) along with information on their capacity, free space, type
+and mount point. It also allows you to mount and unmount drives and view them
+in a file manager.
+
+%files -n trinity-kdf
+%defattr(-,root,root,-)
+%{tde_bindir}/kdf
+%{tde_bindir}/kwikdisk
+%{tde_tdelibdir}/kcm_kdf.la
+%{tde_tdelibdir}/kcm_kdf.so
+%{tde_tdeappdir}/kcmdf.desktop
+%{tde_tdeappdir}/kdf.desktop
+%{tde_tdeappdir}/kwikdisk.desktop
+%{tde_datadir}/apps/kdf/
+%{tde_datadir}/icons/hicolor/*/apps/kdf.png
+%{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png
+%{tde_tdedocdir}/HTML/en/kdf/
+%{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/
+%{tde_mandir}/man1/kdf.1*
+%{tde_mandir}/man1/kwikdisk.1*
+
+##########
+
+%package -n trinity-kedit
+Summary:	Basic text editor for Trinity
+Group:		Applications/Utilities
+
+%description -n trinity-kedit
+A simple text editor for TDE.
+
+It can be used with Konqueror for text and configuration file browsing.
+KEdit also serves well for creating small plain text documents. KEdit's
+functionality will intentionally remain rather limited to ensure a
+reasonably fast start.
+
+%files -n trinity-kedit
+%defattr(-,root,root,-)
+%{tde_bindir}/kedit
+%{tde_tdelibdir}/kedit.la
+%{tde_tdelibdir}/kedit.so
+%{tde_libdir}/libtdeinit_kedit.so
+%{tde_tdeappdir}/KEdit.desktop
+%{tde_datadir}/apps/kedit/
+%{tde_datadir}/config.kcfg/kedit.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kedit.png
+%{tde_tdedocdir}/HTML/en/kedit/
+%{tde_mandir}/man1/kedit.1*
+
+##########
+
+%package -n trinity-kfloppy
+Summary:	Floppy formatter for Trinity
+Group:		Applications/Utilities
+Requires:	dosfstools
+
+%description -n trinity-kfloppy
+Kfloppy is a utility that provides a straightforward graphical means
+to format 3.5" and 5.25" floppy disks.
+
+%files -n trinity-kfloppy
+%defattr(-,root,root,-)
+%{tde_bindir}/kfloppy
+%{tde_tdeappdir}/KFloppy.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kfloppy.png
+%{tde_tdedocdir}/HTML/en/kfloppy/
+%{tde_mandir}/man1/kfloppy.1*
+
+##########
+
+%package -n trinity-kgpg
+Summary:	GnuPG frontend for Trinity
+Group:		Applications/Utilities
+Requires:	trinity-konsole
+Requires:	gnupg
+
+%description -n trinity-kgpg
+Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
+encryption, file decryption and key management.
+
+Features:
+* an editor mode for easily and quickly encrypting or decrypting a file
+  or message which is typed, copied, pasted or dragged into the editor,
+  or which is double-clicked in the file manager
+* Konqueror integration for encrypting or decrypting files
+* a panel applet for encrypting / decrypting files or the clipboard
+  contents, etc.
+* key management functions (generation, import, export, deletion and
+  signing)
+* decrypting clipboard contents, including integration with Klipper
+
+%files -n trinity-kgpg
+%defattr(-,root,root,-)
+%{tde_bindir}/kgpg
+%{tde_tdeappdir}/kgpg.desktop
+%{tde_datadir}/apps/kgpg/
+%{tde_datadir}/apps/konqueror/servicemenus/encryptfile.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/encryptfolder.desktop
+%{tde_datadir}/autostart/kgpg.desktop
+%{tde_datadir}/config.kcfg/kgpg.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kgpg.png
+%{tde_tdedocdir}/HTML/en/kgpg/
+%{tde_mandir}/man1/kgpg.1*
+
+##########
+
+%package -n trinity-khexedit
+Summary:	Trinity hex editor
+Group:		Applications/Utilities
+
+%description -n trinity-khexedit
+KHexEdit is an editor for the raw data of binary files.  It includes
+find/replace functions, bookmarks, many configuration options, drag and drop
+support and other powerful features.
+
+%files -n trinity-khexedit
+%defattr(-,root,root,-)
+%{tde_bindir}/khexedit
+%{tde_tdelibdir}/libkbyteseditwidget.la
+%{tde_tdelibdir}/libkbyteseditwidget.so
+%{tde_tdelibdir}/libkhexedit2part.la
+%{tde_tdelibdir}/libkhexedit2part.so
+%{tde_libdir}/libkhexeditcommon.so.*
+%{tde_tdeappdir}/khexedit.desktop
+%{tde_datadir}/apps/khexedit/
+%{tde_datadir}/apps/khexedit2part/
+%{tde_datadir}/icons/hicolor/*/apps/khexedit.png
+%{tde_datadir}/services/kbyteseditwidget.desktop
+%{tde_datadir}/services/khexedit2part.desktop
+%{tde_tdedocdir}/HTML/en/khexedit/
+%{tde_mandir}/man1/khexedit.1*
+
+##########
+
+%package -n trinity-kjots
+Summary:	Note taking utility for Trinity
+Group:		Applications/Utilities
+
+%description -n trinity-kjots
+Kjots is a small note taker program. Name and idea are taken from the jots
+program included in the tkgoodstuff package.
+
+%files -n trinity-kjots
+%defattr(-,root,root,-)
+%{tde_bindir}/kjots
+%{tde_tdeappdir}/Kjots.desktop
+%{tde_datadir}/apps/kjots/
+%{tde_datadir}/config.kcfg/kjots.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/kjots.png
+%{tde_tdedocdir}/HTML/en/kjots/
+
+##########
+
+%if 0%{?build_klaptopdaemon}
+
+%package -n trinity-klaptopdaemon
+Summary:	Battery monitoring and management for laptops using Trinity
+Group:		Applications/Utilities
+Requires:	trinity-kcontrol
+
+%if 0%{?with_consolehelper}
+# package 'usermode' provides '/usr/bin/consolehelper-gtk'
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	usermode-gtk
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	usermode
+%endif
+%endif
+
+%description -n trinity-klaptopdaemon
+This package contains utilities to monitor batteries and configure
+power management, for laptops, from within TDE.
+
+%files -n trinity-klaptopdaemon
+%defattr(-,root,root,-)
+%{tde_bindir}/klaptop_acpi_helper
+%{tde_bindir}/klaptop_check
+%{tde_tdelibdir}/kcm_laptop.la
+%{tde_tdelibdir}/kcm_laptop.so
+%{tde_tdelibdir}/kded_klaptopdaemon.la
+%{tde_tdelibdir}/kded_klaptopdaemon.so
+%{tde_libdir}/libkcmlaptop.so.*
+%{tde_tdeappdir}/laptop.desktop
+%{tde_tdeappdir}/pcmcia.desktop
+%{tde_datadir}/apps/klaptopdaemon/
+%{tde_datadir}/icons/crystalsvg/*/apps/laptop_battery.png
+%{tde_datadir}/icons/crystalsvg/*/apps/laptop_pcmcia.png
+%{tde_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+%{tde_datadir}/services/kded/klaptopdaemon.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
+%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
+%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/
+
+# ConsoleHelper support
+%if 0%{?with_consolehelper}
+%{_sysconfdir}/pam.d/klaptop_acpi_helper
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%{tde_sbindir}/klaptop_acpi_helper
+%{_sbindir}/klaptop_acpi_helper
+%endif
+
+%config(noreplace) %{tde_confdir}/kcmlaptoprc
+
+%endif
+
+##########
+
+%package -n trinity-kmilo
+Summary:	Laptop special keys support for Trinity
+Group:		Applications/Utilities
+
+%description -n trinity-kmilo
+KMilo lets you use the special keys on some keyboards and laptops.
+
+Usually this includes volume keys and other features. Currently, KMilo
+comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
+with special keys.
+
+%files -n trinity-kmilo
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kded_kmilod.la
+%{tde_tdelibdir}/kded_kmilod.so
+%{tde_tdelibdir}/kmilo_generic.la
+%{tde_tdelibdir}/kmilo_generic.so
+%{tde_libdir}/libkmilo.so.*
+%{tde_datadir}/services/kded/kmilod.desktop
+%dir %{tde_datadir}/services/kmilo
+%{tde_datadir}/services/kmilo/kmilo_generic.desktop
+%dir %{tde_datadir}/servicetypes/kmilo
+%{tde_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
+
+##########
+
+%package -n trinity-kmilo-legacy
+Summary:	Non-standard plugins for KMilo
+Group:		Applications/Utilities
+Requires:	trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kcontrol
+
+%description -n trinity-kmilo-legacy
+KMilo lets you use the special keys on some keyboards and laptops.
+
+Usually this includes volume keys and other features. Currently, KMilo
+comes with plugins for Powerbooks, Thinkpads and Vaios.
+
+The intention is that all laptops work with the generic kmilo
+plugin, if you need this package please file a bug.
+
+%files -n trinity-kmilo-legacy
+%defattr(-,root,root,-)
+%{tde_tdelibdir}/kcm_kvaio.la
+%{tde_tdelibdir}/kcm_kvaio.so
+%{tde_tdelibdir}/kcm_thinkpad.la
+%{tde_tdelibdir}/kcm_thinkpad.so
+%{tde_tdelibdir}/kmilo_asus.la
+%{tde_tdelibdir}/kmilo_asus.so
+%{tde_tdelibdir}/kmilo_delli8k.la
+%{tde_tdelibdir}/kmilo_delli8k.so
+%{tde_tdelibdir}/kmilo_kvaio.la
+%{tde_tdelibdir}/kmilo_kvaio.so
+%{tde_tdelibdir}/kmilo_thinkpad.la
+%{tde_tdelibdir}/kmilo_thinkpad.so
+%{tde_tdeappdir}/kvaio.desktop
+%{tde_tdeappdir}/thinkpad.desktop
+%{tde_datadir}/services/kmilo/kmilo_asus.desktop
+%{tde_datadir}/services/kmilo/kmilo_delli8k.desktop
+%{tde_datadir}/services/kmilo/kmilo_kvaio.desktop
+%{tde_datadir}/services/kmilo/kmilo_thinkpad.desktop
+%{tde_tdedocdir}/HTML/en/kcontrol/kvaio/
+%{tde_tdedocdir}/HTML/en/kcontrol/thinkpad/
+
+##########
+
+%package -n trinity-kregexpeditor
+Summary:	Graphical regular expression editor plugin for Trinity
+Group:		Applications/Utilities
+
+%description -n trinity-kregexpeditor
+This package contains a graphical regular expression editor plugin for use
+with TDE. It let you draw your regular expression in an unambiguous way.
+
+%files -n trinity-kregexpeditor
+%defattr(-,root,root,-)
+%{tde_bindir}/kregexpeditor
+%{tde_tdelibdir}/libkregexpeditorgui.la
+%{tde_tdelibdir}/libkregexpeditorgui.so
+%{tde_libdir}/libkregexpeditorcommon.so.*
+%{tde_tdeappdir}/kregexpeditor.desktop
+%{tde_datadir}/apps/kregexpeditor/
+%{tde_datadir}/icons/hicolor/*/apps/kregexpeditor.png
+%{tde_datadir}/services/kregexpeditorgui.desktop
+%{tde_tdedocdir}/HTML/en/KRegExpEditor/
+
+##########
+
+%package -n trinity-ksim
+Summary:	System information monitor for Trinity
+Group:		Applications/Utilities
+Requires:	trinity-kicker
+
+%description -n trinity-ksim
+KSim is a system monitor app which has its own plugin system with support
+for GKrellm skins. It allows users to follow uptime, memory usage, network
+connections, power, etc.
+
+%files -n trinity-ksim
+%defattr(-,root,root,-)
+%config(noreplace) %{tde_confdir}/ksim_panelextensionrc
+%{tde_tdelibdir}/ksim_*.la
+%{tde_tdelibdir}/ksim_*.so
+%{tde_libdir}/libksimcore.so.*
+%{tde_datadir}/apps/kicker/extensions/ksim.desktop
+%{tde_datadir}/apps/ksim/
+%{tde_tdedocdir}/HTML/en/ksim/
+%{tde_datadir}/icons/crystalsvg/*/apps/ksim.png
+%{tde_datadir}/icons/crystalsvg/*/devices/ksim_cpu.png
+
+##########
+
+%package -n trinity-ktimer
+Summary:	Timer utility for Trinity
+Group:		Applications/Utilities
+
+%description -n trinity-ktimer
+This is a timer application for TDE. It allows you to execute commands after
+a certain amount of time. It supports looping commands as well as delayed
+command execution.
+
+%files -n trinity-ktimer
+%defattr(-,root,root,-)
+%{tde_bindir}/ktimer
+%{tde_tdeappdir}/ktimer.desktop
+%{tde_datadir}/icons/hicolor/*/apps/ktimer.png
+%{tde_tdedocdir}/HTML/en/ktimer/
+
+##########
+
+%package -n trinity-tdewalletmanager
+Summary:	Wallet manager for Trinity
+Group:		Applications/Utilities
+
+Obsoletes:	trinity-kwalletmanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kwalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdewalletmanager
+This program keeps various wallets for any kind of data that the user can
+store encrypted with passwords and can also serve as a password manager that
+keeps a master password to all wallets.
+
+%files -n trinity-tdewalletmanager
+%defattr(-,root,root,-)
+%{tde_bindir}/tdewalletmanager
+%{tde_tdelibdir}/kcm_tdewallet.la
+%{tde_tdelibdir}/kcm_tdewallet.so
+%{tde_tdeappdir}/tdewalletconfig.desktop
+%{tde_tdeappdir}/tdewalletmanager.desktop
+%{tde_tdeappdir}/tdewalletmanager-tdewalletd.desktop
+%{tde_datadir}/apps/tdewalletmanager/
+%{tde_datadir}/icons/hicolor/*/apps/tdewalletmanager.png
+%{tde_datadir}/services/tdewallet_config.desktop
+%{tde_datadir}/services/tdewalletmanager_show.desktop
+%{tde_tdedocdir}/HTML/en/tdewallet/
+
+##########
+
+%package -n trinity-superkaramba
+Summary:	A program based on karamba improving the eyecandy of TDE
+Group:		Applications/Utilities
+
+%description -n trinity-superkaramba
+SuperKaramba is a tool based on karamba that allows anyone to easily create
+and run little interactive widgets on a TDE desktop. Widgets are defined in a
+simple text file and can be augmented with Python code to make them
+interactive.
+
+Here are just some examples of the things that can be done:
+* Display system information such as CPU Usage, MP3 playing, etc.
+* Create cool custom toolbars that work any way imaginable.
+* Create little games or virtual pets that live on your desktop.
+* Display information from the internet, such as weather and headlines.
+
+%files -n trinity-superkaramba
+%defattr(-,root,root,-)
+%{tde_bindir}/superkaramba
+%{tde_tdeappdir}/superkaramba.desktop
+%{tde_datadir}/apps/superkaramba/
+%{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png
+%{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
+%{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
+%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+%{tde_datadir}/mimelnk/application/x-superkaramba.desktop
+%{tde_tdedocdir}/HTML/en/superkaramba/
+%{tde_mandir}/man1/superkaramba.1*
+
+##########
+
+%if 0%{?build_tdefilereplace}
+
+%package -n trinity-tdefilereplace
+Summary:	Batch search-and-replace component for TDE
+Group:		Applications/Utilities
+
+Obsoletes:	trinity-kfilereplace < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kfilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdefilereplace
+TDEFileReplace is an embedded component for TDE that acts as a batch
+search-and-replace tool. It allows you to replace one expression with
+another in many files at once.
+
+Note that at the moment TDEFileReplace does not come as a standalone
+application.
+
+This package is part of Trinity, as a component of the TDE utilities module.
+
+%files -n trinity-tdefilereplace
+%defattr(-,root,root,-)
+%{tde_bindir}/tdefilereplace
+%{tde_tdelibdir}/libtdefilereplacepart.la
+%{tde_tdelibdir}/libtdefilereplacepart.so
+%{tde_tdeappdir}/tdefilereplace.desktop
+%{tde_datadir}/apps/tdefilereplace/
+%{tde_datadir}/apps/tdefilereplacepart/
+%{tde_tdedocdir}/HTML/en/tdefilereplace/
+%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
+%{tde_datadir}/services/tdefilereplacepart.desktop
+
+%endif
+
+##########
+
+# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
+%package devel
+Summary:	Development files for %{name} 
+Group:		Development/Libraries
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-tdelibs-devel
+
+Obsoletes:	trinity-kdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	tdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	tdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This package contains the development files for tdeutils.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*
+%if 0%{?build_klaptopdaemon}
+%{tde_libdir}/libkcmlaptop.la
+%{tde_libdir}/libkcmlaptop.so
+%endif
+%{tde_libdir}/libtdeinit_ark.la
+%{tde_libdir}/libtdeinit_irkick.la
+%{tde_libdir}/libtdeinit_kcalc.la
+%{tde_libdir}/libtdeinit_kedit.la
+%{tde_libdir}/libkmilo.la
+%{tde_libdir}/libkmilo.so
+%{tde_libdir}/libkregexpeditorcommon.la
+%{tde_libdir}/libkregexpeditorcommon.so
+%{tde_libdir}/libksimcore.la
+%{tde_libdir}/libksimcore.so
+%{tde_libdir}/libkhexeditcommon.la
+%{tde_libdir}/libkhexeditcommon.so
+%{tde_datadir}/cmake/libksimcore.cmake
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+%if 0%{?rhel} == 5
+# Reverts some older Python stuff
+%__sed -i "superkaramba/src/"*".cpp" \
+       -e "s|PyBytes_CheckExact|PyString_CheckExact|g" \
+       -e "s|PyBytes_AsString|PyString_AsString|g" \
+       -e "s|PyBytes_FromString|PyString_FromString|g" \
+%endif
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Shitty hack for RHEL4 ...
+if [ -d "/usr/X11R6" ]; then
+  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  \
+  -DWITH_DPMS=ON \
+  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
+  -DWITH_ASUS=ON \
+  -DWITH_POWERBOOK=OFF \
+  -DWITH_POWERBOOK2=OFF \
+  -DWITH_VAIO=ON \
+  -DWITH_THINKPAD=ON \
+  -DWITH_I8K=ON \
+  -DWITH_SNMP=ON \
+  -DWITH_SENSORS=ON \
+  -DWITH_XMMS=ON \
+  -DWITH_TDENEWSTUFF=ON \
+  -DBUILD_ALL=ON \
+  %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
+  ..
+   
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%if 0%{?build_klaptopdaemon}
+### Use consolehelper for 'klaptop_acpi_helper'
+%if 0%{?with_consolehelper}
+# Install configuration files
+%__install -p -D -m 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper"
+%__install -p -D -m 644 "%{SOURCE2}" "%{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper"
+# Moves the actual binary from 'bin' to 'sbin'
+%__mkdir_p "%{buildroot}%{tde_sbindir}" "%{buildroot}%{_sbindir}"
+%__mv "%{buildroot}%{tde_bindir}/klaptop_acpi_helper" "%{buildroot}%{tde_sbindir}"
+# Links to consolehelper
+%__ln_s "%{_bindir}/consolehelper" "%{buildroot}%{tde_bindir}/klaptop_acpi_helper"
+# Put another symlink under '/usr', otherwise consolehelper does not work
+%if "%{tde_prefix}" != "/usr"
+%__ln_s "%{tde_sbindir}/klaptop_acpi_helper" "%{?buildroot}%{_sbindir}/klaptop_acpi_helper"
+%endif
+%endif
+
+# klaptop settings file
+%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_confdir}/kcmlaptoprc"
+
+%else
+
+# Klaptop's documentation is installed even if we did not build the program ...
+%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
+%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
+%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
+%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/
+
+%endif
+
+# Fix desktop shortcut location
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+  %__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+  %__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
+fi
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file KEdit              Utility TextEditor
+%suse_update_desktop_file superkaramba       Utility DesktopUtility
+%suse_update_desktop_file KCharSelect        Utility Accessibility
+%suse_update_desktop_file khexedit           Utility Editor
+%suse_update_desktop_file Kjots              Utility TimeUtility
+%suse_update_desktop_file ktimer             Utility TimeUtility
+%suse_update_desktop_file kwikdisk           System  Applet
+%suse_update_desktop_file kdf                System  Filesystem
+%suse_update_desktop_file ark                System  Archiving
+%suse_update_desktop_file kcalc              Utility Calculator
+%suse_update_desktop_file kgpg               Utility Security
+%suse_update_desktop_file irkick             Applet
+%suse_update_desktop_file tdewalletmanager   Applet
+%suse_update_desktop_file kregexpeditor      Utility Editor
+%suse_update_desktop_file kcmdf
+%suse_update_desktop_file kcmlirc
+%suse_update_desktop_file tdewalletconfig
+%suse_update_desktop_file thinkpad
+%suse_update_desktop_file kvaio
+%suse_update_desktop_file KFloppy            System  Filesystem
+%if 0%{?build_tdefilereplace}
+%suse_update_desktop_file -r tdefilereplace   System      FileManager
+%endif
+%endif
+
+# Icons from TDE Control Center should only be displayed in TDE
+for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
+  if grep -q "^Categories=.*X-TDE-settings" "${i}"; then
+    if ! grep -q "OnlyShowIn=TDE" "${i}" ; then
+      echo "OnlyShowIn=TDE;" >>"${i}"
+    fi
+  fi
+done
+
+# Other TDE-only apps
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/thinkpad.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmlirc.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kvaio.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmdf.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/tdewalletconfig.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/khexedit.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kregexpeditor.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kgpg.desktop"
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/Kjots.desktop"
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf "%{?buildroot}"
+
+
+%changelog
diff --git a/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc b/redhat/core/tdeutils/trinity-tdeutils-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdeutils/trinity-tdeutils-rpmlintrc
+++ b/redhat/core/tdeutils/trinity-tdeutils-rpmlintrc
diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec
new file mode 100644
index 000000000..9f42f074b
--- /dev/null
+++ b/redhat/core/tdevelop/tdevelop.spec
@@ -0,0 +1,676 @@
+#
+# spec file for package tdevelop (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdevelop
+%define tde_prefix /opt/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Summary:	Integrated Development Environment for C++/C
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Group:		Development/Tools
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
+
+Requires:	%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	tqt3-apps-devel >= 3.5.0
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
+
+Obsoletes:	trinity-kdevelop < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdevelop = %{?epoch:%{epoch}:}%{version}-%{release}
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	gcc-c++
+BuildRequires:	fdupes
+BuildRequires:	desktop-file-utils
+BuildRequires:	make
+
+Requires:	make
+Requires:	perl
+Requires:	tqt3-designer >= 3.5.0
+Requires:	libtqt3-mt-devel >= 3.5.0
+Requires:	gettext
+Requires:	ctags
+
+
+# LIBIDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
+
+# PCRE support
+BuildRequires:	pcre-devel
+
+# DB5 support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 33
+BuildRequires:	libdb-devel
+
+%else
+# DB4 support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+#BuildRequires:	%{_lib}db4.8-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	db4-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	libdb-4_8-devel
+%endif
+%endif
+
+# FLEX support
+BuildRequires:	flex
+Requires: flex >= 2.5.4
+
+# SVN support
+BuildRequires:	subversion-devel
+
+# NEON support
+BuildRequires:	neon-devel
+
+# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	openldap-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	openldap2-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires:	openldap24-libs-devel
+%endif
+
+# LIBACL support
+%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libacl-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python python2
+%else
+%global __python python2
+%endif
+
+
+%description
+The TDevelop Integrated Development Environment provides many features
+that developers need as well as providing a unified interface to programs
+like gdb, the C/C++ compiler, and make. TDevelop manages or provides:
+
+All development tools needed for C++ programming like Compiler,
+Linker, automake and autoconf; KAppWizard, which generates complete,
+ready-to-go sample applications; Classgenerator, for creating new
+classes and integrating them into the current project; File management
+for sources, headers, documentation etc. to be included in the
+project; The creation of User-Handbooks written with SGML and the
+automatic generation of HTML-output with the KDE look and feel;
+Automatic HTML-based API-documentation for your project's classes with
+cross-references to the used libraries; Internationalization support
+for your application, allowing translators to easily add their target
+language to a project;
+
+tdevelop also includes WYSIWYG (What you see is what you get)-creation
+of user interfaces with a built-in dialog editor; Debugging your
+application by integrating KDbg; Editing of project-specific pixmaps
+with KIconEdit; The inclusion of any other program you need for
+development by adding it to the "Tools"-menu according to your
+individual needs.
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/kdevassistant
+%{tde_bindir}/kdevdesigner
+%{tde_bindir}/tdevelop
+%{tde_bindir}/tdevelop-htdig
+%{tde_bindir}/kdevprj2kdevelop
+%{tde_bindir}/kdevprofileeditor
+%{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
+%config(noreplace) %{tde_confdir}/kdevassistantrc
+%config(noreplace) %{tde_confdir}/tdeveloprc
+%{tde_tdeappdir}/kdevassistant.desktop
+%{tde_tdeappdir}/kdevdesigner.desktop
+%{tde_tdeappdir}/tdevelop.desktop
+%{tde_tdeappdir}/tdevelop_c_cpp.desktop
+%{tde_tdeappdir}/tdevelop_kde_cpp.desktop
+%{tde_tdeappdir}/tdevelop_ruby.desktop
+%{tde_tdeappdir}/tdevelop_scripting.desktop
+%{tde_tdelibdir}/tdeio_chm.la
+%{tde_tdelibdir}/tdeio_chm.so
+%{tde_tdelibdir}/tdeio_csharpdoc.la
+%{tde_tdelibdir}/tdeio_csharpdoc.so
+%{tde_tdelibdir}/tdeio_perldoc.la
+%{tde_tdelibdir}/tdeio_perldoc.so
+%{tde_tdelibdir}/tdeio_pydoc.la
+%{tde_tdelibdir}/tdeio_pydoc.so
+%{tde_tdelibdir}/libdocchmplugin.la
+%{tde_tdelibdir}/libdocchmplugin.so
+%{tde_tdelibdir}/libdoccustomplugin.la
+%{tde_tdelibdir}/libdoccustomplugin.so
+%{tde_tdelibdir}/libdocdevhelpplugin.la
+%{tde_tdelibdir}/libdocdevhelpplugin.so
+%{tde_tdelibdir}/libdocdoxygenplugin.la
+%{tde_tdelibdir}/libdocdoxygenplugin.so
+%{tde_tdelibdir}/libdockdevtocplugin.la
+%{tde_tdelibdir}/libdockdevtocplugin.so
+%{tde_tdelibdir}/libdocqtplugin.la
+%{tde_tdelibdir}/libdocqtplugin.so
+%{tde_tdelibdir}/libkchmpart.la
+%{tde_tdelibdir}/libkchmpart.so
+%{tde_tdelibdir}/libkdevabbrev.la
+%{tde_tdelibdir}/libkdevabbrev.so
+%{tde_tdelibdir}/libkdevadaproject.la
+%{tde_tdelibdir}/libkdevadaproject.so
+%{tde_tdelibdir}/libkdevadasupport.la
+%{tde_tdelibdir}/libkdevadasupport.so
+%{tde_tdelibdir}/libkdevantproject.la
+%{tde_tdelibdir}/libkdevantproject.so
+%{tde_tdelibdir}/libkdevappview.la
+%{tde_tdelibdir}/libkdevappview.so
+%{tde_tdelibdir}/libkdevappwizard.la
+%{tde_tdelibdir}/libkdevappwizard.so
+%{tde_tdelibdir}/libkdevastyle.la
+%{tde_tdelibdir}/libkdevastyle.so
+%{tde_tdelibdir}/libkdevautoproject.la
+%{tde_tdelibdir}/libkdevautoproject.so
+%{tde_tdelibdir}/libkdevbashsupport.la
+%{tde_tdelibdir}/libkdevbashsupport.so
+%{tde_tdelibdir}/libkdevbookmarks.la
+%{tde_tdelibdir}/libkdevbookmarks.so
+%{tde_tdelibdir}/libkdevclassview.la
+%{tde_tdelibdir}/libkdevclassview.so
+%{tde_tdelibdir}/libkdevcppsupport.la
+%{tde_tdelibdir}/libkdevcppsupport.so
+%{tde_tdelibdir}/libkdevcsharpsupport.la
+%{tde_tdelibdir}/libkdevcsharpsupport.so
+%{tde_tdelibdir}/libkdevctags2.la
+%{tde_tdelibdir}/libkdevctags2.so
+%{tde_tdelibdir}/libkdevcustompcsimporter.la
+%{tde_tdelibdir}/libkdevcustompcsimporter.so
+%{tde_tdelibdir}/libkdevcustomproject.la
+%{tde_tdelibdir}/libkdevcustomproject.so
+%{tde_tdelibdir}/libkdevdccoptions.la
+%{tde_tdelibdir}/libkdevdccoptions.so
+%{tde_tdelibdir}/libkdevdebugger.la
+%{tde_tdelibdir}/libkdevdebugger.so
+%{tde_tdelibdir}/libkdevdesignerpart.la
+%{tde_tdelibdir}/libkdevdesignerpart.so
+%{tde_tdelibdir}/libkdevdiff.la
+%{tde_tdelibdir}/libkdevdiff.so
+%{tde_tdelibdir}/libkdevdistpart.la
+%{tde_tdelibdir}/libkdevdistpart.so
+%{tde_tdelibdir}/libkdevdocumentation.la
+%{tde_tdelibdir}/libkdevdocumentation.so
+%{tde_tdelibdir}/libkdevdoxygen.la
+%{tde_tdelibdir}/libkdevdoxygen.so
+%{tde_tdelibdir}/libkdeveditorchooser.la
+%{tde_tdelibdir}/libkdeveditorchooser.so
+%{tde_tdelibdir}/libkdevfilecreate.la
+%{tde_tdelibdir}/libkdevfilecreate.so
+%{tde_tdelibdir}/libkdevfilegroups.la
+%{tde_tdelibdir}/libkdevfilegroups.so
+%{tde_tdelibdir}/libkdevfilelist.la
+%{tde_tdelibdir}/libkdevfilelist.so
+%{tde_tdelibdir}/libkdevfileselector.la
+%{tde_tdelibdir}/libkdevfileselector.so
+%{tde_tdelibdir}/libkdevfileview.la
+%{tde_tdelibdir}/libkdevfileview.so
+%{tde_tdelibdir}/libkdevfilter.la
+%{tde_tdelibdir}/libkdevfilter.so
+%{tde_tdelibdir}/libkdevfortransupport.la
+%{tde_tdelibdir}/libkdevfortransupport.so
+%{tde_tdelibdir}/libkdevfpcoptions.la
+%{tde_tdelibdir}/libkdevfpcoptions.so
+%{tde_tdelibdir}/libkdevfullscreen.la
+%{tde_tdelibdir}/libkdevfullscreen.so
+%{tde_tdelibdir}/libkdevgccoptions.la
+%{tde_tdelibdir}/libkdevgccoptions.so
+%{tde_tdelibdir}/libkdevgrepview.la
+%{tde_tdelibdir}/libkdevgrepview.so
+%{tde_tdelibdir}/libkdevjavasupport.la
+%{tde_tdelibdir}/libkdevjavasupport.so
+%{tde_tdelibdir}/libkdevtdelibsimporter.la
+%{tde_tdelibdir}/libkdevtdelibsimporter.so
+%{tde_tdelibdir}/libkdevkonsoleview.la
+%{tde_tdelibdir}/libkdevkonsoleview.so
+%{tde_tdelibdir}/libkdevmakeview.la
+%{tde_tdelibdir}/libkdevmakeview.so
+%{tde_tdelibdir}/libkdevopenwith.la
+%{tde_tdelibdir}/libkdevopenwith.so
+%{tde_tdelibdir}/libkdevpartexplorer.la
+%{tde_tdelibdir}/libkdevpartexplorer.so
+%{tde_tdelibdir}/libkdevpascalproject.la
+%{tde_tdelibdir}/libkdevpascalproject.so
+%{tde_tdelibdir}/libkdevpascalsupport.la
+%{tde_tdelibdir}/libkdevpascalsupport.so
+%{tde_tdelibdir}/libkdevperlsupport.la
+%{tde_tdelibdir}/libkdevperlsupport.so
+%{tde_tdelibdir}/libkdevpgioptions.la
+%{tde_tdelibdir}/libkdevpgioptions.so
+%{tde_tdelibdir}/libkdevphpsupport.la
+%{tde_tdelibdir}/libkdevphpsupport.so
+%{tde_tdelibdir}/libkdevpythonsupport.la
+%{tde_tdelibdir}/libkdevpythonsupport.so
+%{tde_tdelibdir}/libkdevqt4importer.la
+%{tde_tdelibdir}/libkdevqt4importer.so
+%{tde_tdelibdir}/libkdevqtimporter.la
+%{tde_tdelibdir}/libkdevqtimporter.so
+%{tde_tdelibdir}/libkdevquickopen.la
+%{tde_tdelibdir}/libkdevquickopen.so
+%{tde_tdelibdir}/libkdevrbdebugger.la
+%{tde_tdelibdir}/libkdevrbdebugger.so
+%{tde_tdelibdir}/libkdevregexptest.la
+%{tde_tdelibdir}/libkdevregexptest.so
+%{tde_tdelibdir}/libkdevreplace.la
+%{tde_tdelibdir}/libkdevreplace.so
+%{tde_tdelibdir}/libkdevrubysupport.la
+%{tde_tdelibdir}/libkdevrubysupport.so
+%{tde_tdelibdir}/libkdevscripting.la
+%{tde_tdelibdir}/libkdevscripting.so
+%{tde_tdelibdir}/libkdevscriptproject.la
+%{tde_tdelibdir}/libkdevscriptproject.so
+%{tde_tdelibdir}/libkdevsnippet.la
+%{tde_tdelibdir}/libkdevsnippet.so
+%{tde_tdelibdir}/libkdevsqlsupport.la
+%{tde_tdelibdir}/libkdevsqlsupport.so
+%{tde_tdelibdir}/libkdevtexttools.la
+%{tde_tdelibdir}/libkdevtexttools.so
+%{tde_tdelibdir}/libkdevtipofday.la
+%{tde_tdelibdir}/libkdevtipofday.so
+%{tde_tdelibdir}/libkdevtools.la
+%{tde_tdelibdir}/libkdevtools.so
+%{tde_tdelibdir}/libkdevtrollproject.la
+%{tde_tdelibdir}/libkdevtrollproject.so
+%{tde_tdelibdir}/libkdevuichooser.la
+%{tde_tdelibdir}/libkdevuichooser.so
+%{tde_tdelibdir}/libkdevvalgrind.la
+%{tde_tdelibdir}/libkdevvalgrind.so
+%{tde_tdelibdir}/libkdevvcsmanager.la
+%{tde_tdelibdir}/libkdevvcsmanager.so
+%{tde_datadir}/apps/tdeconf_update/
+%{tde_datadir}/apps/kdevabbrev/
+%{tde_datadir}/apps/kdevadaproject/
+%{tde_datadir}/apps/kdevadasupport/
+%{tde_datadir}/apps/kdevantproject/
+%{tde_datadir}/apps/kdevappoutputview/
+%{tde_datadir}/apps/kdevappwizard/
+%{tde_datadir}/apps/kdevassistant/
+%{tde_datadir}/apps/kdevastyle/
+%{tde_datadir}/apps/kdevautoproject/
+%{tde_datadir}/apps/kdevbashsupport/
+%{tde_datadir}/apps/kdevclassview/
+%{tde_datadir}/apps/kdevcppsupport/
+%{tde_datadir}/icons/hicolor/*/actions/breakpoint_add.png
+%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete.png
+%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete_all.png
+%{tde_datadir}/icons/hicolor/*/actions/breakpoint_edit.png
+%{tde_datadir}/icons/hicolor/*/actions/ktip.png
+%{tde_datadir}/icons/hicolor/*/apps/kdevassistant.png
+%{tde_datadir}/icons/hicolor/*/apps/kdevdesigner.png
+%{tde_datadir}/icons/hicolor/*/apps/tdevelop.png
+%{tde_datadir}/icons/locolor/*/actions/tdevelop_tip.png
+%{tde_datadir}/mimelnk/application/x-tdevelop.desktop
+%{tde_datadir}/services/chm.protocol
+%{tde_datadir}/services/csharpdoc.protocol
+%{tde_datadir}/services/docchmplugin.desktop
+%{tde_datadir}/services/doccustomplugin.desktop
+%{tde_datadir}/services/docdevhelpplugin.desktop
+%{tde_datadir}/services/docdoxygenplugin.desktop
+%{tde_datadir}/services/dockdevtocplugin.desktop
+%{tde_datadir}/services/docqtplugin.desktop
+%{tde_datadir}/services/kchmpart.desktop
+%{tde_datadir}/services/kdevabbrev.desktop
+%{tde_datadir}/services/kdevadaproject.desktop
+%{tde_datadir}/services/kdevadasupport.desktop
+%{tde_datadir}/services/kdevantproject.desktop
+%{tde_datadir}/services/kdevappoutputview.desktop
+%{tde_datadir}/services/kdevappwizard.desktop
+%{tde_datadir}/services/kdevastyle.desktop
+%{tde_datadir}/services/kdevautoproject.desktop
+%{tde_datadir}/services/kdevbashsupport.desktop
+%{tde_datadir}/services/kdevbookmarks.desktop
+%{tde_datadir}/services/kdevclassview.desktop
+%{tde_datadir}/services/kdevcppsupport.desktop
+%{tde_datadir}/services/kdevcsharpsupport.desktop
+%{tde_datadir}/services/kdevcsupport.desktop
+%{tde_datadir}/services/kdevctags2.desktop
+%{tde_datadir}/services/kdevcustomproject.desktop
+%{tde_datadir}/services/kdevdccoptions.desktop
+%{tde_datadir}/services/kdevdebugger.desktop
+%{tde_datadir}/services/kdevdesigner_part.desktop
+%{tde_datadir}/services/kdevdiff.desktop
+%{tde_datadir}/services/kdevdistpart.desktop
+%{tde_datadir}/services/kdevdocumentation.desktop
+%{tde_datadir}/services/kdevdoxygen.desktop
+%{tde_datadir}/services/kdeveditorchooser.desktop
+%{tde_datadir}/services/kdevfilecreate.desktop
+%{tde_datadir}/services/kdevfilegroups.desktop
+%{tde_datadir}/services/kdevfilelist.desktop
+%{tde_datadir}/services/kdevfileselector.desktop
+%{tde_datadir}/services/kdevfileview.desktop
+%{tde_datadir}/services/kdevfilter.desktop
+%{tde_datadir}/services/kdevfortransupport.desktop
+%{tde_datadir}/services/kdevfpcoptions.desktop
+%{tde_datadir}/services/kdevfullscreen.desktop
+%{tde_datadir}/services/kdevg77options.desktop
+%{tde_datadir}/services/kdevgccoptions.desktop
+%{tde_datadir}/services/kdevgppoptions.desktop
+%{tde_datadir}/services/kdevgrepview.desktop
+%{tde_datadir}/services/kdevjavasupport.desktop
+%{tde_datadir}/services/kdevtdeautoproject.desktop
+%{tde_datadir}/services/kdevtdelibsimporter.desktop
+%{tde_datadir}/services/kdevkonsoleview.desktop
+%{tde_datadir}/services/kdevmakeview.desktop
+%{tde_datadir}/services/kdevopenwith.desktop
+%{tde_datadir}/services/kdevpartexplorer.desktop
+%{tde_datadir}/services/kdevpascalproject.desktop
+%{tde_datadir}/services/kdevpascalsupport.desktop
+%{tde_datadir}/services/kdevpcscustomimporter.desktop
+%{tde_datadir}/services/kdevperlsupport.desktop
+%{tde_datadir}/services/kdevpgf77options.desktop
+%{tde_datadir}/services/kdevpghpfoptions.desktop
+%{tde_datadir}/services/kdevphpsupport.desktop
+%{tde_datadir}/services/kdevpythonsupport.desktop
+%{tde_datadir}/services/kdevqt4importer.desktop
+%{tde_datadir}/services/kdevqtimporter.desktop
+%{tde_datadir}/services/kdevquickopen.desktop
+%{tde_datadir}/services/kdevrbdebugger.desktop
+%{tde_datadir}/services/kdevregexptest.desktop
+%{tde_datadir}/services/kdevreplace.desktop
+%{tde_datadir}/services/kdevrubysupport.desktop
+%{tde_datadir}/services/kdevscripting.desktop
+%{tde_datadir}/services/kdevscriptproject.desktop
+%{tde_datadir}/services/kdevsnippet.desktop
+%{tde_datadir}/services/kdevsqlsupport.desktop
+%{tde_datadir}/services/kdevtexttools.desktop
+%{tde_datadir}/services/kdevtipofday.desktop
+%{tde_datadir}/services/kdevtmakeproject.desktop
+%{tde_datadir}/services/kdevtools.desktop
+%{tde_datadir}/services/kdevtrollproject.desktop
+%{tde_datadir}/services/kdevuichooser.desktop
+%{tde_datadir}/services/kdevvalgrind.desktop
+%{tde_datadir}/services/kdevvcsmanager.desktop
+%{tde_datadir}/services/perldoc.protocol
+%{tde_datadir}/services/pydoc.protocol
+%{tde_datadir}/servicetypes/tdevelopappfrontend.desktop
+%{tde_datadir}/servicetypes/tdevelopcodebrowserfrontend.desktop
+%{tde_datadir}/servicetypes/tdevelopcompileroptions.desktop
+%{tde_datadir}/servicetypes/tdevelopcreatefile.desktop
+%{tde_datadir}/servicetypes/tdevelopdifffrontend.desktop
+%{tde_datadir}/servicetypes/tdevelopdocumentationplugins.desktop
+%{tde_datadir}/servicetypes/tdeveloplanguagesupport.desktop
+%{tde_datadir}/servicetypes/tdevelopmakefrontend.desktop
+%{tde_datadir}/servicetypes/tdeveloppcsimporter.desktop
+%{tde_datadir}/servicetypes/tdevelopplugin.desktop
+%{tde_datadir}/servicetypes/tdevelopproject.desktop
+%{tde_datadir}/servicetypes/tdevelopquickopen.desktop
+%{tde_datadir}/servicetypes/tdevelopsourceformatter.desktop
+%{tde_datadir}/servicetypes/tdevelopvcsintegrator.desktop
+%{tde_datadir}/servicetypes/tdevelopversioncontrol.desktop
+%{tde_datadir}/apps/kdevcsharpsupport/
+%{tde_datadir}/apps/kdevctags2/
+%{tde_datadir}/apps/kdevcustomproject/
+%{tde_datadir}/apps/kdevdebugger/
+%{tde_datadir}/apps/kdevdesigner/
+%{tde_datadir}/apps/kdevdesignerpart/
+%{tde_datadir}/apps/kdevdiff/
+%{tde_datadir}/apps/kdevdistpart/
+%{tde_datadir}/apps/kdevdocumentation/
+%{tde_datadir}/apps/kdevdoxygen/
+%{tde_datadir}/apps/tdevelop/
+%{tde_datadir}/apps/kdevfilecreate/
+%{tde_datadir}/apps/kdevfilelist/
+%{tde_datadir}/apps/kdevfilter/
+%{tde_datadir}/apps/kdevfortransupport/
+%{tde_datadir}/apps/kdevfullscreen/
+%{tde_datadir}/apps/kdevgrepview/
+%{tde_datadir}/apps/kdevjavasupport/
+%{tde_datadir}/apps/kdevmakeview/
+%{tde_datadir}/apps/kdevpartexplorer/
+%{tde_datadir}/apps/kdevpascalproject/
+%{tde_datadir}/apps/kdevpascalsupport/
+%{tde_datadir}/apps/kdevperlsupport/
+%{tde_datadir}/apps/kdevphpsupport/
+%{tde_datadir}/apps/kdevpythonsupport/
+%{tde_datadir}/apps/kdevquickopen/
+%{tde_datadir}/apps/kdevrbdebugger/
+%{tde_datadir}/apps/kdevregexptest/
+%{tde_datadir}/apps/kdevreplace/
+%{tde_datadir}/apps/kdevrubysupport/
+%{tde_datadir}/apps/kdevscripting/
+%{tde_datadir}/apps/kdevscriptproject/
+%{tde_datadir}/apps/kdevsnippet/
+%{tde_datadir}/apps/kdevsqlsupport
+%{tde_datadir}/apps/kdevtipofday/
+%{tde_datadir}/apps/kdevtools/
+%{tde_datadir}/apps/kdevtrollproject/
+%{tde_datadir}/apps/kdevvalgrind/
+%{tde_datadir}/apps/tdeio_pydoc/
+%{tde_datadir}/desktop-directories/tde-development-tdevelop.directory
+%{tde_tdedocdir}/HTML/en/tdevelop/
+%{tde_libdir}/libd.so.0
+%{tde_libdir}/libd.so.0.0.0
+%{tde_libdir}/libkinterfacedesigner.so.0
+%{tde_libdir}/libkinterfacedesigner.so.0.0.0
+%{tde_tdelibdir}/libkdevvisualboyadvance.la
+%{tde_tdelibdir}/libkdevvisualboyadvance.so
+%{tde_datadir}/apps/kdevdesignerpart/pics/
+%{tde_datadir}/apps/kdevvisualboyadvance/
+%{tde_tdedocdir}/HTML/en/tde_app_devel/
+%{tde_datadir}/mimelnk/text/x-fortran.desktop
+%{tde_datadir}/services/kdevvisualboyadvance.desktop
+%{tde_tdedocdir}/HTML/en/kdevdesigner/
+
+##########
+
+%package devel
+Summary: Development files for %{name}
+Group:		Development/Libraries/Other
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdevelop-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdevelop-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This package contains the development files for tdevelop.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/lib*.so
+%{tde_libdir}/lib*.la
+%{tde_includedir}/*
+
+##########
+
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: trinity-tdelibs >= %{tde_version}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	trinity-kdevelop-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdevelop-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libs
+This package contains the libraries needed for the tdevelop programs.
+
+%files libs
+%defattr(-,root,root,-)
+%{tde_libdir}/libdesignerintegration.so.0
+%{tde_libdir}/libdesignerintegration.so.0.0.0
+%{tde_libdir}/libdocumentation_interfaces.so.0
+%{tde_libdir}/libdocumentation_interfaces.so.0.0.0
+%{tde_libdir}/libgdbmi_parser.so.0
+%{tde_libdir}/libgdbmi_parser.so.0.0.0
+%{tde_libdir}/libkdevbuildbase.so.0
+%{tde_libdir}/libkdevbuildbase.so.0.0.0
+%{tde_libdir}/libkdevbuildtoolswidgets.so.0
+%{tde_libdir}/libkdevbuildtoolswidgets.so.0.0.0
+%{tde_libdir}/libkdevcatalog.so.0
+%{tde_libdir}/libkdevcatalog.so.0.0.0
+%{tde_libdir}/libkdevcppparser.so.0
+%{tde_libdir}/libkdevcppparser.so.0.0.0
+%{tde_libdir}/libtdevelop.so.1
+%{tde_libdir}/libtdevelop.so.1.0.0
+%{tde_libdir}/libkdevextras.so.0
+%{tde_libdir}/libkdevextras.so.0.0.0
+%{tde_libdir}/libkdevpropertyeditor.so.0
+%{tde_libdir}/libkdevpropertyeditor.so.0.0.0
+%{tde_libdir}/libkdevqmakeparser.so.0
+%{tde_libdir}/libkdevqmakeparser.so.0.0.0
+%{tde_libdir}/libkdevshell.so.0
+%{tde_libdir}/libkdevshell.so.0.0.0
+%{tde_libdir}/libkdevwidgets.so.0
+%{tde_libdir}/libkdevwidgets.so.0.0.0
+%{tde_libdir}/liblang_debugger.so.0
+%{tde_libdir}/liblang_debugger.so.0.0.0
+%{tde_libdir}/liblang_interfaces.so.0
+%{tde_libdir}/liblang_interfaces.so.0.0.0
+%{tde_libdir}/libprofileengine.so.0
+%{tde_libdir}/libprofileengine.so.0.0.0
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+# Specific path for RHEL4
+if [ -d /usr/X11R6 ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
+# openldap 2.4 includes (CentOS 5)
+if [ -d "/usr/include/openldap24" ]; then
+  RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
+fi
+
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  \
+  -DWITH_BUILDTOOL_ALL=ON \
+  -DWITH_LANGUAGE_ALL=ON \
+  -DWITH_VCS_ALL=OFF \
+  -DBUILD_ALL=ON \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc b/redhat/core/tdevelop/trinity-tdevelop-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdevelop/trinity-tdevelop-rpmlintrc
+++ b/redhat/core/tdevelop/trinity-tdevelop-rpmlintrc
diff --git a/redhat/main/tdewebdev/css.tar.bz2 b/redhat/core/tdewebdev/css.tar.bz2
index c66fc5ba4..c66fc5ba4 100644
--- a/redhat/main/tdewebdev/css.tar.bz2
+++ b/redhat/core/tdewebdev/css.tar.bz2
diff --git a/redhat/main/tdewebdev/html.tar.bz2 b/redhat/core/tdewebdev/html.tar.bz2
index 7aa4db193..7aa4db193 100644
--- a/redhat/main/tdewebdev/html.tar.bz2
+++ b/redhat/core/tdewebdev/html.tar.bz2
diff --git a/redhat/main/tdewebdev/javascript.tar.bz2 b/redhat/core/tdewebdev/javascript.tar.bz2
index aa044ec2d..aa044ec2d 100644
--- a/redhat/main/tdewebdev/javascript.tar.bz2
+++ b/redhat/core/tdewebdev/javascript.tar.bz2
diff --git a/redhat/main/tdewebdev/php_manual_en_20030401.tar.bz2 b/redhat/core/tdewebdev/php_manual_en_20030401.tar.bz2
index 0b39d8cd0..0b39d8cd0 100644
--- a/redhat/main/tdewebdev/php_manual_en_20030401.tar.bz2
+++ b/redhat/core/tdewebdev/php_manual_en_20030401.tar.bz2
diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec
new file mode 100644
index 000000000..824a8419a
--- /dev/null
+++ b/redhat/core/tdewebdev/tdewebdev.spec
@@ -0,0 +1,551 @@
+#
+# spec file for package tdewebdev (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg tdewebdev
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Summary:	Web development applications
+Group:		Applications/Editors
+Version:	%{tde_version}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	http://download.sourceforge.net/quanta/css.tar.bz2
+Source2:	http://download.sourceforge.net/quanta/html.tar.bz2
+Source3:	http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
+Source4:	http://download.sourceforge.net/quanta/javascript.tar.bz2
+
+Source10:		%{name}-rpmlintrc
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
+
+BuildRequires:	cmake
+BuildRequires:	desktop-file-utils
+BuildRequires:	gcc-c++
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+BuildRequires:	libxslt-devel
+
+%if 0%{?rhel} == 4
+# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
+BuildRequires:	libgcrypt-devel
+%endif
+
+# PERL support
+BuildRequires:	perl
+
+# KXSLDBG requires libxml2
+#if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || ( 0%{?fedora} > 0 && %{?fedora} <= 17 ) || 0%{?suse_version}
+%define build_kxsldbg 1
+BuildRequires:	libxml2-devel
+#endif
+
+# ICU support
+BuildRequires:	libicu-devel
+
+# Readline support
+BuildRequires:	readline-devel
+
+%if "%{?tde_version}" != "14.1.0"
+%define build_tdefilereplace 1
+%endif
+
+Obsoletes:	trinity-kdewebdev-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdewebdev-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-kdewebdev < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdewebdev = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: trinity-quanta = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?build_kxsldbg:Requires: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release}}
+
+%description
+Web development applications, including:
+* kimagemapeditor: HTML image map editor
+* klinkstatus: link checker
+* kommander: visual dialog building tool
+* quanta+: web development
+%{?build_kxsldbg:* kxsldbg: xslt Debugger}
+
+%files
+%defattr(-,root,root,-)
+
+##########
+
+%package -n trinity-quanta
+Summary:	web development environment for TDE [Trinity]
+Group:		Applications/Development
+Requires:	trinity-tdefilereplace
+Requires:	trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires:	trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	tidy
+
+%description -n trinity-quanta
+Quanta Plus is a web development environment for working with HTML
+and associated languages. It strives to be neutral and transparent
+to all markup languages, while supporting popular web-based scripting
+languages, CSS and other emerging W3C recommendations.
+
+Quanta Plus supports many external components, debuggers and other tools
+for web development, several of which are shipped with the TDE web
+development module.
+
+Quanta Plus is not in any way affiliated with any commercial versions
+of Quanta. The primary coders from the original team left the GPL'd
+version to produce a commercial product.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-quanta
+%defattr(-,root,root,-)
+%{tde_bindir}/quanta
+%{tde_tdelibdir}/quantadebuggerdbgp.la
+%{tde_tdelibdir}/quantadebuggerdbgp.so
+%{tde_tdelibdir}/quantadebuggergubed.la
+%{tde_tdelibdir}/quantadebuggergubed.so
+%{tde_tdeappdir}/quanta.desktop
+%{tde_datadir}/apps/kafkapart
+%{tde_datadir}/icons/hicolor/*/apps/quanta.png
+%{tde_datadir}/mimelnk/application/x-webprj.desktop
+%{tde_datadir}/services/quantadebuggerdbgp.desktop
+%{tde_datadir}/services/quantadebuggergubed.desktop
+%{tde_datadir}/services/quanta_preview_config.desktop
+%{tde_datadir}/servicetypes/quantadebugger.desktop
+%{tde_tdedocdir}/HTML/en/quanta/
+%{tde_mandir}/man1/quanta.1*
+
+##########
+
+%package -n trinity-quanta-data
+Summary:	data files for Quanta Plus web development environment [Trinity]
+Group:		Applications/Development
+
+%description -n trinity-quanta-data
+This package contains architecture-independent data files for Quanta
+Plus, a web development environment for working with HTML and associated
+languages.
+
+See the quanta package for further information.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-quanta-data
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/quanta/
+
+##########
+
+%package -n trinity-kimagemapeditor
+Summary:	HTML image map editor for TDE
+Group:		Applications/Development
+
+%description -n trinity-kimagemapeditor
+KImageMapEditor is a tool that allows you to edit image maps in HTML
+files. As well as providing a standalone application, KImageMapEditor
+makes itself available as a KPart for embedding into larger applications.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-kimagemapeditor
+%defattr(-,root,root,-)
+%{tde_bindir}/kimagemapeditor
+%{tde_tdelibdir}/libkimagemapeditor.la
+%{tde_tdelibdir}/libkimagemapeditor.so
+%{tde_tdeappdir}/kimagemapeditor.desktop
+%{tde_datadir}/apps/kimagemapeditor/
+%{tde_datadir}/icons/hicolor/*/apps/kimagemapeditor.png
+%{tde_datadir}/icons/locolor/*/apps/kimagemapeditor.png
+%{tde_datadir}/services/kimagemapeditorpart.desktop
+%{tde_tdedocdir}/HTML/en/kimagemapeditor/
+%{tde_mandir}/man1/kimagemapeditor.1*
+
+##########
+
+%package -n trinity-klinkstatus
+Summary:	web link validity checker for TDE
+Group:		Applications/Development
+
+%description -n trinity-klinkstatus
+KLinkStatus is TDE's web link validity checker. It allows you to
+search internal and external links throughout your web site. Simply
+point it to a single page and choose the depth to search.
+
+You can also check local files, or files over ftp:, fish: or any other
+KIO protocols. For performance, links can be checked simultaneously.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-klinkstatus
+%defattr(-,root,root,-)
+%{tde_bindir}/klinkstatus
+%{tde_tdelibdir}/libklinkstatuspart.la
+%{tde_tdelibdir}/libklinkstatuspart.so
+%{tde_tdeappdir}/klinkstatus.desktop
+%{tde_datadir}/apps/klinkstatus/
+%{tde_datadir}/apps/klinkstatuspart/
+%{tde_datadir}/config.kcfg/klinkstatus.kcfg
+%{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png
+%{tde_datadir}/services/klinkstatus_part.desktop
+%{tde_tdedocdir}/HTML/en/klinkstatus/
+%{tde_mandir}/man1/klinkstatus.1*
+
+##########
+
+%package -n trinity-kommander
+Summary:	visual dialog builder and executor tool [Trinity]
+Group:		Applications/Development
+Requires:	gettext
+
+%description -n trinity-kommander
+Kommander is a visual dialog building tool whose primary objective is
+to create as much functionality as possible without using any scripting
+language.
+
+More specifically, Kommander is a set of tools that allow you to create
+dynamic GUI dialogs that generate, based on their state, a piece of
+text. The piece of text can be a command line to a program, any piece
+of code, business documents that contain a lot of repetitious or
+templated text and so on.
+
+The resulting generated text can then be executed as a command line
+program (hence the name "Kommander"), written to a file, passed to a
+script for extended processing, and literally anything else you can
+think of. And you aren't required to write a single line of code!
+
+As well as building dialogs, Kommander may be expanded to create full
+mainwindow applications.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-kommander
+%defattr(-,root,root,-)
+%{tde_bindir}/kmdr-editor
+%{tde_bindir}/kmdr-executor
+%{tde_bindir}/kmdr-plugins
+%{tde_libdir}/libkommanderplugin.so.*
+%{tde_libdir}/libkommanderwidgets.la
+%{tde_libdir}/libkommanderwidget.so.*
+%{tde_libdir}/libkommanderwidgets.so.*
+%{tde_tdeappdir}/kmdr-editor.desktop
+%{tde_datadir}/applnk/.hidden/kmdr-executor.desktop
+%{tde_datadir}/apps/katepart/syntax/kommander.xml
+%{tde_tdedocdir}/HTML/en/kommander/
+%{tde_datadir}/icons/crystalsvg/*/apps/kommander.png
+%{tde_datadir}/icons/hicolor/*/apps/kommander.png
+%{tde_datadir}/mimelnk/application/x-kommander.desktop
+%{tde_tdelibdir}/libkommander_part.so
+%{tde_tdelibdir}/libkommander_part.la
+%{tde_datadir}/apps/kommander/
+%{tde_datadir}/apps/kmdr-editor/
+%{tde_datadir}/apps/katepart/syntax/kommander-new.xml
+%{tde_datadir}/apps/tdevappwizard/
+%{tde_datadir}/services/kommander_part.desktop
+%{tde_mandir}/man1/extractkmdr.1*
+%{tde_mandir}/man1/kmdr-editor.1*
+%{tde_mandir}/man1/kmdr-executor.1*
+%{tde_mandir}/man1/kmdr-plugins.1*
+%{tde_mandir}/man1/kmdr2po.1*
+
+##########
+
+%package -n trinity-kommander-devel
+Summary:	development files for Kommander [Trinity]
+Group:		Development/Libraries
+Requires:	trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-kommander-devel
+This package contains the headers and other development files for
+building plugins or otherwise extending Kommander.
+
+Kommander is a visual dialog building tool whose primary objective is
+to create as much functionality as possible without using any scripting
+language.
+
+See the kommander package for further information.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-kommander-devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkommanderplugin.la
+%{tde_libdir}/libkommanderplugin.so
+%{tde_libdir}/libkommanderwidget.la
+%{tde_libdir}/libkommanderwidget.so
+%{tde_libdir}/libkommanderwidgets.so
+%{tde_tdeincludedir}/kommander*
+%{tde_tdeincludedir}/specials.h
+
+##########
+
+%if 0%{?build_kxsldbg}
+
+%package -n trinity-kxsldbg
+Summary:	graphical XSLT debugger for TDE [Trinity]
+Group:		Applications/Development
+
+%description -n trinity-kxsldbg
+KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
+interface as well as a text-based debugger. KXSLDbg can be run as a
+standalone application or as an embedded TDE part.
+
+XSLT is an XML language for defining transformations of XML files from
+XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
+using standard XSLT stylesheets.
+
+This package is part of TDE, as a component of the TDE web development module.
+
+%files -n trinity-kxsldbg
+%defattr(-,root,root,-)
+%{tde_bindir}/kxsldbg
+%{tde_bindir}/xsldbg
+%{tde_tdelibdir}/libkxsldbgpart.la
+%{tde_tdelibdir}/libkxsldbgpart.so
+%{tde_tdeappdir}/kxsldbg.desktop
+%{tde_datadir}/applnk/.hidden/xsldbg.desktop
+%{tde_datadir}/apps/kxsldbg/
+%{tde_datadir}/apps/kxsldbgpart/
+%{tde_tdedocdir}/HTML/en/kxsldbg/
+%{tde_tdedocdir}/HTML/en/xsldbg/
+%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png
+%{tde_datadir}/icons/hicolor/*/actions/configure.png
+%{tde_datadir}/icons/hicolor/*/actions/system-log-out.png
+%{tde_datadir}/icons/hicolor/*/actions/system-run.png
+%{tde_datadir}/icons/hicolor/*/actions/hash.png
+%{tde_datadir}/icons/hicolor/*/actions/mark.png
+%{tde_datadir}/icons/hicolor/*/actions/next.png
+%{tde_datadir}/icons/hicolor/*/actions/step.png
+%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png
+%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png
+%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png
+%{tde_datadir}/services/kxsldbg_part.desktop
+%{tde_mandir}/man1/kxsldbg.1*
+
+%endif
+
+##########
+
+%if 0%{?build_tdefilereplace}
+
+%package -n trinity-tdefilereplace
+Summary:	Batch search-and-replace component for TDE
+Group:		Applications/Utilities
+
+Obsoletes:	trinity-kfilereplace < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kfilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-tdefilereplace
+TDEFileReplace is an embedded component for TDE that acts as a batch
+search-and-replace tool. It allows you to replace one expression with
+another in many files at once.
+
+Note that at the moment TDEFileReplace does not come as a standalone
+application.
+
+This package is part of Trinity, as a component of the TDE utilities module.
+
+%files -n trinity-tdefilereplace
+%defattr(-,root,root,-)
+%{tde_bindir}/tdefilereplace
+%{tde_tdelibdir}/libtdefilereplacepart.la
+%{tde_tdelibdir}/libtdefilereplacepart.so
+%{tde_tdeappdir}/tdefilereplace.desktop
+%{tde_datadir}/apps/tdefilereplace/
+%{tde_datadir}/apps/tdefilereplacepart/
+%{tde_tdedocdir}/HTML/en/tdefilereplace/
+%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
+%{tde_datadir}/services/tdefilereplacepart.desktop
+%{tde_mandir}/man1/tdefilereplace.1*
+
+%endif
+
+##########
+
+%package devel
+Group: Development/Libraries
+Summary:	Header files and documentation for %{name} 
+
+Obsoletes:	trinity-kdewebdev-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-kdewebdev-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	trinity-tdelibs-devel >= %{tde_version}
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+%{summary}.
+
+%files devel
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4
+
+%if 0%{?build_kxsldbg} == 0
+%__rm -rf kxsldbg/ doc/kxsldbg/ doc/xsldbg/
+%endif
+
+
+%build
+unset QTDIR QTLIB QTINC
+export PATH="%{tde_bindir}:${PATH}"
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DDOC_INSTALL_DIR="%{tde_docdir}" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_QUANTA_CVSSERVICE=OFF \
+  \
+  -DBUILD_ALL=ON \
+  \
+  ..
+
+# Strange cmake behaviour under rhel6
+%if 0%{?rhel} == 6
+grep -rl "CXX_FLAGS.*\"-O2" | while read file; do
+  sed -i "${file}" -e "s|\"||g"
+done
+%endif
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+
+## package separately?  Why doesn't upstream include this? -- Rex
+# install docs
+for i in css html javascript ; do
+   pushd $i
+   ./install.sh <<EOF
+%{buildroot}%{tde_datadir}/apps/quanta/doc
+EOF
+   popd
+   rm -rf $i
+done
+cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r klinkstatus      Office WebDevelopment
+%if 0%{?build_kxsldbg}
+%suse_update_desktop_file -r kxsldbg          Office WebDevelopment
+%endif
+%suse_update_desktop_file -r kimagemapeditor  Office WebDevelopment
+%suse_update_desktop_file    kmdr-editor      Development GUIDesigner
+%suse_update_desktop_file    kmdr-executor    Development GUIDesigner
+%suse_update_desktop_file -r quanta           Office WebDevelopment
+%if 0%{?build_tdefilereplace}
+%suse_update_desktop_file -r tdefilereplace   System      FileManager
+%endif
+%endif
+
+# Adds missing icons in 'hicolor' theme
+%__mkdir_p %{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
+pushd %{buildroot}%{tde_datadir}/icons
+for i in {16,22,32,64,128}; do %__cp crystalsvg/"$i"x"$i"/apps/kommander.png  hicolor/"$i"x"$i"/apps/kommander.png  ;done
+popd
+
+# Unwanted icon
+%__rm -f "%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png"
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc b/redhat/core/tdewebdev/trinity-tdewebdev-rpmlintrc
index 529351884..529351884 100644
--- a/redhat/main/tdewebdev/trinity-tdewebdev-rpmlintrc
+++ b/redhat/core/tdewebdev/trinity-tdewebdev-rpmlintrc
diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec
index 507b6ce12..362abdf4b 100644
--- a/redhat/dependencies/akode/akode.spec
+++ b/redhat/dependencies/akode/akode.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -62,7 +62,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:  gcc-c++
 BuildRequires:	libtool
 
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 188d0ef2a..d4a7d9b33 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg arts
 %define tde_prefix /opt/trinity
@@ -32,6 +32,7 @@
 %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_sbindir %{tde_prefix}/sbin
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
@@ -66,7 +67,7 @@ BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -162,6 +163,9 @@ playing a wave file with some effects.
 %{tde_bindir}/artswrapper
 # The '.la' files are needed for runtime, not devel !
 %{tde_libdir}/lib*.la
+%{tde_mandir}/man1/artsc-config-trinity.1*
+%{tde_mandir}/man1/artscat-trinity.1*
+%{tde_mandir}/man1/artsdsp-trinity.1*
 
 ##########
 
@@ -250,6 +254,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -257,8 +262,9 @@ fi
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \
+  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  -DMAN_INSTALL_DIR="%{tde_mandir}" \
   -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
   \
   -DWITH_ALSA=ON \
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
index 26704a7d6..5423dd752 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -52,7 +52,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
index 0b09e8436..bea084031 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -53,7 +53,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
index aa84d39a5..3bdbea59b 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -52,7 +52,7 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
index 9d1664e4c..ccf75ed31 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec
@@ -19,7 +19,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -51,7 +51,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -194,6 +194,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 6377ee601..fd5979d40 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libcaldav
 %define tde_prefix /opt/trinity
@@ -54,7 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	make
 BuildRequires:	libtool
 BuildRequires:	fdupes
@@ -166,6 +166,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 5bf6f4ab8..865c7c27d 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libcarddav
 %define tde_prefix /opt/trinity
@@ -54,7 +54,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	make
 BuildRequires:	libtool
@@ -168,6 +168,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
new file mode 100644
index 000000000..010c353fe
--- /dev/null
+++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
@@ -0,0 +1,232 @@
+#
+# spec file for package polkit-tqt (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/
+#
+
+# TDE variables
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg polkit-tqt
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libpolkit_tqt %{_lib}%{tde_pkg}
+%else
+%define libpolkit_tqt lib%{tde_pkg}
+%endif
+
+
+Name:		trinity-%{tde_pkg}
+Version:	0.103.0
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	PolicyKit-tqt library
+Group:		Development/Libraries/C and C++
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
+BuildRequires:	libtqt4-devel
+BuildRequires:	trinity-cmake >= %{tde_version}
+BuildRequires:	trinity-dbus-1-tqt-devel
+BuildRequires:	trinity-filesystem >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	gcc-c++
+BuildRequires:	gettext
+
+BuildRequires:	polkit-devel
+
+%description
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+libpolkit-tqt provides convenience classes and methods for TQt/TDE
+applications that want to use PolicyKit.
+
+This package contains the files necessary for running applications that use
+the libpolkit-tqt library.
+
+##########
+
+%package -n %{libpolkit_tqt}0
+Summary:	TQt source code editing component based on Scintilla
+Group:		Development/Libraries/C and C++
+Provides:	libpolkit-tqt = %{version}-%{release}
+Requires:	libtqt3-mt >= 3.5.0
+
+%description -n %{libpolkit_tqt}0
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+libpolkit-tqt provides convenience classes and methods for TQt/TDE
+applications that want to use PolicyKit.
+
+This package contains the files necessary for running applications that use
+the libpolkit-tqt library.
+
+%post -n %{libpolkit_tqt}0
+/sbin/ldconfig
+
+%postun -n %{libpolkit_tqt}0
+/sbin/ldconfig
+
+%files -n %{libpolkit_tqt}0
+%defattr(-,root,root,-)
+%{_libdir}/libpolkit-tqt-agent.so.0
+%{_libdir}/libpolkit-tqt-agent.so.0.0.0
+%{_libdir}/libpolkit-tqt-core.so.0
+%{_libdir}/libpolkit-tqt-core.so.0.0.0
+%{_libdir}/libpolkit-tqt-gui.so.0
+%{_libdir}/libpolkit-tqt-gui.so.0.0.0
+
+##########
+
+%package -n %{libpolkit_tqt}-devel
+Summary:	PolicyKit-tqt development files
+Group:		Development/Libraries/C and C++
+Provides:	libpolkit-tqt-devel = %{version}-%{release}
+Requires:	%{libpolkit_tqt}0 = %{version}-%{release}
+Requires:	libtqt3-mt-devel >= 3.5.0
+
+%description -n %{libpolkit_tqt}-devel
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+libpolkit-tqt provides convenience classes and methods for TQt/TDE
+applications that want to use PolicyKit.
+.
+This package contains the development libraries and headers.
+
+%post -n %{libpolkit_tqt}-devel
+/sbin/ldconfig
+
+%postun -n %{libpolkit_tqt}-devel
+/sbin/ldconfig
+
+%files -n %{libpolkit_tqt}-devel
+%defattr(-,root,root,-)
+%{_includedir}/polkit-tqt/
+%{_libdir}/cmake/polkit-tqt.cmake
+%{_libdir}/libpolkit-tqt-agent.so
+%{_libdir}/libpolkit-tqt-core.so
+%{_libdir}/libpolkit-tqt-gui.so
+%{_libdir}/pkgconfig/polkit-tqt-agent.pc
+%{_libdir}/pkgconfig/polkit-tqt-core.pc
+%{_libdir}/pkgconfig/polkit-tqt-gui.pc
+%{_libdir}/pkgconfig/polkit-tqt.pc
+
+##########
+
+%package -n %{libpolkit_tqt}-examples
+Summary:	Polkit-tqt Documentation
+Group:		Development/Libraries/C and C++
+Provides:	libpolkit-tqt-doc = %{version}-%{release}
+Requires:	%{libpolkit_tqt}0 = %{version}-%{release}
+Requires:	trinity-filesystem >= %{tde_version}
+
+%description -n %{libpolkit_tqt}-examples
+PolicyKit is an application-level toolkit for defining and handling the policy
+that allows unprivileged processes to speak to privileged processes.
+
+It is a framework for centralizing the decision making process with respect to
+granting access to privileged operations for unprivileged (desktop) applications.
+
+libpolkit-tqt provides convenience classes and methods for TQt/TDE
+applications that want to use PolicyKit.
+
+This package contains example files and applications.
+
+%files -n %{libpolkit_tqt}-examples
+%defattr(-,root,root,-)
+%{_sysconfdir}/dbus-1/system.d/org.tqt.policykit.examples.conf
+%{_bindir}/polkit-tqt-agent-example
+%{_bindir}/polkit-tqt-example
+%{_bindir}/polkit-tqt-example-helper
+%{_datadir}/apps/polkit-tqt/
+%{_datadir}/dbus-1/system-services/org.tqt.policykit.examples.service
+%{_datadir}/polkit-1/actions/org.tqt.policykit.examples.policy
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
+
+# Unwanted files
+%__rm -f %{buildroot}%{_libdir}/libpolkit-tqt-agent.la
+%__rm -f %{buildroot}%{_libdir}/libpolkit-tqt-core.la
+%__rm -f %{buildroot}%{_libdir}/libpolkit-tqt-gui.la
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
diff --git a/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc b/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc
new file mode 100644
index 000000000..1a56a48f9
--- /dev/null
+++ b/redhat/dependencies/polkit-tqt/trinity-polkit-tqt-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('polkit-unauthorized-privilege', 0)
+setBadness('suse-dbus-unauthorized-service', 0)
diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/python-tqt/python-tqt.spec
deleted file mode 100644
index 0e5635d07..000000000
--- a/redhat/dependencies/python-tqt/python-tqt.spec
+++ /dev/null
@@ -1,273 +0,0 @@
-#
-# spec file for package python-tqt (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg python-tqt
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	3.18.1
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	TQt bindings for Python
-Group:		Development/Libraries/Python
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Obsoletes:		trinity-PyQt < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-python-qt3 < %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	tqt3-apps-devel >= 3.5.0
-BuildRequires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
-BuildRequires:	trinity-filesystem >= %{tde_version}
-BuildRequires:	sip4-tqt-devel >= %{?epoch:%{epoch}:}4.10.5
-BuildRequires:	libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1
-
-BuildRequires:	gcc-c++
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-
-# XMU support
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXmu-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires: libXmu-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
-%endif
-%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
-BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
-%endif
-
-%description
-Python binding module that allows use of TQt X Window toolkit v3.
-You can use it to create portable graphics-capable scripts.
-
-At this moment python-tqt offers a vast subset of TQt API. There are
-some minor issues related to the differences between C++ and Python
-(types, etc), but usually you'll be able to write code pretty much the
-same way in both languages (with syntax differences, of course)
-
-##########
-
-%package -n python-tqt
-Summary:	TQt bindings for Python
-Group:		Development/Libraries/Python
-Requires:	trinity-filesystem >= %{tde_version}
-Requires:	sip4-tqt >= %{?epoch:%{epoch}:}4.10.5
-Requires:	libtqt4 >= %{?epoch:%{epoch}:}4.2.0
-
-%description -n python-tqt
-Python binding module that allows use of TQt X Window toolkit v3.
-You can use it to create portable graphics-capable scripts.
-
-At this moment python-tqt offers a vast subset of TQt API. There are
-some minor issues related to the differences between C++ and Python
-(types, etc), but usually you'll be able to write code pretty much the
-same way in both languages (with syntax differences, of course)
-
-%files -n python-tqt
-%defattr(-,root,root,-)
-%doc NEWS README
-%dir %{python_sitearch}/python_tqt
-%{python_sitearch}/python_tqt/__init__.py*
-%{python_sitearch}/python_tqt/qt.so
-%{python_sitearch}/python_tqt/qtcanvas.so
-%{python_sitearch}/python_tqt/qtnetwork.so
-%{python_sitearch}/python_tqt/qtsql.so
-%{python_sitearch}/python_tqt/qttable.so
-%{python_sitearch}/python_tqt/qtui.so
-%{python_sitearch}/python_tqt/qtxml.so
-
-##########
-
-%package -n python-tqt-gl
-Summary:	TQt OpenGL bindings for Python
-Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n python-tqt-gl
-Python binding module that allows use of the OpenGL facilities
-offered by the TQt X Window toolkit v3. You can use it to create
-portable graphics-capable scripts.
-
-%files -n python-tqt-gl
-%defattr(-,root,root,-)
-%{python_sitearch}/python_tqt/qtgl.so
-
-##########
-
-%package -n python-tqt-tqtext
-Summary:	TQtext extensions for python-tqt
-Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n python-tqt-tqtext
-python-tqt Extensions. Contains:
-
-* TQScintilla: a featureful TQt source code editing component based
-              on Scintilla.
-
-%files -n python-tqt-tqtext
-%defattr(-,root,root,-)
-%{python_sitearch}/python_tqt/qtext.so
-
-##########
-
-%package -n trinity-pytqt-tools
-Summary:	Pyuic and pylupdate for TQt
-Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-pytqt-tools
-pyuic is the PyQt counterpart for TQt's uic. It takes an XML
-user interface file and generates Python code.
-
-pylupdate is the counterpart for TQt's lupdate. It updates TQt
-Linguist translation files from Python code.
-
-%files -n trinity-pytqt-tools
-%defattr(-,root,root,-)
-%{tde_bindir}/pylupdate
-%{tde_bindir}/pyuic
-
-##########
-
-%package -n python-tqt-devel
-Summary:	TQt bindings for Python - Development files
-Group:		Development/Libraries/Python
-Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-pytqt-tools = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
-
-%description -n python-tqt-devel
-Development .sip files with definitions of PyQt classes. They
-are needed to build PyQt, but also as building blocks of other
-packages based on them, like PyTDE.
-
-%files -n python-tqt-devel
-%defattr(-,root,root,-)
-%{python_sitearch}/python_tqt/pyqtconfig.py*
-%dir %{_datadir}/sip
-%{_datadir}/sip/tqt/
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-mkdir build
-cd build
-
-# WTF ? CentOS 6 !
-cp -rf ../pyuic3 ../pylupdate3 
-
-echo yes | %__python ../configure.py \
-	-c -n %{_includedir}/tqscintilla \
-	-g %{_includedir}/tqt3 \
-	-q %{_datadir}/tqt3 \
-	-y tqt-mt \
-	-o %{_libdir} -u -j 10 \
-	-d %{python_sitearch}/python_tqt \
-	-v %{_datadir}/sip/tqt \
-	-b %{tde_bindir} \
-	-w \
-	CXXFLAGS_RELEASE="" CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt" STRIP=""
-
-%__make
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%__install -d %{?buildroot}%{_datadir}/sip/
-%__cp -rf sip/* %{?buildroot}%{_datadir}/sip/tqt/
-
-
-%clean
-%__rm -rf %{?buildroot}%{python_sitearch}/python_tqt/__init__.py
-
-
-%changelog
diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec
new file mode 100644
index 000000000..a050b1cff
--- /dev/null
+++ b/redhat/dependencies/pytqt/pytqt.spec
@@ -0,0 +1,288 @@
+#
+# spec file for package pytqt (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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg pytqt
+%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_tdeappdir %{tde_datadir}/applications/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	3.18.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	TQt bindings for Python
+Group:		Development/Libraries/Python
+URL:		http://www.trinitydesktop.org/
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+Obsoletes:		trinity-PyQt < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-python-qt3 < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:		trinity-python-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+BuildRequires:	tqt3-apps-devel >= 3.5.0
+BuildRequires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
+BuildRequires:	trinity-filesystem >= %{tde_version}
+BuildRequires:	sip4-tqt-devel >= %{?epoch:%{epoch}:}4.10.5
+BuildRequires:	libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1
+
+BuildRequires:	gcc-c++
+
+# PYTHON support
+%if 0%{?sle_version} >= 150400
+%define python python3
+%define __python %__python3
+%else
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+
+# XMU support
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXmu-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
+BuildRequires: libxmu-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
+%endif
+
+%description
+Python binding module that allows use of TQt X Window toolkit v3.
+You can use it to create portable graphics-capable scripts.
+
+At this moment pytqt offers a vast subset of TQt API. There are
+some minor issues related to the differences between C++ and Python
+(types, etc), but usually you'll be able to write code pretty much the
+same way in both languages (with syntax differences, of course)
+
+##########
+
+%package -n pytqt
+Summary:	TQt bindings for Python
+Group:		Development/Libraries/Python
+Requires:	trinity-filesystem >= %{tde_version}
+Requires:	sip4-tqt >= %{?epoch:%{epoch}:}4.10.5
+Requires:	libtqt4 >= %{?epoch:%{epoch}:}4.2.0
+Obsoletes:	python-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n pytqt
+Python binding module that allows use of TQt X Window toolkit v3.
+You can use it to create portable graphics-capable scripts.
+
+At this moment pytqt offers a vast subset of TQt API. There are
+some minor issues related to the differences between C++ and Python
+(types, etc), but usually you'll be able to write code pretty much the
+same way in both languages (with syntax differences, of course)
+
+%files -n pytqt
+%defattr(-,root,root,-)
+%doc NEWS README
+%dir %{python_sitearch}/python_tqt
+%{python_sitearch}/python_tqt/__init__.py*
+%{python_sitearch}/python_tqt/qt.so
+%{python_sitearch}/python_tqt/qtcanvas.so
+%{python_sitearch}/python_tqt/qtnetwork.so
+%{python_sitearch}/python_tqt/qtsql.so
+%{python_sitearch}/python_tqt/qttable.so
+%{python_sitearch}/python_tqt/qtui.so
+%{python_sitearch}/python_tqt/qtxml.so
+
+##########
+
+%package -n pytqt-gl
+Summary:	TQt OpenGL bindings for Python
+Group:		Development/Libraries/Python
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	python-tqt-gl < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt-gl = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n pytqt-gl
+Python binding module that allows use of the OpenGL facilities
+offered by the TQt X Window toolkit v3. You can use it to create
+portable graphics-capable scripts.
+
+%files -n pytqt-gl
+%defattr(-,root,root,-)
+%{python_sitearch}/python_tqt/qtgl.so
+
+##########
+
+%package -n pytqt-tqtext
+Summary:	TQtext extensions for pytqt
+Group:		Development/Libraries/Python
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	python-tqt-tqtext < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt-tqtext = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n pytqt-tqtext
+pytqt Extensions. Contains:
+
+* TQScintilla: a featureful TQt source code editing component based
+              on Scintilla.
+
+%files -n pytqt-tqtext
+%defattr(-,root,root,-)
+%{python_sitearch}/python_tqt/qtext.so
+
+##########
+
+%package -n trinity-pytqt-tools
+Summary:	Pyuic and pylupdate for TQt
+Group:		Development/Libraries/Python
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n trinity-pytqt-tools
+pyuic is the PyQt counterpart for TQt's uic. It takes an XML
+user interface file and generates Python code.
+
+pylupdate is the counterpart for TQt's lupdate. It updates TQt
+Linguist translation files from Python code.
+
+%files -n trinity-pytqt-tools
+%defattr(-,root,root,-)
+%{tde_bindir}/pylupdate
+%{tde_bindir}/pyuic
+
+##########
+
+%package -n pytqt-devel
+Summary:	TQt bindings for Python - Development files
+Group:		Development/Libraries/Python
+Requires:	pytqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-pytqt-tools = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
+Obsoletes:	python-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n pytqt-devel
+Development .sip files with definitions of PyQt classes. They
+are needed to build PyQt, but also as building blocks of other
+packages based on them, like PyTDE.
+
+%files -n pytqt-devel
+%defattr(-,root,root,-)
+%{python_sitearch}/python_tqt/pyqtconfig.py*
+%dir %{_datadir}/sip
+%{_datadir}/sip/tqt/
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+
+mkdir build
+cd build
+
+# WTF ? CentOS 6 !
+cp -rf ../pyuic3 ../pylupdate3 
+
+echo yes | %__python ../configure.py \
+	-c -n %{_includedir}/tqscintilla \
+	-g %{_includedir}/tqt3 \
+	-q %{_datadir}/tqt3 \
+	-y tqt-mt \
+	-o %{_libdir} -u -j 10 \
+	-d %{python_sitearch}/python_tqt \
+	-v %{_datadir}/sip/tqt \
+	-b %{tde_bindir} \
+	-w \
+	CXXFLAGS_RELEASE="" CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt" STRIP=""
+
+%__make
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+%__install -d %{?buildroot}%{_datadir}/sip/
+%__cp -rf sip/* %{?buildroot}%{_datadir}/sip/tqt/
+
+
+%clean
+%__rm -rf %{?buildroot}%{python_sitearch}/python_tqt/__init__.py
+
+
+%changelog
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 6fc6d1f62..030ee85d0 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -28,7 +28,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg sip4-tqt
 %define tde_prefix /opt/trinity
@@ -70,19 +70,36 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 
 BuildRequires:	gcc-c++
 
+# BISON support
+BuildRequires:  bison
+
+# FLEX support
+BuildRequires:	flex
+
 # PYTHON support
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
 %else
+%if 0%{?sle_version} >= 150400
+%global python python3
+%global __python %__python3
+%else
 %global python python
 %endif
+%endif
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
+# YACC support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+BuildRequires:  byacc
+%endif
+
 %description
+
 SIP is a tool for generating bindings for C++ classes with some ideas
 borrowed from SWIG, but capable of tighter bindings because of its
 specificity towards C++ and Python.
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
index e5dbcf76c..09ea30645 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tqca-tls
 %define tde_prefix /opt/trinity
@@ -57,7 +57,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
 
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	openssl-devel >= 0.9.8
 
diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec
index e03d59f69..0435898ad 100644
--- a/redhat/dependencies/tqca/tqca.spec
+++ b/redhat/dependencies/tqca/tqca.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tqca
 %define tde_prefix /opt/trinity
@@ -31,6 +31,12 @@
 %define libtqca libtqca
 %endif
 
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libtqt3 %{_lib}tqt3
+%else
+%define libtqt3 libtqt3
+%endif
+
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
@@ -55,9 +61,13 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		trinity-tqca-rpmlintrc
 
+Obsoletes:		%{libtqt3}-mt-tqca-tls < %{version}-%{release}
+Provides:		%{libtqt3}-mt-tqca-tls = %{version}-%{release}
+
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires:	cmake
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
+BuildRequires:	openssl-devel >= 0.9.8
 
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -129,6 +139,8 @@ This packages contains the development files for TQCA
 %{_libdir}/libtqca.la
 %{_libdir}/libtqca.so
 %{_libdir}/pkgconfig/tqca.pc
+%dir %{_libdir}/tqt3/plugins/crypto
+%{_libdir}/tqt3/plugins/crypto/libtqca-tls.so
 
 ##########
 
diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec
index 4ddb7c647..e306fb57b 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla.spec
@@ -18,12 +18,9 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tqscintilla
-%define tde_prefix /opt/trinity
-%define tde_datadir %{tde_prefix}/share
-%define tde_tdedocdir %{tde_datadir}/doc/tde
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libtqscintilla %{_lib}tqscintilla
@@ -58,9 +55,10 @@ Source1:		trinity-tqscintilla-rpmlintrc
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
 BuildRequires:	gcc-c++
+BuildRequires:	gettext
 
 %description
 Scintilla is a free source code editing component. It has features found
@@ -94,7 +92,6 @@ TQScintilla is a port or Scintilla to the TQt GUI toolkit.
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
 %{_libdir}/libqscintilla.so.7
-%{_libdir}/libqscintilla.so.7.0
 %{_libdir}/libqscintilla.so.7.0.1
 %{_libdir}/tqt3/plugins/designer/*.so
 %dir %{_datadir}/tqt3/translations/
@@ -120,9 +117,11 @@ This package contains the development files for tqscintilla.
 
 %files -n %{libtqscintilla}-devel
 %defattr(-,root,root,-)
-%doc doc/Scintilla example
 %{_includedir}/tqscintilla/
 %{_libdir}/libqscintilla.so
+%{_libdir}/pkgconfig/qscintilla.pc
+%exclude %{_libdir}/libqscintilla.la
+%exclude %{_libdir}/tqt3/plugins/designer/*.la
 
 ##########
 
@@ -138,7 +137,7 @@ This package contains the documentation for tqscintilla.
 
 %files -n %{libtqscintilla}-doc
 %defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/%{name}/
+/usr/share/doc/libtqscintilla/
 
 ##########
 
@@ -151,74 +150,46 @@ This package contains the documentation for tqscintilla.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Fix path in project files
-%__sed -i "qt/qscintilla.pro" \
-  -e "s|^INCLUDEPATH = .*|INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3|" \
-  -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \
-  -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|"
-
-%__sed -i "designer/designer.pro" \
-  -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
-  -e "s|# DESTDIR|DESTDIR|"
-
-export QTDIR=%{_libdir}/tqt3
-export TQTDIR=%{_prefix}
-( cd qt; tqmake "DESTDIR=$PWD/../tmplib" )
-( cd designer; tqmake )
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-# Workaround strange tqmake behaviour in RHEL5
-%if 0%{?rhel} == 5
-%__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g"
-%endif
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
 
-export QTDIR=%{_libdir}/tqt3
-export TQTDIR=%{_prefix}
-%__make %{?_smp_mflags} -C qt
-%__make %{?_smp_mflags} -C designer
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL="ON" \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
-unset QTDIR QTINC QTLIB
-export QTDIR=%{_libdir}/tqt3
-export TQTDIR=%{_prefix}
-%__rm -rf $RPM_BUILD_ROOT
+%__rm -rf %{?buildroot}
+%__make install -C build DESTDIR=%{?buildroot}
+
+# Fix doc location
+if [ -d %{?buildroot}%{_docdir}/lib64tqscintilla7 ]; then
+  %__mv -f %{?buildroot}%{_docdir}/lib64tqscintilla7 %{?buildroot}%{_docdir}/libtqscintilla7
+fi
+if [ -d %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 ]; then
+  %__mv -f %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 %{?buildroot}%{_docdir}/libtqscintilla7
+fi
+
 
-# Installs the QT part
-%__make INSTALL_ROOT=$RPM_BUILD_ROOT -C qt install
-
-# Installs supplementary headers
-for i in include/*.h; do
-  %__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/}
-done
-
-# Installs the HTML documentation correctly
-for i in doc/html/*; do
-  %__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/}
-done
-
-# Installs the Designer plugin
-for i in designer/*.so ${QTDIR}/plugins/designer/*.so ${TQTDIR}/plugins/designer/*.so; do
-  [ -r "${i}" ] || continue
-  %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
-done
-
-# Installs libraries
-%__mkdir_p %{buildroot}%{_libdir}
-%__mv -f tmplib/* %{buildroot}%{_libdir}
-
-# Fix private headers location
-%__mkdir_p %{buildroot}%{_includedir}
-%__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3
-%__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla
-
-# Fix permissions
-chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h
-chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h
+# Fix headers location
+%__mv "%{?buildroot}%{_includedir}/tqt3" "%{?buildroot}%{_includedir}/tqscintilla"
 
 
 %clean
diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt3/build-examples.sh
index f8ef0b95c..4d654fcc9 120000
--- a/redhat/dependencies/tqt3/build-examples.sh
+++ b/redhat/dependencies/tqt3/build-examples.sh
@@ -1 +1 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/build-examples.sh
\ No newline at end of file
+../../../debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh
\ No newline at end of file
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index d1abf1e9f..1298ab280 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -48,6 +48,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	build-examples.sh
+Source2:	trinity-tqt3-rpmlintrc
 
 BuildRequires: glibc-devel
 BuildRequires: gcc-c++
@@ -1208,6 +1209,7 @@ for full internationalization support of the application towards the end user.
 %{_datadir}/tqt3/translations/qt_it.qm
 %{_datadir}/tqt3/translations/qt_ja.qm
 %{_datadir}/tqt3/translations/qt_nb.qm
+%{_datadir}/tqt3/translations/qt_pt.qm
 %{_datadir}/tqt3/translations/qt_pt-br.qm
 %{_datadir}/tqt3/translations/qt_ru.qm
 %{_datadir}/tqt3/translations/qt_sk.qm
@@ -1322,6 +1324,7 @@ done
 # Checks for supplementary library dirs
 LIBDIRS=""
 for d in \
+	%{_libdir}/libglvnd \
 	%{_libdir}/mysql \
 	%{_libdir}/pgsql \
 ; do
diff --git a/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc b/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc
new file mode 100644
index 000000000..d131ff5e9
--- /dev/null
+++ b/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc
@@ -0,0 +1 @@
+setBadness('shlib-policy-name-error', 0)
diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec
index 4695eb5d0..a4dfca52c 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -22,10 +22,9 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg tqtinterface
-%define cmake_modules_dir %{_datadir}/cmake/Modules
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libtqt4 %{_lib}tqt4
@@ -57,12 +56,8 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt3-mt-devel >= 3.5.0
 BuildRequires:	tqt3-dev-tools >= 3.5.0
+BuildRequires:	trinity-cmake >= %{tde_version}
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1300
-BuildRequires:	trinity-cmake-macros
-%endif
-
-BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -137,10 +132,6 @@ Provides:	libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	libtqt3-mt >= 3.5.0
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1300
-Requires:		trinity-cmake-macros
-%endif
-
 Obsoletes:	trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -171,10 +162,7 @@ Provides:	libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	%{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	libtqt3-mt-devel >= 3.5.0
 Requires:	tqt3-dev-tools >= 3.5.0
-
-%if 0%{?suse_version} && 0%{?suse_version} < 1300
-Requires:		trinity-cmake-macros
-%endif
+Requires:	trinity-cmake >= %{version}-%{release}
 
 Obsoletes:	trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -210,7 +198,6 @@ although some code has been added for useful functions that are no longer part o
 %{_libdir}/libtqt.so
 %{_libdir}/pkgconfig/tqt.pc
 %{_libdir}/pkgconfig/tqtqui.pc
-%{cmake_modules_dir}/*.cmake
 
 ##########
 
@@ -265,12 +252,6 @@ fi
 %__rm -rf "%{?buildroot}"
 %__make install DESTDIR="%{?buildroot}" -C build
 
-# Install 'cmake' modules for development use
-%__mkdir_p "%{?buildroot}%{cmake_modules_dir}"
-for i in cmake/modules/*.cmake; do
-  %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}"
-done
-
 
 %clean
 %__rm -rf "%{?buildroot}"
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh
index 581abb2cb..f558d17a1 100755
--- a/redhat/docker/build.sh
+++ b/redhat/docker/build.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.10"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
 
@@ -22,3 +22,9 @@ else
   echo "Saving image to '${FILE}'"
   ${DOCKER} image save "${IMAGE}" | pigz >"${FILE}"
 fi
+
+# Strip 'localhost/' prefix from image tag
+if ! docker images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then
+  docker image tag "localhost/${IMAGE}" "${IMAGE}"
+  #docker image rm "localhost/${IMAGE}"
+fi
diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686
index 9ca6e81a4..e12ac2c99 100644
--- a/redhat/docker/el5/Dockerfile.i686
+++ b/redhat/docker/el5/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM centos32:5
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Add local repositories
diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64
index ec65f25a0..cb11f82ab 100644
--- a/redhat/docker/el5/Dockerfile.x86_64
+++ b/redhat/docker/el5/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:5
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add local repositories
@@ -20,8 +20,8 @@ RUN setarch ${ARCH} yum -y remove gnome-screensaver \
 
 # Updated build tools (not provided in centos5)
 # Distro-specific patches
-RUN rpm -Uvh http://repo/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \
- && rpm -Uvh http://repo/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \
+RUN rpm -Uvh http://xh61v/trinity/archives/el5/tools/RPMS/{noarch/autoconf-2.63-5.el5.noarch,noarch/automake-1.11.1-4.el5.noarch,x86_64/m4-1.4.13-5.el5.x86_64}.rpm \
+ && rpm -Uvh http://xh61v/trinity/archives/el5/trinity-14.0.4/RPMS/x86_64/trinity-poppler{,-devel}-0.12.4-1.el5.x86_64.rpm \
  && chmod a+r /usr/libexec/utempter/utempter \
  && sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|"
 
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index 85fd6bc9d..36a570e32 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM centos32:6
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Enable proxy
@@ -12,6 +12,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
  && rpm -Uvh http://repo/repo/archives/centos/6/os/i386/Packages/wget-1.12-10.el6.i686.rpm \
  && rm -fv /etc/yum.repos.d/*.repo \
  && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \
+ && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \
  && setarch i686 yum -y clean all \
  && setarch i686 yum -y update \
  && rm -fv /etc/yum.repos.d/CentOS-*.repo \
@@ -38,7 +39,7 @@ COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
-RUN sudo rpm -Uvh http://repo/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm
+RUN sudo rpm -Uvh http://xh61v/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm
 
 RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index 4f78b4205..98e4a0df5 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:6
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Enable proxy
@@ -12,8 +12,10 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
  && rpm -Uvh http://repo/repo/archives/centos/6/os/x86_64/Packages/wget-1.12-10.el6.x86_64.rpm \
  && rm -fv /etc/yum.repos.d/*.repo \
  && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \
+ && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \
  && yum -y clean all \
  && yum -y update \
+ && rm -fv /etc/yum.repos.d/CentOS-*.repo \
  && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
  && yum -y install $(</packages)
 
diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages
index 7f9db04e2..78e50226a 100644
--- a/redhat/docker/el6/packages
+++ b/redhat/docker/el6/packages
@@ -9,6 +9,7 @@ binutils-devel
 bison
 boost-devel
 bzip2-devel
+byacc
 ccache
 ccrtp-devel
 cdparanoia
@@ -19,6 +20,7 @@ clamav
 clamav-devel
 clucene-core-devel
 cmake
+cmake3
 commoncpp2-devel
 cpp
 cppunit-devel
@@ -116,6 +118,7 @@ libraw1394-devel
 libsamplerate-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libssh2-devel
 libtheora-devel
 libtiff-devel
diff --git a/redhat/docker/el6/rpmmacros b/redhat/docker/el6/rpmmacros
index 3b33ecbc0..74a547ddb 100644
--- a/redhat/docker/el6/rpmmacros
+++ b/redhat/docker/el6/rpmmacros
@@ -3,3 +3,4 @@
 %_smp_mflags -j8
 %jobs 8
 %_topdir /home/trinity/rpmbuild
+%cmake %cmake3
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64
index 3dfcdda6d..11347ba7a 100644
--- a/redhat/docker/el7/Dockerfile.x86_64
+++ b/redhat/docker/el7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM centos:7
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Enable proxy
@@ -38,11 +38,11 @@ COPY rpmmacros /home/trinity/.rpmmacros
 RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm
 
-RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
+RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/y/yaz-5.31.1-4.fc36.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm
 
-RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/r/rdesktop-1.9.0-7.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
 
-RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 46c7034d9..13ff38757 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -10,6 +10,7 @@ bison
 bluez-libs-devel
 boost-devel
 bzip2-devel
+byacc
 ccache
 cdparanoia
 cdparanoia-devel
@@ -19,6 +20,7 @@ clamav
 clamav-devel
 clucene-core-devel
 cmake
+cmake3
 cpp
 cppunit-devel
 createrepo
@@ -118,6 +120,7 @@ libsamplerate-devel
 libsecret-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libssh2-devel
 libtheora-devel
 libtiff-devel
@@ -174,6 +177,7 @@ pigz
 pilot-link-devel
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql-devel
 ppp
diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros
index b76d30014..e0a64de43 100644
--- a/redhat/docker/el7/rpmmacros
+++ b/redhat/docker/el7/rpmmacros
@@ -1,3 +1,4 @@
 %dist .el7
 %_smp_mflags -j8
 %jobs 8
+%cmake %cmake3
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64
index 9126711c1..bf260ca03 100644
--- a/redhat/docker/el8/Dockerfile.x86_64
+++ b/redhat/docker/el8/Dockerfile.x86_64
@@ -1,6 +1,6 @@
-FROM centos:8
+FROM rockylinux:8
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Enable custom repository
@@ -40,19 +40,19 @@ COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/g/gnuchess-6.2.5-10.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
 
 RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-PAR-1.016-4.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-31.fc32.src.rpm \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
 
-RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/perl-PAR-Packer-1.049-5.fc32.src.rpm --nocheck \
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \
  && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index fc8af868a..06283e94e 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -10,6 +10,7 @@ bison
 bluez-libs-devel
 boost-devel
 boost-python3-devel
+byacc
 bzip2-devel
 cdparanoia
 cdparanoia-devel
@@ -21,13 +22,14 @@ clucene-core-devel
 cmake
 cpp
 cppunit-devel
-createrepo
+createrepo_c
 cryptsetup-devel
 cups-devel
 dbus-glib-devel
 docbook2X
 doxygen
 emacs
+esound-devel
 exempi-devel
 exiv2-devel
 fdupes
@@ -60,7 +62,9 @@ gtk3-devel
 gtk-doc
 guile-devel
 heimdal-devel
+help2man
 hspell-devel
+html2ps
 icu
 ImageMagick-devel
 imake
@@ -92,6 +96,7 @@ libgsf-devel
 libgssglue-devel
 libical-devel
 libidn-devel
+libjpeg-turbo-utils
 libksba-devel
 libmad-devel
 libmemcached-devel
@@ -113,6 +118,7 @@ libsamplerate-devel
 libsecret-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libtheora-devel
 libtiff-devel
 libtirpc-devel
@@ -172,6 +178,7 @@ perl(XML::Parser)
 pigz
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql
 postgresql-devel
@@ -208,6 +215,7 @@ systemd-devel
 taglib-devel
 tcl
 texinfo
+texlive-dvips
 torsocks
 transfig
 unixODBC-devel
diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64
new file mode 100644
index 000000000..1e3df3557
--- /dev/null
+++ b/redhat/docker/el9/Dockerfile.x86_64
@@ -0,0 +1,100 @@
+FROM rockylinux:9
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Enable proxy
+# Install OVL plugin for DNF
+# Update distribution packages
+# Add EPEL repository
+# Add RPMFUSION repository
+# Enable supplementary repositories
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && curl -o /usr/lib/python3.9/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
+ && dnf -y update \
+ && dnf -y install epel-release \
+ && dnf -y install https://download1.rpmfusion.org/free/el/updates/9/x86_64/r/rpmfusion-free-release-9-1.noarch.rpm \
+ && dnf -y install dnf-plugins-core \
+ && dnf config-manager --enable devel \
+ && dnf config-manager --enable plus \
+ && dnf -y --enableplugin=ovl install $(</packages)
+
+# Add YUM repository for locally built packages
+WORKDIR /etc/yum.repos.d
+COPY rpmbuild.repo rpmbuild.repo
+RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Build supplementary development tools
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
+
+RUN sudo rpm -Uvh \
+  http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \
+  http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/b/bdftopcf-1.1-4.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/bdftopcf-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/paper-2.3-4.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/psutils-2.07-2.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/h/html2ps-1.0-0.42.b7.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libxml++-2.42.1-3.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libofx-0.10.3-2.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm 
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP{,-devel}-1*.rpm 
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm 
+
+RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm 
diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages
new file mode 100644
index 000000000..dda2b1b20
--- /dev/null
+++ b/redhat/docker/el9/packages
@@ -0,0 +1,219 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+bluez-libs-devel
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+cdparanoia
+cdparanoia-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+docbook2X
+doxygen
+emacs
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-devel
+fontforge
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+gcc-gfortran
+gettext-devel
+giflib-devel
+glibmm24-devel
+gmp-devel
+gnulib-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+help2man
+hiredis
+hspell-devel
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+kernel
+lame-devel
+libacl-devel
+libao-devel
+libarchive-devel
+libassuan-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-devel
+libdb-cxx-devel
+libdvdread-devel
+libfontenc-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libjpeg-turbo-utils
+libjxl
+libksba-devel
+libmad-devel
+libmemcached-devel
+libmng-devel
+libmpcdec-devel
+libmtp-devel
+libnsl2-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpcap-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2-tools
+librsync-devel
+libsamplerate-devel
+libsecret-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libudisks2-devel
+libusb-devel
+lirc-devel
+lm_sensors-devel
+mesa-libGL-devel
+meson
+mysql-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+OpenEXR-devel
+openldap-devel
+opensc
+opensp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl
+perl-devel
+perl-generators
+perl(ExtUtils::MakeMaker)
+perl(inc::Module::Install)
+perl(IPC::Run3)
+perl(PAR::Dist)
+perl(Module::Signature)
+perl(Test::Pod)
+perl(Test::Pod::Coverage)
+perl(XML::Parser)
+pigz
+pkcs11-helper-devel
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+ppp
+pulseaudio-libs-devel
+python3
+python3-devel
+python3-pyxattr
+rdesktop
+rdiff-backup
+readline-devel
+recode
+redhat-rpm-config
+redis
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+systemd-devel
+taglib-devel
+tcl
+texinfo
+texlive-collection-basic
+torsocks
+transfig
+unixODBC-devel
+usbutils
+valgrind
+wget
+xine-lib-devel
+xmlto
+xorg-x11-server-utils
+xorg-x11-util-macros
+xz-devel
diff --git a/redhat/docker/el9/rpmbuild.repo b/redhat/docker/el9/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/el9/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/el9/rpmmacros b/redhat/docker/el9/rpmmacros
new file mode 100644
index 000000000..a6c71dccc
--- /dev/null
+++ b/redhat/docker/el9/rpmmacros
@@ -0,0 +1,6 @@
+%dist .el9
+%_smp_mflags -j8
+%jobs 8
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64
index d0db97079..f200d9eb6 100644
--- a/redhat/docker/f25/Dockerfile.x86_64
+++ b/redhat/docker/f25/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:25
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686
index 96c2c8b26..bc8bb6f43 100644
--- a/redhat/docker/f26/Dockerfile.i686
+++ b/redhat/docker/f26/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:26
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64
index 1ef251c6d..c8fda601c 100644
--- a/redhat/docker/f26/Dockerfile.x86_64
+++ b/redhat/docker/f26/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:26
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686
index 32e2d0a5c..53d03fe5a 100644
--- a/redhat/docker/f27/Dockerfile.i686
+++ b/redhat/docker/f27/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:27
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64
index 167ba6e31..0e29b1ee4 100644
--- a/redhat/docker/f27/Dockerfile.x86_64
+++ b/redhat/docker/f27/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:27
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add RPMFUSION repository
diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686
index caa4fef93..209fa9aab 100644
--- a/redhat/docker/f28/Dockerfile.i686
+++ b/redhat/docker/f28/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:28
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64
index 85a985080..ea6030994 100644
--- a/redhat/docker/f28/Dockerfile.x86_64
+++ b/redhat/docker/f28/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:28
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.i686 b/redhat/docker/f29/Dockerfile.i686
index 52cc048d9..75db326b7 100644
--- a/redhat/docker/f29/Dockerfile.i686
+++ b/redhat/docker/f29/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:29
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f29/Dockerfile.x86_64 b/redhat/docker/f29/Dockerfile.x86_64
index 739e6da98..018c4da28 100644
--- a/redhat/docker/f29/Dockerfile.x86_64
+++ b/redhat/docker/f29/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:29
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686
index 197570e3a..0bb6dfa50 100644
--- a/redhat/docker/f30/Dockerfile.i686
+++ b/redhat/docker/f30/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM fedora32:30
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64
index da972215e..5b42d6be3 100644
--- a/redhat/docker/f30/Dockerfile.x86_64
+++ b/redhat/docker/f30/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:30
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64
index 988ea56c5..9e44bd470 100644
--- a/redhat/docker/f31/Dockerfile.x86_64
+++ b/redhat/docker/f31/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:31
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64
index c6374db5b..b07ebffcd 100644
--- a/redhat/docker/f32/Dockerfile.x86_64
+++ b/redhat/docker/f32/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:32
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf"
diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64
index be1456054..013dcb55a 100644
--- a/redhat/docker/f33/Dockerfile.x86_64
+++ b/redhat/docker/f33/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:33
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Fix DNF database corruption
diff --git a/redhat/docker/f34/Dockerfile.x86_64 b/redhat/docker/f34/Dockerfile.x86_64
index e86d2a75d..0436b4b23 100644
--- a/redhat/docker/f34/Dockerfile.x86_64
+++ b/redhat/docker/f34/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM fedora:34
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Fix DNF database corruption
@@ -18,9 +18,8 @@ COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
 RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
 
 # Fix utempter detection
-RUN chmod a+r /usr/libexec/utempter/utempter
-
-RUN chmod 777 /tmp
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
 
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity \
diff --git a/redhat/docker/f34/packages b/redhat/docker/f34/packages
index e3c97e622..84825b0a8 100644
--- a/redhat/docker/f34/packages
+++ b/redhat/docker/f34/packages
@@ -10,6 +10,7 @@ binutils-devel
 bison
 boost-devel
 boost-python3-devel
+byacc
 bzip2-devel
 ccache
 cdparanoia
@@ -42,6 +43,7 @@ fftw-devel
 file-devel
 flac-devel
 flex-static
+fontforge
 fontpackages-devel
 fribidi-devel
 gcc
@@ -185,6 +187,7 @@ perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
+polkit-devel
 poppler-devel
 postgresql
 postgresql-devel
diff --git a/redhat/docker/f35/Dockerfile.x86_64 b/redhat/docker/f35/Dockerfile.x86_64
new file mode 100644
index 000000000..172edbd89
--- /dev/null
+++ b/redhat/docker/f35/Dockerfile.x86_64
@@ -0,0 +1,36 @@
+FROM fedora:35
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-35.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
diff --git a/redhat/docker/f35/packages b/redhat/docker/f35/packages
new file mode 100644
index 000000000..f6d605f1a
--- /dev/null
+++ b/redhat/docker/f35/packages
@@ -0,0 +1,238 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+wireless-tools-devel
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f35/rpmbuild.repo b/redhat/docker/f35/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f35/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f35/rpmmacros b/redhat/docker/f35/rpmmacros
new file mode 100644
index 000000000..4ce88c1fd
--- /dev/null
+++ b/redhat/docker/f35/rpmmacros
@@ -0,0 +1,7 @@
+%dist .fc35
+%_smp_mflags -j8
+%jobs 8
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/f36/Dockerfile.x86_64 b/redhat/docker/f36/Dockerfile.x86_64
new file mode 100644
index 000000000..967534f81
--- /dev/null
+++ b/redhat/docker/f36/Dockerfile.x86_64
@@ -0,0 +1,40 @@
+FROM fedora:36
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-36.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
diff --git a/redhat/docker/f36/packages b/redhat/docker/f36/packages
new file mode 100644
index 000000000..71b1f0d27
--- /dev/null
+++ b/redhat/docker/f36/packages
@@ -0,0 +1,238 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f36/rpmbuild.repo b/redhat/docker/f36/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f36/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f36/rpmmacros b/redhat/docker/f36/rpmmacros
new file mode 100644
index 000000000..fd63b7997
--- /dev/null
+++ b/redhat/docker/f36/rpmmacros
@@ -0,0 +1,8 @@
+%dist .fc36
+%_smp_mflags -j8
+%jobs 8
+%__brp_remove_la_files %nil
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
diff --git a/redhat/docker/f37/Dockerfile.x86_64 b/redhat/docker/f37/Dockerfile.x86_64
new file mode 100644
index 000000000..0aefc0840
--- /dev/null
+++ b/redhat/docker/f37/Dockerfile.x86_64
@@ -0,0 +1,47 @@
+FROM fedora:37
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Fix DNF database corruption
+# Add RPMFUSION repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
+ && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \
+ && sed -i /etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo  -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|37|g" \
+ && dnf -y install dnf-plugin-ovl findutils \
+ && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-37.noarch.rpm \
+ && dnf -y --enableplugin=ovl update \
+ && dnf -y --enableplugin=ovl install --skip-broken $(</packages)
+
+# Add YUM repository for locally built packages
+COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
+RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter \
+ && chmod 777 /tmp
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
+
+RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2*
diff --git a/redhat/docker/f37/packages b/redhat/docker/f37/packages
new file mode 100644
index 000000000..474a39686
--- /dev/null
+++ b/redhat/docker/f37/packages
@@ -0,0 +1,240 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bdftopcf
+bind-devel
+binutils-devel
+bison
+boost-devel
+boost-python3-devel
+byacc
+bzip2-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+clucene-core-devel
+cmake
+cpp
+cppunit-devel
+crda
+createrepo_c
+cryptsetup-devel
+cups-devel
+dbus-glib-devel
+djvulibre
+djvulibre-devel
+dnf-plugin-ovl
+docbook2X
+doxygen
+dssi-devel
+esound-devel
+exempi-devel
+exiv2-devel
+fdupes
+fedora-rpm-macros
+ffmpeg-devel
+fftw-devel
+file-devel
+flac-devel
+flex-static
+fontpackages-devel
+fribidi-devel
+gcc
+gcc-c++
+geoip-devel
+gettext-devel
+giflib-devel
+glib-devel
+gmime-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+graphviz
+gsl-devel
+gstreamer1-devel
+gstreamer1-plugins-base-devel
+gtk2-devel
+gtk3-devel
+gtk+-devel
+gtk-doc
+guile-devel
+harfbuzz-devel
+hspell-devel
+htdig
+html2ps
+iceauth
+icu
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.8.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libacl-devel
+libblkid-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-cxx-devel
+libdb-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libical-devel
+libidn-devel
+libifp-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz5-devel
+libnjb-devel
+libnsl2-devel
+libofx-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg2
+librsvg2-tools
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtool-ltdl-devel
+libudev-devel
+libudisks2-devel
+libusb-compat-0.1-devel
+libusb1-devel
+libutempter-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvncserver-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXcomposite-devel
+libXdamage-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+lm_sensors-devel
+meanwhile-devel
+mesa-libGL-devel
+mftrace
+mysql-devel
+nas-devel
+neon-devel
+netpbm-progs
+NetworkManager-libnm-devel
+net-snmp-devel
+net-tools
+nspr-devel
+ocaml
+ocaml(compiler)
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+opensc
+openslp-devel
+opensp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+pcsc-perl
+perl
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(PAR::Packer)
+perl(XML::Parser)
+pilot-link-devel
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+poppler-devel
+postgresql
+postgresql-devel
+postgresql-private-devel
+postgresql-server-devel
+ppp
+pulseaudio-libs-devel
+python
+python3-devel
+qt4-devel
+recode
+redhat-rpm-config
+rpcgen
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+scons
+SDL-devel
+selinux-policy-devel
+speex-devel
+sqlite-devel
+subversion-devel
+sudo
+swig
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+texinfo
+texlive-newunicodechar
+torsocks
+transfig
+udisks-devel
+unixODBC-devel
+usbutils
+valgrind
+xbase-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xz-devel
diff --git a/redhat/docker/f37/rpmbuild.repo b/redhat/docker/f37/rpmbuild.repo
new file mode 100644
index 000000000..750290651
--- /dev/null
+++ b/redhat/docker/f37/rpmbuild.repo
@@ -0,0 +1,11 @@
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+enabled=1
+gpgcheck=0
diff --git a/redhat/docker/f37/rpmmacros b/redhat/docker/f37/rpmmacros
new file mode 100644
index 000000000..3865a262b
--- /dev/null
+++ b/redhat/docker/f37/rpmmacros
@@ -0,0 +1,9 @@
+%dist .fc37
+%_smp_mflags -j8
+%jobs 8
+%__brp_remove_la_files %nil
+%__cmake_builddir %nil
+%__cmake_in_source_build 1
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%source_date_epoch_from_changelog 0
diff --git a/redhat/docker/mageia32.sh b/redhat/docker/mageia32.sh
index 29afb4b59..2f2e10e4f 100755
--- a/redhat/docker/mageia32.sh
+++ b/redhat/docker/mageia32.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 NAME="mageia32"
-VERSION="$1" # E.g: '26'
+VERSION="${1:-8}" # E.g: '26'
 IMAGE="${NAME}:${VERSION}"
 INSTALLROOT="/dev/shm/${IMAGE}"
 
diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64
index d75089de9..a8ef08acf 100644
--- a/redhat/docker/mga5/Dockerfile.x86_64
+++ b/redhat/docker/mga5/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:5.1
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686
index d5ff923a9..344319a5f 100644
--- a/redhat/docker/mga6/Dockerfile.i686
+++ b/redhat/docker/mga6/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:6
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64
index c5b7f7e72..73c33dcea 100644
--- a/redhat/docker/mga6/Dockerfile.x86_64
+++ b/redhat/docker/mga6/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:6
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686
index 139cd9290..0e82ab87c 100644
--- a/redhat/docker/mga7/Dockerfile.i686
+++ b/redhat/docker/mga7/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:7
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64
index 04ab8c173..8ad899d78 100644
--- a/redhat/docker/mga7/Dockerfile.x86_64
+++ b/redhat/docker/mga7/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:7
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga8/Dockerfile.i686 b/redhat/docker/mga8/Dockerfile.i686
index 558f70451..46d2810d9 100644
--- a/redhat/docker/mga8/Dockerfile.i686
+++ b/redhat/docker/mga8/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM mageia32:8
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga8/Dockerfile.x86_64 b/redhat/docker/mga8/Dockerfile.x86_64
index b216b7d09..f9424ee50 100644
--- a/redhat/docker/mga8/Dockerfile.x86_64
+++ b/redhat/docker/mga8/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM mageia:8
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Reset URPMI repositories to default
diff --git a/redhat/docker/mga8/packages.i686 b/redhat/docker/mga8/packages.i686
index af6c6feb7..a39a701af 100644
--- a/redhat/docker/mga8/packages.i686
+++ b/redhat/docker/mga8/packages.i686
@@ -55,6 +55,7 @@ gtk2-devel
 gtk+3.0-devel
 gtk-doc
 hspell-devel
+html2ps
 hunspell-en
 iceauth
 ImageMagick-devel
@@ -213,6 +214,7 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
diff --git a/redhat/docker/mga8/packages.x86_64 b/redhat/docker/mga8/packages.x86_64
index ad8802b2c..998e0c682 100644
--- a/redhat/docker/mga8/packages.x86_64
+++ b/redhat/docker/mga8/packages.x86_64
@@ -55,6 +55,7 @@ gtk2-devel
 gtk+3.0-devel
 gtk-doc
 hspell-devel
+html2ps
 hunspell-en
 iceauth
 ImageMagick-devel
@@ -216,6 +217,7 @@ pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
 polkit-agent-none
+polkit-devel
 postgresql13
 postgresql13-devel
 ppp
diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686
new file mode 100644
index 000000000..46d2810d9
--- /dev/null
+++ b/redhat/docker/mga9/Dockerfile.i686
@@ -0,0 +1,51 @@
+FROM mageia32:8
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=i686
+
+# Reset URPMI repositories to default
+# Enable more URPMI repositories
+RUN urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/i586/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release  {/{p;N;d}" -e "/Tainted\\\ Updates  {/{p;N;d}"
+
+# Enable english locales
+RUN urpmi --replacepkgs glibc \
+ && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || :
+
+# Update distribution
+# Install Trinity build dependencies
+COPY packages.${ARCH} /packages
+RUN urpmi.update -a \
+ && urpmi --auto-select --auto \
+ && urpmi --auto $(</packages)
+
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Fix poppler support
+RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
+
+# Add non-root user to build packages
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \
+ && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64
new file mode 100644
index 000000000..9d4ef301e
--- /dev/null
+++ b/redhat/docker/mga9/Dockerfile.x86_64
@@ -0,0 +1,51 @@
+FROM mageia:9
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Reset URPMI repositories to default
+# Enable more URPMI repositories
+RUN urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/x86_64/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release  {/{p;N;d}" -e "/Tainted\\\ Updates  {/{p;N;d}"
+
+# Enable english locales
+RUN urpmi --replacepkgs glibc \
+ && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || :
+
+# Update distribution
+# Install Trinity build dependencies
+COPY packages.${ARCH} /packages
+RUN urpmi.update -a \
+ && urpmi --auto-select --auto \
+ && urpmi --auto $(</packages)
+
+# Enable ccache
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
+
+# Fix utempter detection
+RUN chmod a+r /usr/libexec/utempter/utempter
+
+# Fix poppler support
+RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
+
+# Add non-root user to build packages
+RUN rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add rpmbuild repositories
+RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
+
+# Build development packages that are missing
+RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \
+ && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686
new file mode 100644
index 000000000..a39a701af
--- /dev/null
+++ b/redhat/docker/mga9/packages.i686
@@ -0,0 +1,256 @@
+advancecomp
+alsa-lib-devel
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+fontconfig-devel
+freetype2-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gtk2-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+hunspell-en
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+karma-sharp
+kde-dev-scripts
+libapr-devel
+libapr-util-devel
+libart_lgpl-devel
+libattr-devel
+libavformat58
+libbinutils-devel
+libblkid-devel
+libcdda-devel
+libcln-devel
+libclucene-devel
+libclucene-devel
+libcommoncpp-devel
+libcommoncpp-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libcurl-devel
+libdvdread-devel
+libdvdread-devel
+libecpg13_6
+libexiv2-devel
+libext2fs-devel
+libfbclient-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libflac-devel
+libfontenc-devel
+libgadu-devel
+libgeoip-devel
+libgmime2.6-devel
+libgpod-devel
+libgsf-devel
+libgstreamer1.0-devel
+libgstreamer-plugins-base1.0-devel
+libhd-devel
+libical-devel
+libice-devel
+libidn-devel
+libifp-devel
+libinotifytools-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjasper-devel
+libjpeg-devel
+libkarma-devel
+liblo-devel
+liblrdf-devel
+liblua-devel
+libmad-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libnpth-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpaper-devel
+libpkcs11-helper-devel
+libpoppler-devel
+libpulseaudio-devel
+libpx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg
+libsane1-devel
+libsmbclient-devel
+libsm-devel
+libsndfile-devel
+libt1lib-devel
+libt1lib-devel
+libtheora-devel
+libtiff-devel
+libtwolame-devel
+libudev-devel
+libungif-devel
+libusb1.0-devel
+libutempter
+libutempter0
+libutempter-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxaw-devel
+libxcursor-devel
+libxdg-basedir-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxi-devel
+libxine1.2-devel
+libxinerama-devel
+libxkbfile-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxscrnsaver-devel
+libxslt-devel
+libxtst-devel
+libxv-devel
+libxxf86dga-devel
+libxxf86dga-devel
+libyaz-devel
+libyaz-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+notification-daemon
+ocaml
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+openldap-servers-devel
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl(PAR::Packer)
+perl-pcsc-perl
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+polkit-agent-none
+polkit-devel
+postgresql13
+postgresql13-devel
+ppp
+python-devel
+python-sip
+qt4-devel
+readline-devel
+recode
+rpcgen
+rpm-build
+rpm-devel
+ruby-devel
+scons
+SDL-devel
+speex-devel
+sqlite3-devel
+sqlite-devel
+sshfs-fuse
+subversion-devel
+sudo
+swig
+sword-devel
+taglib-devel
+torsocks
+transfig
+udisks2-devel
+unixODBC-devel
+usbutils
+valgrind
+wv2-devel
+x11-font-util
+xbase-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+yaz
+zlib-devel
diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64
new file mode 100644
index 000000000..998e0c682
--- /dev/null
+++ b/redhat/docker/mga9/packages.x86_64
@@ -0,0 +1,259 @@
+advancecomp
+alsa-lib-devel
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+drakconf
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+fontconfig-devel
+freetype2-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gtk2-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+hunspell-en
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+karma-sharp
+kde-dev-scripts
+lib64apr-devel
+lib64apr-util-devel
+lib64avformat58
+lib64binutils-devel
+lib64boost_python3-devel
+lib64cln-devel
+lib64clucene-devel
+lib64commoncpp-devel
+lib64cryptsetup-devel
+lib64curl-devel
+lib64dvdread-devel
+lib64ecpg13_6
+lib64exiv2-devel
+lib64ext2fs-devel
+lib64fbclient-devel
+lib64ffmpeg-devel
+lib64flac++-devel
+lib64flac-devel
+lib64fontenc-devel
+lib64geoip-devel
+lib64gmime2.6-devel
+lib64gstreamer1.0-devel
+lib64gstreamer-plugins-base1.0-devel
+lib64inotifytools-devel
+lib64jasper-devel
+lib64jpeg-devel
+lib64lua-devel
+lib64mad-devel
+lib64mp3lame-devel
+lib64npth-devel
+lib64paper-devel
+lib64pkcs11-helper-devel
+lib64poppler-devel
+lib64pulseaudio-devel
+lib64sane1-devel
+lib64t1lib-devel
+lib64tiff-devel
+lib64twolame-devel
+lib64udev-devel
+lib64usb1.0-devel
+lib64utempter0
+lib64utempter-devel
+lib64v4l-devel
+lib64xaw-devel
+lib64xdg-basedir-devel
+lib64xi-devel
+lib64xine1.2-devel
+lib64xscrnsaver-devel
+lib64xtst-devel
+lib64xxf86dga-devel
+lib64yaz-devel
+libart_lgpl-devel
+libattr-devel
+libblkid-devel
+libcdda-devel
+libclucene-devel
+libcommoncpp-devel
+libconfig-devel
+libcurl-devel
+libdvdread-devel
+libffmpeg-devel
+libflac++-devel
+libflac-devel
+libgadu-devel
+libgpod-devel
+libgsf-devel
+libhd-devel
+libical-devel
+libice-devel
+libidn-devel
+libifp-devel
+libiodbc-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libkarma-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpx-devel
+libqalculate-devel
+libraw1394-devel
+librsvg
+libsmbclient-devel
+libsm-devel
+libsndfile-devel
+libt1lib-devel
+libtheora-devel
+libungif-devel
+libutempter
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libx11-devel
+libxcursor-devel
+libxext-devel
+libxft-devel
+libxi-devel
+libxinerama-devel
+libxkbfile-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+libxslt-devel
+libxv-devel
+libxxf86dga-devel
+libyaz-devel
+lilo
+lirc-devel
+lm_sensors-devel
+mesaglu-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+notification-daemon
+ocaml
+ocaml-facile-devel
+OpenEXR-devel
+openldap-devel
+openldap-servers-devel
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl(PAR::Packer)
+perl-pcsc-perl
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+polkit-agent-none
+polkit-devel
+postgresql13
+postgresql13-devel
+ppp
+python-devel
+python-sip
+qt4-devel
+readline-devel
+recode
+rpcgen
+rpm-build
+rpm-devel
+ruby-devel
+scons
+SDL-devel
+speex-devel
+sqlite3-devel
+sqlite-devel
+sshfs-fuse
+subversion-devel
+sudo
+swig
+sword-devel
+taglib-devel
+torsocks
+transfig
+udisks2-devel
+unixODBC-devel
+usbutils
+valgrind
+wv2-devel
+x11-font-util
+xbase-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+yaz
+zlib-devel
diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros
new file mode 100644
index 000000000..2bc3bb37f
--- /dev/null
+++ b/redhat/docker/mga9/rpmmacros
@@ -0,0 +1,6 @@
+%_smp_mflags -j8
+%jobs 8
+%_program_prefix ""
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%_vpath_builddir .
diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh
index f2d686df5..1a78e6340 100755
--- a/redhat/docker/opensuse32.sh
+++ b/redhat/docker/opensuse32.sh
@@ -32,14 +32,20 @@ sudo zypper --root "${INSTALLROOT}" \
 sudo setarch i686 zypper --root "${INSTALLROOT}"  \
   install --download-only -y \
   bash \
+  docbook-utils \
   filesystem \
+  gawk \
   glibc \
   glibc-extra \
+  grep \
+  gzip \
   libpcre1 \
   libselinux1 \
   openSUSE-release \
   system-user-root \
   util-linux vim \
+  xz \
+  zlib \
   zypper
 sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm"
 
diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64
index 41787b819..5c6329d04 100644
--- a/redhat/docker/oss131/Dockerfile.x86_64
+++ b/redhat/docker/oss131/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:13.1
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64
index 0d84c611d..4d9cd433b 100644
--- a/redhat/docker/oss132/Dockerfile.x86_64
+++ b/redhat/docker/oss132/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:13.2
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64
index 82289a39e..c0c48fa74 100644
--- a/redhat/docker/oss150/Dockerfile.x86_64
+++ b/redhat/docker/oss150/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.0
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64
index 9dbe812a7..ad1e11ac5 100644
--- a/redhat/docker/oss151/Dockerfile.x86_64
+++ b/redhat/docker/oss151/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.1
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64
index 4b65eb3b7..6efb20b54 100644
--- a/redhat/docker/oss152/Dockerfile.x86_64
+++ b/redhat/docker/oss152/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/leap:15.2
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64
new file mode 100644
index 000000000..842b020ff
--- /dev/null
+++ b/redhat/docker/oss153/Dockerfile.x86_64
@@ -0,0 +1,30 @@
+FROM opensuse/leap:15.3
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+ && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.3/ packman \
+ && zypper refresh \
+ && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64 \
+ && zypper -n install postgresql10{,-devel,-server}-10.17-8.35.1.x86_64 \
+ && zypper -n update \
+ && zypper -n install -l $(</packages)
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages
new file mode 100644
index 000000000..cf45a5a34
--- /dev/null
+++ b/redhat/docker/oss153/packages
@@ -0,0 +1,218 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+bind-devel
+binutils-devel
+bison
+brp-check-suse
+brp-extract-appdata
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+createrepo
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+docbook2x
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+git
+glu-devel
+gmime-devel
+gmime2_6-devel
+gmp-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel 
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+iceauth
+ImageMagick-devel
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+less
+libacl-devel
+libao-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libboost_python-py3-1_66_0-devel
+libboost_system1_66_0-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libgadu-devel
+libGeoIP-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libICE-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+liblcms2-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel 
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpisock-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libSM-devel
+libsmbclient-devel
+libsndfile-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libxine-devel
+libXmu-devel
+libxslt-devel
+libXt-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl-PAR-Packer
+perl-pcsc
+pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
+polkit-devel
+python-devel
+python3-devel
+python3-sip-devel
+recode
+rpcgen
+rpm-build
+rpmlint
+rsvg-convert
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+torsocks
+transfig
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+vim
+wireless-tools
+wv2-devel
+xbase-devel
+xcb-proto-devel
+xorg-x11
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
+
+font-util
+imake
+libXScrnSaver-devel
+libXdmcp-devel
+libfontenc-devel
+libssh-devel
+libxkbfile-devel
+libXxf86vm-devel
+libXxf86dga-devel
+libXaw-devel
+libXv-devel
diff --git a/redhat/docker/oss153/rpmmacros b/redhat/docker/oss153/rpmmacros
new file mode 100644
index 000000000..bdf6be354
--- /dev/null
+++ b/redhat/docker/oss153/rpmmacros
@@ -0,0 +1,4 @@
+%dist .oss153
+%_smp_mflags -j8
+%jobs 8
+%sle_version 150300
diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64
new file mode 100644
index 000000000..bf03a3966
--- /dev/null
+++ b/redhat/docker/oss154/Dockerfile.x86_64
@@ -0,0 +1,32 @@
+FROM opensuse/leap:15.4
+
+ARG TDE_VERSION=14.0.13
+ARG ARCH=x86_64
+
+# Add PACKMAN repository
+# Install Trinity build dependencies
+COPY packages /packages
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+ && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
+ && rm -fv /etc/zypp/repos.d/repo-sle-* \
+ && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \
+ && zypper refresh \
+ && zypper -n update \
+ && zypper -n install --oldpackage libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-data-2.4.46-150200.14.5.1.noarch \
+ && zypper -n install -l $(</packages)
+
+RUN ln -sfv python3 /usr/bin/python
+
+# Add non-root user to build packages
+RUN useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+# Add YUM repository for locally built packages
+RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
+ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
+ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages
new file mode 100644
index 000000000..cf75e1def
--- /dev/null
+++ b/redhat/docker/oss154/packages
@@ -0,0 +1,218 @@
+alsa-devel
+aspell
+aspell-devel
+audiofile-devel
+automake
+bdftopcf
+binutils-devel
+bison
+brp-check-suse
+brp-extract-appdata
+ccache
+cdparanoia
+cdparanoia-devel
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cln-devel
+clucene-core-devel
+cmake
+createrepo_c
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-utils
+docbook-xsl-stylesheets
+docbook2x
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+font-util
+freetype-devel
+fribidi-devel
+gamin-devel
+gcc-c++
+giflib-devel
+git
+glu-devel
+gmime-devel
+gmime2_6-devel
+gmp-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel 
+gstreamer-devel
+gtk2-devel
+gtk3-devel
+gtk-doc
+htdig
+html2ps
+hunspell-devel
+iceauth
+ImageMagick-devel
+imake
+imlib2-devel
+intltool
+java-1_8_0-openjdk-devel
+less
+libacl-devel
+libao-devel
+libart_lgpl-devel
+libavahi-devel
+libavcodec-devel
+libblkid-devel
+libboost_python-py3-1_66_0-devel
+libboost_system1_66_0-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcryptsetup-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexempi-devel
+libexiv2-devel
+libfontenc-devel
+libgadu-devel
+libGeoIP-devel
+libgpgme-devel
+libgphoto2-devel
+libgpod-devel
+libgssglue-devel
+libical-devel
+libICE-devel
+libidn-devel
+libiw-devel
+libjack-devel
+libjasper-devel
+libjpeg8-devel
+liblcms2-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel 
+libmysqld-devel
+libneon-devel
+libnjb-devel
+libnsl-devel
+libofx-devel
+libotr-devel
+libpaper-devel
+libpng16-devel
+libpoppler-devel
+libpqxx-devel
+libpulse-devel
+libqalculate-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libSDL-devel
+libSM-devel
+libsmbclient-devel
+libsndfile-devel
+libssh-devel
+libtag-devel
+libtheora-devel
+libtiff-devel
+libtirpc-devel
+libtool
+libtwolame-devel
+libudev1
+libudisks2-0-devel
+libuuid-devel
+libv4l-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXdmcp-devel
+libxine-devel
+libxkbfile-devel
+libXpm-devel
+libXmu-devel
+libXScrnSaver-devel
+libxslt-devel
+libXt-devel
+libXv-devel
+libXxf86dga-devel
+libXxf86vm-devel
+libyaz-devel
+libzrtpcpp-devel
+lirc-devel
+make
+makeinfo
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+mozilla-nspr-devel
+mysql-devel
+net-tools
+net-tools-deprecated
+NetworkManager-devel
+ocaml
+openexr-devel
+opensc
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+perl-PAR-Packer
+perl-pcsc
+pkcs11-helper-devel
+polkit-devel
+postgresql10
+postgresql10-devel
+python3-devel
+python3-sip-devel
+recode
+rpcgen
+rpm-build
+rpmlint
+rsvg-convert
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+sword-devel
+torsocks
+transfig
+unixODBC-devel
+update-desktop-files
+usbutils
+utempter-devel
+valgrind
+vim
+wireless-tools
+wv2-devel
+xbase-devel
+xcb-proto-devel
+xorg-x11
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
diff --git a/redhat/docker/oss154/rpmmacros b/redhat/docker/oss154/rpmmacros
new file mode 100644
index 000000000..9917a9332
--- /dev/null
+++ b/redhat/docker/oss154/rpmmacros
@@ -0,0 +1,5 @@
+%dist .oss154
+%_smp_mflags -j8
+%jobs 8
+%sle_version 150400
+%_build_insert_debug_package %nil
diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64
index fd06adf97..701b47d89 100644
--- a/redhat/docker/oss421/Dockerfile.x86_64
+++ b/redhat/docker/oss421/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.1
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64
index 2384a9789..ad34292c5 100644
--- a/redhat/docker/oss422/Dockerfile.x86_64
+++ b/redhat/docker/oss422/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.2
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64
index 348baaf0e..5f3bc940a 100644
--- a/redhat/docker/oss423/Dockerfile.x86_64
+++ b/redhat/docker/oss423/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse:42.3
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 2ba255565..ffaad703d 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -1,6 +1,6 @@
 FROM opensuse32/tumbleweed:latest
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=i686
 
 # Add PACKMAN repository
@@ -10,12 +10,15 @@ RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/op
  && setarch ${ARCH} zypper -n refresh \
  && setarch ${ARCH} zypper -n dup \
  && setarch ${ARCH} zypper -n update \
- && setarch ${ARCH} zypper -n install $(</packages)
+ && setarch ${ARCH} zypper -n install --allow-vendor-change $(</packages)
 
 # Add non-root user to build packages
 RUN useradd -m -s /bin/bash -u 1000 trinity \
  && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 
+# Fix postgresql
+RUN ln -sfv /usr/lib/postgresql10/bin/pg_config /usr/bin/pg_config
+
 USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
 
@@ -24,3 +27,13 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
  && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Add GeoIP
+RUN setarch ${ARCH} rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
+
+# Add lilypond (i686 only)
+RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.9.src.rpm \
+ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \
+ && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \
+ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-texgy-fonts,-emmentaler-fonts}"-2"*".rpm"
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index e69c02087..21fc9a863 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM opensuse/tumbleweed:latest
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Add PACKMAN repository
@@ -24,3 +24,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \
  && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \
  && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
+
+# Add GeoIP
+RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 623129a61..6a0428a66 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -9,7 +9,6 @@ bison
 bluez-devel
 boost-devel
 brp-check-suse
-brp-extract-appdata
 ccache
 cdparanoia
 cdparanoia-devel
@@ -24,8 +23,10 @@ createrepo_c
 cups-devel
 curl
 cyrus-sasl-devel
+dblatex
 dbus-1-devel
 dbus-1-glib-devel
+dejavu-fonts
 djvulibre
 docbook-utils
 docbook-xsl-stylesheets
@@ -45,6 +46,7 @@ freetype-devel
 fribidi-devel
 gamin-devel
 gcc-c++
+ghostscript-fonts-other mftrace
 giflib-devel
 glu-devel
 gmime-devel
@@ -93,6 +95,7 @@ libical-devel
 libidn-devel
 libiw-devel
 libjack-devel
+libjasper7
 libjasper-devel
 liblcms2-devel
 liblo-devel
@@ -111,7 +114,6 @@ libofx-devel
 libopenssl-devel
 libotr-devel
 libpaper-devel
-libpisock-devel
 libpng16-devel
 libpoppler-devel
 libpqxx-devel
@@ -124,14 +126,15 @@ libSDL-devel
 libsensors4-devel
 libsmbclient-devel
 libsndfile-devel
+libssh-devel
 libtag-devel
 libtheora-devel
 libtiff-devel
 libtirpc-devel
 libtool
 libtwolame-devel
-libudev-devel
 libudisks2-0-devel
+libuuid-devel
 libv4l-devel
 libvisual-devel
 libvorbis-devel
@@ -176,8 +179,12 @@ pcsc-lite-devel
 perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
+pkgconfig(guile-1.8)
+polkit-devel
 postgresql10
 postgresql10-devel
+potrace-devel
+ppp
 python-devel
 python-gtk-devel
 python3-devel
@@ -186,6 +193,7 @@ rpcgen
 rpm-build
 rpm-devel
 rsvg-convert
+rsync
 ruby
 ruby-devel
 sane-backends-devel
@@ -196,16 +204,22 @@ subversion-devel
 sudo
 swig
 sword-devel
+t1utils
+texi2html
+texinfo
 texlive-adjustbox
 texlive-etoc
+texlive-float
 texlive-hanging
 texlive-metafont-bin
+texlive-metapost
 texlive-multirow
 texlive-natbib
 texlive-newunicodechar
 texlive-refman
 texlive-sectsty
 texlive-stackengine
+texlive-lh
 texlive-tocloft
 torsocks
 transfig
@@ -224,3 +238,4 @@ xscreensaver-data
 xscreensaver-data-extra
 xz
 xz-devel
+zip
diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg
index 1b72a6d01..30bb665db 100644
--- a/redhat/docker/pclinuxos.pkg
+++ b/redhat/docker/pclinuxos.pkg
@@ -28,7 +28,7 @@ gnutls
 grep
 gzip
 icu
-icu65-data
+icu69-data
 info-install
 kernel-userspace-headers
 krb5
@@ -52,10 +52,12 @@ lib64curl4
 lib64db4.8
 lib64dbnss4.8
 lib64elfutils1
+lib64ev4
 lib64expat1
 lib64ext2fs2
 lib64fdisk1
 lib64ffi6
+lib64ffi8
 lib64fuse2
 lib64fuse3_3
 lib64gcrypt20
@@ -68,7 +70,7 @@ lib64gmp10
 lib64gnutls30
 lib64gpg-error0
 lib64gudev1.0_0
-lib64icu65
+lib64icu69
 lib64idn2_0
 lib64intl8
 lib64iso9660_7
@@ -109,6 +111,7 @@ lib64png3
 lib64popt0
 lib64psl5
 lib64python3.6
+lib64readline7
 lib64readline8
 lib64rpm1
 lib64rtmp1
@@ -124,6 +127,7 @@ lib64tiff3
 lib64tiff5
 lib64tirpc3
 lib64udev0
+lib64unbound8
 lib64unistring2
 lib64usb1.0_0
 lib64usb-compat0.1_4
diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh
index aa906f26c..cd7689569 100755
--- a/redhat/docker/pclinuxos.sh
+++ b/redhat/docker/pclinuxos.sh
@@ -47,11 +47,12 @@ sudo chroot "${INSTALLROOT}" apt-get -y upgrade
 sudo umount "${INSTALLROOT}/dev/shm"
 sudo umount "${INSTALLROOT}/dev"
 
-sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar"
+docker rmi -f "${IMAGE}" || :
+sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}"
+docker run -ti --rm "${IMAGE}" ls -l
 sudo rm -rf "${INSTALLROOT}"
 
-docker rmi -f "${IMAGE}" || :
-cat "${IMAGE}.tar" | docker import - "${IMAGE}"
+docker image save "${IMAGE}" >"${IMAGE}.tar"
 rm -f "${IMAGE}.tar.gz"
 pigz -9 "${IMAGE}.tar"
 mv -vf "${IMAGE}.tar.gz" "${HOME}/tde/obs"
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64
index 0c5afd8a9..66036cba0 100644
--- a/redhat/docker/pclinuxos/Dockerfile.x86_64
+++ b/redhat/docker/pclinuxos/Dockerfile.x86_64
@@ -1,6 +1,6 @@
 FROM pclinuxos:2021
 
-ARG TDE_VERSION=14.0.10
+ARG TDE_VERSION=14.0.13
 ARG ARCH=x86_64
 
 # Update distribution
@@ -26,7 +26,8 @@ COPY genla.sh /usr/bin/genla.sh
 RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \
  && genla.sh libjpeg \
  && genla.sh liblcms \
- && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
+ && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la \
+ && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so
 
 # Add non-root user to build packages
 RUN rm -rf /home/trinity \
@@ -37,12 +38,12 @@ USER trinity
 COPY rpmmacros /home/trinity/.rpmmacros
 
 # Build supplementary development tools
-RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/torsocks-2.3.0-2.mga8.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \
  && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec \
  && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm
 
-RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm \
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/cscope-15.9-2.mga8.src.rpm \
  && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec  -e "s|%autopatch|%patch0|" \
  && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec \
  && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
@@ -51,3 +52,7 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM
  && sed -i ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec  -e "s|%autosetup .*|%setup -q|" -e "s|%configure|%configure2_5x|" -e "s|%license|%doc|" \
  && rpmbuild -ba ${HOME}/rpmbuild/SPECS/rpcsvc-proto.spec \
  && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/rpcgen-1*.rpm
+
+RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/html2ps-2.0-3.b7.8.mga8.src.rpm \
+ && rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \
+ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index 3d9b6c38b..e63e1594e 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -13,6 +13,7 @@ clamav
 clamav-devel
 cmake
 cups-devel
+dbus-glib-devel
 desktop-file-utils
 djvulibre
 docbook-style-xsl
@@ -60,6 +61,8 @@ lib64geoip-devel
 lib64gif-devel
 lib64gpod4
 lib64gpod-devel
+lib64gstreamer1.0-devel
+lib64gstreamer-plugins-base1.0-devel
 lib64idn-devel
 lib64inotifytools-devel
 lib64iw29-devel
@@ -68,10 +71,13 @@ lib64mpcdec-devel
 lib64OpenSP5-devel
 lib64pcsclite-devel
 lib64pkcs11-helper-devel
+lib64polkit1-devel
 lib64poppler-devel
 lib64readline-devel
 lib64sane1-devel
 lib64sndfile-devel
+lib64ssh-devel
+lib64unwind-devel
 lib64usb1.0-devel
 lib64usb-compat0.1-devel
 lib64wv2-devel
@@ -157,13 +163,16 @@ openldap-devel
 opensc
 openslp-devel
 pam-devel
+pcre-devel
 perl-devel
+perl-Image-Magick
 perl-PAR-Packer
 perl-pcsc-perl
 pilot-link-devel
 pkgconfig(pygtk-2.0)
 postgresql
 postgresql-devel
+ppp
 pth-devel
 python3
 python-devel
diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros
index 067e3aa64..a8b78eb0d 100644
--- a/redhat/docker/pclinuxos/rpmmacros
+++ b/redhat/docker/pclinuxos/rpmmacros
@@ -1,4 +1,5 @@
 %dist .pclos
 %_smp_mflags -j8
 %jobs 8
-%pclinuxos 2021
+%pclinuxos 2022
+%configure %configure2_5x
diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh
index 587c09c23..30064325f 100755
--- a/redhat/docker/pull.sh
+++ b/redhat/docker/pull.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.10"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh
index 55774eed5..0d4ea6ace 100755
--- a/redhat/docker/push.sh
+++ b/redhat/docker/push.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.10"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh
index cc8f2a023..7d9d87b2e 100755
--- a/redhat/docker/remove.sh
+++ b/redhat/docker/remove.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.10"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh
index 533076dd2..91eb82e99 100755
--- a/redhat/docker/run.sh
+++ b/redhat/docker/run.sh
@@ -4,7 +4,7 @@ DISTRIB="$1"
 TDE_VERSION="$2"
 ARCH="$3"
 
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.10"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.13"
 [ -z "${ARCH}" ] && ARCH="x86_64"
 [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker
 
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index ffa66a3ab..f7dd246b0 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_prefix /opt/trinity
 
@@ -43,10 +43,14 @@ BuildArch:	noarch
 
 BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-suse
+%if 0%{?suse_version} <= 1500
 BuildRequires:	brp-extract-appdata
+%endif
 Requires:	update-desktop-files
 Requires:	brp-check-suse
+%if 0%{?suse_version} <= 1500
 Requires:	brp-extract-appdata
+%endif
 Requires:	sed
 
 
@@ -69,8 +73,9 @@ for i in \
 	map-desktop-category.sh \
 	suse_update_desktop_file.sh \
 ; do
-	echo "Patching file '/usr/lib/rpm/${i}' ..."
 	[ -r "/usr/lib/rpm/${i}" ] || continue
+	[ -r "/usr/lib/rpm.orig/${i}" ] && continue
+	echo "Patching file '/usr/lib/rpm/${i}' ..."
 	install -D "/usr/lib/rpm/${i}" "/usr/lib/rpm.orig/${i}"
 	sed -i "/usr/lib/rpm/${i}" \
 		-e "s|opt/kde3|opt/trinity|g" \
@@ -82,11 +87,12 @@ for i in \
 		-e "s|applications/kde|applications/tde|g" \
 		-e "s|KDE|TDE|g" \
 		-e "s|kde-|tde-|g" \
-%if 0%{?suse_version} == 1550
+%if 0%{?suse_version} >= 1550
 		-e "s|/usr/share/applications|/opt/trinity/share/applications|g" \
 		-e "/^for i in/ s|\\\| /\$RPM_BUILD_ROOT/opt/trinity/share/applnk \\\|" \
 %endif
 		-e "s|tde-settings.menu|kde-settings.menu|g"
+	diff -Nua "/usr/lib/rpm.orig/${i}" "/usr/lib/rpm/${i}" || :
 done
 
 
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index f445562fc..2470b3412 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -97,7 +97,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
 
 # Rename binary to avoid conflict with kde3
 mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2"
-
+ln -sf "fileshareset2"  "%{?buildroot}%{_bindir}/filesharelist"
 
 
 %clean
diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec
index a2a42e6c6..dab280946 100644
--- a/redhat/extras/htdig/htdig.spec
+++ b/redhat/extras/htdig/htdig.spec
@@ -5,13 +5,19 @@
 
 Summary:	A web indexing and searching system for a small domain or intranet
 Name:		htdig
-Version:	3.2.0b7
+Version:	3.2.0b6_19
 Release:	1%{?dist}
 License:	GPL
 Group:		Networking/WWW
 URL:		http://www.htdig.org/
 
-Source0:	htdig-3.2.0b7.tar.gz
+Source0:	htdig_3.2.0b6.orig.tar.gz
+
+Patch1:		patches/htdig_3.2.0b6-13.diff
+Patch2:		patches/gcc-6
+Patch3:		patches/sourceforge_logo
+Patch4:		patches/drop-bogus-assignment
+Patch5:		patches/gcc-11
 
 BuildRequires:	flex >= 2.5.4a-13
 BuildRequires:	libtool
@@ -172,7 +178,12 @@ fi
 ##########
 
 %prep
-%setup -q
+%setup -q -n htdig-3.2.0b6
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 autoreconf -fiv
 
 
diff --git a/redhat/extras/htdig/patches/drop-bogus-assignment b/redhat/extras/htdig/patches/drop-bogus-assignment
new file mode 100644
index 000000000..2328280e3
--- /dev/null
+++ b/redhat/extras/htdig/patches/drop-bogus-assignment
@@ -0,0 +1,16 @@
+--- htdig-3.2.0b6.orig/htdig/Parsable.cc
++++ htdig-3.2.0b6/htdig/Parsable.cc
+@@ -74,7 +74,6 @@ Parsable::addString(Retriever& retriever
+ 	    retriever.got_word(w, wordindex++, slot); // slot for img_alt
+ 	w = HtWordToken(0);
+     }
+-    w = '\0';
+ }
+ 
+ //*****************************************************************************
+@@ -92,5 +91,4 @@ Parsable::addKeywordString(Retriever& re
+ 	    retriever.got_word(w, wordindex++, 9);
+ 	w = HtWordToken(0);
+     }
+-    w = '\0';
+ }
diff --git a/redhat/extras/htdig/patches/gcc-11 b/redhat/extras/htdig/patches/gcc-11
new file mode 100644
index 000000000..09c974cea
--- /dev/null
+++ b/redhat/extras/htdig/patches/gcc-11
@@ -0,0 +1,370 @@
+Index: b/htword/WordBitCompress.cc
+===================================================================
+--- a/htword/WordBitCompress.cc
++++ b/htword/WordBitCompress.cc
+@@ -29,7 +29,7 @@
+ #include"WordBitCompress.h"
+ 
+ // ******** HtVector_byte (implementation)
+-#define GType byte
++#define GType byte_t
+ #define HtVectorGType HtVector_byte
+ #include "HtVectorGenericCode.h"
+ 
+@@ -424,13 +424,13 @@
+ // **************************************************
+ 
+ void 
+-BitStream::put_zone(byte *vals,int n,const char *tag)
++BitStream::put_zone(byte_t *vals,int n,const char *tag)
+ {
+     add_tag(tag);
+     for(int i=0;i<(n+7)/8;i++){put_uint(vals[i],TMin(8,n-8*i),NULL);}
+ }
+ void 
+-BitStream::get_zone(byte *vals,int n,const char *tag)
++BitStream::get_zone(byte_t *vals,int n,const char *tag)
+ {
+     check_tag(tag);
+     for(int i=0;i<(n+7)/8;i++){vals[i]=get_uint(TMin(8,n-8*i));}
+@@ -699,16 +699,16 @@
+     if(all){printf("\n");}
+ 
+ }
+-byte *
++byte_t *
+ BitStream::get_data()
+ {
+-    byte *res=(byte *)malloc(buff.size());
++    byte_t *res=(byte_t *)malloc(buff.size());
+     CHECK_MEM(res);
+     for(int i=0;i<buff.size();i++){res[i]=buff[i];}
+     return(res);
+ }
+ void 
+-BitStream::set_data(const byte *nbuff,int nbits)
++BitStream::set_data(const byte_t *nbuff,int nbits)
+ {
+     if(buff.size()!=1 || bitpos!=0)
+     {
+@@ -835,7 +835,7 @@
+ 
+ 
+ int 
+-Compressor::put_fixedbitl(byte *vals,int n,const char *tag)
++Compressor::put_fixedbitl(byte_t *vals,int n,const char *tag)
+ {
+     int cpos=bitpos;
+     int i,j;
+@@ -844,19 +844,19 @@
+     put_uint_vl(n,NBITS_NVALS,"size");
+     if(n==0){return 0;}
+ 
+-    byte maxv=vals[0];
++    byte_t maxv=vals[0];
+     for(i=1;i<n;i++)
+     {
+-	byte v=vals[i];
++	byte_t v=vals[i];
+ 	if(v>maxv){maxv=v;}
+     }
+     int nbits=num_bits(maxv);
+-    if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte *) : overflow: nvals>2^16");}
++    if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte_t *) : overflow: nvals>2^16");}
+     put_uint(nbits,NBITS_NBITS_CHARVAL,"nbits");
+     add_tag("data");
+     for(i=0;i<n;i++)
+     {
+-	byte v=vals[i];
++	byte_t v=vals[i];
+ 	for(j=0;j<nbits;j++) {put(v&pow2(j));}
+     }	
+     return(bitpos-cpos);
+@@ -887,15 +887,15 @@
+     }
+ }
+ int 
+-Compressor::get_fixedbitl(byte **pres,const char *tag/*="BADTAG!"*/)
++Compressor::get_fixedbitl(byte_t **pres,const char *tag/*="BADTAG!"*/)
+ {
+-    if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte *): check_tag failed");}
++    if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte_t *): check_tag failed");}
+     int n=get_uint_vl(NBITS_NVALS);
+     if(!n){*pres=NULL;return 0;}
+     int nbits=get_uint(NBITS_NBITS_CHARVAL);
+-    if(verbose)printf("get_fixedbitl(byte):n%3d nbits:%2d\n",n,nbits);
++    if(verbose)printf("get_fixedbitl(byte_t):n%3d nbits:%2d\n",n,nbits);
+     int i;
+-    byte *res=new byte[n];
++    byte_t *res=new byte_t[n];
+     CHECK_MEM(res);
+     for(i=0;i<n;i++)
+     {
+Index: b/htword/WordBitCompress.h
+===================================================================
+--- a/htword/WordBitCompress.h
++++ b/htword/WordBitCompress.h
+@@ -28,9 +28,9 @@
+ #include"HtVector_int.h"
+ #include"HtMaxMin.h"
+ 
+-typedef unsigned char byte;
++typedef unsigned char byte_t;
+ // ******** HtVector_byte (header)
+-#define GType byte
++#define GType byte_t
+ #define HtVectorGType HtVector_byte
+ #include "HtVectorGeneric.h"
+ 
+@@ -123,12 +123,12 @@
+     }
+ 
+     // gets a bit from the bitstream
+-    inline byte get(const char *tag=(char*)NULL)
++    inline byte_t get(const char *tag=(char*)NULL)
+     {
+ 	// SPEED CRITICAL SECTION
+ 	if(check_tag(tag)==NOTOK){errr("BitStream::get() check_tag failed");}
+ 	if(bitpos>=(buff.size()<<3)){errr("BitStream::get reading past end of BitStream!");}
+-	byte res=buff[bitpos>>3] & pow2(bitpos & 0x07);
++	byte_t res=buff[bitpos>>3] & pow2(bitpos & 0x07);
+ //  	printf("get:res:%d bitpos:%5d/%d buff[%3d]=%x\n",res,bitpos,bitpos%8,bitpos/8,buff[bitpos/8]);
+ 	bitpos++;
+ 	return(res);
+@@ -139,8 +139,8 @@
+     unsigned int get_uint(               int n,const char *tag=(char*)NULL);
+ 
+     // get/put n bits of data stored in vals
+-    void put_zone(byte *vals,int n,const char *tag);
+-    void get_zone(byte *vals,int n,const char *tag);
++    void put_zone(byte_t *vals,int n,const char *tag);
++    void get_zone(byte_t *vals,int n,const char *tag);
+ 
+     // 
+     inline void add_tag(const char *tag)
+@@ -167,9 +167,9 @@
+     int buffsize(){return(buff.size());}
+ 
+     // get a copy of the buffer
+-    byte *get_data();
++    byte_t *get_data();
+     // set the buffer from outside data (current buffer must be empty)
+-    void set_data(const byte *nbuff,int nbits);
++    void set_data(const byte_t *nbuff,int nbits);
+       
+     // use this for reading a BitStream after you have written in it 
+     // (generally for debuging)
+@@ -211,7 +211,7 @@
+ #define NBITS_VAL 32
+ // number of bits to code he number of bits used by an unsigned int value
+ #define NBITS_NBITS_VAL  5
+-// number of bits to code the number of bits used by a byte value
++// number of bits to code the number of bits used by a byte_t value
+ #define NBITS_NBITS_CHARVAL 4
+ 
+ class Compressor : public BitStream
+@@ -240,8 +240,8 @@
+     int get_vals(unsigned int **pres,const char *tag=(char*)"BADTAG!");
+ 
+     // compress/decompress an array of bytes (very simple)
+-    int put_fixedbitl(byte *vals,int n,const char *tag);    
+-    int get_fixedbitl(byte **pres,const char *tag=(char*)"BADTAG!");
++    int put_fixedbitl(byte_t *vals,int n,const char *tag);
++    int get_fixedbitl(byte_t **pres,const char *tag=(char*)"BADTAG!");
+ 
+     // compress/decompress an array of unsigned ints (very simple)
+     void get_fixedbitl(unsigned int *res,int n);
+Index: b/htword/WordDBPage.cc
+===================================================================
+--- a/htword/WordDBPage.cc
++++ b/htword/WordDBPage.cc
+@@ -155,7 +155,7 @@
+ 	Uncompress_main(pin);
+ 	break;
+     case CMPRTYPE_BADCOMPRESS:// this page did not compress correctly
+-	pin->get_zone((byte *)pg,pgsz*8,"INITIALBUFFER");
++	pin->get_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER");
+ 	break;
+     default:
+ 	errr("WordDBPage::Uncompress: CMPRTYPE incoherent");
+@@ -181,7 +181,7 @@
+     int *rnum_sizes=new int[nnums];
+     CHECK_MEM(rnum_sizes);
+     // char differences between words
+-    byte *rworddiffs=NULL;
++    byte_t *rworddiffs=NULL;
+     int nrworddiffs;
+ 
+     // *********** read header
+@@ -288,7 +288,7 @@
+     return OK;
+ }
+ void 
+-WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs)
++WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs)
+ {
+     int irwordiffs=0;
+     int nfields=WordKey::NFields();
+@@ -405,7 +405,7 @@
+ 
+ // display
+ void 
+-WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs)
++WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs)
+ {
+     int i,j;
+     if(verbose)
+@@ -464,7 +464,7 @@
+ 	res->put_uint(COMPRESS_VERSION,NBITS_COMPRESS_VERSION,"COMPRESS_VERSION");
+ 	res->put_uint(CMPRTYPE_BADCOMPRESS,NBITS_CMPRTYPE,"CMPRTYPE");
+ 
+-	res->put_zone((byte *)pg,pgsz*8,"INITIALBUFFER");
++	res->put_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER");
+     }
+ 
+     if(verbose)
+@@ -761,7 +761,7 @@
+ 	printf("compare failed in some unknown place in header:\n");
+ 	for(i=0;i<(int)(sizeof(PAGE)-sizeof(db_indx_t));i++)
+ 	{
+-	    printf("%3d: %3x %3x\n",i,((byte *)pg)[i],((byte *)other.pg)[i]);
++	    printf("%3d: %3x %3x\n",i,((byte_t *)pg)[i],((byte_t *)other.pg)[i]);
+ 	}
+     }
+ 
+@@ -998,7 +998,7 @@
+ 	  printf("%5d: ",nn);
+ 	  for(j=0;j<20;j++)
+ 	  {
+-	      printf("%2x ",((byte *)pg)[nn++]);
++	      printf("%2x ",((byte_t *)pg)[nn++]);
+ 	      if(nn>=pgsz){break;}
+ 	  }
+ 	  printf("\n");
+Index: b/htword/WordDBPage.h
+===================================================================
+--- a/htword/WordDBPage.h
++++ b/htword/WordDBPage.h
+@@ -65,7 +65,7 @@
+ 	}
+     }
+     WordDBRecord():WordRecord(){;}
+-    WordDBRecord(byte *dat,int len,int rectyp):WordRecord()
++    WordDBRecord(byte_t *dat,int len,int rectyp):WordRecord()
+     {
+ 	type=(rectyp ? DefaultType() : WORD_RECORD_STATS);
+ 	Unpack(String((char *)dat,len));
+@@ -118,7 +118,7 @@
+ 	}
+ 	else{Unpack(String((char *)nkey->data,nkey->len));}
+     }
+-    WordDBKey(byte *data,int len):WordKey()
++    WordDBKey(byte_t *data,int len):WordKey()
+     {
+ 	key=NULL;
+ 	if(!data || !len){errr("WordDBKey::WordDBKey(data,len) !data || !len");}
+@@ -207,7 +207,7 @@
+     void *alloc_entry(int size)
+     {
+ 	size=WORD_ALIGN_TO(size,4);	
+-	int inp_pos=((byte *)&(pg->inp[insert_indx]))-(byte *)pg;
++	int inp_pos=((byte_t *)&(pg->inp[insert_indx]))-(byte_t *)pg;
+ 	insert_pos-=size;
+ 	if(insert_pos<=inp_pos)
+ 	{
+@@ -216,7 +216,7 @@
+ 	    errr("WordDBPage::alloc_entry: PAGE OVERFLOW");
+ 	}
+ 	pg->inp[insert_indx++]=insert_pos;
+-	return((void *)((byte *)pg+insert_pos));
++	return((void *)((byte_t *)pg+insert_pos));
+     }
+ 
+     
+@@ -260,11 +260,11 @@
+ 	    ky.Pack(pkey);
+ 	    keylen=pkey.length();
+ 	}
+-	int size=keylen+((byte *)&(bti.data))-((byte *)&bti);// pos of data field in BINTERNAL
++	int size=keylen+((byte_t *)&(bti.data))-((byte_t *)&bti);// pos of data field in BINTERNAL
+ 	if(empty)
+ 	{
+ 	    if(verbose){printf("WordDBPage::insert_btikey: empty : BINTERNAL:%d datapos:%d keylen:%d size:%d alligned to:%d\n",(int)sizeof(BINTERNAL),
+-			       (int)(((byte *)&(bti.data))-((byte *)&bti)),
++			       (int)(((byte_t *)&(bti.data))-((byte_t *)&bti)),
+ 			       keylen,size,WORD_ALIGN_TO(size,4));}
+ 	}
+ 
+@@ -306,8 +306,8 @@
+     int  Uncompress_main(Compressor *pin);
+     void Uncompress_vals_chaged_flags(Compressor &in,unsigned int **pcflags,int *pn);
+     int  Uncompress_header(Compressor &in);
+-    void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs);
+-    void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs);
++    void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs);
++    void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs);
+ 
+     int TestCompress(int debuglevel);
+     int Compare(WordDBPage &other);
+@@ -326,14 +326,14 @@
+ 	    out.put_uint(btikey(i)->type ,sizeof(btikey(i)->type )*8,label_str("seperatekey_bti_type" ,i));
+ 	    out.put_uint(btikey(i)->pgno ,sizeof(btikey(i)->pgno )*8,label_str("seperatekey_bti_pgno" ,i));
+ 	    out.put_uint(btikey(i)->nrecs,sizeof(btikey(i)->nrecs)*8,label_str("seperatekey_bti_nrecs",i));
+-	    if(len){out.put_zone((byte *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));}
++	    if(len){out.put_zone((byte_t *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));}
+ 	}
+ 	else
+ 	{
+ 	    int len=key(i)->len;
+ 	    out.put_uint(len,NBITS_KEYLEN,label_str("seperatekey_len",i));
+ 	    if(verbose){printf("WordDBPage::compress_key: compress(typ5):%d\n",len);}
+-	    out.put_zone((byte *)key(i)->data,8*len,label_str("seperatekey_data",i));
++	    out.put_zone((byte_t *)key(i)->data,8*len,label_str("seperatekey_data",i));
+ 	}
+     }
+     void compress_data(Compressor &out,int i)
+@@ -341,7 +341,7 @@
+ 	int len=data(i)->len;
+ 	out.put_uint(len,NBITS_DATALEN,label_str("seperatedata_len",i));
+ 	if(verbose){printf("WordDBPage::compress_data: compressdata(typ5):%d\n",len);}
+-	out.put_zone((byte *)data(i)->data,8*len,label_str("seperatedata_data",i));
++	out.put_zone((byte_t *)data(i)->data,8*len,label_str("seperatedata_data",i));
+     }
+     WordDBKey uncompress_key(Compressor &in,int i)
+     {
+@@ -360,7 +360,7 @@
+ 	    if(len!=bti.len){errr("WordDBPage::uncompress_key: incoherence: len!=bti.len");}
+ 	    if(len)
+ 	    {
+-		byte *gotdata=new byte[len];
++		byte_t *gotdata=new byte_t[len];
+ 		CHECK_MEM(gotdata);
+ 		in.get_zone(gotdata,8*len,label_str("seperatekey_btidata",i));
+ 		res=WordDBKey(gotdata,len);
+@@ -370,7 +370,7 @@
+ 	}
+ 	else
+ 	{
+-	    byte *gotdata=new byte[len];
++	    byte_t *gotdata=new byte_t[len];
+ 	    CHECK_MEM(gotdata);
+ 	    in.get_zone(gotdata,8*len,label_str("seperatekey_data",i));
+ 	    res=WordDBKey(gotdata,len);
+@@ -384,7 +384,7 @@
+ 	WordDBRecord res;
+ 	int len=in.get_uint(NBITS_DATALEN,label_str("seperatedata_len",i));
+ 	if(verbose)printf("uncompressdata:len:%d\n",len);
+-	byte *gotdata=new byte[len];
++	byte_t *gotdata=new byte_t[len];
+ 	CHECK_MEM(gotdata);
+ 	in.get_zone(gotdata,8*len,label_str("seperatedata_data",i));
+ 	res=WordDBRecord(gotdata,len,rectyp);
+@@ -488,7 +488,7 @@
+     {
+ 	init0();
+ 	pgsz=npgsz;
+-	pg=(PAGE *)(new byte[pgsz]);
++	pg=(PAGE *)(new byte_t[pgsz]);
+ 	CHECK_MEM(pg);
+ 	insert_pos=pgsz;
+ 	insert_indx=0;
diff --git a/redhat/extras/htdig/patches/gcc-6 b/redhat/extras/htdig/patches/gcc-6
new file mode 100644
index 000000000..5031ea0c7
--- /dev/null
+++ b/redhat/extras/htdig/patches/gcc-6
@@ -0,0 +1,12 @@
+Description: Fix FTBFS with gcc-6.
+--- htdig-3.2.0b6.orig/htfuzzy/Accents.cc
++++ htdig-3.2.0b6/htfuzzy/Accents.cc
+@@ -43,7 +43,7 @@ extern int debug;
+ | table iso-latin1 "minusculisee" et "de-accentuee" |
+ `--------------------------------------------------*/
+   
+-static char MinusculeISOLAT1[256] = {
++static unsigned char MinusculeISOLAT1[256] = {
+      0,   1,   2,   3,   4,   5,   6,   7,
+      8,   9,  10,  11,  12,  13,  14,  15,
+     16,  17,  18,  19,  20,  21,  22,  23,
diff --git a/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff b/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff
new file mode 100644
index 000000000..4562e03fe
--- /dev/null
+++ b/redhat/extras/htdig/patches/htdig_3.2.0b6-13.diff
@@ -0,0 +1,176 @@
+Description: complete diff against upstream of version 3.2.0b6
+
+--- htdig-3.2.0b6.orig/db/os_rw.c
++++ htdig-3.2.0b6/db/os_rw.c
+@@ -5,6 +5,13 @@
+  *	Sleepycat Software.  All rights reserved.
+  */
+ 
++#define _XOPEN_SOURCE 500
++#include <sys/types.h>
++#include <unistd.h>
++#ifndef u_long
++typedef __u_long u_long;
++#endif
++
+ #include "db_config.h"
+ 
+ #ifndef lint
+--- htdig-3.2.0b6.orig/htcommon/defaults.cc
++++ htdig-3.2.0b6/htcommon/defaults.cc
+@@ -596,7 +596,7 @@
+ 	<a href=\"htfuzzy.html\">htfuzzy</a> for more information on the \
+ 	format of this file. \
+ " }, \
+-{ "endings_root2word_db", "${common_dir}/root2word.db",  \
++{ "endings_root2word_db", "${database_dir}/root2word.db",  \
+ 	"string", "htfuzzy htsearch", "", "all", "File Layout", "endings_root2word_db: /var/htdig/r2w.db", " \
+ 	This attributes specifies the database filename to be \
+ 	used in the 'endings' fuzzy search algorithm. The \
+@@ -610,7 +610,7 @@
+ 	This is because this database can be shared with \
+ 	different search databases. \
+ " }, \
+-{ "endings_word2root_db", "${common_dir}/word2root.db",  \
++{ "endings_word2root_db", "${database_dir}/word2root.db",  \
+ 	"string", "htfuzzy htsearch", "", "all", "File Layout", "endings_word2root_db: /var/htdig/w2r.bm", " \
+ 	This attributes specifies the database filename to be \
+ 	used in the 'endings' fuzzy search algorithm. The \
+@@ -2426,7 +2426,7 @@
+ 	that this does not limit the number of documents that \
+ 	are matched in any way. \
+ " }, \
+-{ "synonym_db", "${common_dir}/synonyms.db",  \
++{ "synonym_db", "${database_dir}/synonyms.db",  \
+ 	"string", "htsearch htfuzzy", "", "3.0", "File Layout", "synonym_db: ${database_base}.syn.db", " \
+ 	Points to the database that <a href=\"htfuzzy.html\"> \
+ 	htfuzzy</a> creates when the <strong>synonyms</strong> \
+--- htdig-3.2.0b6.orig/htdig/Server.cc
++++ htdig-3.2.0b6/htdig/Server.cc
+@@ -341,6 +341,8 @@
+     {
+ 	String	fullpatt = "^[^:]*://[^/]*(";
+ 	fullpatt << pattern << ')';
++	if (pattern.length() == 0)
++		fullpatt = "";
+ 	_disallow.set(fullpatt, config->Boolean("case_sensitive"));
+     }
+ }
+--- htdig-3.2.0b6.orig/htsearch/Collection.h
++++ htdig-3.2.0b6/htsearch/Collection.h
+@@ -36,9 +36,9 @@
+                const char *docExcerpt);
+     ~Collection();
+ 
+-    void Collection::Open();
++    void Open();
+ 
+-    void Collection::Close(); 
++    void Close(); 
+ 
+     char *getWordFile() { return wordFile.get(); }
+     DocumentRef         *getDocumentRef(int id);
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -54,6 +54,7 @@
+ 
+ #include <math.h>
+ #include <float.h>
++#include <values.h>
+ 
+ #if !defined(DBL_MAX)
+ # if defined (MAXDOUBLE)
+@@ -137,7 +138,7 @@
+       // Must temporarily stash the message in a String, since
+       // displaySyntaxError will overwrite the static temp used in form.
+ 
+-      String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++      String s("Invalid sort method.");
+ 
+       displaySyntaxError(s);
+       return;
+--- htdig-3.2.0b6.orig/htsearch/htsearch.cc
++++ htdig-3.2.0b6/htsearch/htsearch.cc
+@@ -211,8 +211,7 @@
+ 	}
+ 	if (access((char*)configFile, R_OK) < 0)
+ 	{
+-	    reportError(form("Unable to read configuration file '%s'",
+-			     configFile.get()));
++		reportError("Unable to read configuration file");
+ 	}
+ 	config->Read(configFile);
+ 
+--- htdig-3.2.0b6.orig/htsearch/qtest.cc
++++ htdig-3.2.0b6/htsearch/qtest.cc
+@@ -132,8 +132,7 @@
+ 
+     if (access((char*)configFile, R_OK) < 0)
+     {
+-	reportError(form("Unable to find configuration file '%s'",
+-			 configFile.get()));
++    	reportError("Unable to find configuration file");
+     }
+ 	
+     config->Read(configFile);
+--- htdig-3.2.0b6.orig/htword/WordDBPage.cc
++++ htdig-3.2.0b6/htword/WordDBPage.cc
+@@ -82,7 +82,7 @@
+   	if(debuglevel>2)printf("TOTAL SIZE: %6d %8f\n",size,size/8.0);
+ 	// argh! compare failed somthing went wrong
+ 	// display the compress/decompress sequence and fail
+-	if(cmp || size>8*1024*1000000000)
++	if(cmp || size>8*1024)
+ 	{
+ 	    if(size>8*1024)
+ 	    {
+--- htdig-3.2.0b6.orig/installdir/rundig
++++ htdig-3.2.0b6/installdir/rundig
+@@ -7,17 +7,18 @@
+ #
+ # This is a sample script to create a search database for ht://Dig.
+ #
+-DBDIR=@DATABASE_DIR@
+-COMMONDIR=@COMMON_DIR@
+-BINDIR=@BIN_DIR@
+-conffile=@DEFAULT_CONFIG_FILE@
++DBDIR=/var/lib/htdig
++COMMONDIR=/etc/htdig
++BINDIR=/usr/bin
++conffile=/etc/htdig/htdig.conf
+ 
+ # To help debug problems, try running rundig -vvv
+ # This will add lots of debugging output to all of the programs
+-stats= opts= alt=
++stats= opts= alt= nohtnotify=
+ while [ "$#" -gt 0 ]
+ do
+     case "$1" in
++    --no-htnotify) nohtnotify="true" ;;
+     -a)  alt="$1" ;;
+     -s)  stats="$1" ;;
+     -c)  shift
+@@ -65,7 +66,11 @@
+     test -f db.words.db.work_weakcmpr &&
+ 	mv -f db.words.db.work_weakcmpr db.words.db_weakcmpr) ;;
+ esac
+-$BINDIR/htnotify $opts
++if [ "$nohtnotify" = "true" ]; then
++	echo "Skipping htnotify."
++else
++	$BINDIR/htnotify $opts
++fi
+ # If you want to use the soundex and (or) metaphone fuzzy matchings,
+ # Uncomment the following line
+ # $BINDIR/htfuzzy $opts soundex metaphone
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@
+         // Must temporarily stash the message in a String, since
+         // displaySyntaxError will overwrite the static temp used in form.
+ 
+-        String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++        String s("Invalid search method.");
+ 
+         displaySyntaxError(s);
+         //return;
diff --git a/redhat/extras/htdig/patches/kfreebsd b/redhat/extras/htdig/patches/kfreebsd
new file mode 100644
index 000000000..d30d68be7
--- /dev/null
+++ b/redhat/extras/htdig/patches/kfreebsd
@@ -0,0 +1,25 @@
+From: Steven Chamberlain <steven@pyro.eu.org>
+Subject: only use ETIME if defined
+Bug-Debian: http://bugs.debian.org/765284
+Forwarded: no
+
+ETIME relates to an optional POSIX STREAMS extension not implemented
+on some platforms (such as GNU/kFreeBSD).
+
+Don't check for this return value on platforms that don't define it.
+
+--- htdig-3.2.0b6.orig/db/mut_pthread.c.orig	2002-02-02 18:18:05.000000000 +0000
++++ htdig-3.2.0b6/db/mut_pthread.c	2014-10-14 12:40:53.771737556 +0100
+@@ -201,7 +201,11 @@
+ 			 * call, and Solaris delivers the signal to the wrong
+ 			 * LWP.
+ 			 */
+-			if (ret != 0 && ret != ETIME && ret != ETIMEDOUT)
++			if (ret != 0 &&
++#ifdef ETIME
++			    ret != ETIME &&
++#endif
++			    ret != ETIMEDOUT)
+ 				return (ret);
+ 		}
+ 
diff --git a/redhat/extras/htdig/patches/series b/redhat/extras/htdig/patches/series
new file mode 100644
index 000000000..da0d40c91
--- /dev/null
+++ b/redhat/extras/htdig/patches/series
@@ -0,0 +1,6 @@
+htdig_3.2.0b6-13.diff
+kfreebsd
+gcc-6
+sourceforge_logo
+drop-bogus-assignment
+gcc-11
diff --git a/redhat/extras/htdig/patches/sourceforge_logo b/redhat/extras/htdig/patches/sourceforge_logo
new file mode 100644
index 000000000..dd3d1e719
--- /dev/null
+++ b/redhat/extras/htdig/patches/sourceforge_logo
@@ -0,0 +1,118 @@
+Description: don't remote-link SourceForge's logo
+ This let SourceForge track everyone who reads these docs.  As the image is
+ not freely licensed, let's leave only a piece of text.
+--- htdig-3.2.0b6.orig/htdoc/FAQ.html
++++ htdig-3.2.0b6/htdoc/FAQ.html
+@@ -2585,6 +2585,6 @@ find /path/to/your/document/root -type f
+ 	  	Last modified: $Date: 2004/05/28 13:15:16 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/author.html
++++ htdig-3.2.0b6/htdoc/author.html
+@@ -34,6 +34,6 @@
+ 	Last modified: $Date: 2004/05/28 13:15:18 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/bugs.html
++++ htdig-3.2.0b6/htdoc/bugs.html
+@@ -50,6 +50,6 @@
+ 	Last modified: $Date: 2004/05/28 13:15:18 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/isp.html
++++ htdig-3.2.0b6/htdoc/isp.html
+@@ -81,7 +81,7 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/mailing.html
++++ htdig-3.2.0b6/htdoc/mailing.html
+@@ -55,6 +55,6 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br>
+     <a href="http://sourceforge.net/">
+-      <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++      SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/main.html
++++ htdig-3.2.0b6/htdoc/main.html
+@@ -103,6 +103,6 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br>
+     <a href="http://sourceforge.net/">
+-      <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++      SourceForge</a>
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/rundig.html
++++ htdig-3.2.0b6/htdoc/rundig.html
+@@ -184,7 +184,7 @@
+ 	Last modified: $Date: 2004/06/12 13:39:13 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/running.html
++++ htdig-3.2.0b6/htdoc/running.html
+@@ -131,7 +131,7 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/uses.html
++++ htdig-3.2.0b6/htdoc/uses.html
+@@ -646,7 +646,7 @@
+ 	Last modified: $Date: 2004/05/28 13:15:19 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+ </body>
+ </html>
+--- htdig-3.2.0b6.orig/htdoc/where.html
++++ htdig-3.2.0b6/htdoc/where.html
+@@ -121,6 +121,6 @@
+ <br> 
+ 
+    <a href="http://sourceforge.net/"> 
+-<img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a> 
++SourceForge</a> 
+   </body>
+ </html>
+--- htdig-3.2.0b6.orig/test/htdocs/set1/bad_local.htm
++++ htdig-3.2.0b6/test/htdocs/set1/bad_local.htm
+@@ -51,7 +51,7 @@
+ 	Last modified: $Date: 2004/01/18 12:54:15 $
+ <br> 
+     <a href="http://sourceforge.net/"> 
+-          <img src="http://sourceforge.net/sflogo.php?group_id=4593&amp;type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
++          SourceForge</a>
+ 
+   </body>
+ </html>
diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
index fc958eb36..8c26664fe 100644
--- a/redhat/extras/pinentry-tqt/pinentry-tqt.spec
+++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec
@@ -37,7 +37,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{name}-%{version}.tar.gz
 
 BuildRequires:	trinity-tqtinterface-devel
-BuildRequires:	libsecret-devel
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -45,6 +44,9 @@ BuildRequires:	gcc-c++
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	pkgconfig
 
+BuildRequires:	libassuan-devel
+BuildRequires:	libsecret-devel
+
 Requires:		pinentry
 
 
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index d4a0d78a3..07f41dcd5 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -16,7 +16,7 @@
 #
 
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -149,7 +149,10 @@ Requires: trinity-kkbswitch
 Requires: trinity-klamav
 %endif
 Requires: trinity-klcddimmer
+%if 0%{?rhel} <= 8
+# No mplayer on RHEL9
 Requires: trinity-kmplayer
+%endif
 Requires: trinity-kmyfirewall
 Requires: trinity-kmymoney
 Requires: trinity-knemo
@@ -165,9 +168,11 @@ Requires: trinity-konversation
 Requires: trinity-kooldock
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
-%if 0%{?rhel} != 5
+%if 0%{?sle_version} <= 150300 && 0%{?suse_version} != 1599
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6
 Requires: trinity-kpilot
 %endif
+%endif
 #Requires: trinity-kplayer
 Requires: trinity-krecipes
 Requires: trinity-krename
@@ -187,10 +192,16 @@ Requires: trinity-kvkbd
 Requires: trinity-kvpnc
 Requires: trinity-kxmleditor
 Requires: trinity-mathemagics
+%if 0%{?rhel} <= 8
 Requires: trinity-mplayerthumbs
+%endif
 Requires: trinity-piklab
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
+# On RHEL6, polkit is too old
+Requires: trinity-polkit-agent-tde
+%endif
 Requires: trinity-potracegui
-#Requires: trinity-qalculate-tde
+Requires: trinity-qalculate-tde
 # On RHEL, lilypond is not available, so no rosegarden :'-(
 %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 Requires: trinity-rosegarden
@@ -199,16 +210,24 @@ Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
 Requires: trinity-tastymenu
+%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8
 Requires: trinity-tde-guidance
+%endif
 Requires: trinity-tde-style-baghira
 Requires: trinity-tde-style-domino
 Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
+%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8
 Requires: trinity-tde-systemsettings
+%endif
 Requires: trinity-tdedocker
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
+Requires: trinity-tdeio-appinfo
+%endif
 Requires: trinity-tdeio-apt
 Requires: trinity-tdeio-ftps
+Requires: trinity-tdeio-gopher
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-sword
 Requires: trinity-tdeio-umountwrapper
@@ -217,12 +236,16 @@ Requires: trinity-tdepacman
 Requires: trinity-tdepowersave
 %endif
 Requires: trinity-tderadio
+Requires: trinity-tdesshaskpass
 Requires: trinity-tdesudo
 Requires: trinity-tdesvn
 Requires: trinity-tdmtheme
 Requires: trinity-tellico
 Requires: trinity-tork
 Requires: trinity-twin-style-crystal
+Requires: trinity-twin-style-dekorator
+Requires: trinity-twin-style-machbunt
+Requires: trinity-twin-style-suse2
 Requires: trinity-wlassistant
 Requires: trinity-yakuake
 
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 5b2a7fe77..1ae57054b 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -17,7 +17,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -62,6 +62,8 @@ This package installs the Trinity directory structure.
 %defattr(-,root,root,-)
 %dir %{tde_prefix}
 
+%dir %{_datadir}/apps
+
 %dir %{tde_bindir}
 
 %dir %{tde_datadir}
@@ -137,6 +139,8 @@ This package installs the Trinity directory structure.
 %build
 
 %install
+%__install -d -m 755 %{?buildroot}%{_datadir}/apps
+
 %__install -d -m 755 %{?buildroot}%{tde_prefix}
 
 %__install -d -m 755 %{?buildroot}%{tde_bindir}
@@ -253,6 +257,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/et/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fi/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/fr/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/gl/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/he/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/hu/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/it/common
@@ -266,10 +271,12 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sk/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sl/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sr/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sr@Latn/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/sv/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/tr/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/uk/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_CN/common
+%__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_Hans/common
 %__install -d -m 755 %{?buildroot}%{tde_tdedocdir}/HTML/zh_TW/common
 
 %__install -d -m 755 %{?buildroot}%{tde_includedir}
@@ -531,6 +538,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/br/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/bs/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ca/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ca@valencia/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/cs/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/csb/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/cy/LC_MESSAGES/
@@ -606,6 +614,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/tg/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/th/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/tr/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/ug/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uk@cyrillic/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/uz/LC_MESSAGES/
@@ -618,6 +627,7 @@ done
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/xx/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_CN.GB2312/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_CN/LC_MESSAGES/
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_Hans/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_TW.Big5/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zh_TW/LC_MESSAGES/
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale/zu/LC_MESSAGES/
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index cedd25f6a..602ae384d 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg kipi-plugins
 %define tde_prefix /opt/trinity
@@ -93,7 +93,7 @@ BuildRequires:	libexiv2-devel
 %endif
 
 # GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_gpod 1
 BuildRequires:	libgpod-devel >= 0.4.2
 %endif
diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec
index e5576a13c..02afad0fc 100644
--- a/redhat/libraries/libkdcraw/libkdcraw.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libkdcraw
 %define tde_prefix /opt/trinity
@@ -56,10 +56,11 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
-BuildRequires: automake autoconf libtool
+BuildRequires: libtool
 BuildRequires: gcc-c++
 BuildRequires: desktop-file-utils
 BuildRequires: pkgconfig
@@ -161,38 +162,49 @@ library documentation is available on kdcraw.h header file.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-# Warning: gcc-hidden-visibility causes FTBFS in digikam !
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
+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}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_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}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
+  \
+  -DBUILD_ALL=ON \
+  -DBUILD_DOC=ON \
+  -DBUILD_TRANSLATIONS=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 5e36f5e67..6b9b7b5a2 100644
--- a/redhat/libraries/libkexiv2/libkexiv2.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libkexiv2
 %define tde_prefix /opt/trinity
@@ -67,7 +67,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	gettext
 BuildRequires:	gcc-c++
 
@@ -159,6 +159,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec
index da1575b4e..38eba2393 100644
--- a/redhat/libraries/libkipi/libkipi.spec
+++ b/redhat/libraries/libkipi/libkipi.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libkipi
 %define tde_prefix /opt/trinity
@@ -92,7 +92,7 @@ BuildRequires:	libidn-devel
 BuildRequires:	openssl-devel
 
 # CMAKE
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 
 %description
 Libkipi is a library
@@ -179,6 +179,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index 2bc0fbf8a..f432c5e8f 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -26,7 +26,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libksquirrel
 %define tde_prefix /opt/trinity
@@ -35,6 +35,7 @@
 %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_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -324,6 +325,23 @@ This package contains the runtime libraries for KSquirrel.
 %{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui
 %{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
 %{tde_datadir}/ksquirrel-libs/rgbmap
+%{tde_mandir}/man1/ksquirrel-libs-camera2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-dcraw.1
+%{tde_mandir}/man1/ksquirrel-libs-dicom2png.1
+%{tde_mandir}/man1/ksquirrel-libs-fig2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-iff2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-leaf2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm-s.1
+%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-mac2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-neo2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-pi12ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-pi32ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-svg2png.1
+%{tde_mandir}/man1/ksquirrel-libs-ttf2pnm.1
+%{tde_mandir}/man1/ksquirrel-libs-utah2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-xcf2pnm.1
+%{tde_mandir}/man1/ksquirrel-libs-xim2ppm.1
 
 ##########
 
diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index eae777adc..cf049df44 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libtdeldap
 %define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gcc-c++
-BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-cmake >= %{tde_version}
 BuildRequires:	pkgconfig
 
 # LIBTOOL
@@ -181,6 +181,7 @@ fi
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec
index 915c40e34..729be4c3c 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg libtqt-perl
 %define tde_prefix /opt/trinity
diff --git a/redhat/libraries/pytde/pytde.spec b/redhat/libraries/pytde/pytde.spec
new file mode 100644
index 000000000..ef7c94f19
--- /dev/null
+++ b/redhat/libraries/pytde/pytde.spec
@@ -0,0 +1,190 @@
+#
+# spec file for package pytde (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/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.13
+%endif
+%define tde_pkg pytde
+%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_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+
+
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	3.16.3
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Trinity bindings for Python
+Group:		Development/Libraries/Python
+URL:		http://www.trinitydesktop.org/
+#URL:		http://www.simonzone.com/software/pykdeextensions
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
+BuildRequires:	pytqt-devel
+Requires:		pytqt
+
+# SIP
+BuildRequires:	sip4-tqt-devel >= 4.10.5
+Requires:		sip4-tqt >= 4.10.5
+
+Obsoletes:	python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description
+Python binding module that provides wide access to the Trinity API,
+also known as PyTDE. Using this, you'll get (for example) classes
+from tdeio, tdejs, tdehtml and tdeprint.
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{python_sitearch}/*.so
+%{python_sitearch}/dcop*.py*
+%{python_sitearch}/pytde*.py*
+
+##########
+
+%package devel
+Summary:	Trinity bindings for Python - Development files and scripts
+Group:		Development/Libraries/Python
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes:	python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+Development .sip files with definitions of PyTDE classes. They
+are needed to build PyTDE, but also as building blocks of other
+packages based on them. 
+The package also contains kdepyuic, a wrapper script around PyQt's 
+user interface compiler.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_bindir}/tdepyuic
+# The SIP files are outside TDE's prefix
+%{_datadir}/sip/trinity/
+
+##########
+
+%package doc
+Summary:	Documentation and examples for PyTDE
+Group:		Development/Libraries/Python
+
+Obsoletes:	python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:	trinity-python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description doc
+General documentation and examples for PyTDE providing programming
+tips and working code you can use to learn from.
+
+%files doc
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/en/pytde/
+
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
+
+##########
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
+%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|"
+%endif
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export LD_RUN_PATH="%{tde_libdir}"
+
+export DH_OPTIONS
+
+%__python configure.py \
+	-k %{tde_prefix} \
+	-L %{_lib} \
+	-v %{_datadir}/sip/trinity
+
+%__make %{_smp_mflags} || %__make
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Install documentation
+%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
+%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/pytde/
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%changelog
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec
index b60ebc332..30c1f416c 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.10
+%define tde_version 14.0.13
 %endif
 %define tde_pkg pytdeextensions
 %define tde_prefix /opt/trinity
@@ -62,11 +62,11 @@ BuildRequires:	gettext
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	gcc-c++
 
-BuildRequires:	python-tqt-devel >= %{?epoch:%{epoch}:}3.18.1
-BuildRequires:	trinity-python-trinity-devel
+BuildRequires:	pytqt-devel >= %{?epoch:%{epoch}:}3.18.1
+BuildRequires:	trinity-pytde-devel
 BuildRequires:	trinity-pytqt-tools
-Requires:		python-tqt
-Requires:		trinity-python-trinity
+Requires:		pytqt
+Requires:		trinity-pytde
 
 Requires:		trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release}
 
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec
deleted file mode 100644
index b518667c4..000000000
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# spec file for package python-trinity (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg python-trinity
-%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_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	3.16.3
-Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Trinity bindings for Python
-Group:		Development/Libraries/Python
-URL:		http://www.trinitydesktop.org/
-#URL:		http://www.simonzone.com/software/pykdeextensions
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-BuildRequires:	python-tqt-devel
-Requires:		python-tqt
-
-# SIP
-BuildRequires:	sip4-tqt-devel >= 4.10.5
-Requires:		sip4-tqt >= 4.10.5
-
-Obsoletes:	python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-Python binding module that provides wide access to the Trinity API,
-also known as PyTDE. Using this, you'll get (for example) classes
-from tdeio, tdejs, tdehtml and tdeprint.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pytde*.py*
-
-##########
-
-%package devel
-Summary:	Trinity bindings for Python - Development files and scripts
-Group:		Development/Libraries/Python
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Development .sip files with definitions of PyTDE classes. They
-are needed to build PyTDE, but also as building blocks of other
-packages based on them. 
-The package also contains kdepyuic, a wrapper script around PyQt's 
-user interface compiler.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/tdepyuic
-# The SIP files are outside TDE's prefix
-%{_datadir}/sip/trinity/
-
-##########
-
-%package doc
-Summary:	Documentation and examples for PyTDE
-Group:		Development/Libraries/Python
-
-Obsoletes:	python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description doc
-General documentation and examples for PyTDE providing programming
-tips and working code you can use to learn from.
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|"
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export LD_RUN_PATH="%{tde_libdir}"
-
-export DH_OPTIONS
-
-%__python configure.py \
-	-k %{tde_prefix} \
-	-L %{_lib} \
-	-v %{_datadir}/sip/trinity
-
-%__make %{_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Install documentation
-%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
-%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tde-i18n/tde-i18n.spec b/redhat/main/tde-i18n/tde-i18n.spec
deleted file mode 100644
index c519bdfb7..000000000
--- a/redhat/main/tde-i18n/tde-i18n.spec
+++ /dev/null
@@ -1,1494 +0,0 @@
-#
-# spec file for package tde-i18n (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tde-i18n
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Builds all supported languages (not unsupported ones)
-%if "%{?TDE_LANGS}" == ""
-%define TDE_LANGS af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW
-%endif
-
-
-Name:			trinity-%{tde_pkg}
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Internationalization support for Trinity
-Group:			User Interface/Desktops
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:		noarch
-
-# Speed build options
-%define debug_package %{nil}
-%define __spec_install_post %{nil}
-AutoReq: no
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	findutils
-BuildRequires:	gettext
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-
-%description
-This package contains %{summary}.
-
-##########
-
-%package Afrikaans
-Summary:		Afrikaans(af) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-af = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Afrikaans < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Afrikaans = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Afrikaans
-This package contains %{summary}.
-
-%files Afrikaans
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/af/
-
-##########
-
-%package Arabic 
-Summary:		Arabic(ar) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ar = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Arabic < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Arabic = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Arabic
-This package contains %{summary}.
-
-%files Arabic 
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ar/
-
-##########
-
-%package Azerbaijani
-Summary:		Azerbaijani(az) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-az = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Arabic < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Arabic = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Azerbaijani
-This package contains %{summary}.
-
-%files Azerbaijani
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/az/
-
-##########
-
-%package Belarusian
-Summary:		Belarusian(be) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-be = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Belarusian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Belarusian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Belarusian
-This package contains %{summary}.
-
-%files Belarusian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/be/
-
-##########
-
-%package Bulgarian
-Summary:		Bulgarian(bg) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-bg = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Bulgarian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Bulgarian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Bulgarian
-This package contains %{summary}.
-
-%files Bulgarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bg/
-
-##########
-
-%package Bengali
-Summary:		Bengali(bn) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-bn = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Bengali < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Bengali = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Bengali
-This package contains %{summary}.
-
-%files Bengali
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bn/
-
-##########
-
-%package Tibetan
-Summary:		Tibetan(bo) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-bo = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Tibetan < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Tibetan = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Tibetan
-This package contains %{summary}.
-
-#%files Tibetan
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/bo/
-
-##########
-
-%package Breton
-Summary:		Breton(br) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-br = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Breton < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Breton = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Breton
-This package contains %{summary}.
-
-%files Breton
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/br/
-
-##########
-
-%package Bosnian
-Summary:		Bosnian(bs) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-bs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Bosnian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Bosnian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Bosnian
-This package contains %{summary}.
-
-%files Bosnian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/bs/
-
-##########
-
-%package Catalan
-Summary:		Catalan(ca) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ca = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Catalan < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Catalan = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Catalan
-This package contains %{summary}.
-
-%files Catalan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ca/
-%{tde_tdedocdir}/HTML/ca/
-
-##########
-
-%package Czech
-Summary:		Czech(cs) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-cs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Czech < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Czech = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Czech
-This package contains %{summary}.
-
-%files Czech
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cs/
-%{tde_tdedocdir}/HTML/cs/
-
-##########
-
-%package Kashubian
-Summary:		Kashubian(csb) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-csb = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kashubian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Kashubian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Kashubian
-This package contains %{summary}.
-
-%files Kashubian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/csb/
-
-##########
-
-%package Cymraeg
-Summary:		Cymraeg language support for TDE
-Group:			User Interface/Desktops
-Obsoletes:		trinity-kde-i18n-Cymraeg < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Cymraeg = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Cymraeg
-This package contains %{summary}.
-
-##########
-
-%package Welsh
-Summary:		Welsh(cy) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-cy = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Welsh < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Welsh = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Welsh
-This package contains %{summary}.
-
-%files Welsh
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/cy/
-
-##########
-
-%package Danish
-Summary:		Danish(da) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-da = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Danish < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Danish = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Danish
-This package contains %{summary}.
-
-%files Danish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/da/
-%{tde_tdedocdir}/HTML/da/
-
-##########
-
-%package German
-Summary:		German(de) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-de = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-German < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-German = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description German
-This package contains %{summary}.
-
-%files German
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/de/
-%{tde_tdedocdir}/HTML/de/
-
-##########
-
-%package Greek
-Summary:		Greek(el) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-el = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Greek < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Greek = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Greek
-This package contains %{summary}.
-
-%files Greek
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/el/
-
-##########
-
-%package British
-Summary:		British(en_GB) English support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-en_GB = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-British < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-British = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description British
-This package contains %{summary}.
-
-%files British
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/en_GB/
-%{tde_tdedocdir}/HTML/en_GB/
-
-##########
-
-%package Esperanto
-Summary:		Esperanto(eo) support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-eo = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Esperanto < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Esperanto = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Esperanto
-This package contains %{summary}.
-
-%files Esperanto
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eo/
-
-##########
-
-%package Spanish
-Summary:		Spanish(es) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-es = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Spanish < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Spanish = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Spanish
-This package contains %{summary}.
-
-%files Spanish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/es/
-%{tde_tdedocdir}/HTML/es/
-
-##########
-
-%package Estonian
-Summary:		Estonian(et) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-et = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Estonian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Estonian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Estonian
-This package contains %{summary}.
-
-%files Estonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/et/
-%{tde_tdedocdir}/HTML/et/
-
-##########
-
-%package Basque
-Summary:		Basque(eu) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-eu = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Basque < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Basque = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Basque
-This package contains %{summary}.
-
-%files Basque
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/eu/
-%{tde_tdedocdir}/HTML/eu/
-
-##########
-
-%package Farsi
-Summary:		Farsi(fa) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fa = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Farsi < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Farsi = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Farsi
-This package contains %{summary}.
-
-%files Farsi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fa/
-
-##########
-
-%package Finnish
-Summary:		Finnish(fi) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fi = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Finnish < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Finnish = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Finnish
-This package contains %{summary}.
-
-%files Finnish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fi/
-%{tde_tdedocdir}/HTML/fi/
-
-##########
-
-%package Faroese
-Summary:		Faroese(fo) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fo = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Faroese < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Faroese = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Faroese
-This package contains %{summary}.
-
-#%files Faroese
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/fo/
-
-##########
-
-%package French
-Summary:		French(fr) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fr = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-French < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-French = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description French
-This package contains %{summary}.
-
-%files French
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fr/
-%{tde_tdedocdir}/HTML/fr/
-
-##########
-
-%package Frisian
-Summary:		Frisian(fy) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-fy = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Frisian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Frisian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Frisian
-This package contains %{summary}.
-
-%files Frisian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/fy/
-
-##########
-
-%package Irish
-Summary:		Irish(ga) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ga = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Irish < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Irish = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Irish
-This package contains %{summary}.
-
-%files Irish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ga/
-
-##########
-
-%package Galician
-Summary:		Galician(gl) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-gl = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Galician < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Galician = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Galician
-This package contains %{summary}.
-
-%files Galician
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/gl/
-
-##########
-
-%package Hebrew
-Summary:		Hebrew(he) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-he = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Hebrew < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Hebrew = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Hebrew
-This package contains %{summary}.
-
-%files Hebrew
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/he/
-%{tde_tdedocdir}/HTML/he/
-
-##########
-
-%package Hindi
-Summary:		Hindi(hi) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-hi = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Hindi < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Hindi = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Hindi
-This package contains %{summary}.
-
-%files Hindi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hi/
-
-##########
-
-%package Croatian
-Summary:		Croatian(hr) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-hr = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Croatian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Croatian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Croatian
-This package contains %{summary}.
-
-%files Croatian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hr/
-%{tde_tdedocdir}/HTML/hr/
-
-##########
-
-%package Hungarian
-Summary:		Hungarian(hu) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-hu = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Hungarian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Hungarian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Hungarian
-This package contains %{summary}.
-
-%files Hungarian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/hu/
-%{tde_tdedocdir}/HTML/hu/
-
-##########
-
-%package Indonesian
-Summary:		Indonesian(id) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-id = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Indonesian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Indonesian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Indonesian
-This package contains %{summary}.
-
-#%files Indonesian
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/id/
-
-##########
-
-%package Icelandic
-Summary:		Icelandic(is) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-is = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Icelandic < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Icelandic = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Icelandic
-This package contains %{summary}.
-
-%files Icelandic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/is/
-
-##########
-
-%package Italian
-Summary:		Italian(it) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-it = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Italian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Italian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Italian
-This package contains %{summary}.
-
-%files Italian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/it/
-%{tde_tdedocdir}/HTML/it/
-
-##########
-
-%package Japanese
-Summary:		Japanese(ja) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ja = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Japanese < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Japanese = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Japanese
-This package contains %{summary}.
-
-%files Japanese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ja/
-%{tde_tdedocdir}/HTML/ja/
-
-##########
-
-%package Kazakh
-Summary:		Kazakh(kk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-kk = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kazakh < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Kazakh = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Kazakh
-This package contains %{summary}.
-
-%files Kazakh
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/kk/
-
-##########
-
-%package Khmer
-Summary:		Khmer(km) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Khmer < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Khmer = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Khmer
-This package contains %{summary}.
-
-%files Khmer
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/km/
-
-##########
-
-%package Korean
-Summary:		Korean(ko) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Korean < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Korean = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Korean
-This package contains %{summary}.
-
-%files Korean
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ko/
-%{tde_tdedocdir}/HTML/ko/
-
-##########
-
-%package Kurdish
-Summary:		Kurdish(ku) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ku = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kurdish < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Kurdish = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Kurdish
-This package contains %{summary}.
-
-#%files Kurdish
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/ku/
-
-##########
-
-%package Lao
-Summary:		Lao(lo) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-lo = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Lao < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Lao = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Lao
-This package contains %{summary}.
-
-#%files Lao
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/lo/
-
-##########
-
-%package Lithuanian
-Summary:		Lithuanian(lt) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-lt = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Lithuanian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Lithuanian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Lithuanian
-This package contains %{summary}.
-
-%files Lithuanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lt/
-
-##########
-
-%package Latvian
-Summary:		Latvian(lv) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-lv = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Latvian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Latvian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Latvian
-This package contains %{summary}.
-
-%files Latvian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/lv/
-
-##########
-
-%package Maori
-Summary:		Maori(mi) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-mi = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Maori < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Maori = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Maori
-This package contains %{summary}.
-
-#%files Maori
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/mi/
-
-##########
-
-%package Macedonian
-Summary:		Macedonian(mk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-mk = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Macedonian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Macedonian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Macedonian
-This package contains %{summary}.
-
-%files Macedonian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mk/
-
-##########
-
-%package Mongolian
-Summary:		Mongolian(mn) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-mn = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Mongolian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Mongolian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Mongolian
-This package contains %{summary}.
-
-%files Mongolian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/mn/
-
-##########
-
-%package Malay
-Summary:		Malay(ms) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ms = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Malay < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Malay = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Malay
-This package contains %{summary}.
-
-%files Malay
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ms/
-
-##########
-
-%package Maltese
-Summary:		Maltese(mt) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-mt = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Maltese < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Maltese = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Maltese
-This package contains %{summary}.
-
-#%files Maltese
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/mt/
-
-##########
-
-%package Low-Saxon
-Summary:		Low Saxon(nds) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-nds = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Low-Saxon < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Low-Saxon = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Low-Saxon
-This package contains %{summary}.
-
-%files Low-Saxon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nds/
-
-##########
-
-%package Dutch
-Summary:		Dutch(nl) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-nl = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Dutch < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Dutch = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Dutch
-This package contains %{summary}.
-
-%files Dutch
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nl/
-%{tde_tdedocdir}/HTML/nl/
-
-##########
-
-%package Norwegian
-Summary:		Norwegian(no) (Bokmaal) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-no = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Norwegian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Norwegian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Norwegian
-This package contains %{summary}.
-
-%files Norwegian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nb/
-
-##########
-
-%package Norwegian-Nynorsk
-Summary:		Norwegian(nn) (Nynorsk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-nn = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Norwegian-Nynorsk < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Norwegian-Nynorsk = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Norwegian-Nynorsk
-This package contains %{summary}.
-
-%files Norwegian-Nynorsk
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/nn/
-
-##########
-
-%package Occitan
-Summary:		Occitan(oc) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-oc = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Occitan < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Occitan = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Occitan
-This package contains %{summary}.
-
-#%files Occitan
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/oc/
-
-##########
-
-%package Polish
-Summary:		Polish(pl) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-pl = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Polish < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Polish = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Polish
-This package contains %{summary}.
-
-%files Polish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pl/
-%{tde_tdedocdir}/HTML/pl/
-
-##########
-
-%package Portuguese
-Summary:		Portuguese(pt) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-pt = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Portuguese < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Portuguese = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Portuguese
-This package contains %{summary}.
-
-%files Portuguese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt/
-%{tde_tdedocdir}/HTML/pt/
-
-##########
-
-%package Punjabi
-Summary:		Punjabi(pa) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-pa = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Punjabi < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Punjabi = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Punjabi
-This package contains %{summary}.
-
-%files Punjabi
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pa/
-
-##########
-
-%package Brazil
-Summary:		Brazil(pt_BR) Portuguese language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Brazil < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Brazil = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Brazil
-This package contains %{summary}.
-
-%files Brazil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/pt_BR/
-%{tde_tdedocdir}/HTML/pt_BR/
-
-##########
-
-%package Romanian
-Summary:		Romanian(ro) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ro = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Romanian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Romanian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Romanian
-This package contains %{summary}.
-
-%files Romanian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ro/
-%{tde_tdedocdir}/HTML/ro/
-
-##########
-
-%package Russian
-Summary:		Russian(ru) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ru = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Russian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Russian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Russian
-This package contains %{summary}.
-
-%files Russian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ru/
-%{tde_tdedocdir}/HTML/ru/
-
-##########
-
-%package Kinyarwanda
-Summary:		Kinyarwanda(rw) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-rw = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Kinyarwanda < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Kinyarwanda = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Kinyarwanda
-This package contains %{summary}.
-
-%files Kinyarwanda
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/rw/
-
-##########
-
-%package Northern-Sami
-Summary:		Northern-Sami(se) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-se = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Northern-Sami < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Northern-Sami = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Northern-Sami
-This package contains %{summary}.
-
-%files Northern-Sami
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/se/
-
-##########
-
-%package Slovak
-Summary:		Slovak(sk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-sk = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Slovak < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Slovak = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Slovak
-This package contains %{summary}.
-
-%files Slovak
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sk/
-%{tde_tdedocdir}/HTML/sk/
-
-##########
-
-%package Slovenian
-Summary:		Slovenian(sl) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-sl = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Slovenian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Slovenian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Slovenian
-This package contains %{summary}.
-
-%files Slovenian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sl/
-%{tde_tdedocdir}/HTML/sl/
-
-##########
-
-%package Serbian
-Summary:		Serbian(sr) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-sr = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Serbian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Serbian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Serbian
-This package contains %{summary}.
-
-%files Serbian
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sr/
-%{tde_tdedocdir}/HTML/sr/
-
-##########
-
-%package Serbian-Latin
-Summary:		Serbian-Latin(sr@Latn) language support for TDE
-Group:			User Interface/Desktops
-Obsoletes:		trinity-kde-i18n-Serbian-Latin < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Serbian-Latin = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Serbian-Latin
-This package contains %{summary}.
-
-%files Serbian-Latin
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sr@Latn/
-
-##########
-
-%package South-Sudan
-Summary:		South-Sudan(ss) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ss = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-South-Sudan < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-South-Sudan = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description South-Sudan
-This package contains %{summary}.
-
-%files South-Sudan
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ss/
-
-##########
-
-%package Swedish
-Summary:		Swedish(sv) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-sv = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Swedish < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Swedish = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Swedish
-This package contains %{summary}.
-
-%files Swedish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/sv/
-%{tde_tdedocdir}/HTML/sv/
-
-##########
-
-%package Tamil
-Summary:		Tamil(ta) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ta = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Tamil < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Tamil = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Tamil
-This package contains %{summary}.
-
-%files Tamil
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/ta/
-
-##########
-
-%package Telugu
-Summary:		Telugu(te) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-te = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Telugu < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Telugu = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Telugu
-This package contains %{summary}.
-
-%files Telugu
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/te/
-
-##########
-
-%package Tajik
-Summary:		Tajik(tg) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-tg = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Tajik < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Tajik = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Tajik
-This package contains %{summary}.
-
-%files Tajik
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tg/
-
-##########
-
-%package Thai
-Summary:		Thai(th) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-th = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Thai < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Thai = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Thai
-This package contains %{summary}.
-
-%files Thai
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/th/
-
-##########
-
-%package Turkish
-Summary:		Turkish(tr) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-tr = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Turkish < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Turkish = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Turkish
-This package contains %{summary}.
-
-%files Turkish
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/tr/
-%{tde_tdedocdir}/HTML/tr/
-
-##########
-
-%package Ukrainian
-Summary:		Ukrainian(uk) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-uk = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Ukrainian < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Ukrainian = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Ukrainian
-This package contains %{summary}.
-
-%files Ukrainian
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/uk/
-%{tde_datadir}/locale/uk/
-
-##########
-
-%package Uzbek
-Summary:		Uzbek(uz) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-uz = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Uzbek < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Uzbek = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Uzbek
-This package contains %{summary}.
-
-%files Uzbek
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/uz/
-
-##########
-
-%package Uzbek-Cyrillic
-Summary:		Uzbek(uz@cyrillic) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-uz@cyrillic = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Uzbek-Cyrillic < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Uzbek-Cyrillic = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Uzbek-Cyrillic
-This package contains %{summary}.
-
-%files Uzbek-Cyrillic
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/uz@cyrillic/
-
-##########
-
-%package Venda
-Summary:		Venda(ven) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-ven = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Venda < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Venda = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Venda
-This package contains %{summary}.
-
-#%files Venda
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/ven/
-
-##########
-
-%package Vietnamese
-Summary:		Vietnamese(vi) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-vi = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Vietnamese < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Vietnamese = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Vietnamese
-This package contains %{summary}.
-
-%files Vietnamese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/vi/
-
-##########
-
-%package Walloon
-Summary:		Walloon(wa) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-wa = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Walloon < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Walloon = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Walloon
-This package contains %{summary}.
-
-%files Walloon
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/wa/
-
-##########
-
-%package Xhosa
-Summary:		Xhosa(xh) (a Bantu language) support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-xh = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Xhosa < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Xhosa = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Xhosa
-This package contains %{summary}.
-
-#%files Xhosa
-#%defattr(-,root,root,-)
-#%{tde_datadir}/locale/xh/
-
-##########
-
-%package Chinese
-Summary:		Chinese(zh_CN) (Simplified Chinese) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-zh_CN = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Chinese < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Chinese = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Chinese
-This package contains %{summary}.
-
-%files Chinese
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_CN/
-%{tde_tdedocdir}/HTML/zh_CN/
-
-##########
-
-%package Chinese-Big5
-Summary:		Chinese(zh_TW) (Big5) language support for TDE
-Group:			User Interface/Desktops
-Provides:		%{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kde-i18n-Chinese-Big5 < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kde-i18n-Chinese-Big5 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description Chinese-Big5
-This package contains %{summary}.
-
-%files Chinese-Big5
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/zh_TW/
-%{tde_tdedocdir}/HTML/zh_TW/
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-(
-for l in %{TDE_LANGS}; do
-  for f in tde-i18n-${l}/; do
-    if [ -d "${f}" ]; then 
-      pushd ${f}
-      if ! rpm -E %%cmake|grep -q "cd build"; then
-        %__mkdir_p build
-        cd build
-      fi
-      
-      %cmake \
-        -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-        -DCMAKE_VERBOSE_MAKEFILE=ON \
-        \
-        -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-        -DBIN_INSTALL_DIR="%{tde_bindir}" \
-        -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-        -DLIB_INSTALL_DIR="%{tde_libdir}" \
-        -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-        -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-        \
-        -DBUILD_ALL=ON \
-        -DBUILD_DOC=ON \
-        -DBUILD_DATA=ON \
-        -DBUILD_MESSAGES=ON \
-      ..
-
-      # Run the build process in background
-      ( %__make -j4 || %__make || echo TDE_Error ) &
-
-      # Do not build more than 4 languages at the same time
-      while [ $(jobs | wc -l) -ge 4 ]; do sleep 3; done
-      popd
-    fi
-  done
-done
-) 2>&1 | tee /tmp/rpmbuild.$$
-
-if grep -qw TDE_Error /tmp/rpmbuild.$$; then
-  echo "Error while building. See '/tmp/rpmbuild.$$'"
-  exit 1
-fi
-
-wait
-rm -f /tmp/rpmbuild.$$
-
-
-%install
-%__rm -rf %{?buildroot}
-export PATH="%{tde_bindir}:${PATH}"
-
-for l in %{TDE_LANGS}; do
-  for f in tde-i18n-${l}/; do
-    %__make install DESTDIR="%{?buildroot}" -C "${f}/build"
-  done
-done
-
-
-# remove zero-length file
-find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
-
-# remove obsolete KDE 3 application data translations
-%__rm -rf "%{buildroot}%{tde_datadir}/apps"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeaccessibility/tdeaccessibility.spec b/redhat/main/tdeaccessibility/tdeaccessibility.spec
deleted file mode 100644
index b5b962463..000000000
--- a/redhat/main/tdeaccessibility/tdeaccessibility.spec
+++ /dev/null
@@ -1,505 +0,0 @@
-#
-# spec file for package tdeaccessibility (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeaccessibility
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-tdeaccessibility
-Summary:		Trinity Desktop Environment - Accessibility
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	desktop-file-utils
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# AUDIOFILE support
-BuildRequires:	audiofile-devel
-
-# AKODE support
-%define with_akode 1
-BuildRequires: trinity-akode-devel
-
-# MAD support
-%ifarch %{ix86} x86_64
-%define with_libmad 1
-%{?with_libmad:BuildRequires: libakode_mpeg_decoder}
-%endif
-
-# ALSA support
-BuildRequires:	alsa-lib-devel
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-# XCB support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
-BuildRequires:	libxcb-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-BuildRequires:	%{_lib}xcb-devel
-%endif
-%endif
-
-# XAU support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xau-devel
-%else
-BuildRequires:	%{_lib}xau%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXau-devel
-%endif
-
-Obsoletes:		trinity-kdeaccessibility < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdeaccessibility = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kdeaccessibility-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdeaccessibility-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: trinity-tde-icons-mono = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kbstate = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmag = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmousetool = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmouth = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksayit = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kttsd = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kttsd-contrib-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-Included with this package are:
-* kmag, a screen magnifier,
-* kmousetool, a program for people whom it hurts to click the mouse,
-* kmouth, program that allows people who have lost their voice
-  to let their computer speak for them.
-
-%files
-
-##########
-
-%package -n trinity-tde-icons-mono
-Summary:	A monochromatic icons theme for TDE
-Group:		System/GUI/Other
-
-Obsoletes:	trinity-kde-icons-mono < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kde-icons-mono = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tde-icons-mono
-A monochromatic icon theme for TDE, designed for accessibility purposes.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-tde-icons-mono
-%defattr(-,root,root,-)
-%dir %{tde_datadir}/icons/mono
-%dir %{tde_datadir}/icons/mono/scalable
-%dir %{tde_datadir}/icons/mono/scalable/actions
-%dir %{tde_datadir}/icons/mono/scalable/apps
-%dir %{tde_datadir}/icons/mono/scalable/devices
-%dir %{tde_datadir}/icons/mono/scalable/mimetypes
-%dir %{tde_datadir}/icons/mono/scalable/places
-%{tde_datadir}/icons/mono/index.theme
-%{tde_datadir}/icons/mono/scalable/*/*.svgz
-
-##########
-
-%package -n trinity-kbstate
-Summary:	A keyboard status applet for TDE
-Group:		System/GUI/Other
-
-%description -n trinity-kbstate
-A panel applet that displays the keyboard status.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kbstate
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kbstate_panelapplet.la
-%{tde_tdelibdir}/kbstate_panelapplet.so
-%{tde_datadir}/apps/kbstateapplet/
-%{tde_datadir}/apps/kicker/applets/kbstateapplet.desktop
-
-##########
-
-%package -n trinity-kmag
-Summary:	A screen magnifier for TDE
-Group:		System/GUI/Other
-
-%description -n trinity-kmag
-TDE's screen magnifier tool.
-
-You can use KMagnifier to magnify a part of the screen just as you would use 
-a lens to magnify a newspaper fine-print or a photograph.  This application is
-useful for a variety of people: from researchers to artists to web-designers to
-people with low vision.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kmag
-%defattr(-,root,root,-)
-%{tde_bindir}/kmag
-%{tde_tdeappdir}/kmag.desktop
-%{tde_datadir}/apps/kmag/
-%{tde_datadir}/icons/hicolor/*/apps/kmag.png
-%{tde_datadir}/icons/locolor/*/apps/kmag.png
-%{tde_tdedocdir}/HTML/en/kmag/
-
-##########
-
-%package -n trinity-kmousetool
-Summary:	TDE mouse manipulation tool for the disabled
-Group:		System/GUI/Other
-
-%description -n trinity-kmousetool
-KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was
-designed to help those with repetitive strain injuries, for whom pressing
-buttons hurts.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kmousetool
-%defattr(-,root,root,-)
-%{tde_bindir}/kmousetool
-%{tde_tdeappdir}/kmousetool.desktop
-%{tde_datadir}/apps/kmousetool/
-%{tde_datadir}/icons/hicolor/*/apps/kmousetool.png
-%{tde_tdedocdir}/HTML/en/kmousetool/
-
-##########
-
-%package -n trinity-kmouth
-Summary:	A type-and-say KDE frontend for speech synthesizers
-Group:		System/GUI/Other
-
-%description -n trinity-kmouth
-KDE's type-and-say frontend for speech synthesizers.
-
-It includes a history of spoken sentences from which the user can select
-sentences to be re-spoken.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kmouth
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/kmouthrc
-%{tde_bindir}/kmouth
-%{tde_tdeappdir}/kmouth.desktop
-%{tde_datadir}/apps/kmouth/
-%{tde_datadir}/icons/hicolor/*/actions/speak.png
-%{tde_datadir}/icons/hicolor/*/actions/nospeak.png
-%{tde_datadir}/icons/hicolor/*/apps/kmouth.png
-%{tde_datadir}/icons/locolor/*/actions/speak.png
-%{tde_datadir}/icons/locolor/*/apps/kmouth.png
-%{tde_tdedocdir}/HTML/en/kmouth/
-
-##########
-
-%package -n trinity-ksayit
-Summary:	A frontend for the TDE Text-to-Speech system
-Group:		System/GUI/Other
-
-%description -n trinity-ksayit
-Text-to-speech front-end to kttsd.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-ksayit
-%defattr(-,root,root,-)
-%{tde_bindir}/ksayit
-%{tde_tdelibdir}/libFreeverb_plugin.la
-%{tde_tdelibdir}/libFreeverb_plugin.so
-%{tde_libdir}/libKTTSD_Lib.so.*
-%{tde_tdeappdir}/ksayit.desktop
-%{tde_datadir}/apps/ksayit/
-%{tde_datadir}/icons/hicolor/*/apps/ksayit.png
-%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_clipempty.png
-%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_talking.png
-%{tde_datadir}/services/ksayit_libFreeverb.desktop
-%{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop
-%{tde_tdedocdir}/HTML/en/ksayit/
-
-##########
-
-%package -n trinity-kttsd
-Summary:	A Text-to-Speech system for TDE
-Group:		System/GUI/Other
-
-%description -n trinity-kttsd
-The KDE Text-to-Speech system is a plugin based service that allows any KDE
-(or non-KDE) application to speak using the DCOP interface.
-
-ksayit and kmouth are useful front-ends for this capability, while one of
-festival, flite, and epos are essential back-ends.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-Homepage: http://accessibility.kde.org/developer/kttsd
-
-%files -n trinity-kttsd
-%defattr(-,root,root,-)
-%{tde_bindir}/kttsd
-%{tde_bindir}/kttsmgr
-%{tde_tdelibdir}/kcm_kttsd.la
-%{tde_tdelibdir}/kcm_kttsd.so
-%{tde_tdelibdir}/tdetexteditor_kttsd.la
-%{tde_tdelibdir}/tdetexteditor_kttsd.so
-%if 0%{?with_akode}
-%{tde_tdelibdir}/libkttsd_akodeplugin.la
-%{tde_tdelibdir}/libkttsd_akodeplugin.so
-%endif
-%{tde_tdelibdir}/libkttsd_alsaplugin.la
-%{tde_tdelibdir}/libkttsd_alsaplugin.so
-%{tde_tdelibdir}/libkttsd_artsplugin.la
-%{tde_tdelibdir}/libkttsd_artsplugin.so
-%{tde_tdelibdir}/libkttsd_commandplugin.la
-%{tde_tdelibdir}/libkttsd_commandplugin.so
-%{tde_tdelibdir}/libkttsd_eposplugin.la
-%{tde_tdelibdir}/libkttsd_eposplugin.so
-%{tde_tdelibdir}/libkttsd_festivalintplugin.la
-%{tde_tdelibdir}/libkttsd_festivalintplugin.so
-%{tde_tdelibdir}/libkttsd_fliteplugin.la
-%{tde_tdelibdir}/libkttsd_fliteplugin.so
-%{tde_tdelibdir}/libkttsd_sbdplugin.la
-%{tde_tdelibdir}/libkttsd_sbdplugin.so
-%{tde_tdelibdir}/libkttsd_stringreplacerplugin.la
-%{tde_tdelibdir}/libkttsd_stringreplacerplugin.so
-%{tde_tdelibdir}/libkttsd_talkerchooserplugin.la
-%{tde_tdelibdir}/libkttsd_talkerchooserplugin.so
-%{tde_tdelibdir}/libkttsd_xmltransformerplugin.la
-%{tde_tdelibdir}/libkttsd_xmltransformerplugin.so
-%{tde_tdelibdir}/libkttsjobmgrpart.la
-%{tde_tdelibdir}/libkttsjobmgrpart.so
-%{tde_libdir}/libkttsd.so.*
-%{tde_tdeappdir}/kcmkttsd.desktop
-%{tde_tdeappdir}/kttsmgr.desktop
-%{tde_datadir}/apps/tdetexteditor_kttsd/
-%exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
-%{tde_datadir}/apps/kttsd/
-%{tde_datadir}/icons/hicolor/16x16/actions/female.png
-%{tde_datadir}/icons/hicolor/16x16/actions/male.png
-%{tde_datadir}/icons/hicolor/*/apps/kttsd.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmkttsd.png
-%{tde_datadir}/services/tdetexteditor_kttsd.desktop
-%{tde_datadir}/services/kttsd.desktop
-%if 0%{?with_akode}
-%{tde_datadir}/services/kttsd_akodeplugin.desktop
-%endif
-%{tde_datadir}/services/kttsd_alsaplugin.desktop
-%{tde_datadir}/services/kttsd_artsplugin.desktop
-%{tde_datadir}/services/kttsd_commandplugin.desktop
-%{tde_datadir}/services/kttsd_eposplugin.desktop
-%{tde_datadir}/services/kttsd_festivalintplugin.desktop
-%{tde_datadir}/services/kttsd_fliteplugin.desktop
-%{tde_datadir}/services/kttsd_sbdplugin.desktop
-%{tde_datadir}/services/kttsd_stringreplacerplugin.desktop
-%{tde_datadir}/services/kttsd_talkerchooserplugin.desktop
-%{tde_datadir}/services/kttsd_xmltransformerplugin.desktop
-%{tde_datadir}/services/kttsjobmgr.desktop
-%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
-%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
-%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
-%{tde_tdedocdir}/HTML/en/kttsd/
-
-##########
-
-%package -n trinity-kttsd-contrib-plugins
-Summary:	The TDE Text-to-Speech system
-Group:		System/GUI/Other
-Requires:	trinity-kttsd = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kttsd-contrib-plugins
-kttsd synthetizer plugins that depends on non-free software :
-* FreeTTS plugin.
-* Hadifix (mbrola/txt2pho) plugin.
-Those plugins will require manual installation of third party,
-non free software to work.
-
-This package is part of Trinity, as a component of the TDE accessibility module.
-
-%files -n trinity-kttsd-contrib-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkttsd_freettsplugin.la
-%{tde_tdelibdir}/libkttsd_freettsplugin.so
-%{tde_tdelibdir}/libkttsd_hadifixplugin.la
-%{tde_tdelibdir}/libkttsd_hadifixplugin.so
-%{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl
-%{tde_datadir}/services/kttsd_freettsplugin.desktop
-%{tde_datadir}/services/kttsd_hadifixplugin.desktop
-
-##########
-
-%package devel
-Summary:	Development files for tdeaccessibility
-Group:		Development/Libraries/X11
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{version}
-Requires:	libjpeg-devel
-Requires:	libpng-devel
-
-Obsoletes:		trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdeaccessibility-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains the development file for TDE accessibility 
-programs.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkttsd.la
-%{tde_libdir}/libkttsd.so
-%{tde_libdir}/libKTTSD_Lib.la
-%{tde_libdir}/libKTTSD_Lib.so
-%{tde_tdeincludedir}/ksayit_fxplugin.h
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# Update icons for some control center modules
-%__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|"
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export kde_confdir="%{tde_confdir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --enable-ksayit-audio-plugins \
-  %{?with_akode:--with-akode} %{?!with_akode:--without-akode}
-  
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Adds missing icons in 'hicolor' theme
-# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
-%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
-pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png  hicolor/"$i"x"$i"/apps/kttsd.png    ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png  hicolor/"$i"x"$i"/apps/kcmkttsd.png ;done
-popd
-
-# Avoid conflict with tdelibs
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
-%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r kmag         Utility Accessibility
-%suse_update_desktop_file    kmousetool   Utility Accessibility
-%suse_update_desktop_file    kmouth       Utility Accessibility
-%suse_update_desktop_file    kttsmgr      Utility Accessibility
-%suse_update_desktop_file    ksayit       Utility Accessibility
-%suse_update_desktop_file    kcmkttsd     Utility Accessibility
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec
deleted file mode 100644
index 1ddcbe793..000000000
--- a/redhat/main/tdeaddons/tdeaddons.spec
+++ /dev/null
@@ -1,762 +0,0 @@
-#
-# spec file for package tdeaddons (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeaddons
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Trinity Desktop Environment - Plugins
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:		User Interface/Desktops
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Obsoletes:	trinity-kdeaddons < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdeaddons = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdeaddons-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdeaddons-extras = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-
-# Trinity dependencies
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-tdegames-devel >= %{tde_version}
-BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
-BuildRequires: trinity-tdepim-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# SDL support
-BuildRequires: SDL-devel
-
-# ALSA support
-BuildRequires: alsa-lib-devel
-
-# OPENSSL support
-BuildRequires: openssl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_pcre 1
-BuildRequires:	pcre-devel
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# DB4/DB5 support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
-%define with_db 1
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
-BuildRequires:	db5-devel
-%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-BuildRequires:	libdb-devel
-BuildRequires:	libdb-cxx-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libdb-4_8-devel
-%endif
-%if 0%{?rhel} && 0%{?rhel} <= 6
-BuildRequires:	db4-devel
-%endif
-%endif
-
-# XMMS support: no, always disabled, even on Fedora
-#%if 0%{?fedora}
-#define with_xmms 1
-#BuildRequires:	xmms-devel
-#%endif
-
-# PYTHON2 support
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
-%global python python2
-%global __python %__python2
-%else
-%global python python
-%endif
-
-Requires: trinity-atlantikdesigner = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kaddressbook-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kate-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdeaddons-tdefile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kicker-applets = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-knewsticker-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-konq-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksig = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-noatun-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-A collection of TDE Addons/Plugins, including: 
-* atlantikdesigner: game board designer
-* konq-plugins: akregator, babelfish, domtreeviewer, imagerotation, validators, webarchiver
-* kate (plugins) 
-* kicker-applets: kbinaryclock, kolourpicker, ktimemon, mediacontrol
-* knewsticker-scripts
-* noatun-plugins
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package -n trinity-atlantikdesigner
-Summary:	Game board designer for Atlantik
-Group:		Applications/Games
-#Requires:	trinity-atlantik
-Requires:	trinity-tdegames
-
-%description -n trinity-atlantikdesigner
-Atlantik Designer is a game board designer for the game Atlantik.
-
-Atlantik is a TDE client for playing Monopoly-like board games on the
-monopd network.  It can play any board supported by the network
-server, including the classic Monopoly game as well as the Atlantik
-game in which the properties include several major cities in North
-America and Europe.
-
-%files -n trinity-atlantikdesigner
-%defattr(-,root,root,-)
-%doc README atlantikdesigner/TODO
-%{tde_bindir}/atlantikdesigner
-%{tde_datadir}/apps/atlantikdesigner
-%{tde_tdeappdir}/atlantikdesigner.desktop
-%{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
-%{tde_tdedocdir}/HTML/en/atlantikdesigner/
-
-##########
-
-%package -n trinity-kaddressbook-plugins
-Summary:	Plugins for KAddressBook, the Trinity address book
-Group:		Applications/Utilities
-Requires:	trinity-kaddressbook
-
-%description -n trinity-kaddressbook-plugins
-This package contains a variety of useful plugins for the KDE address
-book.  These plugins can be loaded through the TDE address book settings.
-
-Highlights include exporting postal addresses as flags in KWorldClock,
-as well as importing and exporting contacts in the native format used
-by the German freemail provider GMX.
-
-%files -n trinity-kaddressbook-plugins
-%defattr(-,root,root,-)
-%doc README
-%{tde_tdelibdir}/libkaddrbk_geo_xxport.la
-%{tde_tdelibdir}/libkaddrbk_geo_xxport.so
-%{tde_tdelibdir}/libkaddrbk_gmx_xxport.la
-%{tde_tdelibdir}/libkaddrbk_gmx_xxport.so
-%{tde_datadir}/apps/kaddressbook
-%{tde_datadir}/services/kaddressbook
-
-##########
-
-%package -n trinity-kate-plugins
-Summary:	Plugins for Kate, the TDE Advanced Text Editor
-Group:		Applications/Utilities
-Requires:	trinity-kate
-Requires:	tidy
-
-%description -n trinity-kate-plugins
-This package contains a variety of useful plugins for Kate, the KDE
-Advanced Text Editor.  These plugins can be loaded through the plugin
-manager in Kate settings.
-
-Highlights include spell checking, text filtering, HTML/XML construction
-and validation, vim/emacs modeline handling, templates for new files
-and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
-a tab bar, a Python browser and even more.
-
-%files -n trinity-kate-plugins
-%defattr(-,root,root,-)
-%doc kate/xmltools/ChangeLog kate/xmltools/README
-%{tde_tdelibdir}/katecppsymbolviewerplugin.la
-%{tde_tdelibdir}/katecppsymbolviewerplugin.so
-%{tde_tdelibdir}/katefiletemplates.la
-%{tde_tdelibdir}/katefiletemplates.so
-%{tde_tdelibdir}/katefll_plugin.la
-%{tde_tdelibdir}/katefll_plugin.so
-%{tde_tdelibdir}/katehelloworldplugin.la
-%{tde_tdelibdir}/katehelloworldplugin.so
-%{tde_tdelibdir}/katehtmltoolsplugin.la
-%{tde_tdelibdir}/katehtmltoolsplugin.so
-%{tde_tdelibdir}/kateinsertcommandplugin.la
-%{tde_tdelibdir}/kateinsertcommandplugin.so
-%{tde_tdelibdir}/katemakeplugin.la
-%{tde_tdelibdir}/katemakeplugin.so
-%{tde_tdelibdir}/katemodelineplugin.la
-%{tde_tdelibdir}/katemodelineplugin.so
-%{tde_tdelibdir}/kateopenheaderplugin.la
-%{tde_tdelibdir}/kateopenheaderplugin.so
-%{tde_tdelibdir}/katepybrowseplugin.la
-%{tde_tdelibdir}/katepybrowseplugin.so
-%{tde_tdelibdir}/katesnippetsplugin.la
-%{tde_tdelibdir}/katesnippetsplugin.so
-%{tde_tdelibdir}/katetextfilterplugin.la
-%{tde_tdelibdir}/katetextfilterplugin.so
-%{tde_tdelibdir}/katexmlcheckplugin.la
-%{tde_tdelibdir}/katexmlcheckplugin.so
-%{tde_tdelibdir}/katexmltoolsplugin.la
-%{tde_tdelibdir}/katexmltoolsplugin.so
-%{tde_tdelibdir}/libkatetabbarextensionplugin.la
-%{tde_tdelibdir}/libkatetabbarextensionplugin.so
-%{tde_datadir}/applnk/.hidden/kate-plugins.desktop
-%{tde_datadir}/applnk/.hidden/katefll.desktop
-%{tde_datadir}/apps/kate
-%{tde_datadir}/apps/katepart
-%{tde_datadir}/apps/katexmltools
-%{tde_datadir}/services/katecppsymbolviewer.desktop
-%{tde_datadir}/services/katefiletemplates.desktop
-%{tde_datadir}/services/katefll_plugin.desktop
-%{tde_datadir}/services/katehelloworld.desktop
-%{tde_datadir}/services/katehtmltools.desktop
-%{tde_datadir}/services/kateinsertcommand.desktop
-%{tde_datadir}/services/katemake.desktop
-%{tde_datadir}/services/katemodeline.desktop
-%{tde_datadir}/services/kateopenheader.desktop
-%{tde_datadir}/services/katepybrowse.desktop
-%{tde_datadir}/services/katesnippets.desktop
-%{tde_datadir}/services/katetabbarextension.desktop
-%{tde_datadir}/services/katetextfilter.desktop
-%{tde_datadir}/services/katexmlcheck.desktop
-%{tde_datadir}/services/katexmltools.desktop
-%{tde_tdedocdir}/HTML/en/kate-plugins/
-# katesort plugin
-%{tde_tdelibdir}/katesortplugin.la
-%{tde_tdelibdir}/katesortplugin.so
-%{tde_datadir}/icons/hicolor/*/actions/katesort.png
-%{tde_datadir}/services/katesort.desktop
-
-##########
-
-%package tdefile-plugins
-Summary:	Trinity file dialog plugins for text files and folders
-Group:		Applications/Utilities
-
-Obsoletes:	trinity-tdeaddons-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tdeaddons-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tdefile-plugins
-This is a collection of plugins for the TDE file dialog.  These plugins
-extend the file dialog to offer advanced meta-information for text,
-HTML and desktop files, as well as for folders, Windows .lnk files,
-MIME archives and X.509 certificates.
-
-This package also includes plugins for the KDE file rename dialog,
-allowing a user to more easily decide what to do when faced with a
-decision regarding conflicting filenames.  Rename dialog plugins are
-provided for audio and image files.
-
-%files tdefile-plugins
-%defattr(-,root,root,-)
-%doc tdefile-plugins/lnk/README
-%{tde_bindir}/lnkforward
-%{tde_tdelibdir}/tdefile_cert.la
-%{tde_tdelibdir}/tdefile_cert.so
-%{tde_tdelibdir}/tdefile_desktop.la
-%{tde_tdelibdir}/tdefile_desktop.so
-%{tde_tdelibdir}/tdefile_folder.la
-%{tde_tdelibdir}/tdefile_folder.so
-%{tde_tdelibdir}/tdefile_html.la
-%{tde_tdelibdir}/tdefile_html.so
-%{tde_tdelibdir}/tdefile_lnk.la
-%{tde_tdelibdir}/tdefile_lnk.so
-%{tde_tdelibdir}/tdefile_mhtml.la
-%{tde_tdelibdir}/tdefile_mhtml.so
-%{tde_tdelibdir}/tdefile_txt.la
-%{tde_tdelibdir}/tdefile_txt.so
-%{tde_tdelibdir}/librenaudioplugin.la
-%{tde_tdelibdir}/librenaudioplugin.so
-%{tde_tdelibdir}/librenimageplugin.la
-%{tde_tdelibdir}/librenimageplugin.so
-%{tde_datadir}/applnk/.hidden/lnkforward.desktop
-%{tde_datadir}/mimelnk/application/x-win-lnk.desktop
-%{tde_datadir}/services/tdefile_cert.desktop
-%{tde_datadir}/services/tdefile_desktop.desktop
-%{tde_datadir}/services/tdefile_folder.desktop
-%{tde_datadir}/services/tdefile_html.desktop
-%{tde_datadir}/services/tdefile_lnk.desktop
-%{tde_datadir}/services/tdefile_mhtml.desktop
-%{tde_datadir}/services/tdefile_txt.desktop
-%{tde_datadir}/services/renaudiodlg.desktop
-%{tde_datadir}/services/renimagedlg.desktop
-
-##########
-
-%package -n trinity-kicker-applets
-Summary:	Applets for Kicker, the Trinity panel
-Group:		Applications/Utilities
-Requires:	trinity-kicker
-
-%description -n trinity-kicker-applets
-This package contains a variety of applets for Kicker, the KDE panel.
-These applets will appear in the panel's Add--Applet menu.
-
-Included are a system monitor, a colour picker, a media player controller,
-a mathematical evaluator and a binary clock.
-
-The media control applet does not support XMMS, as this would force all
-kicker-applets users to install XMMS. If you want a kicker applet that
-controls XMMS, install the xmms-kde-trinity package.
-
-%files -n trinity-kicker-applets
-%defattr(-,root,root,-)
-%doc README 
-%{tde_tdelibdir}/kolourpicker_panelapplet.la
-%{tde_tdelibdir}/kolourpicker_panelapplet.so
-%{tde_tdelibdir}/ktimemon_panelapplet.la
-%{tde_tdelibdir}/ktimemon_panelapplet.so
-%{tde_tdelibdir}/math_panelapplet.la
-%{tde_tdelibdir}/math_panelapplet.so
-%{tde_tdelibdir}/mediacontrol_panelapplet.la
-%{tde_tdelibdir}/mediacontrol_panelapplet.so
-%{tde_tdelibdir}/kbinaryclock_panelapplet.la
-%{tde_tdelibdir}/kbinaryclock_panelapplet.so
-%{tde_datadir}/apps/kicker/applets
-%{tde_datadir}/apps/mediacontrol
-%{tde_datadir}/config.kcfg/kbinaryclock.kcfg
-%{tde_datadir}/icons/locolor/*/apps/ktimemon.png
-%{tde_datadir}/icons/crystalsvg/*/apps/ktimemon.png
-%{tde_tdedocdir}/HTML/en/kicker-applets/
-
-##########
-
-%package -n trinity-knewsticker-scripts
-Summary: scripts for KNewsTicker, the Trinity news ticker
-Group:		Applications/Utilities
-Requires:	perl
-Requires:	%{python}
-#Requires:	libfinance-quote-perl
-#Requires:	libmime-perl
-#Requires:	libnews-nntpclient-perl
-Requires:	perl-libwww-perl
-Requires:	trinity-knewsticker
-
-%description -n trinity-knewsticker-scripts
-This package contains a variety of scripts that provide additional news
-sources for KNewsTicker, the news ticker applet for the TDE panel.
-
-Highlights include newsgroup handling, stock data retrieval, sports scores
-and various local news sources.
-
-%files -n trinity-knewsticker-scripts
-%defattr(-,root,root,-)
-%doc README
-%{tde_datadir}/apps/knewsticker/
-
-##########
-
-%package -n trinity-konq-plugins
-Summary:	plugins for Konqueror, the Trinity file/web/doc browser
-Group:		Applications/Utilities
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
-Requires:	%{_lib}jpeg8
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	libjpeg
-%endif
-%if 0%{?suse_version} == 1220
-Requires:	libjpeg62
-%endif
-%if 0%{?pclinuxos}
-Requires:	%{_lib}jpeg62
-%endif
-%if 0%{?suse_version} == 1230
-Requires:	libjpeg8
-%endif
-Requires:	%{python}
-Requires:	rsync
-#Requires:	unison
-Requires:	trinity-konqueror
-%if 0%{?fedora}
-Requires:	%{python}-exif
-%endif
-
-%description -n trinity-konq-plugins
-This package contains a variety of useful plugins for Konqueror, the
-file manager, web browser and document viewer for TDE.  Many of these
-plugins will appear in Konqueror's Tools menu.
-
-Highlights for web browsing include web page translation, web page archiving,
-auto-refreshing, HTML and CSS structural analysis, a search toolbar, a
-sidebar news ticker, fast access to common options, bookmarklets, a crash
-monitor, a microformat availability indicator, a del.icio.us bookmarks
-sidebar, and integration with the aKregator RSS feed reader.
-
-Highlights for directory browsing include directory filters, image gallery
-creation, archive compression and extraction, quick copy/move, a sidebar
-media player, a file information metabar/sidebar, a media folder helper, a
-graphical disk usage viewer and image conversions and transformations.
-
-%files -n trinity-konq-plugins
-%defattr(-,root,root,-)
-%doc konq-plugins/README
-%{_sysconfdir}/trinity/translaterc
-%{tde_bindir}/fsview
-%{tde_bindir}/jpegorient
-%{tde_bindir}/tdeio_media_realfolder
-%{tde_tdelibdir}/konq_sidebarnews.la
-%{tde_tdelibdir}/konq_sidebarnews.so
-%{tde_tdelibdir}/konqsidebar_delicious.la
-%{tde_tdelibdir}/konqsidebar_delicious.so
-%{tde_tdelibdir}/konqsidebar_mediaplayer.la
-%{tde_tdelibdir}/konqsidebar_mediaplayer.so
-%{tde_tdelibdir}/konqsidebar_metabar.la
-%{tde_tdelibdir}/konqsidebar_metabar.so
-%{tde_tdelibdir}/libakregatorkonqfeedicon.la
-%{tde_tdelibdir}/libakregatorkonqfeedicon.so
-%{tde_tdelibdir}/libakregatorkonqplugin.la
-%{tde_tdelibdir}/libakregatorkonqplugin.so
-%{tde_tdelibdir}/libarkplugin.la
-%{tde_tdelibdir}/libarkplugin.so
-%{tde_tdelibdir}/libautorefresh.la
-%{tde_tdelibdir}/libautorefresh.so
-%{tde_tdelibdir}/libbabelfishplugin.la
-%{tde_tdelibdir}/libbabelfishplugin.so
-%{tde_tdelibdir}/libcrashesplugin.la
-%{tde_tdelibdir}/libcrashesplugin.so
-%{tde_tdelibdir}/libdirfilterplugin.la
-%{tde_tdelibdir}/libdirfilterplugin.so
-%{tde_tdelibdir}/librsyncplugin.la
-%{tde_tdelibdir}/librsyncplugin.so
-%{tde_tdelibdir}/libdomtreeviewerplugin.la
-%{tde_tdelibdir}/libdomtreeviewerplugin.so
-%{tde_tdelibdir}/libfsviewpart.la
-%{tde_tdelibdir}/libfsviewpart.so
-%{tde_tdelibdir}/libtdehtmlsettingsplugin.la
-%{tde_tdelibdir}/libtdehtmlsettingsplugin.so
-%{tde_tdelibdir}/kcm_kuick.la
-%{tde_tdelibdir}/kcm_kuick.so
-%{tde_tdelibdir}/libkimgallery.la
-%{tde_tdelibdir}/libkimgallery.so
-%{tde_tdelibdir}/libkuickplugin.la
-%{tde_tdelibdir}/libkuickplugin.so
-%{tde_tdelibdir}/libmfkonqmficon.la
-%{tde_tdelibdir}/libmfkonqmficon.so
-%{tde_tdelibdir}/libminitoolsplugin.la
-%{tde_tdelibdir}/libminitoolsplugin.so
-%{tde_tdelibdir}/librellinksplugin.la
-%{tde_tdelibdir}/librellinksplugin.so
-%{tde_tdelibdir}/libsearchbarplugin.la
-%{tde_tdelibdir}/libsearchbarplugin.so
-%{tde_tdelibdir}/libuachangerplugin.la
-%{tde_tdelibdir}/libuachangerplugin.so
-%{tde_tdelibdir}/libvalidatorsplugin.la
-%{tde_tdelibdir}/libvalidatorsplugin.so
-%{tde_tdelibdir}/libwebarchiverplugin.la
-%{tde_tdelibdir}/libwebarchiverplugin.so
-%{tde_tdelibdir}/webarchivethumbnail.la
-%{tde_tdelibdir}/webarchivethumbnail.so
-%{tde_datadir}/applnk/.hidden/arkplugin.desktop
-%{tde_datadir}/applnk/.hidden/kcmkuick.desktop
-%{tde_datadir}/applnk/.hidden/kuickplugin.desktop
-%{tde_datadir}/applnk/.hidden/mediaplayerplugin.desktop
-%{tde_datadir}/applnk/.hidden/crashesplugin.desktop
-%{tde_datadir}/applnk/.hidden/dirfilterplugin.desktop
-%{tde_datadir}/applnk/.hidden/rsyncplugin.desktop
-%{tde_datadir}/applnk/.hidden/fsview.desktop
-%{tde_datadir}/applnk/.hidden/tdehtmlsettingsplugin.desktop
-%{tde_datadir}/applnk/.hidden/kimgalleryplugin.desktop
-%{tde_datadir}/applnk/.hidden/plugin_babelfish.desktop
-%{tde_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop
-%{tde_datadir}/applnk/.hidden/plugin_validators.desktop
-%{tde_datadir}/applnk/.hidden/plugin_webarchiver.desktop
-%{tde_datadir}/applnk/.hidden/uachangerplugin.desktop
-%{tde_datadir}/apps/akregator
-%{tde_datadir}/apps/domtreeviewer
-%{tde_datadir}/apps/fsview
-%{tde_datadir}/apps/imagerotation/
-%{tde_datadir}/apps/tdehtml/kpartplugins
-%{tde_datadir}/apps/konqiconview
-%{tde_datadir}/apps/konqlistview
-%{tde_datadir}/apps/konqsidebartng
-%{tde_datadir}/apps/konqueror/icons
-%{tde_datadir}/apps/konqueror/kpartplugins
-%{tde_datadir}/apps/konqueror/servicemenus
-%{tde_datadir}/apps/metabar/
-%{tde_datadir}/apps/microformat/
-%{tde_datadir}/config.kcfg/konq_sidebarnews.kcfg
-%{tde_datadir}/icons/crystalsvg/*/actions/babelfish.png
-%{tde_datadir}/icons/crystalsvg/*/actions/cssvalidator.png
-%{tde_datadir}/icons/crystalsvg/*/actions/domtreeviewer.png
-%{tde_datadir}/icons/crystalsvg/*/actions/htmlvalidator.png
-%{tde_datadir}/icons/crystalsvg/*/actions/imagegallery.png
-%{tde_datadir}/icons/crystalsvg/*/actions/remotesync.png
-%{tde_datadir}/icons/crystalsvg/*/actions/remotesyncconfig.png
-%{tde_datadir}/icons/crystalsvg/*/actions/minitools.png
-%{tde_datadir}/icons/crystalsvg/*/actions/validators.png
-%{tde_datadir}/icons/crystalsvg/*/actions/webarchiver.png
-%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_delicious.png
-%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_mediaplayer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_news.png
-%{tde_datadir}/icons/hicolor/*/apps/metabar.png
-%{tde_datadir}/icons/hicolor/*/apps/fsview.png
-%{tde_datadir}/icons/hicolor/scalable/apps/metabar.svgz
-%{tde_datadir}/icons/locolor/*/apps/autorefresh.png
-%{tde_datadir}/icons/locolor/*/apps/konqsidebar_mediaplayer.png
-%{tde_datadir}/services/akregator_konqplugin.desktop
-%{tde_datadir}/services/ark_plugin.desktop
-%{tde_datadir}/services/fsview_part.desktop
-%{tde_datadir}/services/kuick_plugin.desktop
-%{tde_datadir}/services/webarchivethumbnail.desktop
-%{tde_tdelibdir}/libadblock.la
-%{tde_tdelibdir}/libadblock.so
-%{tde_tdedocdir}/HTML/en/konq-plugins/
-
-##########
-
-%package -n trinity-ksig
-Summary:	Graphical tool for managing multiple email signatures
-Group:		Applications/Utilities
-Requires:	trinity-kmail
-
-%description -n trinity-ksig
-KSig is a graphical tool for keeping track of many different email
-signatures.  The signatures themselves can be edited through KSig's
-graphical user interface.  A command-line interface is then available
-for generating random or daily signatures from this list.
-
-The command-line interface makes a suitable plugin for generating
-signatures in external mail clients such as KMail.
-
-%files -n trinity-ksig
-%defattr(-,root,root,-)
-%doc README
-%{tde_bindir}/ksig
-%{tde_tdeappdir}/ksig.desktop
-%{tde_datadir}/apps/ksig/
-%{tde_datadir}/icons/hicolor/*/apps/ksig.png
-%{tde_tdedocdir}/HTML/en/ksig/
-
-##########
-
-%package -n trinity-noatun-plugins
-Summary:	plugins for Noatun, the Trinity media player
-Group:		Applications/Utilities
-Requires:	trinity-noatun
-
-%description -n trinity-noatun-plugins
-This package contains a variety of useful plugins for Noatun, the audio and
-video media player for TDE. These plugins can be loaded through the plugin
-manager in Noatun settings.
-
-Highlights include an alarm clock, guessing tags from filenames, adjustable
-playback speed, capture to wave file and displaying lyrics, plus a variety
-of user interfaces, playlists and visualisation plugins.
-
-%files -n trinity-noatun-plugins
-%defattr(-,root,root,-)
-%doc README
-%{tde_bindir}/noatunsynaescope.bin
-%{tde_bindir}/noatuntippecanoe.bin
-%{tde_bindir}/noatuntyler.bin
-%{tde_tdelibdir}/noatunalsaplayer.la
-%{tde_tdelibdir}/noatunalsaplayer.so
-%{tde_tdelibdir}/noatunblurscope.la
-%{tde_tdelibdir}/noatunblurscope.so
-%{tde_tdelibdir}/noatuncharlatan.la
-%{tde_tdelibdir}/noatuncharlatan.so
-%{tde_tdelibdir}/noatundub.la
-%{tde_tdelibdir}/noatundub.so
-%{tde_tdelibdir}/noatun_ffrs.la
-%{tde_tdelibdir}/noatun_ffrs.so
-%{tde_tdelibdir}/noatunluckytag.la
-%{tde_tdelibdir}/noatunluckytag.so
-%{tde_tdelibdir}/noatunlyrics.la
-%{tde_tdelibdir}/noatunlyrics.so
-%{tde_tdelibdir}/noatunmadness.la
-%{tde_tdelibdir}/noatunmadness.so
-%if 0%{?with_db}
-%{tde_tdelibdir}/noatun_oblique.la
-%{tde_tdelibdir}/noatun_oblique.so
-%endif
-%{tde_tdelibdir}/noatunpitchablespeed.la
-%{tde_tdelibdir}/noatunpitchablespeed.so
-%{tde_tdelibdir}/noatunsynaescope.la
-%{tde_tdelibdir}/noatunsynaescope.so
-%{tde_tdelibdir}/noatuntippecanoe.la
-%{tde_tdelibdir}/noatuntippecanoe.so
-%{tde_tdelibdir}/noatuntyler.la
-%{tde_tdelibdir}/noatuntyler.so
-%{tde_tdelibdir}/noatunwakeup.la
-%{tde_tdelibdir}/noatunwakeup.so
-%{tde_tdelibdir}/noatunwavecapture.la
-%{tde_tdelibdir}/noatunwavecapture.so
-%{tde_datadir}/apps/noatun/*
-%{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-# Fix shebangs
-sed -i "knewsticker-scripts/sportscores.py" \
-       "konq-plugins/imagerotation/orient.py" \
-       "konq-plugins/imagerotation/exif.py" \
-    -e "s|env python|env %{python}|"
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-# Help cmake to find DB headers ...
-if [ -d "/usr/include/db53" ]; then
-  export CMAKE_INCLUDE_PATH="/usr/include/db53"
-fi
-if [ -d "/usr/include/db4" ]; then
-  export CMAKE_INCLUDE_PATH="/usr/include/db4"
-fi
-
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_SDL=ON \
-  -DWITH_BERKELEY_DB=ON \
-  -DWITH_XMMS=OFF \
-  -DWITH_TEST=OFF \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_ATLANTIKDESIGNER=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_KADDRESSBOOK_PLUGINS=ON \
-  -DBUILD_KATE_PLUGINS=ON \
-  -DBUILD_KICKER_APPLETS=ON \
-  -DBUILD_KNEWSTICKER_SCRIPTS=ON \
-  -DBUILD_KONQ_PLUGINS=ON \
-  -DBUILD_KSIG=ON \
-  -DBUILD_NOATUN_PLUGINS=ON \
-  -DBUILD_RENAMEDLG_PLUGINS=ON \
-  -DBUILD_TDEFILE_PLUGINS=ON \
-  -DBUILD_TUTORIALS=OFF \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Temporary
-%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter
-
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file atlantikdesigner Game    BoardGame
-%suse_update_desktop_file -r ksig          Network Email
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/main/tdeadmin/tdeadmin.spec
deleted file mode 100644
index fae6c7a60..000000000
--- a/redhat/main/tdeadmin/tdeadmin.spec
+++ /dev/null
@@ -1,475 +0,0 @@
-#
-# spec file for package tdeadmin (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeadmin
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%define tde_sbindir %{tde_prefix}/sbin
-%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_sbindir %{tde_prefix}/sbin
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Administrative tools for TDE
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:		System/GUI/Other
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		kuser.pam
-Source2:		kuser.pamd
-Source5:		kpackagerc
-Source6:		ksysvrc
-Source7:		kuserrc
-
-Obsoletes:		trinity-kdeadmin < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdeadmin = %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	libtool
-BuildRequires:	fdupes
-BuildRequires:	gcc-c++
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# RPM support
-BuildRequires: rpm-devel
-
-# PAM support
-BuildRequires: pam-devel
-
-# LILO support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-#define with_lilo 1
-%endif
-%if 0%{?with_lilo}
-BuildRequires:	lilo
-%endif
-
-Requires: trinity-kcron = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kdat = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-knetworkconf = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kpackage = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksysv = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kuser = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?with_lilo}
-Requires: trinity-lilo-config = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Obsoletes: trinity-lilo-config < %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-# CONSOLEHELPER (usermode) support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_consolehelper 1
-
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-%endif
-
-%description
-The tdeadmin package includes administrative tools for the Trinity Desktop
-Environment (TDE) including:
-kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package -n trinity-kcron
-Summary:	The Trinity crontab editor
-Group:		System/GUI/Other
-
-%description -n trinity-kcron
-KCron is an application for scheduling programs to run in the background.
-It is a graphical user interface to cron, the UNIX system scheduler.
-
-%files -n trinity-kcron
-%defattr(-,root,root,-)
-%{tde_bindir}/kcron
-%{tde_tdeappdir}/kcron.desktop
-%{tde_datadir}/apps/kcron/
-%{tde_datadir}/icons/hicolor/*/apps/kcron.png
-%{tde_tdedocdir}/HTML/en/kcron/
-
-##########
-
-%package -n trinity-kdat
-Summary:	A Trinity tape backup tool
-Group:		System/GUI/Other
-
-%description -n trinity-kdat
-KDat is a tar-based tape archiver. It is designed to work with multiple
-archives on a single tape.
-
-Main features are:
-* Simple graphical interface to local filesystem and tape contents.
-* Multiple archives on the same physical tape.
-* Complete index of archives and files is stored on local hard disk.
-* Selective restore of files from an archive.
-* Backup profiles for frequently used backups.
-
-%files -n trinity-kdat
-%defattr(-,root,root,-)
-%doc rpmdocs/kdat/*
-%{tde_bindir}/kdat
-%{tde_tdeappdir}/kdat.desktop
-%{tde_datadir}/apps/kdat/
-%{tde_datadir}/icons/hicolor/*/apps/kdat.png
-%{tde_datadir}/icons/locolor/*/apps/kdat.png
-%{tde_tdedocdir}/HTML/en/kdat/
-
-##########
-
-%package kfile-plugins
-Summary:	Trinity file metainfo plugins for deb and rpm files
-Group:		System/GUI/Other
-
-%description kfile-plugins
-This package contains the Trinity File metainfo plugins for deb and rpm
-package files.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdefile_deb.la
-%{tde_tdelibdir}/tdefile_deb.so
-%{tde_tdelibdir}/tdefile_rpm.la
-%{tde_tdelibdir}/tdefile_rpm.so
-%{tde_datadir}/services/tdefile_deb.desktop
-%{tde_datadir}/services/tdefile_rpm.desktop
-
-##########
-
-%package -n trinity-knetworkconf
-Summary:	Trinity network configuration tool
-Group:		System/GUI/Other
-
-%description -n trinity-knetworkconf
-This is a TDE control center module to configure TCP/IP settings.  It
-can be used to manage network devices and settings for each device.
-
-%files -n trinity-knetworkconf
-%defattr(-,root,root,-)
-%doc rpmdocs/knetworkconf/*
-%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png
-%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png
-%{tde_datadir}/apps/knetworkconf/
-%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop
-%{tde_tdelibdir}/kcm_knetworkconfmodule.so
-%{tde_tdelibdir}/kcm_knetworkconfmodule.la
-%{tde_tdedocdir}/HTML/en/knetworkconf/
-
-##########
-
-%package -n trinity-kpackage
-Summary:	Trinity package management tool
-Group:		System/GUI/Other
-
-%description -n trinity-kpackage
-This is a frontend to both .rpm and .deb package formats. It allows you
-to view currently installed packages, browse available packages, and
-install/remove them.
-
-%files -n trinity-kpackage
-%defattr(-,root,root,-)
-%doc rpmdocs/kpackage/*
-%{tde_bindir}/kpackage
-%{tde_tdeappdir}/kpackage.desktop
-%{tde_datadir}/apps/kpackage/
-%config(noreplace) %{tde_confdir}/kpackagerc
-%{tde_datadir}/icons/hicolor/*/apps/kpackage.png
-%{tde_tdedocdir}/HTML/en/kpackage/
-
-##########
-
-%package -n trinity-ksysv
-Summary:	Trinity SysV-style init configuration editor
-Group:		System/GUI/Other
-
-%description -n trinity-ksysv
-This program allows you to edit your start and stop scripts using a
-drag and drop GUI.
-
-%files -n trinity-ksysv
-%defattr(-,root,root,-)
-%doc rpmdocs/ksysv/*
-%{tde_bindir}/ksysv
-%{tde_tdeappdir}/ksysv.desktop
-%{tde_datadir}/apps/ksysv/
-%config(noreplace) %{tde_confdir}/ksysvrc
-%{tde_datadir}/icons/hicolor/*/apps/ksysv.png
-%{tde_datadir}/mimelnk/application/x-ksysv.desktop
-%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
-%{tde_tdedocdir}/HTML/en/ksysv/
-
-##########
-
-%package -n trinity-kuser
-Summary:	Trinity user/group administration tool
-Group:		System/GUI/Other
-
-%if 0%{?with_consolehelper}
-# package 'usermode' provides '/usr/bin/consolehelper-gtk'
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	usermode-gtk
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	usermode
-%endif
-%endif
-
-%description -n trinity-kuser
-A user/group administration tool for TDE.
-
-%files -n trinity-kuser
-%defattr(-,root,root,-)
-%doc rpmdocs/kuser/*
-%{tde_bindir}/kuser
-%{tde_tdeappdir}/kuser.desktop
-%{tde_datadir}/apps/kuser/
-%config(noreplace) %{tde_confdir}/kuserrc
-%{tde_datadir}/config.kcfg/kuser.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kuser.png
-%{tde_tdedocdir}/HTML/en/kuser/
-
-%if 0%{?with_consolehelper}
-%{tde_sbindir}/kuser
-%{_sbindir}/kuser
-%config(noreplace) /etc/pam.d/kuser
-%config(noreplace) /etc/security/console.apps/kuser
-%endif
-
-##########
-
-%if 0%{?with_lilo}
-%package -n trinity-lilo-config
-Summary:	Trinity frontend for lilo configuration
-Group:		System/GUI/Other
-Requires:	trinity-kcontrol
-Requires:	trinity-tdebase-bin
-#Requires:	lilo
-
-%description -n trinity-lilo-config
-lilo-config is a TDE based frontend to the lilo boot manager configuration.
-It runs out of the Trinity Control Center.
-
-If you want to use the menu entry to launch lilo-config, you need to install
-tdebase-bin since it uses the tdesu command to gain root privileges.
-
-%files -n trinity-lilo-config
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_lilo.la
-%{tde_tdelibdir}/kcm_lilo.so
-%{tde_tdeappdir}/lilo.desktop
-%{tde_tdedocdir}/HTML/en/lilo-config/
-
-%post -n trinity-lilo-config
-touch /etc/lilo.conf
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTLIB QTINC
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DBUILD_ALL=ON \
-  -DBUILD_DOC=ON \
-  -DBUILD_KCRON=ON \
-  -DBUILD_KDAT=ON \
-  -DBUILD_KNETWORKCONF=ON \
-  -DBUILD_KPACKAGE=ON \
-  -DBUILD_KSYSV=ON \
-  -DBUILD_KUSER=ON \
-  -DBUILD_LILO_CONFIG=ON \
-  -DBUILD_SECPOLICY=ON \
-  -DBUILD_TDEFILE_PLUGINS=ON \
-  \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
-  -DKU_FIRSTUID="1000" \
-  -DKU_FIRSTGID="1000" \
-%endif
-  -DKU_USERPRIVATEGROUP=false \
-  -DKU_HOMEDIR_PERM="0700" \
-  -DKU_HOMETEMPLATE="/home/%U" \
-  -DKU_MAILBOX_GID="0" \
-  -DKU_MAILBOX_PERM="0660" \
-  \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-comps="kcron kdat knetworkconf kpackage ksysv kuser"
-%__mkdir_p	%{buildroot}%{tde_datadir}/config \
-			%{buildroot}%{_sysconfdir}/security/console.apps \
-			%{buildroot}%{_sysconfdir}/pam.d \
-			%{buildroot}%{tde_sbindir} \
-			%{buildroot}%{_sbindir}
-
-%__mkdir_p "%{buildroot}%{tde_confdir}/"
-%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} "%{buildroot}%{tde_confdir}/"
-
-%if 0%{?with_consolehelper}
-# Run kuser through consolehelper
-%__install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/security/console.apps/kuser
-%__install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/kuser
-%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir}
-%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kuser
-%if "%{tde_prefix}" != "/usr"
-%__ln_s %{tde_sbindir}/kuser %{?buildroot}%{_sbindir}/kuser
-%endif
-%endif
-
-# rpmdocs
-for dir in $comps ; do
-  for file in AUTHORS ChangeLog README TODO ; do
-    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
-  done
-done
-
-# The following files are not installed in any binary package.
-# This is deliberate.
-
-# - This file serves no purpose that we can see, and conflicts
-#   with GNOME system tools, so be sure to leave it out.
-%__rm -f %{?buildroot}%{tde_libdir}/pkgconfig/*.pc
-
-# Extract from changelog:
-# tdeadmin (4:3.5.5-2) unstable; urgency=low
-#  +++ Changes by Ana Beatriz Guerrero Lopez:
-#  * Removed useless program secpolicy. (Closes: #399426)
-%__rm -f %{?buildroot}%{tde_bindir}/secpolicy
-
-# Remove lilo related files, if unwanted.
-%if 0%{?with_lilo} == 0
-%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/lilo-config/
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.la
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.so
-%__rm -f %{?buildroot}%{tde_tdeappdir}/lilo.desktop
-%endif
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file kdat     System Backup
-%suse_update_desktop_file kpackage System PackageManager
-%suse_update_desktop_file kcron    System ServiceConfiguration
-%suse_update_desktop_file ksysv    System ServiceConfiguration
-%suse_update_desktop_file kuser    System SystemSetup
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec
deleted file mode 100644
index 0b7199279..000000000
--- a/redhat/main/tdeartwork/tdeartwork.spec
+++ /dev/null
@@ -1,778 +0,0 @@
-#
-# spec file for package tdeartwork (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeartwork
-%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_sbindir %{tde_prefix}/sbin
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Additional artwork (themes, sound themes, ...) for TDE
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:		System/GUI/Other
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-Obsoletes:	trinity-kdeartwork < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdeartwork = %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	fdupes
-
-BuildRequires:	gettext
-BuildRequires:	libidn-devel
-
-# ESOUND support
-BuildRequires:	esound-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-Mesa-libGLU
-%endif
-
-# LIBART support
-%define with_libart 1
-BuildRequires:	libart_lgpl-devel
-
-# XSCREENSAVER support
-#  RHEL 4: disabled
-#  RHEL 6: available in EPEL
-#  RHEL 7: available in NUX
-#  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-BuildRequires:	xscreensaver-extras
-%if 0%{?fedora}
-BuildRequires:	xscreensaver-extras-base
-%endif
-BuildRequires:	xscreensaver-gl-base
-BuildRequires:	xscreensaver-gl-extras
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-data
-BuildRequires:	xscreensaver-data-extra
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-%if 0%{?pclinuxos} == 0
-BuildRequires:	xscreensaver-extrusion
-%endif
-BuildRequires:	xscreensaver-gl
-%endif
-
-# Opensuse <= 13.10 does not provide 'webcollage' screensaver
-%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1320
-%define with_webcollage 1
-%endif
-
-%endif
-
-# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
-%define with_jack 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define jack_devel %{_lib}jack-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-%define jack_devel jack-audio-connection-kit-devel
-%endif
-%if 0%{?suse_version}
-%define jack_devel libjack-devel
-%endif
-BuildRequires:	%{jack_devel}
-%endif
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-# Metapackage
-Requires: %{name}-emoticons = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-style = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-theme-icon = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-theme-window = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdewallpapers = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdescreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%if 0%{?with_xscreensaver}
-Requires: trinity-tdescreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdescreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?with_webcollage}
-Requires: trinity-tdescreensaver-xsavers-webcollage = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%endif
-
-
-%description
-TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
-desktop environment for Unix workstations. It combines ease of use,
-contemporary functionality, and outstanding graphical design with the
-technological superiority of the Unix operating system.
-
-This metapackage includes a collection of artistic extras (themes, widget
-styles, screen savers, wallpaper, icons, emoticons and so on) provided
-with the official release of TDE.
-
-
-%files
-
-##########
-
-%package emoticons
-Summary:	Emoticon collections for tDE chat clients
-Group:		System/GUI/Other
-
-%description emoticons
-This package contains several collections of emoticons used by official
-and unofficial TDE chat clients, such as Kopete and Konversation.
-
-This package is part of TDE, and a component of the TDE artwork module.
-
-%files emoticons
-%defattr(-,root,root,-)
-%{tde_datadir}/emoticons/
-
-##########
-
-%package misc
-Summary:	Various multimedia goodies released with TDE
-Group:		System/GUI/Other
-
-%description misc
-This package contains miscellaneous multimedia goodies for TDE.
-Included are additional TDE sounds and kworldclock themes.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files misc
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kworldclock/
-%{tde_datadir}/sounds/KDE_Logout_new.wav
-%{tde_datadir}/sounds/KDE_Startup_new.wav
-
-##########
-
-%package style
-Summary:	Widget styles released with Trinity
-Group:		System/GUI/Other
-
-%description style
-This package contains additional widget styles for Trinity. Widget styles
-can be used to customise the look and feel of interface components such
-as buttons, scrollbars and so on.  They can be applied using the style
-manager in the Trinity Control Center.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files style
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/styles/
-%{tde_tdelibdir}/tdestyle_phase_config.la
-%{tde_tdelibdir}/tdestyle_phase_config.so
-%{tde_datadir}/apps/tdestyle/
-
-##########
-
-%package theme-icon
-Summary:	Icon themes released with Trinity
-Group:		System/GUI/Other
-
-Obsoletes:	trinity-kdeartwork-icons < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdeartwork-icons = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description theme-icon
-This package contains additional icon themes for Trinity. Icon themes can be
-used to customise the appearance of standard icons throughout TDE. They
-can be applied using the icon manager in the Trinity Control Centre.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files theme-icon
-%defattr(-,root,root,-)
-%{tde_datadir}/icons/ikons/
-%{tde_datadir}/icons/kdeclassic/
-%{tde_datadir}/icons/kids/
-%{tde_datadir}/icons/slick/
-%{tde_datadir}/icons/locolor/index.theme
-%{tde_datadir}/icons/locolor/*/*/*.png
-
-##########
-
-%package theme-window
-Summary:	Window decoration themes released with Trinity
-Group:		System/GUI/Other
-
-%description theme-window
-This package contains additional window decoration themes for Trinity. Window
-decoration themes can be used to customise the look of window borders and
-buttons, and can be applied using the window decoration manager in the Trinity
-Control Center.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files theme-window
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/twin*
-%{tde_datadir}/apps/twin/
-
-##########
-
-%package -n trinity-tdewallpapers
-Summary:	Wallpapers released with Trinity
-Group:		System/GUI/Other
-Obsoletes:	trinity-kdewallpapers < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdewallpapers = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdewallpapers
-This package contains additional wallpapers for Trinity. Wallpapers can be
-applied using the background manager in the Trinity Control Center.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdewallpapers
-%defattr(-,root,root,-)
-%{tde_datadir}/wallpapers/*
-
-##########
-
-%package -n trinity-tdescreensaver
-Summary:	Additional screen savers released with Trinity
-Group:		System/GUI/Other
-
-Obsoletes:	trinity-kscreensaver < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdescreensaver
-This package contains the screen savers for Trinity. They can be tested and
-selected within the Appearance and Themes section of the Trinity Control
-Center.
-
-The hooks for the standard xscreensavers are no longer part of this
-package. To select and/or configure the standard xscreensavers through
-the Trinity Control Center, install the separate package tdescreensaver-xsavers.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdescreensaver
-%defattr(-,root,root,-)
-%{tde_bindir}/kslideshow.kss
-%{tde_bindir}/kpolygon.kss
-%{tde_bindir}/krotation.kss
-%{tde_bindir}/ksolarwinds.kss
-%{tde_bindir}/klorenz.kss
-%{tde_bindir}/kvm.kss
-%{tde_bindir}/kflux.kss
-%{tde_bindir}/kscience.kss
-%{tde_bindir}/kbanner.kss
-%{tde_bindir}/kclock.kss
-%{tde_bindir}/kfiresaver.kss
-%{tde_bindir}/keuphoria.kss
-%{tde_bindir}/kfountain.kss
-%{tde_bindir}/kgravity.kss
-%{tde_bindir}/tdepartsaver.kss
-%{tde_bindir}/kpendulum.kss
-%{tde_bindir}/kblob.kss
-%{tde_bindir}/klines.kss
-%{tde_bindir}/kwave.kss
-%{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop
-%{tde_datadir}/apps/kfiresaver/
-%{tde_datadir}/apps/tdescreensaver/
-
-%if 0%{?with_xscreensaver}
-%{tde_bindir}/kspace.kss
-%{tde_bindir}/kswarm.kss
-%{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
-%endif
-
-##########
-
-%if 0%{?with_xscreensaver}
-
-%package -n trinity-tdescreensaver-xsavers
-Summary:	Trinity hooks for standard xscreensavers
-Group:		System/GUI/Other
-Requires:	trinity-tdebase-bin >= %{tde_version}
-Requires:	xscreensaver
-
-Obsoletes:	trinity-kscreensaver-xsavers < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kscreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdescreensaver-xsavers
-This package allows a smooth integration of the standard xscreensavers
-into Trinity. With this package installed you can select and/or configure
-the standard xscreensavers through the Appearances and Themes section of
-the Trinity Control Centre.
-
-Note that this package does not actually contain any screensavers itself.
-For the additional screensavers shipped with Trinity, see the separate package
-tdescreensaver-trinity. This package does depend on the xscreensaver package, and
-recommend the xscreensaver-gl package, as well as contain the necessary
-files to integrate these packages into Trinity.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdescreensaver-xsavers
-%defattr(-,root,root,-)
-%{tde_bindir}/xscreensaver-getimage-file
-%{tde_bindir}/xscreensaver-getimage
-%{tde_bindir}/kxsconfig
-%{tde_bindir}/kxsrun
-%{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
-%endif
-%if 0%{?rhel} == 5
-%{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/critical.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flag.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/forest.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/laser.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/vines.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
-%endif
-
-%endif
-
-##########
-
-%if 0%{?with_webcollage}
-
-%package -n trinity-tdescreensaver-xsavers-webcollage
-Summary:	Webcollage screensaver Trinity hook
-Group:		System/GUI/Other
-Requires:	trinity-tdescreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	netpbm
-
-Obsoletes:	trinity-kscreensaver-xsavers-webcollage < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kscreensaver-xsavers-webcollage = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdescreensaver-xsavers-webcollage
-This package give access to the webcollage screensaver through the Trinity
-screensaver configuration.
-
-This screensaver downloads random pictures from the internet and creates
-a collage as screensaver.
-
-IMPORTANT NOTICE: The internet contains all kinds of pictures, some of which
-you might find inappropriate and offensive.
-You are specially discouraged to install this package if you are using 
-your computer in a working environment or in an environment with children.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdescreensaver-xsavers-webcollage
-%defattr(-,root,root,-)
-%{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
-
-%endif
-
-##########
-
-%package -n trinity-tdescreensaver-xsavers-extra
-Summary:	Trinity hooks for standard xscreensavers
-Group:		System/GUI/Other
-Requires:	trinity-tdescreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-kscreensaver-xsavers-extra < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kscreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdescreensaver-xsavers-extra
-This package allows a smooth integration of the universe xscreensavers
-into Trinity. With this package installed you can select and/or configure
-the universe xscreensavers through the Appearances and Themes section of
-the Trinity Control Centre.
-
-Note that this package does not actually contain any screensavers itself.
-For the additional screensavers shipped with TDE, see the separate package
-tdescreensaver.
-
-This package is part of Trinity, and a component of the TDE artwork module.
-
-%files -n trinity-tdescreensaver-xsavers-extra
-%defattr(-,root,root,-)
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
-%endif
-%if 0%{?rhel} == 5
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubbles.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/critical.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/flag.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/forest.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/glforestfire.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/hyperball.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypercube.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/juggle.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/laser.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/lightning.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/lisa.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/lissie.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/lmorph.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/mismunch.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/rotor.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/sphere.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/spiral.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/t3d.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/vines.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/whirlygig.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
-%endif
-
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/tdepartsaver.desktop
-
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop
-%exclude %{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop
-
-%{tde_datadir}/applnk/System/ScreenSavers/*.desktop
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# http://www.trinitydesktop.org/wiki/bin/view/Developers/HowToBuild
-# NOTE: Before building tdeartwork, install any and all xhack screensavers that might be uses, then:
-cd tdescreensaver/kxsconfig/
-./update_hacks.sh
-
-
-%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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
-  %{!?with_libart}:-DWITH_LIBART=OFF} \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_LIBART=ON \
-  -DWITH_OPENGL=ON \
-  -DWITH_XSCREENSAVER=ON \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf "%{buildroot}"
-%__make install -C build DESTDIR="%{buildroot}"
-
-# Should not be here if xscreensaver is disabled
-%if 0%{?with_xscreensaver} == 0
-%__rm -f "%{?buildroot}%{tde_bindir}/xscreensaver-getimage"
-%__rm -f "%{?buildroot}%{tde_bindir}/xscreensaver-getimage-file"
-%endif
-
-# Duplicate with trinity-kbabel (from tdesdk)
-%__rm -f "%{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png"
-%__rm -f "%{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png"
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-# Fix invalid permissions
-%if 0%{?with_xscreensaver}
-chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage"
-chmod +x "%{?buildroot}%{tde_bindir}/xscreensaver-getimage-file"
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el4 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el4
deleted file mode 100644
index 48e0276a6..000000000
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.el4
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required	pam_stack.so service=system-auth
-auth       required	pam_nologin.so
-auth       sufficient	pam_timestamp.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    required  pam_loginuid.so
-session    optional	pam_timestamp.so
-session    optional	pam_selinux.so
-session    optional	pam_console.so
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
-password   include	system-auth
-session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el4 b/redhat/main/tdebase/pamd.kdm-trinity-np.el4
deleted file mode 100644
index 687312da5..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.el4
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth       required	pam_env.so
-auth       required	pam_nologin.so
-auth       required	pam_permit.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    required  pam_loginuid.so
-session    optional  pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc33 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc33
deleted file mode 100644
index 0616e66f6..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc33
+++ /dev/null
@@ -1,16 +0,0 @@
- #%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_permit.so
-auth       include     postlogin
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_selinux.so close
-session    required    pam_loginuid.so
-session    optional    pam_console.so
--session    optional    pam_ck_connector.so
-session    required    pam_selinux.so open
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
-session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga5 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga5
deleted file mode 100644
index f884c1de6..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga5
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_permit.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga6 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga6
deleted file mode 100644
index f884c1de6..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga6
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_permit.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga7 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga7
deleted file mode 100644
index f884c1de6..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga7
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_permit.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el4 b/redhat/main/tdebase/pamd.kdm-trinity.el4
deleted file mode 100644
index 48e0276a6..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity.el4
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required	pam_stack.so service=system-auth
-auth       required	pam_nologin.so
-auth       sufficient	pam_timestamp.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    required  pam_loginuid.so
-session    optional	pam_timestamp.so
-session    optional	pam_selinux.so
-session    optional	pam_console.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc33 b/redhat/main/tdebase/pamd.kdm-trinity.fc33
deleted file mode 100644
index 4e760760f..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity.fc33
+++ /dev/null
@@ -1,23 +0,0 @@
-#%PAM-1.0
-auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
-auth       required    pam_env.so
-auth       substack    system-auth
--auth       optional    pam_gnome_keyring.so
--auth       optional    pam_kwallet.so
--auth       optional    pam_kwallet5.so
-auth       include     postlogin
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_selinux.so close
-session    required    pam_loginuid.so
-session    optional    pam_console.so
--session    optional    pam_ck_connector.so
-session    required    pam_selinux.so open
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
--session    optional    pam_gnome_keyring.so auto_start
--session    optional    pam_kwallet.so
--session    optional    pam_kwallet5.so
-session    include     postlogin
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga5 b/redhat/main/tdebase/pamd.kdm-trinity.mga5
deleted file mode 100644
index cb0982c9a..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity.mga5
+++ /dev/null
@@ -1,15 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_succeed_if.so 
-auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
-auth       substack    system-auth
--auth      optional    pam_kwallet.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
--session   optional    pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga6 b/redhat/main/tdebase/pamd.kdm-trinity.mga6
deleted file mode 100644
index cb0982c9a..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity.mga6
+++ /dev/null
@@ -1,15 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_succeed_if.so 
-auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
-auth       substack    system-auth
--auth      optional    pam_kwallet.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
--session   optional    pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga7 b/redhat/main/tdebase/pamd.kdm-trinity.mga7
deleted file mode 100644
index cb0982c9a..000000000
--- a/redhat/main/tdebase/pamd.kdm-trinity.mga7
+++ /dev/null
@@ -1,15 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_succeed_if.so 
-auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
-auth       substack    system-auth
--auth      optional    pam_kwallet.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
--session   optional    pam_kwallet.so
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el4 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el4
deleted file mode 100644
index 48e0276a6..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.el4
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required	pam_stack.so service=system-auth
-auth       required	pam_nologin.so
-auth       sufficient	pam_timestamp.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    required  pam_loginuid.so
-session    optional	pam_timestamp.so
-session    optional	pam_selinux.so
-session    optional	pam_console.so
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
-password   include	system-auth
-session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
-password   include	system-auth
-session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc32 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc32
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc32
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
-password   include	system-auth
-session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc33 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc33
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc33
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
-password   include	system-auth
-session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga5
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
-password   include	system-auth
-session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga6
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
-password   include	system-auth
-session    include	system-auth
diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7
deleted file mode 100644
index 0a37e6e13..000000000
--- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       include	system-auth
-account    include	system-auth
-password   include	system-auth
-session    include	system-auth
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
deleted file mode 100644
index 620e8833f..000000000
--- a/redhat/main/tdebase/tdebase.spec
+++ /dev/null
@@ -1,3769 +0,0 @@
-#
-# spec file for package tdebase (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdebase
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define tdm tdm
-%define tdm_datadir %{tde_datadir}/apps/%{tdm}
-%define starttde starttde
-
-
-Name:			trinity-%{tde_pkg}
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		Trinity Base Programs
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:		GPL-2.0+
-%else
-License:		GPLv2+
-%endif
-
-#Vendor:			Trinity Desktop
-#Packager:		Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-# Pam configuration files for RHEL / Fedora
-%if 0%{?suse_version} == 0
-Source2:		pamd.kdm-trinity%{?dist}
-Source3:		pamd.kdm-trinity-np%{?dist}
-Source4:		pamd.kcheckpass-trinity%{?dist}
-Source5:		pamd.kscreensaver-trinity%{?dist}
-%endif
-
-# openSUSE: configuration file for TDM
-%if 0%{?suse_version} >= 1210
-Source6:		suse-displaymanagers-tdm
-%endif
-
-# Fedora 18: use SYSTEMD for TDM startup
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
-Source7:		tdm.service%{?dist}
-%endif
-
-# openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
-%if 0%{?suse_version} == 1140
-Source7:		xdm%{?dist}
-%endif
-
-# Fedora >= 17: special selinux policy required for TDM
-#  If login through TDM takes ages, then look at '/var/log/audit/audit.log'.
-#  Locate the line containing 'USER_AVC' and dbus stuff.
-#  Put this line into a temporary file, then (e.g for Fedora 17):
-#   audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te
-#   audit2allow -i /tmp/file -M tdm.fc17
-
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
-%define with_selinux_policy 1
-Source8:	tdm%{?dist}.te
-%endif
-
-%if 0%{?mgaversion} >= 3
-Source9:	mgabutton.svg
-%endif
-
-Obsoletes:	trinity-kdebase < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdebase = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdebase-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdebase-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdebase-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdebase-extras = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdebase < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdebase = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# for set_permissions macro
-%if 0%{?suse_version}
-PreReq: permissions
-%endif
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-### Distribution-specific settings ###
-
-# Fedora 15 Theme: "Lovelock"
-%if 0%{?fedora} == 15
-Requires:	lovelock-backgrounds-single
-%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 16 Theme: "Verne"
-%if 0%{?fedora} == 16
-Requires:	verne-backgrounds-single
-%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 17 Theme: "Beefy Miracle"
-%if 0%{?fedora} == 17
-Requires:	beefy-miracle-backgrounds-single
-%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 18 Theme: "Spherical Cow"
-%if 0%{?fedora} == 18
-Requires:	spherical-cow-backgrounds-single
-%define tde_bg /usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 19 Theme: "Schroedinger's cat"
-%if 0%{?fedora} == 19
-Requires:	schroedinger-cat-backgrounds-base
-%define tde_bg /usr/share/backgrounds/schroedinger-cat/default/standard/schroedinger-cat.jpg
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 20 Theme: "Heisenbug"
-%if 0%{?fedora} == 20
-Requires:	heisenbug-backgrounds-base
-%define tde_bg /usr/share/backgrounds/heisenbug/default/standard/heisenbug.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 21 Theme
-%if 0%{?fedora} == 21
-Requires:	f21-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f21/default/standard/f21.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 22 Theme
-%if 0%{?fedora} == 22
-Requires:	f22-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f22/default/standard/f22.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 23 Theme
-%if 0%{?fedora} == 23
-Requires:	f23-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f23/default/standard/f23.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 24 Theme
-%if 0%{?fedora} == 24
-Requires:	f24-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f24/default/standard/f24.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 25 Theme
-%if 0%{?fedora} == 25
-Requires:	f25-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f25/default/standard/f25.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 26 Theme
-%if 0%{?fedora} == 26
-Requires:	f26-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f26/default/standard/f26.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 27 Theme
-%if 0%{?fedora} == 27
-Requires:	f27-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f27/default/standard/f27.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 28 Theme
-%if 0%{?fedora} == 28
-Requires:	f28-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f28/default/standard/f28.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 29 Theme
-%if 0%{?fedora} == 29
-Requires:	f29-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f29/default/standard/f29.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 30 Theme
-%if 0%{?fedora} == 30
-Requires:	f30-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f30/default/standard/f30.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 31 Theme
-%if 0%{?fedora} == 31
-Requires:	f31-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f31/default/standard/f31.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 32 Theme
-%if 0%{?fedora} == 32
-Requires:	f32-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f32/default/standard/f32.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 33 Theme
-%if 0%{?fedora} == 33
-Requires:	f33-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f33/default/standard/f33.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# Fedora 34 Theme
-%if 0%{?fedora} == 34
-Requires:	f34-backgrounds-base
-%define tde_bg /usr/share/backgrounds/f34/default/standard/f34.png
-Requires:	fedora-logos
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
-%endif
-
-# RHEL 4 Theme
-%if 0%{?rhel} == 4
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.png
-Requires:	redhat-logos
-%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm
-%endif
-
-# RHEL 5 Theme
-%if 0%{?rhel} == 5
-Requires:	desktop-backgrounds-basic
-%define tde_bg /usr/share/backgrounds/images/default.jpg
-%define tde_starticon /usr/share/pixmaps/redhat-starthere.png
-%endif
-
-# RHEL 6 Theme
-%if 0%{?rhel} == 6
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/default.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-%endif
-
-# RHEL 7 Theme
-%if 0%{?rhel} == 7
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/day.jpg
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-%endif
-
-# RHEL 8 Theme
-%if 0%{?rhel} == 8
-Requires:	redhat-logos
-%define tde_bg /usr/share/backgrounds/c8/default/normalish/c8.png
-%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
-%endif
-
-# Mageia 2 Theme
-%if 0%{?mgaversion} == 2
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg
-%endif
-
-# Mageia 3 Theme
-%if 0%{?mgaversion} == 3
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
-%endif
-
-# Mageia 4 Theme
-%if 0%{?mgaversion} == 4
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
-%endif
-
-# Mageia 5 Theme
-%if 0%{?mgaversion} == 5
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
-%endif
-
-# Mageia 6 Theme
-%if 0%{?mgaversion} == 6
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
-%endif
-
-# Mageia 7 Theme
-%if 0%{?mgaversion} == 7
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
-%endif
-
-# Mageia 8 Theme
-%if 0%{?mgaversion} == 8
-Requires:	mageia-theme-Default
-%define tde_bg /usr/share/mga/backgrounds/default.jpg
-%define tde_starticon %{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
-%endif
-
-# Mandriva 2011 Theme: "rosa"
-%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
-Requires:	mandriva-theme
-%define tde_bg /usr/share/mdk/backgrounds/default.jpg
-%define tde_starticon /usr/share/icons/mandriva.png
-%endif
-
-# PCLINUXOS
-%if 0%{?pclinuxos}
-Requires:	desktop-common-data
-%define tde_starticon /usr/share/icons/pclinuxos.png
-%endif
-
-# OpenSuse 11.4 Theme
-%if "%{?suse_version}" == "1140"
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 12.2 Theme
-%if "%{?suse_version}" == "1220"
-Requires:	wallpaper-branding = 12.2
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 12.3 Theme
-%if "%{?suse_version}" == "1230"
-Requires:	wallpaper-branding = 12.3
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 13.1 Theme
-%if "%{?suse_version}" == "1310"
-Requires:	wallpaper-branding = 13.1
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 13.2 Theme
-%if "%{?suse_version}" == "1320"
-Requires:	wallpaper-branding = 13.2
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 42.1 Theme
-%if "%{?sle_version}" == "120100"
-Requires:	wallpaper-branding = 42.1
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 42.2 Theme
-%if "%{?sle_version}" == "120200"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 42.3 Theme
-%if "%{?sle_version}" == "120300"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 15.0 Theme
-%if "%{?suse_version}" == "1500"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 15.1 Theme
-%if "%{?suse_version}" == "1510"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse 15.2 Theme
-%if "%{?suse_version}" == "1520"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-# OpenSuse TW Theme
-%if "%{?suse_version}" == "1550"
-Requires:	wallpaper-branding
-%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
-%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
-%endif
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	make
-BuildRequires:	fdupes
-
-# HTDIG support
-BuildRequires:	htdig
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# AUDIOFILE support
-BuildRequires:	audiofile-devel
-
-# ALSA supportl
-BuildRequires:	alsa-lib-devel
-
-# RAW1394 support
-BuildRequires:	libraw1394-devel
-
-# VORBIS support
-BuildRequires:	libvorbis-devel
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# SASL support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
-BuildRequires:	%{_lib}sasl2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	cyrus-sasl-devel
-%endif
-
-# PAM support
-BuildRequires:	pam-devel
-
-# LIBUSB support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
-BuildRequires:	%{_lib}usb1.0-devel
-BuildRequires:	%{_lib}usb-compat0.1-devel
-%else
-BuildRequires:	libusb-devel
-%endif
-
-# ESOUND support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_esound 1
-BuildRequires:	esound-devel
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENLDAP support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	openldap-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires:	openldap24-libs-devel
-%endif
-
-# SENSORS support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel}
-BuildRequires:	lm_sensors-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libsensors4-devel
-%endif
-
-# TSAK support (requires libudev-devel)
-#  On RHEL5, udev is built statically, so TSAK cannot build.
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%if 0%{?suse_version} >= 1310
-BuildRequires:	udev
-%endif
-BuildRequires:	libudev-devel
-%define with_tsak 1
-%define with_tdehwlib 1
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# XRANDR support
-#  On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_xrandr 1
-%endif
-
-# XTEST support
-#  On RHEL4, xtest library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xtest 1
-%endif
-
-# HAL support
-# Only for RHEL5
-%if 0%{?rhel} == 5
-%define with_hal 1
-BuildRequires:	hal-devel >= 0.5
-%endif
-
-# OPENEXR support
-#  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_exr 1
-BuildRequires:	OpenEXR-devel
-%endif
-
-# XSCREENSAVER support
-#  RHEL 4: disabled
-#  RHEL 5: available in centos-extras
-#  RHEL 6: available in EPEL
-#  RHEL 7: available in NUX
-#  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-BuildRequires:	xscreensaver-extras
-%if 0%{?fedora}
-BuildRequires:	xscreensaver-extras-base
-%endif
-BuildRequires:	xscreensaver-gl-base
-BuildRequires:	xscreensaver-gl-extras
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-data
-BuildRequires:	xscreensaver-data-extra
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-%if 0%{?pclinuxos} == 0
-BuildRequires:	xscreensaver-extrusion
-%endif
-BuildRequires:	xscreensaver-gl
-%endif
-%endif
-
-# AVAHI support
-#  Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	libavahi-tqt-devel
-%endif
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-
-# DBUS support
-#  TQT bindings not available for RHEL4
-%if 0%{?rhel} == 4
-# Dbus bindings were rebuilt with Qt support
-BuildRequires:	dbus-devel >= 0.22-12.EL.9p1
-Requires:		dbus-qt >= 0.22-12.EL.9p1
-%else
-BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
-BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
-Requires:		libdbus-tqt-1-0 >= %{tde_epoch}:0.63
-%endif
-
-%if 0%{?fedora} >= 17
-BuildRequires:	perl-Digest-MD5
-%endif
-
-# LIBART_LGPL support
-%define with_libart 1
-BuildRequires:	libart_lgpl-devel
-
-# SAMBA support
-%if 0%{?rhel} == 4
-BuildRequires:	samba-common
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-BuildRequires:	libsmbclient-devel
-%endif
-
-# IMAKE
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
-BuildRequires:	imake
-%endif
-
-# XKB support
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libxkbfile-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
-BuildRequires:	libxkbfile-devel
-%endif
-
-# XDMCP support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xdmcp-devel
-%else
-BuildRequires:	%{_lib}xdmcp%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXdmcp-devel
-%endif
-
-# XTST support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-%define xtst_devel %{_lib}xtst-devel
-%else
-%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-%define xtst_devel libXtst-devel
-%endif
-%{?xtst_devel:BuildRequires: %{xtst_devel}}
-
-# XDAMAGE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xdamage-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXdamage-devel
-%endif
-
-# Requires 'usb.ids'
-BuildRequires:	usbutils
-
-# LIBFONTENC support
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libfontenc-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
-BuildRequires:	libfontenc-devel
-%endif
-
-# Other X11 stuff ...
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	x11-font-util
-BuildRequires:	x11-proto-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	xorg-x11-proto-devel
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	xorg-x11-font-utils
-%endif
-
-%if 0%{?suse_version} >= 1220 || 0%{?fedora} >= 34
-BuildRequires:	font-util
-BuildRequires:	bdftopcf
-%endif
-
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	drakconf
-%endif
-
-# LIBCONFIG support
-# Needed for "compton" stuff
-%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
-%define with_libconfig 1
-BuildRequires:	libconfig-devel
-%endif
-
-# KBDLEDSYNC support
-%if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
-%define with_kbdledsync 1
-%endif
-
-# TDERANDR support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_tderandrtray 1
-%endif
-
-# ELFICON support
-%if 0
-%define with_elficon 1
-BuildRequires:		libr-devel >= 0.6.0
-%endif
-
-# RPC support
-%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8 || 0%{?pclinuxos}
-BuildRequires:		libtirpc-devel
-BuildRequires:		rpcgen
-%if 0%{?fedora}
-BuildRequires:		libnsl2-devel
-%else
-BuildRequires:		libnsl-devel
-%endif
-%endif
-
-# ATTR support
-BuildRequires:	libattr-devel
-
-# SELINUX support
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires:	checkpolicy
-BuildRequires:	selinux-policy-devel
-%endif
-
-# tdebase is a metapackage that installs all sub-packages
-Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-tdeio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kappfinder = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdepasswd = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdeprint = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-khelpcenter = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-klipper = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmenuedit = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-konqueror-nsplugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-konsole = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kpager = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kpersonalizer = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksmserver = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ktip = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-tdeio-smb-plugin = %{?epoch:%{epoch}:}%{version}-%{release}
- 
-Requires:	trinity-arts >= %{tde_epoch}:1.5.10
-Requires:	trinity-tdelibs >= %{tde_version}
-Requires:	openssl
-
-
-# RHEL 6 Configuration files are provided in separate packages
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	redhat-menus
-%endif
-
-%if 0%{?suse_version}
-Requires:	desktop-data-openSUSE
-%endif
-
-%description
-TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
-desktop environment for Unix workstations. It combines ease of use,
-contemporary functionality, and outstanding graphical design with the
-technological superiority of the Unix operating system.
-
-This metapackage includes the nucleus of TDE, namely the minimal package
-set necessary to run TDE as a desktop environment. This includes the
-window manager, taskbar, control center, a text editor, file manager,
-web browser, X terminal emulator, and many other programs and components.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS README README.pam
-%{tde_bindir}/tde_release_notes
-%{tde_datadir}/autostart/tde_release_notes.desktop
-%{tde_tdeappdir}/tdehtml_userinterface.desktop
-
-##########
-
-%package devel
-Summary:	%{summary} - Development files
-Group:		Development/Libraries/Other
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-
-Requires:	%{name}-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kate-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kcontrol-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kdesktop-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kicker-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-konqueror-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-ksplash-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-ksysguard-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkonq-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdm-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-twin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Provides:	trinity-kdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This is a meta-package that installs all tdebase development packages.
-
-Header files for developing applications using %{name}.
-Install tdebase-devel if you want to develop or compile Konqueror,
-Kate plugins or TWin styles.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_datadir}/cmake/*.cmake
-
-##########
-
-%package tdeio-pim-plugins
-Summary:	PIM TDEIOslaves from %{name}
-Group:		System/GUI/Other
-
-Provides:	trinity-kdebase-pim-ioslaves = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdebase-pim-ioslaves < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tdeio-pim-plugins
-Protocol handlers (TDEIOslaves) for personal information management, including:
- * tdeio_ldap
- * tdeio_nntp
- * tdeio_pop3
- * tdeio_smtp
-
-%files tdeio-pim-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdeio_ldap.la
-%{tde_tdelibdir}/tdeio_ldap.so
-%{tde_tdelibdir}/tdeio_nntp.la
-%{tde_tdelibdir}/tdeio_nntp.so
-%{tde_tdelibdir}/tdeio_pop3.la
-%{tde_tdelibdir}/tdeio_pop3.so
-%{tde_tdelibdir}/tdeio_smtp.la
-%{tde_tdelibdir}/tdeio_smtp.so
-%{tde_datadir}/services/ldap.protocol
-%{tde_datadir}/services/ldaps.protocol
-%{tde_datadir}/services/nntp.protocol
-%{tde_datadir}/services/nntps.protocol
-%{tde_datadir}/services/pop3.protocol
-%{tde_datadir}/services/pop3s.protocol
-%{tde_datadir}/services/smtp.protocol
-%{tde_datadir}/services/smtps.protocol
-
-##########
-
-%package runtime-data-common
-Summary:	Shared common files for Trinity and KDE4
-Group:		System/GUI/Other
-
-Provides:	tdebase-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdebase-runtime-data-common < %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description runtime-data-common
-Shared common files for both Trinity and KDE4
-Such as the desktop right-click-"Create New" list
-
-%files runtime-data-common
-%defattr(-,root,root,-)
-%{tde_datadir}/desktop-directories/
-%{tde_datadir}/icons/hicolor/*/apps/kxkb.png
-%{tde_datadir}/icons/hicolor/*/apps/knetattach.*
-%{tde_datadir}/icons/hicolor/*/apps/khotkeys.png
-%{tde_datadir}/icons/hicolor/*/apps/kmenuedit.png
-%{tde_datadir}/icons/hicolor/*/apps/ksplash.png
-%{tde_datadir}/locale/en_US/entry.desktop
-%{tde_datadir}/locale/l10n/*.desktop
-%{tde_datadir}/locale/l10n/*/entry.desktop
-%{tde_datadir}/locale/l10n/*/flag.png
-%{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/templates/
-
-##########
-
-%package -n trinity-kappfinder
-Summary:	Non-TDE application finder for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kappfinder
-kappfinder searches your workstation for many common applications and
-creates menu entries for them.
-
-%files -n trinity-kappfinder
-%defattr(-,root,root,-)
-%{tde_bindir}/kappfinder
-%{tde_tdeappdir}/kappfinder.desktop
-%{tde_datadir}/applnk/System/kappfinder.desktop
-%{tde_datadir}/apps/kappfinder
-%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png
-
-##########
-
-%package -n trinity-libkateinterfaces
-Summary:	Common libraries used by kwrite and kate
-Group:		System/GUI/Other
-
-%description -n trinity-libkateinterfaces
-This package contains the kateinterface library.
-
-%files -n trinity-libkateinterfaces
-%defattr(-,root,root,-)
-%{tde_libdir}/libkateinterfaces.so.*
-
-##########
-
-%package -n trinity-kate
-Summary:	Advanced text editor for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kate
-Kate is a multi document editor, based on a rewritten version of the kwrite
-editing widget of TDE.
-
-It is a multi-view editor that lets you view several instances of the same
-document with all instances being synced, or view more files at the same
-time for easy reference or simultaneous editing. The terminal emulation
-and sidebar are docked windows that can be plugged out of the main window,
-or replaced therein according to your preference.
-
-Some random features:
-* Editing of big files
-* Extensible syntax highlighting
-* Folding
-* Dynamic word wrap
-* Selectable encoding
-* Filter command
-* Global grep dialog
-
-%files -n trinity-kate
-%defattr(-,root,root,-)
-%{tde_bindir}/kate
-%{tde_tdelibdir}/kate.la
-%{tde_tdelibdir}/kate.so
-%{tde_libdir}/libkateutils.so.*
-%{tde_libdir}/libtdeinit_kate.la
-%{tde_libdir}/libtdeinit_kate.so
-%{tde_tdeappdir}/kate.desktop
-%{tde_datadir}/apps/kate/
-%{tde_datadir}/apps/tdeconf_update/kate-2.4.upd
-%config(noreplace) %{tde_confdir}/katerc
-%{tde_datadir}/icons/hicolor/*/apps/kate.png
-%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz
-%{tde_datadir}/servicetypes/kateplugin.desktop
-%{tde_tdedocdir}/HTML/en/kate/
-
-##########
-
-%package -n trinity-kate-devel
-Summary:	Development files for kate
-Group:		Development/Libraries/Other
-Requires:	trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kate-devel
-This package contains the development files fare Kate.
-
-%files -n trinity-kate-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kate/
-%{tde_libdir}/libkateutils.so
-%{tde_libdir}/libkateutils.la
-%{tde_libdir}/libkateinterfaces.so
-%{tde_libdir}/libkateinterfaces.la
-
-##########
-
-%package -n trinity-kwrite
-Summary:	Advanced text editor for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kwrite
-Kwrite is an advanced text editor for TDE.
-
-%files -n trinity-kwrite
-%defattr(-,root,root,-)
-%{tde_bindir}/kwrite
-%{tde_tdelibdir}/kwrite.la
-%{tde_tdelibdir}/kwrite.so
-%{tde_libdir}/libtdeinit_kwrite.la
-%{tde_libdir}/libtdeinit_kwrite.so
-%{tde_tdeappdir}/kwrite.desktop
-%{tde_datadir}/apps/kwrite/
-%{tde_datadir}/icons/hicolor/*/apps/kwrite.png
-%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz
-%{tde_tdedocdir}/HTML/en/kwrite/
-
-
-##########
-
-%package -n trinity-kcontrol
-Summary:	Control center for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# Requires 'usb.ids'
-Requires:		usbutils
-BuildRequires:	usbutils
-%if 0%{?suse_version} == 0
-BuildRequires:	hwdata
-Requires:		hwdata
-%endif
-
-%description -n trinity-kcontrol
-The Trinity Control Center provides you with a centralized and convenient
-way to configure all of your TDE settings.
-
-It is made up of multiple modules. Each module is a separate application,
-but the control center organizes all of these programs into a convenient
-location.
-
-In combination with udev KControl supports the advanced
-configuration of Logitech mice, though the user must be a member of the
-plugdev group.
-
-%files -n trinity-kcontrol
-%defattr(-,root,root,-)
-%{tde_bindir}/kaccess
-%{tde_bindir}/kcontrol
-%{tde_bindir}/kdeinstallktheme
-%{tde_bindir}/keditfiletype
-%{tde_bindir}/tdefontinst
-%{tde_bindir}/tdefontview
-%{tde_bindir}/klocaldomainurifilterhelper
-%{tde_bindir}/krdb
-%{tde_tdelibdir}/fontthumbnail.la
-%{tde_tdelibdir}/fontthumbnail.so
-%{tde_tdelibdir}/kaccess.la
-%{tde_tdelibdir}/kaccess.so
-%{tde_tdelibdir}/kcm_access.la
-%{tde_tdelibdir}/kcm_access.so
-%{tde_tdelibdir}/kcm_arts.la
-%{tde_tdelibdir}/kcm_arts.so
-%{tde_tdelibdir}/kcm_background.la
-%{tde_tdelibdir}/kcm_background.so
-%{tde_tdelibdir}/kcm_bell.la
-%{tde_tdelibdir}/kcm_bell.so
-%{tde_tdelibdir}/kcm_clock.la
-%{tde_tdelibdir}/kcm_clock.so
-%{tde_tdelibdir}/kcm_colors.la
-%{tde_tdelibdir}/kcm_colors.so
-%{tde_tdelibdir}/kcm_componentchooser.la
-%{tde_tdelibdir}/kcm_componentchooser.so
-%{tde_tdelibdir}/kcm_crypto.la
-%{tde_tdelibdir}/kcm_crypto.so
-%{tde_tdelibdir}/kcm_css.la
-%{tde_tdelibdir}/kcm_css.so
-%{tde_tdelibdir}/kcm_display.la
-%{tde_tdelibdir}/kcm_display.so
-%{tde_tdelibdir}/kcm_energy.la
-%{tde_tdelibdir}/kcm_energy.so
-%{tde_tdelibdir}/kcm_filetypes.la
-%{tde_tdelibdir}/kcm_filetypes.so
-%{tde_tdelibdir}/kcm_fontinst.la
-%{tde_tdelibdir}/kcm_fontinst.so
-%{tde_tdelibdir}/kcm_fonts.la
-%{tde_tdelibdir}/kcm_fonts.so
-%if 0%{?with_tdehwlib}
-%{tde_tdelibdir}/kcm_hwmanager.la
-%{tde_tdelibdir}/kcm_hwmanager.so
-%endif
-%{tde_tdelibdir}/kcm_icons.la
-%{tde_tdelibdir}/kcm_icons.so
-%{tde_tdelibdir}/kcm_info.la
-%{tde_tdelibdir}/kcm_info.so
-%{tde_tdelibdir}/kcm_input.la
-%{tde_tdelibdir}/kcm_input.so
-%{tde_tdelibdir}/kcm_joystick.la
-%{tde_tdelibdir}/kcm_joystick.so
-%{tde_tdelibdir}/kcm_kded.la
-%{tde_tdelibdir}/kcm_kded.so
-%{tde_tdelibdir}/kcm_%{tdm}.la
-%{tde_tdelibdir}/kcm_%{tdm}.so
-%{tde_tdelibdir}/kcm_tdednssd.so
-%{tde_tdelibdir}/kcm_tdednssd.la
-%{tde_tdelibdir}/kcm_keys.la
-%{tde_tdelibdir}/kcm_keys.so
-%{tde_tdelibdir}/kcm_kicker.la
-%{tde_tdelibdir}/kcm_kicker.so
-%{tde_tdelibdir}/kcm_tdeio.la
-%{tde_tdelibdir}/kcm_tdeio.so
-%{tde_tdelibdir}/kcm_knotify.la
-%{tde_tdelibdir}/kcm_knotify.so
-%{tde_tdelibdir}/kcm_konqhtml.la
-%{tde_tdelibdir}/kcm_konqhtml.so
-%{tde_tdelibdir}/kcm_konq.la
-%{tde_tdelibdir}/kcm_konq.so
-%{tde_tdelibdir}/kcm_kthememanager.la
-%{tde_tdelibdir}/kcm_kthememanager.so
-%{tde_tdelibdir}/kcm_kurifilt.la
-%{tde_tdelibdir}/kcm_kurifilt.so
-%{tde_tdelibdir}/kcm_launch.la
-%{tde_tdelibdir}/kcm_launch.so
-%{tde_tdelibdir}/kcm_locale.la
-%{tde_tdelibdir}/kcm_locale.so
-%{tde_tdelibdir}/kcm_nic.la
-%{tde_tdelibdir}/kcm_nic.so
-%{tde_tdelibdir}/kcm_performance.la
-%{tde_tdelibdir}/kcm_performance.so
-%{tde_tdelibdir}/kcm_privacy.la
-%{tde_tdelibdir}/kcm_privacy.so
-%{tde_tdelibdir}/kcm_screensaver.la
-%{tde_tdelibdir}/kcm_screensaver.so
-%{tde_tdelibdir}/kcm_smserver.la
-%{tde_tdelibdir}/kcm_smserver.so
-%{tde_tdelibdir}/kcm_spellchecking.la
-%{tde_tdelibdir}/kcm_spellchecking.so
-%{tde_tdelibdir}/kcm_style.la
-%{tde_tdelibdir}/kcm_style.so
-%{tde_tdelibdir}/kcm_taskbar.la
-%{tde_tdelibdir}/kcm_taskbar.so
-%{tde_tdelibdir}/kcm_usb.la
-%{tde_tdelibdir}/kcm_usb.so
-%{tde_tdelibdir}/kcm_view1394.la
-%{tde_tdelibdir}/kcm_view1394.so
-%{tde_tdelibdir}/kcm_xinerama.la
-%{tde_tdelibdir}/kcm_xinerama.so
-%{tde_tdelibdir}/kcontrol.la
-%{tde_tdelibdir}/kcontrol.so
-%{tde_tdelibdir}/tdefile_font.la
-%{tde_tdelibdir}/tdefile_font.so
-%{tde_tdelibdir}/tdeio_fonts.la
-%{tde_tdelibdir}/tdeio_fonts.so
-%{tde_tdelibdir}/tdestyle_keramik_config.la
-%{tde_tdelibdir}/tdestyle_keramik_config.so
-%{tde_tdelibdir}/libtdefontviewpart.la
-%{tde_tdelibdir}/libtdefontviewpart.so
-%{tde_tdelibdir}/libtdeshorturifilter.la
-%{tde_tdelibdir}/libtdeshorturifilter.so
-%{tde_tdelibdir}/libkuriikwsfilter.la
-%{tde_tdelibdir}/libkuriikwsfilter.so
-%{tde_tdelibdir}/libkurisearchfilter.la
-%{tde_tdelibdir}/libkurisearchfilter.so
-%{tde_tdelibdir}/liblocaldomainurifilter.la
-%{tde_tdelibdir}/liblocaldomainurifilter.so
-%{tde_libdir}/libtdeinit_kaccess.la
-%{tde_libdir}/libtdeinit_kaccess.so
-%{tde_libdir}/libtdeinit_kcontrol.la
-%{tde_libdir}/libtdeinit_kcontrol.so
-%{tde_libdir}/libtdefontinst.so.*
-%{tde_tdeappdir}/arts.desktop
-%{tde_tdeappdir}/background.desktop
-%{tde_tdeappdir}/bell.desktop
-%{tde_tdeappdir}/cache.desktop
-%{tde_tdeappdir}/cdinfo.desktop
-%{tde_tdeappdir}/clock.desktop
-%{tde_tdeappdir}/colors.desktop
-%{tde_tdeappdir}/componentchooser.desktop
-%{tde_tdeappdir}/cookies.desktop
-%{tde_tdeappdir}/crypto.desktop
-%{tde_tdeappdir}/desktopbehavior.desktop
-%{tde_tdeappdir}/desktop.desktop
-%{tde_tdeappdir}/desktoppath.desktop
-%{tde_tdeappdir}/devices.desktop
-%{tde_tdeappdir}/display.desktop
-%{tde_tdeappdir}/dma.desktop
-%{tde_tdeappdir}/ebrowsing.desktop
-%{tde_tdeappdir}/filebrowser.desktop
-%{tde_tdeappdir}/filetypes.desktop
-%{tde_tdeappdir}/fonts.desktop
-%if 0%{?with_tdehwlib}
-%{tde_tdeappdir}/hwmanager.desktop
-%endif
-%{tde_tdeappdir}/icons.desktop
-%{tde_tdeappdir}/installktheme.desktop
-%{tde_tdeappdir}/interrupts.desktop
-%{tde_tdeappdir}/ioports.desktop
-%{tde_tdeappdir}/joystick.desktop
-%{tde_tdeappdir}/kcm_tdednssd.desktop
-%{tde_tdeappdir}/kcmaccess.desktop
-%{tde_tdeappdir}/kcmcss.desktop
-%{tde_tdeappdir}/kcmfontinst.desktop
-%{tde_tdeappdir}/kcmkded.desktop
-%{tde_tdeappdir}/kcmlaunch.desktop
-%{tde_tdeappdir}/kcmnotify.desktop
-%{tde_tdeappdir}/kcmperformance.desktop
-%{tde_tdeappdir}/kcmsmserver.desktop
-%{tde_tdeappdir}/kcmtaskbar.desktop
-%{tde_tdeappdir}/kcmusb.desktop
-%{tde_tdeappdir}/kcmview1394.desktop
-%{tde_tdeappdir}/KControl.desktop
-%{tde_tdeappdir}/%{tdm}.desktop
-%{tde_tdeappdir}/keys.desktop
-%{tde_tdeappdir}/tdefontview.desktop
-%{tde_tdeappdir}/tdehtml_behavior.desktop
-%{tde_tdeappdir}/tdehtml_fonts.desktop
-%{tde_tdeappdir}/tdehtml_java_js.desktop
-%{tde_tdeappdir}/kthememanager.desktop
-%{tde_tdeappdir}/lanbrowser.desktop
-%{tde_tdeappdir}/language.desktop
-%{tde_tdeappdir}/media.desktop
-%{tde_tdeappdir}/memory.desktop
-%{tde_tdeappdir}/mouse.desktop
-%{tde_tdeappdir}/netpref.desktop
-%{tde_tdeappdir}/nic.desktop
-%{tde_tdeappdir}/opengl.desktop
-%{tde_tdeappdir}/panel_appearance.desktop
-%{tde_tdeappdir}/panel.desktop
-%{tde_tdeappdir}/partitions.desktop
-%{tde_tdeappdir}/pci.desktop
-%{tde_tdeappdir}/privacy.desktop
-%{tde_tdeappdir}/processor.desktop
-%{tde_tdeappdir}/proxy.desktop
-%{tde_tdeappdir}/screensaver.desktop
-%{tde_tdeappdir}/scsi.desktop
-%{tde_tdeappdir}/smbstatus.desktop
-%{tde_tdeappdir}/sound.desktop
-%{tde_tdeappdir}/spellchecking.desktop
-%{tde_tdeappdir}/style.desktop
-%{tde_tdeappdir}/tde-kcontrol.desktop
-%{tde_tdeappdir}/useragent.desktop
-%{tde_tdeappdir}/xserver.desktop
-%{tde_datadir}/applnk/.hidden/energy.desktop
-%{tde_datadir}/applnk/.hidden/fileappearance.desktop
-%{tde_datadir}/applnk/.hidden/filebehavior.desktop
-%{tde_datadir}/applnk/.hidden/filepreviews.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonqyperformance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_appearance.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config.desktop
-%{tde_datadir}/applnk/.hidden/smb.desktop
-%{tde_datadir}/applnk/.hidden/xinerama.desktop
-%{tde_datadir}/applnk/Settings/LookNFeel/
-%{tde_datadir}/applnk/Settings/WebBrowsing/tdehtml_appearance.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop
-%{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_filemanager.desktop
-%{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop
-%{tde_datadir}/apps/kcmview1394/
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/apps/usb.ids
-%{tde_datadir}/mimelnk/application/x-ktheme.desktop
-%{tde_datadir}/mimelnk/fonts/folder.desktop
-%{tde_datadir}/mimelnk/fonts/package.desktop
-%{tde_datadir}/mimelnk/fonts/system-folder.desktop
-%{tde_datadir}/services/fonts.protocol
-%{tde_datadir}/services/fontthumbnail.desktop
-%{tde_datadir}/services/kaccess.desktop
-%{tde_datadir}/services/tdefile_font.desktop
-%{tde_datadir}/services/tdefontviewpart.desktop
-%{tde_datadir}/services/tdeshorturifilter.desktop
-%{tde_datadir}/services/kuriikwsfilter.desktop
-%{tde_datadir}/services/kurisearchfilter.desktop
-%{tde_datadir}/services/localdomainurifilter.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kcmcolors.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmcomponentchooser.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmdesktop.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmdesktopbehavior.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmkdnssd.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmlaunch.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmmedia.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmmouse.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmnetpref.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmnic.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmperformance.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmprivacy.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmtaskbar.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmcgi.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmcrypto.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmhistory.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmjoystick.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmkded.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmsmserver.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
-%{tde_tdedocdir}/HTML/en/tdefontview/
-
-# tdehwtray
-%if "%{?tde_version}" == "14.1.0"
-%{tde_bindir}/tdehwdevicetray
-%{tde_tdeappdir}/tdehwdevicetray.desktop
-%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop
-%endif
-
-# The following features are not compiled under RHEL 5 and older
-%if 0%{?with_tderandrtray}
-%{tde_bindir}/tderandrtray
-%{tde_tdelibdir}/kcm_displayconfig.la
-%{tde_tdelibdir}/kcm_displayconfig.so
-%{tde_tdelibdir}/kcm_iccconfig.la
-%{tde_tdelibdir}/kcm_iccconfig.so
-%{tde_tdelibdir}/kcm_randr.la
-%{tde_tdelibdir}/kcm_randr.so
-%{tde_tdeappdir}/displayconfig.desktop
-%{tde_tdeappdir}/iccconfig.desktop
-%{tde_tdeappdir}/tderandrtray.desktop
-%{tde_datadir}/applnk/.hidden/randr.desktop
-%{tde_datadir}/autostart/tderandrtray-autostart.desktop
-%{tde_tdedocdir}/HTML/en/tderandrtray/
-%endif
-
-##########
-
-%package -n trinity-kcontrol-devel
-Summary:	Development files for kcontrol
-Group:		Development/Libraries/Other
-Requires:	trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kcontrol-devel
-%{summary}.
-
-%files -n trinity-kcontrol-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libtdefontinst.la
-%{tde_libdir}/libtdefontinst.so
-
-##########
-
-%package bin
-Summary:	Core binaries for the TDE base module
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	pam
-%if 0%{?rhel} >= 7
-Requires:	xorg-x11-server-Xorg
-Requires:	xorg-x11-drv-evdev
-Requires:	dejavu-sans-fonts
-%endif
-
-Provides:	tdebase-bin = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdebase-bin < %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description bin
-This package contains miscellaneous programs needed by other
-TDE applications, particularly those in the TDE base module.
-
-%files bin
-%defattr(-,root,root,-)
-%{tde_bindir}/krootbacking
-%if 0%{?with_tsak}
-%{tde_bindir}/tsak
-%endif
-%if 0%{?with_libconfig}
-%{tde_bindir}/compton-tde
-%endif
-%{tde_bindir}/tdedebugdialog
-%{tde_bindir}/kreadconfig
-%{tde_bindir}/kwriteconfig
-%{tde_bindir}/kstart
-%config(noreplace) %{tde_confdir}/kxkb_groups
-%{tde_bindir}/drkonqi
-%{tde_bindir}/crashtest
-%{tde_bindir}/kapplymousetheme
-%{tde_bindir}/kblankscrn.kss
-%{tde_bindir}/kcminit
-%{tde_bindir}/kcminit_startup
-%{tde_bindir}/kdcop
-%{tde_bindir}/tdesu
-%attr(0755,root,root) %{tde_bindir}/tdesud
-%{tde_bindir}/kdialog
-%{tde_bindir}/khotkeys
-%{tde_bindir}/knetattach
-%{tde_bindir}/krandom.kss
-%{tde_bindir}/ksystraycmd
-%{tde_bindir}/kxkb
-%dir %{tde_libdir}/tdeconf_update_bin
-%{tde_libdir}/tdeconf_update_bin/khotkeys_update
-%{tde_tdelibdir}/kcminit.la
-%{tde_tdelibdir}/kcminit.so
-%{tde_tdelibdir}/kcminit_startup.la
-%{tde_tdelibdir}/kcminit_startup.so
-%{tde_tdelibdir}/kcm_keyboard.la
-%{tde_tdelibdir}/kcm_keyboard.so
-%{tde_tdelibdir}/kcm_khotkeys_init.la
-%{tde_tdelibdir}/kcm_khotkeys_init.so
-%{tde_tdelibdir}/kcm_khotkeys.la
-%{tde_tdelibdir}/kcm_khotkeys.so
-%{tde_tdelibdir}/kded_khotkeys.la
-%{tde_tdelibdir}/kded_khotkeys.so
-%{tde_tdelibdir}/kgreet_classic.la
-%{tde_tdelibdir}/kgreet_classic.so
-%{tde_tdelibdir}/kgreet_winbind.la
-%{tde_tdelibdir}/kgreet_winbind.so
-%{tde_tdelibdir}/khotkeys.la
-%{tde_tdelibdir}/khotkeys.so
-%{tde_tdelibdir}/khotkeys_arts.la
-%{tde_tdelibdir}/khotkeys_arts.so
-%{tde_tdelibdir}/kxkb.la
-%{tde_tdelibdir}/kxkb.so
-%{tde_libdir}/libtdeinit_kcminit.la
-%{tde_libdir}/libtdeinit_kcminit.so
-%{tde_libdir}/libtdeinit_kcminit_startup.la
-%{tde_libdir}/libtdeinit_kcminit_startup.so
-%{tde_libdir}/libtdeinit_khotkeys.la
-%{tde_libdir}/libtdeinit_khotkeys.so
-%{tde_libdir}/libtdeinit_kxkb.la
-%{tde_libdir}/libtdeinit_kxkb.so
-%{tde_libdir}/libkhotkeys_shared.so.*
-%{tde_tdeappdir}/kdcop.desktop
-%{tde_tdeappdir}/keyboard.desktop
-%{tde_tdeappdir}/keyboard_layout.desktop
-%{tde_tdeappdir}/khotkeys.desktop
-%{tde_tdeappdir}/knetattach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/
-%{tde_datadir}/apps/drkonqi/
-%{tde_datadir}/apps/tdeconf_update/khotkeys_32b1_update.upd
-%{tde_datadir}/apps/tdeconf_update/khotkeys_printscreen.upd
-%{tde_datadir}/apps/tdeconf_update/konqueror_gestures_trinity21_update.upd
-%{tde_datadir}/apps/kdcop/
-%{tde_datadir}/apps/khotkeys/
-%{tde_datadir}/services/kxkb.desktop
-%if 0%{?suse_version} == 0
-%config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity
-%config(noreplace) %{_sysconfdir}/pam.d/tdescreensaver-trinity
-%endif
-%{tde_tdedocdir}/HTML/en/kdcop/
-%{tde_tdedocdir}/HTML/en/tdedebugdialog//
-%{tde_tdedocdir}/HTML/en/tdesu/
-%{tde_tdedocdir}/HTML/en/knetattach/
-%{tde_tdedocdir}/HTML/en/kxkb/
-
-# SETUID binaries
-# Some setuid binaries need special care
-%if 0%{?suse_version}
-%{?with_tsak:%verify(not mode) %{tde_bindir}/%{tdm}tsak}
-%verify(not mode) %{tde_bindir}/kcheckpass
-%{?with_kbdledsync:%verify(not mode) %{tde_bindir}/tdekbdledsync}
-%else
-%{?with_tsak:%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak}
-%attr(4755,root,root) %{tde_bindir}/kcheckpass
-%{?with_kbdledsync:%attr(4755,root,root) %{tde_bindir}/tdekbdledsync}
-%endif
-
-# SUSE's runupdater utility
-%if 0
-%{tde_bindir}/runupdater
-%{tde_libdir}/libtdeinit_runupdater.la
-%{tde_libdir}/libtdeinit_runupdater.so
-%{tde_tdelibdir}/runupdater.la
-%{tde_tdelibdir}/runupdater.so
-%{tde_datadir}/apps/autostart/runupdater.desktop
-%endif
-
-%post bin
-# Sets permissions on setuid files (openSUSE specific)
-%if 0%{?suse_version}
-%{?with_tsak:%set_permissions %{tde_bindir}/%{tdm}tsak}
-%set_permissions %{tde_bindir}/kcheckpass
-%{?with_kbdledsync:%set_permissions %{tde_bindir}/tdekbdledsync}
-%endif
-
-##########
-
-%package bin-devel
-Summary:	Development files for core binaries for the TDE base module
-Group:		Development/Libraries/Other
-Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?xtst_devel:Requires: %{xtst_devel}}
-
-Obsoletes:	tdebase-bin-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdebase-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description bin-devel
-This package contains the development files for core binaries for 
-the TDE base module
-
-%files bin-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkhotkeys_shared.la
-%{tde_libdir}/libkhotkeys_shared.so
-
-##########
-
-%package data
-Summary:	Shared data files for the TDE base module
-Group:		System/GUI/Other
-Requires:	%{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	tdebase-data < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdebase-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description data
-This package contains the architecture-independent shared data files
-needed for a basic TDE desktop installation.
-
-%files data
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/tdeshorturifilterrc
-%{tde_datadir}/applnk/.hidden/battery.desktop
-%{tde_datadir}/applnk/.hidden/bwarning.desktop
-%{tde_datadir}/applnk/.hidden/cwarning.desktop
-%{tde_datadir}/applnk/.hidden/.directory
-%{tde_datadir}/applnk/.hidden/email.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonq.desktop
-%{tde_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop
-%{tde_datadir}/applnk/.hidden/konqhtml.desktop
-%{tde_datadir}/applnk/.hidden/passwords.desktop
-%{tde_datadir}/applnk/.hidden/power.desktop
-%{tde_datadir}/applnk/.hidden/socks.desktop
-%{tde_datadir}/applnk/.hidden/userinfo.desktop
-%{tde_datadir}/applnk/.hidden/virtualdesktops.desktop
-%{tde_datadir}/apps/kaccess/
-%{tde_datadir}/apps/kcmcss/
-%{tde_datadir}/apps/kcminput/
-%{tde_datadir}/apps/kcmkeys/
-%{tde_datadir}/apps/kcmlocale/
-%{tde_datadir}/apps/tdeconf_update/convertShortcuts.pl
-%{tde_datadir}/apps/tdeconf_update/tdeaccel.upd
-%{tde_datadir}/apps/tdeconf_update/kcmdisplayrc.upd
-%{tde_datadir}/apps/tdeconf_update/kuriikwsfilter.upd
-%{tde_datadir}/apps/tdeconf_update/mouse_cursor_theme.upd
-%{tde_datadir}/apps/tdeconf_update/socks.upd
-%{tde_datadir}/apps/kcontrol/
-%{tde_datadir}/apps/tdedisplay/
-%{tde_datadir}/apps/tdefontview/
-%{tde_datadir}/apps/kthememanager/
-%{tde_datadir}/icons/crystalsvg/*/apps/access.png
-%{tde_datadir}/icons/crystalsvg/*/apps/acroread.png
-%{tde_datadir}/icons/crystalsvg/*/apps/applixware.png
-%{tde_datadir}/icons/crystalsvg/*/apps/arts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/background.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bell.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cache.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clanbomber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/clock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/colors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/date.png
-%{tde_datadir}/icons/crystalsvg/*/apps/email.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/energy_star.png
-%{tde_datadir}/icons/crystalsvg/*/apps/filetypes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fonts.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gimp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/help_index.png
-%{tde_datadir}/icons/crystalsvg/*/apps/hwinfo.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdevices.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkwm.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmemory.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/%{tdm}config.png
-%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
-%{tde_datadir}/icons/crystalsvg/*/apps/tdescreensaver.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kthememgr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/licq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png
-%{tde_datadir}/icons/crystalsvg/*/apps/locale.png
-%{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop.png
-%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png
-%{tde_datadir}/icons/crystalsvg/*/categories/applications-development.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png
-%{tde_datadir}/icons/crystalsvg/*/categories/applications-games.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_kids.png
-%{tde_datadir}/icons/crystalsvg/*/categories/applications-multimedia.png
-%{tde_datadir}/icons/crystalsvg/*/categories/applications-internet.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png
-%{tde_datadir}/icons/crystalsvg/*/categories/applications-utilities.png
-%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png
-%{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-personal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_logic.png
-%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/randr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/samba.png
-%{tde_datadir}/icons/crystalsvg/*/apps/staroffice.png
-%{tde_datadir}/icons/crystalsvg/*/apps/stylesheet.png
-%{tde_datadir}/icons/crystalsvg/*/apps/terminal.png
-%{tde_datadir}/icons/crystalsvg/*/apps/tux.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfmail.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmag.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xpaint.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/access.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aim.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/arts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/background.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/bell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/browser.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/cache.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/camera.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/clock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/colors.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/core.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/date.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/display.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/email.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/energy.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/error.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/locale.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_games_kids.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/samba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/shell.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/tux.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/wine.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/x.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.png
-%{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/newfont.png
-%{tde_datadir}/icons/crystalsvg/*/apps/abiword.png
-%{tde_datadir}/icons/crystalsvg/*/apps/agent.png
-%{tde_datadir}/icons/crystalsvg/*/apps/alevt.png
-%{tde_datadir}/icons/crystalsvg/*/apps/assistant.png
-%{tde_datadir}/icons/crystalsvg/*/apps/blender.png
-%{tde_datadir}/icons/crystalsvg/*/apps/bluefish.png
-%{tde_datadir}/icons/crystalsvg/*/apps/cookie.png
-%{tde_datadir}/icons/crystalsvg/*/apps/designer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dia.png
-%{tde_datadir}/icons/crystalsvg/*/apps/dlgedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/eclipse.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png
-%{tde_datadir}/icons/crystalsvg/*/categories/applications-science.png
-%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png
-%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png
-%{tde_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gabber.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gaim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnome_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnucash.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gnumeric.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gvim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/icons.png
-%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png
-%{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-peripherals.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png
-%{tde_datadir}/icons/crystalsvg/*/categories/preferences-system.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png
-%{tde_datadir}/icons/crystalsvg/*/apps/knotify.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kvirc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/linguist.png
-%{tde_datadir}/icons/crystalsvg/*/apps/lyx.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mac.png
-%{tde_datadir}/icons/crystalsvg/*/apps/mathematica.png
-%{tde_datadir}/icons/crystalsvg/*/apps/nedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/opera.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_application.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_editors.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_edutainment.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png
-%{tde_datadir}/icons/crystalsvg/*/categories/applications-graphics.png
-%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png
-%{tde_datadir}/icons/crystalsvg/*/categories/applications-office.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png
-%{tde_datadir}/icons/crystalsvg/*/apps/plan.png
-%{tde_datadir}/icons/crystalsvg/*/apps/planner.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pybliographic.png
-%{tde_datadir}/icons/crystalsvg/*/apps/realplayer.png
-%{tde_datadir}/icons/crystalsvg/*/apps/remote.png
-%{tde_datadir}/icons/crystalsvg/*/apps/scribus.png
-%{tde_datadir}/icons/crystalsvg/*/apps/sodipodi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/style.png
-%{tde_datadir}/icons/crystalsvg/*/apps/usb.png
-%{tde_datadir}/icons/crystalsvg/*/apps/vnc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wabi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wine.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xcalc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xchat.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xclipboard.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xconsole.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xedit.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xemacs.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xeyes.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xfig.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xload.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xmms.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xosview.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/galeon.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pinguin.png
-%{tde_datadir}/icons/crystalsvg/*/apps/x.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xapp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/xawtv.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kcmopengl.png
-%{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png
-%{tde_datadir}/icons/crystalsvg/*/apps/qtella.png
-%{tde_datadir}/services/searchproviders
-%{tde_datadir}/services/useragentstrings/
-%{tde_datadir}/servicetypes/searchprovider.desktop
-%{tde_datadir}/servicetypes/uasprovider.desktop
-%exclude %{tde_datadir}/sounds/pop.wav
-%{tde_datadir}/sounds/
-%{tde_datadir}/wallpapers/*
-
-# XDG directories information
-%dir %{_sysconfdir}/xdg/menus/applications-merged
-%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu
-%config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu
-
-%{tde_tdedocdir}/HTML/en/kcontrol/
-%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-
-%post data
-%if "%{distribution}" == "Mandriva Linux"
-# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...)
-# First, we read the "product" key in /etc/product.id
-eval $(tr "," ";" </etc/product.id) 2>/dev/null
-# Then, we create a symbolic link to the corresponding background
-if [ -r "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" ]; then
-  ln -sf "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
-fi
-%endif
-
-%if "%{distribution}" == "Mageia"
-if [ ! -r "%{tde_bg}" ] && [ -r "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" ]; then
-  ln -sf "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" "%{tde_bg}"
-fi
-%endif
-
-##########
-
-%package tdeio-plugins
-Summary:	Core I/O slaves for TDE
-Group:		System/GUI/Other
-Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	cyrus-sasl
-Requires:	psmisc
-%if 0%{?with_hal}
-Requires:	hal >= 0.5
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:	cryptsetup
-%else
-Requires:	cryptsetup-luks
-%endif
-
-Obsoletes:	tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tdeio-plugins
-This package includes the base tdeioslaves. They include, amongst many
-others, file, http, and ftp.
-
-It also includes the media tdeioslave, which handles removable devices,
-and which works best with udev, udisks and pmount. Media
-also extends the functionality of many other tdeioslaves. To use this
-service, please make sure that your user is a member of the plugdev
-group.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_bindir}/tdeio_media_mounthelper
-%{tde_bindir}/ktrash
-%{tde_tdelibdir}/cursorthumbnail.la
-%{tde_tdelibdir}/cursorthumbnail.so
-%{tde_tdelibdir}/djvuthumbnail.la
-%{tde_tdelibdir}/djvuthumbnail.so
-%{tde_tdelibdir}/htmlthumbnail.la
-%{tde_tdelibdir}/htmlthumbnail.so
-%{tde_tdelibdir}/imagethumbnail.la
-%{tde_tdelibdir}/imagethumbnail.so
-%{tde_tdelibdir}/kcm_cgi.la
-%{tde_tdelibdir}/kcm_cgi.so
-%{tde_tdelibdir}/kcm_media.la
-%{tde_tdelibdir}/kcm_media.so
-%{tde_tdelibdir}/kded_homedirnotify.la
-%{tde_tdelibdir}/kded_homedirnotify.so
-%{tde_tdelibdir}/kded_mediamanager.la
-%{tde_tdelibdir}/kded_mediamanager.so
-%{tde_tdelibdir}/kded_medianotifier.la
-%{tde_tdelibdir}/kded_medianotifier.so
-%{tde_tdelibdir}/kded_remotedirnotify.la
-%{tde_tdelibdir}/kded_remotedirnotify.so
-%{tde_tdelibdir}/kded_systemdirnotify.la
-%{tde_tdelibdir}/kded_systemdirnotify.so
-%{tde_tdelibdir}/tdefile_media.la
-%{tde_tdelibdir}/tdefile_media.so
-%{tde_tdelibdir}/tdefile_trash.la
-%{tde_tdelibdir}/tdefile_trash.so
-%{tde_tdelibdir}/tdeio_about.la
-%{tde_tdelibdir}/tdeio_about.so
-%{tde_tdelibdir}/tdeio_cgi.la
-%{tde_tdelibdir}/tdeio_cgi.so
-%{tde_tdelibdir}/tdeio_filter.la
-%{tde_tdelibdir}/tdeio_filter.so
-%{tde_tdelibdir}/tdeio_finger.la
-%{tde_tdelibdir}/tdeio_finger.so
-%{tde_tdelibdir}/tdeio_fish.la
-%{tde_tdelibdir}/tdeio_fish.so
-%{tde_tdelibdir}/tdeio_floppy.la
-%{tde_tdelibdir}/tdeio_floppy.so
-%{tde_tdelibdir}/tdeio_home.la
-%{tde_tdelibdir}/tdeio_home.so
-%{tde_tdelibdir}/tdeio_info.la
-%{tde_tdelibdir}/tdeio_info.so
-%{tde_tdelibdir}/tdeio_mac.la
-%{tde_tdelibdir}/tdeio_mac.so
-%{tde_tdelibdir}/tdeio_man.la
-%{tde_tdelibdir}/tdeio_man.so
-%{tde_tdelibdir}/tdeio_media.la
-%{tde_tdelibdir}/tdeio_media.so
-%{tde_tdelibdir}/tdeio_nfs.la
-%{tde_tdelibdir}/tdeio_nfs.so
-%{tde_tdelibdir}/tdeio_remote.la
-%{tde_tdelibdir}/tdeio_remote.so
-%{tde_tdelibdir}/tdeio_settings.la
-%{tde_tdelibdir}/tdeio_settings.so
-%{tde_tdelibdir}/tdeio_sftp.la
-%{tde_tdelibdir}/tdeio_sftp.so
-%{tde_tdelibdir}/tdeio_system.la
-%{tde_tdelibdir}/tdeio_system.so
-%{tde_tdelibdir}/tdeio_tar.la
-%{tde_tdelibdir}/tdeio_tar.so
-%{tde_tdelibdir}/tdeio_thumbnail.la
-%{tde_tdelibdir}/tdeio_thumbnail.so
-%{tde_tdelibdir}/tdeio_trash.la
-%{tde_tdelibdir}/tdeio_trash.so
-%{tde_tdelibdir}/libkmanpart.la
-%{tde_tdelibdir}/libkmanpart.so
-%{tde_tdelibdir}/textthumbnail.la
-%{tde_tdelibdir}/textthumbnail.so
-%{tde_tdeappdir}/kcmcgi.desktop
-%{tde_datadir}/apps/tdeio_finger/
-%{tde_datadir}/apps/tdeio_info/
-%{tde_datadir}/apps/tdeio_man/
-%{tde_datadir}/apps/systemview/
-%{tde_datadir}/autostart/mediabackend.desktop
-%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg
-%{tde_datadir}/mimelnk/application/x-smb-server.desktop
-%{tde_datadir}/mimelnk/inode/system_directory.desktop
-%{tde_datadir}/mimelnk/media/*.desktop
-%{tde_datadir}/services/about.protocol
-%{tde_datadir}/services/applications.protocol
-%{tde_datadir}/services/ar.protocol
-%{tde_datadir}/services/bzip.protocol
-%{tde_datadir}/services/bzip2.protocol
-%{tde_datadir}/services/cgi.protocol
-%{tde_datadir}/services/cursorthumbnail.desktop
-%{tde_datadir}/services/djvuthumbnail.desktop
-%{tde_datadir}/services/finger.protocol
-%{tde_datadir}/services/fish.protocol
-%{tde_datadir}/services/floppy.protocol
-%{tde_datadir}/services/gzip.protocol
-%{tde_datadir}/services/home.protocol
-%{tde_datadir}/services/htmlthumbnail.desktop
-%{tde_datadir}/services/imagethumbnail.desktop
-%{tde_datadir}/services/info.protocol
-%{tde_datadir}/services/kded/homedirnotify.desktop
-%{tde_datadir}/services/kded/mediamanager.desktop
-%{tde_datadir}/services/kded/medianotifier.desktop
-%{tde_datadir}/services/kded/remotedirnotify.desktop
-%{tde_datadir}/services/kded/systemdirnotify.desktop
-%{tde_datadir}/services/tdefile_media.desktop
-%{tde_datadir}/services/tdefile_trash_system.desktop
-%{tde_datadir}/services/lzma.protocol
-%{tde_datadir}/services/kmanpart.desktop
-%{tde_datadir}/services/mac.protocol
-%{tde_datadir}/services/man.protocol
-%{tde_datadir}/services/media.protocol
-%{tde_datadir}/services/nfs.protocol
-%{tde_datadir}/services/nxfish.protocol
-%{tde_datadir}/services/programs.protocol
-%{tde_datadir}/services/remote.protocol
-%{tde_datadir}/services/settings.protocol
-%{tde_datadir}/services/sftp.protocol
-%{tde_datadir}/services/system.protocol
-%{tde_datadir}/services/tar.protocol
-%{tde_datadir}/services/textthumbnail.desktop
-%{tde_datadir}/services/thumbnail.protocol
-%{tde_datadir}/services/trash.protocol
-%{tde_datadir}/services/xz.protocol
-%{tde_datadir}/services/zip.protocol
-%{tde_datadir}/servicetypes/thumbcreator.desktop
-%{tde_datadir}/services/tdefile_trash.desktop
-%{tde_tdedocdir}/HTML/en/tdeioslave/
-
-%if 0%{?with_exr}
-%{tde_tdelibdir}/exrthumbnail.la
-%{tde_tdelibdir}/exrthumbnail.so
-%{tde_datadir}/services/exrthumbnail.desktop
-%endif
-
-# HWManager
-%{tde_tdelibdir}/media_propsdlgplugin.la
-%{tde_tdelibdir}/media_propsdlgplugin.so
-%{tde_datadir}/services/media_propsdlgplugin.desktop
-
-%if "%{tde_version}" == "14.1.0"
-%{tde_tdelibdir}/ktrashpropsdlgplugin.la
-%{tde_tdelibdir}/ktrashpropsdlgplugin.so
-%{tde_datadir}/services/ktrashpropsdlgplugin.desktop
-%endif
-
-##########
-
-%package -n trinity-tdepasswd
-Summary:	Password changer for TDE
-Group:		System/GUI/Other
-
-Obsoletes:	trinity-kdepasswd < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdepasswd = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdepasswd
-This is a simple application which allows users to change their
-system passwords.
-
-%files -n trinity-tdepasswd
-%defattr(-,root,root,-)
-%{tde_bindir}/tdepasswd
-%{tde_tdelibdir}/kcm_useraccount.la
-%{tde_tdelibdir}/kcm_useraccount.so
-%{tde_tdeappdir}/kcm_useraccount.desktop
-%{tde_tdeappdir}/tdepasswd.desktop
-%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
-%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
-%{tde_tdedocdir}/HTML/en/tdepasswd/
-%{_datadir}/faces/Apple.png
-%{_datadir}/faces/BeachBall.png
-%{_datadir}/faces/Blowfish.png
-%{_datadir}/faces/Bug.png
-%{_datadir}/faces/Butterfly.png
-%{_datadir}/faces/Car.png
-%{_datadir}/faces/Cow.png 
-%{_datadir}/faces/Daemon.png
-%{_datadir}/faces/Dog.png
-%{_datadir}/faces/Elephant.png
-%{_datadir}/faces/Flower.png
-%{_datadir}/faces/Frog.png
-%{_datadir}/faces/Ghost.png
-%{_datadir}/faces/Guitar.png
-%{_datadir}/faces/Heart.png
-%{_datadir}/faces/Konqui.png
-%{_datadir}/faces/Lion.png
-%{_datadir}/faces/Monkey.png
-%{_datadir}/faces/Penguin.png
-%{_datadir}/faces/Pig.png
-%{_datadir}/faces/Rabbit.png
-%{_datadir}/faces/Ring.png
-%{_datadir}/faces/Scream.png
-%{_datadir}/faces/Shark.png
-%{_datadir}/faces/Splash.png
-%{_datadir}/faces/Star.png
-%{_datadir}/faces/Teddybear.png
-%{_datadir}/faces/Turtle.png
-
-##########
-
-%package -n trinity-tdeprint
-Summary:	Print system for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	psutils
-
-%description -n trinity-tdeprint
-This package contains the TDE printing subsystem. It can use CUPS,
-lpd-ng or the traditional lpd. It also includes support for fax and
-pdf printing.
-
-Installation of smbclient will make you able to use smb shared printers.
-
-%files -n trinity-tdeprint
-%defattr(-,root,root,-)
-%{tde_bindir}/tdeprintfax
-%{tde_bindir}/kjobviewer
-%{tde_bindir}/kprinter
-%{tde_tdelibdir}/kcm_printmgr.la
-%{tde_tdelibdir}/kcm_printmgr.so
-%{tde_tdelibdir}/tdeio_print.la
-%{tde_tdelibdir}/tdeio_print.so
-%{tde_tdelibdir}/kjobviewer.la
-%{tde_tdelibdir}/kjobviewer.so
-%{tde_tdelibdir}/kprinter.la
-%{tde_tdelibdir}/kprinter.so
-%{tde_tdelibdir}/libtdeprint_part.la
-%{tde_tdelibdir}/libtdeprint_part.so
-%{tde_libdir}/libtdeinit_kjobviewer.la
-%{tde_libdir}/libtdeinit_kjobviewer.so
-%{tde_libdir}/libtdeinit_kprinter.la
-%{tde_libdir}/libtdeinit_kprinter.so
-%{tde_tdeappdir}/tdeprintfax.desktop
-%{tde_tdeappdir}/kjobviewer.desktop
-%{tde_tdeappdir}/printers.desktop
-%{tde_datadir}/apps/tdeprint/
-%{tde_datadir}/apps/tdeprintfax/
-%{tde_datadir}/apps/kjobviewer/
-%{tde_datadir}/apps/tdeprint_part/
-%{tde_datadir}/autostart/kjobviewer-autostart.desktop
-%{tde_datadir}/icons/hicolor/*/apps/tdeprintfax.png
-%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
-%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
-%{tde_datadir}/icons/hicolor/scalable/apps/tdeprintfax.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/kjobviewer.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/printmgr.svgz
-%{tde_datadir}/mimelnk/print/class.desktop
-%{tde_datadir}/mimelnk/print/driver.desktop
-%{tde_datadir}/mimelnk/print/folder.desktop
-%{tde_datadir}/mimelnk/print/jobs.desktop
-%{tde_datadir}/mimelnk/print/manager.desktop
-%{tde_datadir}/mimelnk/print/printer.desktop
-%{tde_datadir}/mimelnk/print/printermodel.desktop
-%{tde_datadir}/services/tdeprint_part.desktop
-%{tde_datadir}/services/print.protocol
-%{tde_datadir}/services/printdb.protocol
-%{tde_tdedocdir}/HTML/en/tdeprint/
-%{tde_tdedocdir}/HTML/en/tdeprintfax/
-%{tde_tdedocdir}/HTML/en/kjobviewer/
-
-##########
-
-%package -n trinity-kdesktop
-Summary:	Miscellaneous binaries and files for the TDE desktop
-Group:		System/GUI/Other
-Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	eject
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	xdg-utils
-%endif
-
-%description -n trinity-kdesktop
-This package contains miscellaneous binaries and files integral to
-the TDE desktop.
-
-%files -n trinity-kdesktop
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/kdesktop_custom_menu1
-%config(noreplace) %{tde_confdir}/kdesktop_custom_menu2
-%{tde_bindir}/kcheckrunning
-%{tde_bindir}/tdeeject
-%{tde_bindir}/kdesktop
-%{tde_bindir}/kdesktop_lock
-%{tde_bindir}/kwebdesktop
-%{tde_tdelibdir}/kdesktop.la
-%{tde_tdelibdir}/kdesktop.so
-%{tde_libdir}/libtdeinit_kdesktop.la
-%{tde_libdir}/libtdeinit_kdesktop.so
-%{tde_datadir}/apps/kdesktop/
-%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%{tde_datadir}/autostart/kdesktop.desktop
-%{tde_datadir}/config.kcfg/kdesktop.kcfg
-%{tde_datadir}/config.kcfg/tdelaunch.kcfg
-%{tde_datadir}/config.kcfg/kwebdesktop.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/error.png
-
-##########
-
-%package -n trinity-kdesktop-devel
-Summary:	Development files for kdesktop
-Group:		Development/Libraries/Other
-Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kdesktop-devel
-This package contains the development files for kdesktop.
-
-%files -n trinity-kdesktop-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/KBackgroundIface.h
-%{tde_tdeincludedir}/KDesktopIface.h
-%{tde_tdeincludedir}/KScreensaverIface.h
-
-##########
-
-%package -n trinity-tdm
-Summary:	X Display manager for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	pam
-Requires:	logrotate
-
-# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
-Requires:	xinitrc
-%endif
-%if 0%{?suse_version} == 1140
-Requires:	xorg-x11
-%endif
-%if 0%{?suse_version} >= 1220
-Requires:	xdm
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-Requires:	xorg-x11-xinit
-%endif
-
-# Required for Fedora LiveCD
-%if 0%{?rhel} || 0%{?fedora}
-Provides:	service(graphical-login)
-%endif
-# Required for Mandriva's installer
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	dm
-Provides:	%{tdm}
-%endif
-
-%description -n trinity-tdm
-TDM manages a collection of X servers, which may be on the local host or
-remote machines. It provides services similar to those provided by init,
-getty, and login on character-based terminals: prompting for login name and
-password, authenticating the user, and running a session. tdm supports XDMCP
-(X Display Manager Control Protocol) and can also be used to run a chooser
-process which presents the user with a menu of possible hosts that offer
-XDMCP display management.
-
-A collection of icons to associate with individual users is included with
-TDE, but as part of the tdepasswd package.
-
-The menu package will help to provide TDM with a list of window managers
-that can be launched, if the window manager does not register with TDM
-already. Most users won't need this.
-
-%files -n trinity-tdm
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kgreet_pam.la
-%{tde_tdelibdir}/kgreet_pam.so
-%{tde_bindir}/gen%{tdm}conf
-%{tde_bindir}/%{tdm}
-%{tde_bindir}/%{tdm}_config
-%{tde_bindir}/%{tdm}ctl
-%{tde_bindir}/%{tdm}_greet
-%{tde_bindir}/krootimage
-%dir %{tdm_datadir}
-%dir %{tdm_datadir}/pics
-%{tdm_datadir}/pics/tdelogo.png
-%{tdm_datadir}/pics/shutdown.jpg
-%{tdm_datadir}/pics/users
-%dir %{tdm_datadir}/sessions
-%{tdm_datadir}/sessions/*.desktop
-%{tdm_datadir}/themes/
-%config(noreplace) %{tde_confdir}/%{tdm}
-%if 0%{?with_selinux_policy}
-%exclude %{tde_confdir}/%{tdm}/tdm.pp
-%endif
-%{tde_tdedocdir}/HTML/en/%{tdm}/
-%if 0%{?suse_version} == 0
-%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
-%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
-%endif
-
-%if "%{?tde_version}" == "14.1.0"
-%{tde_bindir}/tdecryptocardwatcher
-%endif
-
-# XDG user faces
-%dir %{_datadir}/faces
-%{_datadir}/faces/default1.png
-%{_datadir}/faces/default2.png
-%{_datadir}/faces/default3.png
-%{_datadir}/faces/default4.png
-%{_datadir}/faces/root1.png
-
-# Distribution specific stuff
-%if 0%{?suse_version} == 1140
-%{_sysconfdir}/init.d/xdm.tde
-%endif
-%if 0%{?suse_version} >= 1210
-/usr/lib/X11/displaymanagers/tdm
-%endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
-/usr/lib/systemd/system/tdm.service
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
-%{_datadir}/xsessions/tde.desktop
-%endif
-
-# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%{_sysconfdir}/X11/wmsession.d/45TDE
-%{_datadir}/X11/dm.d/45TDE.conf
-%endif
-
-# SELINUX policy
-%if 0%{?with_selinux_policy}
-%config %{tde_confdir}/%{tdm}/tdm.pp
-%endif
-
-# Logrotate configuration
-%config %{_sysconfdir}/logrotate.d/trinity-tdm
-
-%pre -n trinity-tdm
-# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
-  if [ -d "%{tde_confdir}/%{tdm}" ]; then
-    # If there is already something under '/etc/trinity/tdm', simply delete old configuration
-    echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
-    rm -rf "%{tde_datadir}/config/%{tdm}"
-  else
-    # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
-    if [ ! -d "%{tde_confdir}" ]; then
-      mkdir -p "%{tde_confdir}"
-    fi
-    echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{tde_confdir}/%{tdm}'"
-    mv -f "%{tde_datadir}/config/%{tdm}" "%{tde_confdir}/%{tdm}.migr"
-  fi
-fi
-
-# Remove actual directory before creating a symlink
-if [ ! -L "%{tdm_datadir}/pics/users" ] && [ -d "%{tdm_datadir}/pics/users" ] ; then
-  [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces"
-  cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces"
-  rm -rf "%{tdm_datadir}/pics/users"
-fi
-
-%post -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%make_session
-%endif
-
-# SELINUX context for tdm
-%if 0%{?with_selinux_policy}
-/usr/sbin/semodule -i "%{tde_confdir}/%{tdm}/tdm.pp"
-%endif
-
-%if 0%{?fedora} == 21 || 0%{?rhel} >= 7
-if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then
-  echo "%{tde_bindir}/tdm	--	system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local"
-  restorecon "%{tde_bindir}/tdm"
-fi
-%endif
-
-# Sets default user icon in TDM
-if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then
-  [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces"
-  cp -f "%{tdm_datadir}/pics/users/default2.png" "%{tdm_datadir}/faces/.default.face.icon"
-fi
-
-# Sets default language for TDM
-if [ "$1" = "1" ]; then
-  if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
-    sed -i "%{tde_confdir}/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
-  fi
-fi
-
-# openSUSE 11.4 tdm's startup script
-if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then
-  cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
-fi
-
-# openSUSE 15.0 alternatives
-%if 0%{?suse_version} >= 1500
-update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager default-displaymanager /usr/lib/X11/displaymanagers/tdm 30 || :
-%endif
-
-%posttrans -n trinity-tdm
-# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
-if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then
-  mv -f "%{tde_confdir}/%{tdm}.migr/"* "%{tde_confdir}/%{tdm}/"
-  rmdir "%{tde_confdir}/%{tdm}.migr/"
-fi
-
-%postun -n trinity-tdm
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%make_session
-%endif
-
-# openSUSE 15.0 alternatives
-%if 0%{?suse_version} >= 1500
-if [ "$1" = "0" ]; then
-  update-alternatives --remove default-displaymanager /usr/lib/X11/displaymanagers/tdm || :
-fi
-%endif
-
-##########
-
-%package -n trinity-tdm-devel
-Summary:	Development files for tdm
-Group:		Development/Libraries/Other
-Requires:	trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?xtst_devel:Requires: %{xtst_devel}}
-
-%description -n trinity-tdm-devel
-This package contains the development files for TDM.
-
-%files -n trinity-tdm-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kgreeterplugin.h
-
-##########
-
-%package -n trinity-kfind
-Summary:	File-find utility for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kfind
-kfind can be used to find files and directories on your
-workstations.
-
-%files -n trinity-kfind
-%defattr(-,root,root,-)
-%{tde_bindir}/kfind
-%{tde_tdelibdir}/libkfindpart.la
-%{tde_tdelibdir}/libkfindpart.so
-%{tde_tdeappdir}/Kfind.desktop
-%{tde_datadir}/apps/kfindpart/
-%{tde_datadir}/icons/hicolor/*/apps/kfind.png
-%{tde_datadir}/services/kfindpart.desktop
-%{tde_datadir}/servicetypes/findpart.desktop
-%{tde_tdedocdir}/HTML/en/kfind/
-
-##########
-
-%package -n trinity-khelpcenter
-Summary:	Help center for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	htdig
-
-%description -n trinity-khelpcenter
-The TDE Help Center provides documentation on how to use the TDE desktop.
-
-The htdig package is needed to build a searchable archive of TDE
-documentation.
-
-%files -n trinity-khelpcenter
-%defattr(-,root,root,-)
-%{tde_bindir}/khc_docbookdig.pl
-%{tde_bindir}/khc_htdig.pl
-%{tde_bindir}/khc_htsearch.pl
-%{tde_bindir}/khc_indexbuilder
-%{tde_bindir}/khc_mansearch.pl
-%{tde_bindir}/khelpcenter
-%{tde_tdelibdir}/khelpcenter.la
-%{tde_tdelibdir}/khelpcenter.so
-%{tde_libdir}/libtdeinit_khelpcenter.la
-%{tde_libdir}/libtdeinit_khelpcenter.so
-%{tde_tdeappdir}/Help.desktop
-%{tde_datadir}/apps/khelpcenter/
-%{tde_datadir}/config.kcfg/khelpcenter.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/khelpcenter.*
-%{tde_datadir}/services/khelpcenter.desktop
-%{tde_tdedocdir}/HTML/en/khelpcenter/
-
-##########
-
-%package -n trinity-kicker
-Summary:	Desktop panel for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kicker
-Kicker provides the TDE panel on you desktop. It can be used as a
-program launcher and can load plugins to provide additional
-functionality.
-
-%files -n trinity-kicker
-%defattr(-,root,root,-)
-%{tde_bindir}/appletproxy
-%{tde_bindir}/extensionproxy
-%{tde_bindir}/kasbar
-%{tde_bindir}/kicker
-%{tde_libdir}/tdeconf_update_bin/kicker-3.4-reverseLayout
-%{tde_tdelibdir}/appletproxy.la
-%{tde_tdelibdir}/appletproxy.so
-%{tde_tdelibdir}/clock_panelapplet.la
-%{tde_tdelibdir}/clock_panelapplet.so
-%{tde_tdelibdir}/dockbar_panelextension.la
-%{tde_tdelibdir}/dockbar_panelextension.so
-%{tde_tdelibdir}/extensionproxy.la
-%{tde_tdelibdir}/extensionproxy.so
-%{tde_tdelibdir}/kasbar_panelextension.la
-%{tde_tdelibdir}/kasbar_panelextension.so
-%{tde_tdelibdir}/kicker.la
-%{tde_tdelibdir}/kickermenu_find.la
-%{tde_tdelibdir}/kickermenu_find.so
-%{tde_tdelibdir}/kickermenu_kate.so
-%{tde_tdelibdir}/kickermenu_kate.la
-%{tde_tdelibdir}/kickermenu_tdeprint.la
-%{tde_tdelibdir}/kickermenu_tdeprint.so
-%{tde_tdelibdir}/kickermenu_konqueror.la
-%{tde_tdelibdir}/kickermenu_konqueror.so
-%{tde_tdelibdir}/kickermenu_konsole.la
-%{tde_tdelibdir}/kickermenu_konsole.so
-%{tde_tdelibdir}/kickermenu_prefmenu.la
-%{tde_tdelibdir}/kickermenu_prefmenu.so
-%{tde_tdelibdir}/kickermenu_recentdocs.la
-%{tde_tdelibdir}/kickermenu_recentdocs.so
-%{tde_tdelibdir}/kickermenu_remotemenu.la
-%{tde_tdelibdir}/kickermenu_remotemenu.so
-%{tde_tdelibdir}/kickermenu_systemmenu.la
-%{tde_tdelibdir}/kickermenu_systemmenu.so
-%{tde_tdelibdir}/kicker.so
-%{tde_tdelibdir}/launcher_panelapplet.la
-%{tde_tdelibdir}/launcher_panelapplet.so
-%{tde_tdelibdir}/lockout_panelapplet.la
-%{tde_tdelibdir}/lockout_panelapplet.so
-%{tde_tdelibdir}/media_panelapplet.la
-%{tde_tdelibdir}/media_panelapplet.so
-%{tde_tdelibdir}/menu_panelapplet.la
-%{tde_tdelibdir}/menu_panelapplet.so
-%{tde_tdelibdir}/minipager_panelapplet.la
-%{tde_tdelibdir}/minipager_panelapplet.so
-%{tde_tdelibdir}/naughty_panelapplet.la
-%{tde_tdelibdir}/naughty_panelapplet.so
-%{tde_tdelibdir}/run_panelapplet.la
-%{tde_tdelibdir}/run_panelapplet.so
-%{tde_tdelibdir}/sidebar_panelextension.la
-%{tde_tdelibdir}/sidebar_panelextension.so
-%{tde_tdelibdir}/systemtray_panelapplet.la
-%{tde_tdelibdir}/systemtray_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelapplet.la
-%{tde_tdelibdir}/taskbar_panelapplet.so
-%{tde_tdelibdir}/taskbar_panelextension.la
-%{tde_tdelibdir}/taskbar_panelextension.so
-%{tde_tdelibdir}/trash_panelapplet.la
-%{tde_tdelibdir}/trash_panelapplet.so
-%{tde_libdir}/libkasbar.so.*
-%{tde_libdir}/libtdeinit_appletproxy.la
-%{tde_libdir}/libtdeinit_appletproxy.so
-%{tde_libdir}/libtdeinit_extensionproxy.la
-%{tde_libdir}/libtdeinit_extensionproxy.so
-%{tde_libdir}/libtdeinit_kicker.la
-%{tde_libdir}/libtdeinit_kicker.so
-%{tde_libdir}/libkickermain.so.*
-%{tde_libdir}/libtaskbar.so.*
-%{tde_libdir}/libtaskmanager.so.*
-%{tde_libdir}/libkickoffsearch_interfaces.so.*
-%{tde_tdeappdir}/kcmkicker.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop
-%{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop
-%{tde_datadir}/apps/clockapplet/
-%{tde_datadir}/apps/tdeconf_update/kicker-3.1-properSizeSetting.pl
-%{tde_datadir}/apps/tdeconf_update/kicker-3.5-taskbarEnums.pl
-%{tde_datadir}/apps/tdeconf_update/kickerrc.upd
-%{tde_datadir}/apps/kicker/
-%exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
-%exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/naughtyapplet/
-%{tde_datadir}/autostart/panel.desktop
-%{tde_datadir}/config.kcfg/kickerSettings.kcfg
-%{tde_datadir}/config.kcfg/launcherapplet.kcfg
-%{tde_datadir}/config.kcfg/pagersettings.kcfg
-%{tde_datadir}/config.kcfg/taskbar.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png
-%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kdisknav.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png
-%{tde_datadir}/icons/crystalsvg/*/apps/panel.png
-%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz
-%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz
-%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop
-%{tde_tdedocdir}/HTML/en/kicker/
-%if 0%{?mgaversion} >= 3
-%{tde_datadir}/icons/oxygen/scalable/mgabutton.svg
-%endif
-
-##########
-
-%package -n trinity-kicker-devel
-Summary:	Development files for kicker
-Group:		Development/Libraries/Other
-Requires:	trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?xtst_devel:Requires: %{xtst_devel}}
-
-%description -n trinity-kicker-devel
-This package contains the development files for kicker.
-
-%files -n trinity-kicker-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kickoff-search-plugin.h
-%{tde_tdeincludedir}/kickoffsearchinterface.h
-%{tde_libdir}/libkasbar.la
-%{tde_libdir}/libkasbar.so
-%{tde_libdir}/libkickermain.la
-%{tde_libdir}/libkickermain.so
-%{tde_libdir}/libkickoffsearch_interfaces.la
-%{tde_libdir}/libkickoffsearch_interfaces.so
-%{tde_libdir}/libtaskbar.la
-%{tde_libdir}/libtaskbar.so
-%{tde_libdir}/libtaskmanager.la
-%{tde_libdir}/libtaskmanager.so
-
-##########
-
-%package -n trinity-klipper
-Summary:	Clipboard utility for Trinity
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-klipper
-klipper provides standard clipboard functions (cut and paste, history
-saving) plus additional features, like the ability to offer actions to 
-take dependent on the clipboard contents. For example, it can launch a 
-web browser if the clipboard contains a URL.
-
-%files -n trinity-klipper
-%defattr(-,root,root,-)
-%{tde_bindir}/klipper
-%config(noreplace) %{tde_confdir}/klipperrc
-%{tde_tdelibdir}/klipper.la
-%{tde_tdelibdir}/klipper.so
-%{tde_tdelibdir}/klipper_panelapplet.la
-%{tde_tdelibdir}/klipper_panelapplet.so
-%{tde_libdir}/libtdeinit_klipper.la
-%{tde_libdir}/libtdeinit_klipper.so
-%{tde_tdeappdir}/klipper.desktop
-%{tde_datadir}/apps/tdeconf_update/klipper-1-2.pl
-%{tde_datadir}/apps/tdeconf_update/klipper-trinity1.sh
-%{tde_datadir}/apps/tdeconf_update/klipperrc.upd
-%{tde_datadir}/apps/tdeconf_update/klippershortcuts.upd
-%{tde_datadir}/apps/kicker/applets/klipper.desktop
-%{tde_datadir}/autostart/klipper.desktop
-%{tde_datadir}/icons/hicolor/*/apps/klipper.*
-%{tde_tdedocdir}/HTML/en/klipper/
-
-##########
-
-%package -n trinity-kmenuedit
-Summary:	Menu editor for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kmenuedit
-The TDE menu editor allows you to make customisations to the TDE menu
-structure.
-
-%files -n trinity-kmenuedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcontroledit
-%{tde_bindir}/kmenuedit
-%{tde_tdelibdir}/kcontroledit.la
-%{tde_tdelibdir}/kcontroledit.so
-%{tde_tdelibdir}/kmenuedit.la
-%{tde_tdelibdir}/kmenuedit.so
-%{tde_libdir}/libtdeinit_kcontroledit.la
-%{tde_libdir}/libtdeinit_kcontroledit.so
-%{tde_libdir}/libtdeinit_kmenuedit.la
-%{tde_libdir}/libtdeinit_kmenuedit.so
-%{tde_tdeappdir}/kmenuedit.desktop
-%{tde_datadir}/applnk/System/kmenuedit.desktop
-%{tde_datadir}/apps/kcontroledit/
-%{tde_datadir}/apps/kmenuedit/
-%{tde_tdedocdir}/HTML/en/kmenuedit/
-
-##########
-
-%package -n trinity-konqueror
-Summary:	TDE's advanced file manager, web browser and document viewer
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-konqueror
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view documents without
-ever launching another application.
-
-%files -n trinity-konqueror
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/konqsidebartng.rc
-%{tde_bindir}/kbookmarkmerger
-%{tde_bindir}/keditbookmarks
-%{tde_bindir}/kfmclient
-%{tde_bindir}/konqueror
-%{tde_tdelibdir}/kcm_history.la
-%{tde_tdelibdir}/kcm_history.so
-%{tde_tdelibdir}/kded_konqy_preloader.la
-%{tde_tdelibdir}/kded_konqy_preloader.so
-%{tde_tdelibdir}/keditbookmarks.la
-%{tde_tdelibdir}/keditbookmarks.so
-%{tde_tdelibdir}/kfmclient.la
-%{tde_tdelibdir}/kfmclient.so
-%{tde_tdelibdir}/konq_aboutpage.la
-%{tde_tdelibdir}/konq_aboutpage.so
-%{tde_tdelibdir}/konq_iconview.la
-%{tde_tdelibdir}/konq_iconview.so
-%{tde_tdelibdir}/konq_listview.la
-%{tde_tdelibdir}/konq_listview.so
-%{tde_tdelibdir}/konq_remoteencoding.la
-%{tde_tdelibdir}/konq_remoteencoding.so
-%{tde_tdelibdir}/konq_shellcmdplugin.la
-%{tde_tdelibdir}/konq_shellcmdplugin.so
-%{tde_tdelibdir}/konq_sidebar.la
-%{tde_tdelibdir}/konq_sidebar.so
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.la
-%{tde_tdelibdir}/konq_sidebartree_bookmarks.so
-%{tde_tdelibdir}/konq_sidebartree_dirtree.la
-%{tde_tdelibdir}/konq_sidebartree_dirtree.so
-%{tde_tdelibdir}/konq_sidebartree_history.la
-%{tde_tdelibdir}/konq_sidebartree_history.so
-%{tde_tdelibdir}/konqsidebar_tree.la
-%{tde_tdelibdir}/konqsidebar_tree.so
-%{tde_tdelibdir}/konqsidebar_web.la
-%{tde_tdelibdir}/konqsidebar_web.so
-%{tde_tdelibdir}/konqueror.la
-%{tde_tdelibdir}/konqueror.so
-%{tde_tdelibdir}/libtdehtmlkttsdplugin.la
-%{tde_tdelibdir}/libtdehtmlkttsdplugin.so
-%{tde_libdir}/libtdeinit_keditbookmarks.la
-%{tde_libdir}/libtdeinit_keditbookmarks.so
-%{tde_libdir}/libtdeinit_kfmclient.la
-%{tde_libdir}/libtdeinit_kfmclient.so
-%{tde_libdir}/libtdeinit_konqueror.la
-%{tde_libdir}/libtdeinit_konqueror.so
-%{tde_libdir}/libkonqsidebarplugin.so.*
-%{tde_tdeappdir}/Home.desktop
-%{tde_tdeappdir}/kcmhistory.desktop
-%{tde_tdeappdir}/kfmclient.desktop
-%{tde_tdeappdir}/kfmclient_dir.desktop
-%{tde_tdeappdir}/kfmclient_html.desktop
-%{tde_tdeappdir}/kfmclient_war.desktop
-%{tde_tdeappdir}/tdehtml_filter.desktop
-%{tde_tdeappdir}/konqbrowser.desktop
-%{tde_tdeappdir}/konquerorsu.desktop
-%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop
-%{tde_datadir}/applnk/Internet/keditbookmarks.desktop
-%{tde_datadir}/applnk/konqueror.desktop
-%{tde_datadir}/apps/tdeconf_update/kfmclient_3_2.upd
-%{tde_datadir}/apps/tdeconf_update/kfmclient_3_2_update.sh
-%{tde_datadir}/apps/tdeconf_update/konqsidebartng.upd
-%{tde_datadir}/apps/tdeconf_update/move_konqsidebartng_entries.sh
-%{tde_datadir}/apps/keditbookmarks/
-%{tde_datadir}/apps/tdehtml/kpartplugins/
-%{tde_datadir}/apps/konqiconview/
-%{tde_datadir}/apps/konqlistview/
-%exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-%{tde_datadir}/apps/konqsidebartng/
-%{tde_datadir}/apps/konqueror/about/
-%dir %{tde_datadir}/apps/konqueror/dirtree
-%dir %{tde_datadir}/apps/konqueror/dirtree/remote
-%{tde_datadir}/apps/konqueror/icons/
-%{tde_datadir}/apps/konqueror/konq-simplebrowser.rc
-%{tde_datadir}/apps/konqueror/konqueror.rc
-%{tde_datadir}/apps/konqueror/pics/indicator_connect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_empty.png
-%{tde_datadir}/apps/konqueror/pics/indicator_noconnect.png
-%{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png
-%{tde_datadir}/apps/konqueror/profiles/
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
-%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
-%{tde_datadir}/apps/konqueror/tiles/
-%{tde_datadir}/autostart/konqy_preload.desktop
-%{tde_datadir}/config.kcfg/keditbookmarks.kcfg
-%{tde_datadir}/config.kcfg/konq_listview.kcfg
-%{tde_datadir}/config.kcfg/konqueror.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kfm.png
-%{tde_datadir}/icons/hicolor/*/apps/konqueror.*
-%{tde_datadir}/services/kded/konqy_preloader.desktop
-%{tde_datadir}/services/konq_*.desktop
-%{tde_datadir}/servicetypes/konqaboutpage.desktop
-%{tde_tdedocdir}/HTML/en/konqueror/
-%{tde_tdedocdir}/HTML/en/keditbookmarks/
-
-%post -n trinity-konqueror
-if [ $1 -eq 1 ]; then
-  update-alternatives --install \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \
-    media_safelyremove.desktop_konqueror \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \
-    10 || :
-fi
-
-%preun -n trinity-konqueror
-if [ $1 -eq 0 ]; then
-  update-alternatives --remove \
-    media_safelyremove.desktop_konqueror \
-    %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
-fi
-
-##########
-
-%package -n trinity-konqueror-devel
-Summary:	Development files for konqueror
-Group:		Development/Libraries/Other
-Requires:	trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-konqueror-devel
-This package contains the development files for konqueror.
-
-%files -n trinity-konqueror-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/konqsidebarplugin.h
-%{tde_tdeincludedir}/KonquerorIface.h
-%{tde_libdir}/libkonqsidebarplugin.la
-%{tde_libdir}/libkonqsidebarplugin.so
-
-##########
-
-%package -n trinity-konqueror-nsplugins
-Summary:	Netscape plugin support for Konqueror
-Group:		System/GUI/Other
-Requires:	trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-konqueror-nsplugins
-This package includes support for Netscape plugins in Konqueror.
-
-%files -n trinity-konqueror-nsplugins
-%defattr(-,root,root,-)
-%{tde_bindir}/nspluginscan
-%{tde_bindir}/nspluginviewer
-%{tde_tdelibdir}/kcm_nsplugins.la
-%{tde_tdelibdir}/kcm_nsplugins.so
-%{tde_tdelibdir}/libnsplugin.la
-%{tde_tdelibdir}/libnsplugin.so
-%{tde_tdeappdir}/tdehtml_plugins.desktop
-%{tde_datadir}/apps/plugin/nspluginpart.rc
-
-##########
-
-%package -n trinity-konsole
-Summary:	X terminal emulator for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-konsole
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-
-Its advanced features include a simple configuration and the ability to use
-multiple terminal shells in a single window
-
-Using Konsole, a user can open:
-* Linux console sessions
-* Midnight Commander file manager sessions
-* Shell sessions
-* Root consoles sessions
-
-%files -n trinity-konsole
-%defattr(-,root,root,-)
-%{tde_bindir}/konsole
-%{tde_bindir}/terminalhere
-%{tde_tdelibdir}/kcm_konsole.la
-%{tde_tdelibdir}/kcm_konsole.so
-%{tde_tdelibdir}/kded_kwrited.la
-%{tde_tdelibdir}/kded_kwrited.so
-%{tde_tdelibdir}/konsole.la
-%{tde_tdelibdir}/konsole.so
-%{tde_tdelibdir}/libkonsolepart.la
-%{tde_tdelibdir}/libkonsolepart.so
-%{tde_libdir}/libtdeinit_konsole.la
-%{tde_libdir}/libtdeinit_konsole.so
-%{tde_tdeappdir}/konsole.desktop
-%{tde_tdeappdir}/konsolesu.desktop
-%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop
-%{tde_datadir}/apps/tdeconf_update/konsole.upd
-%{tde_datadir}/apps/tdeconf_update/schemaStrip.pl
-%{tde_datadir}/apps/konsole/
-%{tde_datadir}/icons/hicolor/*/apps/konsole.*
-%{tde_datadir}/mimelnk/application/x-konsole.desktop
-%{tde_datadir}/services/kded/kwrited.desktop
-%{tde_datadir}/services/konsolepart.desktop
-%{tde_datadir}/services/konsole-script.desktop
-%{tde_datadir}/services/kwrited.desktop
-%{tde_datadir}/servicetypes/terminalemulator.desktop
-%{tde_tdedocdir}/HTML/en/konsole/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-%config %{_sysconfdir}/fonts/conf.d/99-konsole.conf
-
-##########
-
-%package -n trinity-kpager
-Summary:	Desktop pager for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kpager
-This package contains TDE's desktop pager, which displays your virtual
-desktops iconically in a window, along with icons of any running
-applications. It is used to switch between applications or desktops.
-
-%files -n trinity-kpager
-%defattr(-,root,root,-)
-%{tde_bindir}/kpager
-%{tde_tdeappdir}/kpager.desktop
-%{tde_datadir}/applnk/Utilities/kpager.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kpager.png
-%{tde_tdedocdir}/HTML/en/kpager/
-
-##########
-
-%package -n trinity-kpersonalizer
-Summary:	Installation personalizer for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kpersonalizer
-TDE Personalizer is the application that configures the TDE desktop for you.
-It's a very useful wizard that allows you to quickly change the TDE desktop to
-suit your own needs. When you run TDE for the first time, KPersonalizer is
-automatically started. KPersonalizer can also be called later.
-
-%files -n trinity-kpersonalizer
-%defattr(-,root,root,-)
-%{tde_bindir}/kpersonalizer
-%{tde_tdeappdir}/kpersonalizer.desktop
-%{tde_datadir}/applnk/System/kpersonalizer.desktop
-%{tde_datadir}/apps/kpersonalizer/
-%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
-
-##########
-
-%package -n trinity-ksmserver
-Summary:	Session manager for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-ksmserver
-This package contains the TDE session manager. It is responsible for
-restoring your TDE session on login. It is also needed to properly
-start a TDE session. It registers TDE with X display managers, and
-provides the 'starttde' command, for starting an X session with TDE
-from the console.
-
-If you are running TDE for the first time for a certain user,
-kpersonalizer is used to help with setup. If it is not present,
-TDE will start, but many good defaults will not be set.
-
-%files -n trinity-ksmserver
-%defattr(-,root,root,-)
-%{tde_bindir}/ksmserver
-%{tde_bindir}/%{starttde}
-%{tde_bindir}/migratekde3
-%{tde_bindir}/r14-xdg-update
-%{tde_bindir}/tdeinit_displayconfig
-%{tde_bindir}/tdeinit_phase1
-%{tde_tdelibdir}/ksmserver.la
-%{tde_tdelibdir}/ksmserver.so
-%{tde_libdir}/libtdeinit_ksmserver.la
-%{tde_libdir}/libtdeinit_ksmserver.so
-%{tde_datadir}/apps/tdeconf_update/ksmserver.upd
-%{tde_datadir}/apps/tdeconf_update/move_session_config.sh
-%{tde_datadir}/apps/ksmserver/
-
-%post -n trinity-ksmserver
-%if 0%{?mdkversion} || 0%{?mgaversion}
-fndSession
-%endif
-
-# openSUSE 15.0 alternatives
-%if 0%{?suse_version} >= 1500
-update-alternatives --install /usr/share/xsessions/default.desktop default-xsession.desktop /usr/share/xsessions/tde.desktop 30 || :
-%endif
-
-%postun -n trinity-ksmserver
-%if 0%{?mdkversion} || 0%{?mgaversion}
-fndSession
-%endif
-
-# openSUSE 15.0 alternatives
-%if 0%{?suse_version} >= 1500
-update-alternatives --remove default-xsession.desktop /usr/share/xsessions/tde.desktop || :
-%endif
-
-##########
-
-%package -n trinity-ksplash
-Summary:	The TDE splash screen
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-ksplash
-This package includes the TDE Splash screen, which is seen when
-a TDE session is launched.
-
-%files -n trinity-ksplash
-%defattr(-,root,root,-)
-%{tde_bindir}/ksplash
-%{tde_bindir}/ksplashsimple
-%{tde_tdelibdir}/kcm_ksplashthemes.la
-%{tde_tdelibdir}/kcm_ksplashthemes.so
-%{tde_tdelibdir}/ksplashdefault.la
-%{tde_tdelibdir}/ksplashdefault.so
-%{tde_tdelibdir}/ksplashunified.la
-%{tde_tdelibdir}/ksplashunified.so
-%{tde_tdelibdir}/ksplashredmond.la
-%{tde_tdelibdir}/ksplashredmond.so
-%{tde_tdelibdir}/ksplashstandard.la
-%{tde_tdelibdir}/ksplashstandard.so
-%{tde_libdir}/libksplashthemes.so.*
-%{tde_tdeappdir}/ksplashthememgr.desktop
-%{tde_datadir}/apps/ksplash
-%{tde_datadir}/services/ksplashdefault.desktop
-%{tde_datadir}/services/ksplash.desktop
-%{tde_datadir}/services/ksplashunified.desktop
-%{tde_datadir}/services/ksplashredmond.desktop
-%{tde_datadir}/services/ksplashstandard.desktop
-%{tde_datadir}/servicetypes/ksplashplugins.desktop
-%{tde_tdedocdir}/HTML/en/ksplashml/
-
-##########
-
-%package -n trinity-ksplash-devel
-Summary:	Development files for ksplash
-Group:		Development/Libraries/Other
-Requires:	trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-ksplash-devel
-This package contains the development files for ksplash.
-
-%files -n trinity-ksplash-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksplash/
-%{tde_libdir}/libksplashthemes.la
-%{tde_libdir}/libksplashthemes.so
-
-##########
-
-%package -n trinity-ksysguard
-Summary:	System guard for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-ksysguard
-TDE System Guard allows you to monitor various statistics about your
-computer.
-
-%files -n trinity-ksysguard
-%defattr(-,root,root,-)
-%{tde_bindir}/kpm
-%{tde_bindir}/ksysguard
-%{tde_tdelibdir}/sysguard_panelapplet.la
-%{tde_tdelibdir}/sysguard_panelapplet.so
-%{tde_libdir}/libksgrd.so.*
-%{tde_tdeappdir}/ksysguard.desktop
-%{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
-%{tde_datadir}/apps/ksysguard/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksysguard.png
-%{tde_datadir}/mimelnk/application/x-ksysguard.desktop
-%{tde_tdedocdir}/HTML/en/ksysguard/
-
-##########
-
-%package -n trinity-ksysguard-devel
-Summary:	Development files for ksysguard
-Group:		Development/Libraries/Other
-Requires:	trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-ksysguard-devel
-This package contains the development files for ksysguard.
-
-%files -n trinity-ksysguard-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksgrd/
-%{tde_libdir}/libksgrd.la
-%{tde_libdir}/libksgrd.so
-
-##########
-
-%package -n trinity-ksysguardd
-Summary:	System guard daemon for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-ksysguardd
-TDE System Guard Daemon is the daemon part of ksysguard. The daemon can
-be installed on a remote machine to enable ksysguard on another machine
-to monitor it through the daemon running there.
-
-%files -n trinity-ksysguardd
-%defattr(-,root,root,-)
-%{tde_bindir}/ksysguardd
-%config(noreplace) %{tde_confdir}/ksysguarddrc
-
-##########
-
-%package -n trinity-ktip
-Summary:	Useful tips for TDE
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-ktip
-ktip provides many useful tips on using TDE when you log in.
-
-%files -n trinity-ktip
-%defattr(-,root,root,-)
-%{tde_bindir}/ktip
-%{tde_tdeappdir}/ktip.desktop
-%{tde_datadir}/applnk/Toys/ktip.desktop
-%{tde_datadir}/apps/tdewizard/
-%{tde_datadir}/autostart/ktip.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktip.*
-
-##########
-
-%package -n trinity-twin
-Summary:	The TDE window manager
-Group:		System/GUI/Other
-Requires:	%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-twin
-This package contains the default X window manager for TDE.
-
-%files -n trinity-twin
-%defattr(-,root,root,-)
-%{tde_bindir}/twin
-%{tde_bindir}/twin_killer_helper
-%{tde_bindir}/twin_resumer_helper
-%{tde_bindir}/twin_rules_dialog
-%{tde_libdir}/tdeconf_update_bin/twin_update_default_rules
-%{tde_libdir}/tdeconf_update_bin/twin_update_window_settings
-%{tde_tdelibdir}/kcm_twin*.la
-%{tde_tdelibdir}/kcm_twin*.so
-%{tde_tdelibdir}/twin*.la
-%{tde_tdelibdir}/twin*.so
-%{tde_libdir}/libtdecorations.so.*
-%{tde_libdir}/libtdeinit_twin_rules_dialog.la
-%{tde_libdir}/libtdeinit_twin_rules_dialog.so
-%{tde_libdir}/libtdeinit_twin.la
-%{tde_libdir}/libtdeinit_twin.so
-%{tde_tdeappdir}/showdesktop.desktop
-%{tde_tdeappdir}/twindecoration.desktop
-%{tde_tdeappdir}/twinoptions.desktop
-%{tde_tdeappdir}/twinrules.desktop
-%{tde_datadir}/applnk/.hidden/twinactions.desktop
-%{tde_datadir}/applnk/.hidden/twinadvanced.desktop
-%{tde_datadir}/applnk/.hidden/twinfocus.desktop
-%{tde_datadir}/applnk/.hidden/twinmoving.desktop
-%{tde_datadir}/applnk/.hidden/twintranslucency.desktop
-%{tde_datadir}/apps/tdeconf_update/twin3_plugin.pl
-%{tde_datadir}/apps/tdeconf_update/twin3_plugin.upd
-%{tde_datadir}/apps/tdeconf_update/twin_focus1.sh
-%{tde_datadir}/apps/tdeconf_update/twin_focus1.upd
-%{tde_datadir}/apps/tdeconf_update/twin_focus2.sh
-%{tde_datadir}/apps/tdeconf_update/twin_focus2.upd
-%{tde_datadir}/apps/tdeconf_update/twin_fsp_workarounds_1.upd
-%{tde_datadir}/apps/tdeconf_update/twiniconify.upd
-%{tde_datadir}/apps/tdeconf_update/twinsticky.upd
-%{tde_datadir}/apps/tdeconf_update/twin.upd
-%{tde_datadir}/apps/tdeconf_update/twinupdatewindowsettings.upd
-%{tde_datadir}/apps/tdeconf_update/pluginlibFix.pl
-%{tde_datadir}/apps/twin/
-%{tde_datadir}/config.kcfg/twin.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/twin.png
-%{tde_tdedocdir}/HTML/en/kompmgr/
-
-##########
-
-%package -n trinity-twin-devel
-Summary:	Development files for twin
-Group:		Development/Libraries/Other
-Requires:	trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-twin-devel
-This package contains the development files for twin.
-
-%files -n trinity-twin-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/twin/
-%{tde_tdeincludedir}/kcommondecoration.h
-%{tde_tdeincludedir}/kdecoration.h
-%{tde_tdeincludedir}/kdecoration_p.h
-%{tde_tdeincludedir}/kdecoration_plugins_p.h
-%{tde_tdeincludedir}/kdecorationfactory.h
-%{tde_tdeincludedir}/KWinInterface.h
-%{tde_libdir}/libtdecorations.la
-%{tde_libdir}/libtdecorations.so
-
-##########
-
-%package -n trinity-libkonq
-Summary:	Core libraries for Konqueror
-Group:		System/GUI/Other
-
-%description -n trinity-libkonq
-These libraries are used by several TDE applications, most notably
-Konqueror and the kdesktop package.
-
-%files -n trinity-libkonq
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_favicons.la
-%{tde_tdelibdir}/kded_favicons.so
-%{tde_tdelibdir}/konq_sound.la
-%{tde_tdelibdir}/konq_sound.so
-%{tde_libdir}/libkonq.so.*
-%{tde_datadir}/apps/kbookmark/
-%{tde_datadir}/apps/tdeconf_update/favicons.upd
-%{tde_datadir}/apps/tdeconf_update/move_favicons.sh
-%dir %{tde_datadir}/apps/konqueror/pics
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topleft.png
-%{tde_datadir}/apps/konqueror/pics/arrow_topright.png
-%{tde_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png
-%{tde_datadir}/services/kded/favicons.desktop
-%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop
-
-##########
-
-%package libtqt3-integration
-Summary:	Integration library between TQt3 and TDE
-Group:		System/GUI/Other
-
-Obsoletes:	tdebase-libtqt3-integration < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdebase-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libtqt3-integration
-These libraries allow you to use TDE dialogs in native TQt3 applications.
-
-%files libtqt3-integration
-%defattr(-,root,root,-)
-%{_libdir}/tqt3/plugins/integration/
-%{tde_tdelibdir}/kded_kdeintegration.la
-%{tde_tdelibdir}/kded_kdeintegration.so
-%{tde_datadir}/services/kded/kdeintegration.desktop
-
-##########
-
-%package -n trinity-libkonq-devel
-Summary:	Development files for Konqueror's core libraries
-Group:		Development/Libraries/Other
-Requires:	trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?xtst_devel:Requires: %{xtst_devel}}
-
-%description -n trinity-libkonq-devel
-This package contains headers and other development files for the core
-Konqueror libraries.
-
-%files -n trinity-libkonq-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/tdefileivi.h
-%{tde_tdeincludedir}/kivdirectoryoverlay.h
-%{tde_tdeincludedir}/kivfreespaceoverlay.h
-%{tde_tdeincludedir}/knewmenu.h
-%{tde_tdeincludedir}/konqbookmarkmanager.h
-%{tde_tdeincludedir}/konq_*.h
-%{tde_tdeincludedir}/libkonq_export.h
-%{tde_libdir}/libkonq.la
-%{tde_libdir}/libkonq.so
-
-##########
-
-%package tdeio-smb-plugin
-Summary:	Windows Connection Module for TDE
-Group:		System/GUI/Other
-
-%description tdeio-smb-plugin
-This package provides the "smb://" protocol, to connect to and from
-Windows and Samba shares.
-
-%files tdeio-smb-plugin
-%defattr(-,root,root)
-%{tde_tdelibdir}/kcm_samba.la
-%{tde_tdelibdir}/kcm_samba.so
-%{tde_tdelibdir}/tdeio_smb.la
-%{tde_tdelibdir}/tdeio_smb.so
-%{tde_datadir}/services/smb.protocol
-%{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
-%dir %{tde_datadir}/apps/remoteview
-%{tde_datadir}/apps/remoteview/smb-network.desktop
-%{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# Applies an optional distro-specific graphical theme
-%if "%{?tde_bg}" != ""
-# TDM Background
-%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \
-	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
-
-# TDE user default background
-%__sed -i "kpersonalizer/keyecandypage.cpp" \
-	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "%{starttde}" \
-	-e 's|$TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop|%{tde_bg}|' \
-	-e 's|Wallpaper=Trinity-lineart.svg|Wallpaper=%{tde_bg}|'
-%endif
-
-# TDE default directory and icon in startup script
-%__sed -i "%{starttde}" \
-	-e "s|/opt/trinity|%{tde_prefix}|g"
-
-# Sets default TDE menu icon
-%if "%{tde_starticon}" != ""
-%__sed -i "kicker/libkicker/kickerSettings.kcfg" \
-	-e "s|QString(\"kmenu\")|QString(\"%{tde_starticon}\")|"
-%endif
-
-# Xsession script location may vary on some distro
-%if 0%{?rhel} || 0%{?fedora}
-%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
-%endif
-%if 0%{?suse_version}
-%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
-%endif
-%if 0%{?suse_version} >= 1550
-# /etc/X11 moved to /usr/etc/X11 on opensuse TW
-%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \
-       -i "%{tdm}/README" \
-       -i "doc/khelpcenter/adminguide/index.docbook" \
-       -i "doc/khelpcenter/faq/notrelated.docbook" \
-       -e "s|/etc/X11/xdm|/usr/etc/X11/xdm|g" \
-       -e "s|/etc/X11/sessions|/usr/etc/X11/sessions|g"
-%endif
-
-# Reboot command location may vary on some distributions
-if [ -x "/usr/bin/reboot" ]; then
-  POWEROFF="/usr/bin/poweroff"
-  REBOOT="/usr/bin/reboot"
-fi
-if [ -n "${REBOOT}" ]; then
-  %__sed -i \
-    "doc/%{tdm}/%{tdm}rc-ref.docbook" \
-    "kcontrol/%{tdm}/%{tdm}-shut.cpp" \
-    "%{tdm}/config.def" \
-  -e "s|/sbin/poweroff|${POWEROFF}|g" \
-  -e "s|/sbin/reboot|${REBOOT}|g"
-fi
-
-# Update icons for some control center modules
-%__sed -i "kcontrol/componentchooser/componentchooser.desktop"        -e "s|^Icon=.*|Icon=kcmcomponentchooser|"
-%__sed -i "kcontrol/taskbar/kcmtaskbar.desktop"                       -e "s|^Icon=.*|Icon=kcmtaskbar|"
-%__sed -i "kcontrol/nics/nic.desktop"                                 -e "s|^Icon=.*|Icon=kcmnic|"
-%__sed -i "kcontrol/input/mouse.desktop"                              -e "s|^Icon=.*|Icon=kcmmouse|"
-%__sed -i "kcontrol/smserver/kcmsmserver.desktop"                     -e "s|^Icon=.*|Icon=kcmsmserver|"
-%__sed -i "kcontrol/kded/kcmkded.desktop"                             -e "s|^Icon=.*|Icon=kcmkded|"
-%__sed -i "kcontrol/konq/desktop.desktop"                             -e "s|^Icon=.*|Icon=kcmdesktop|"
-%__sed -i "kcontrol/konq/desktopbehavior.desktop"                     -e "s|^Icon=.*|Icon=kcmdesktopbehavior|"
-%__sed -i "kcontrol/privacy/privacy.desktop"                          -e "s|^Icon=.*|Icon=kcmprivacy|"
-%__sed -i "kcontrol/crypto/crypto.desktop"                            -e "s|^Icon=.*|Icon=kcmcrypto|"
-%__sed -i "kcontrol/tdeio/netpref.desktop"                            -e "s|^Icon=.*|Icon=kcmnetpref|"
-%__sed -i "kcontrol/konqhtml/tdehtml_filter.desktop"                  -e "s|^Icon=.*|Icon=kcmkhtml_filter|"
-%__sed -i "kcontrol/joystick/joystick.desktop"                        -e "s|^Icon=.*|Icon=kcmjoystick|"
-%__sed -i "kcontrol/colors/colors.desktop"                            -e "s|^Icon=.*|Icon=kcmcolors|"
-%__sed -i "kcontrol/performance/kcmperformance.desktop"               -e "s|^Icon=.*|Icon=kcmperformance|"
-%__sed -i "kcontrol/launch/kcmlaunch.desktop"                         -e "s|^Icon=.*|Icon=kcmlaunch|"
-%__sed -i "kcontrol/dnssd/kcm_tdednssd.desktop"                       -e "s|^Icon=.*|Icon=kcmkdnssd|"
-%__sed -i "kcontrol/spellchecking/spellchecking.desktop"              -e "s|^Icon=.*|Icon=kcmspellchecking|"
-%__sed -i "konqueror/sidebar/trees/history_module/kcmhistory.desktop" -e "s|^Icon=.*|Icon=kcmhistory|"
-%__sed -i "tdeioslave/cgi/kcmcgi/kcmcgi.desktop"                      -e "s|^Icon=.*|Icon=kcmcgi|"
-%__sed -i "tdeioslave/media/tdecmodule/media.desktop"                 -e "s|^Icon=.*|Icon=kcmmedia|" 
-
-# RHEL 5 does not support 'compton'
-%if 0%{?with_libconfig} == 0
-%__sed -i "twin/CMakeLists.txt" -e "/compton-tde/ s/^/#/"
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export TDEDIR="%{tde_prefix}"
-
-# Samba 4.0 includes (Fedora 18)
-if [ -d "/usr/include/samba-4.0" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0"
-fi
-
-# openldap 2.4 includes (CentOS 5)
-if [ -d "/usr/include/openldap24" ]; then
-  RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
-fi
-
-# libtirpc (fedora)
-if [ -d "/usr/include/tirpc" ]; then
-  RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}"
-fi
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
-  -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_SASL=ON \
-  -DWITH_LDAP=ON \
-  -DWITH_SAMBA=ON \
-  %{?!with_exr:-DWITH_OPENEXR=OFF} \
-  -DWITH_XCOMPOSITE=ON \
-  -DWITH_XCURSOR=ON \
-  -DWITH_XFIXES=ON \
-  %{?!with_xrandr:-DWITH_XRANDR=OFF} \
-  -DWITH_XRENDER=ON \
-  %{?!with_libconfig:-DWITH_LIBCONFIG=OFF} \
-  -DWITH_PCRE=ON \
-  %{?!with_xtest:-DWITH_XTEST=OFF} \
-  -DWITH_OPENGL=ON \
-  %{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \
-  %{?!with_libart:-DWITH_LIBART=OFF} \
-  -DWITH_LIBUSB=ON \
-  -DWITH_LIBRAW1394=ON \
-  -DWITH_SUDO_TDESU_BACKEND=OFF \
-  -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND=OFF \
-  -DWITH_PAM=ON \
-  -DWITH_SHADOW=OFF \
-  -DWITH_XDMCP=ON \
-  -DWITH_XINERAMA=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_I8K=ON \
-  -DWITH_SENSORS=ON \
-  %{?with_hal:-DWITH_HAL=ON} \
-  %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
-  -DWITH_UPOWER=ON \
-  %{?!with_elficon:-DWITH_ELFICON=OFF} \
-  \
-  -DBUILD_ALL=ON \
-%if 0%{?suse_version}
-  -DKCHECKPASS_PAM_SERVICE="xdm" \
-  -DTDM_PAM_SERVICE="xdm" \
-  -DTDESCREENSAVER_PAM_SERVICE="xdm" \
-%else
-  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
-  -DTDM_PAM_SERVICE="tdm-trinity" \
-  -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \
-%endif
-  %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \
-  %{!?with_tsak:-DBUILD_TSAK=OFF} \
-%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320
-  -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
-%endif
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# Removes obsolete Beagle-related files
-%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_index.pl
-%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_search.pl
-
-# Adds a GDM/KDM/XDM session called 'TDE'
-
-# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
-%__install -D -m 644 \
-	"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
-	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
-%endif
-
-# Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
-# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
-cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
-NAME=TDE
-ICON=kde-wmsession.xpm
-DESC=The Trinity Desktop Environment
-EXEC=%{tde_bindir}/%{starttde}
-SCRIPT:
-exec %{tde_bindir}/%{starttde}
-EOF
-
-%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
-cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
-NAME=TDM
-DESCRIPTION=TDM (Trinity Display Manager)
-PACKAGE=trinity-tdm
-EXEC=%{tde_bindir}/%{tdm}
-%if 0%{?pclinuxos}
-FNDSESSION_EXEC="/usr/sbin/chksession -k"
-%else
-%if 0%{?mgaversion} >= 6
-FNDSESSION_EXEC="/usr/sbin/chksession -l"
-%else
-FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
-%endif
-%endif
-EOF
-%endif
-
-# PAM configuration files (except openSUSE)
-%if 0%{?suse_version} == 0
-%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
-%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
-%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
-%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
-%endif
-
-# TDM configuration
-%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
-	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
-%else
-	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
-%endif
-
-# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
-if [ -r "/usr/share/usb.ids" ]; then
-  %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-  %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-elif [ -r "/usr/share/hwdata/usb.ids" ]; then
-  %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-  %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
-fi
-
-# Makes 'media_safelyremove.desktop' an alternative.
-# This allows the use of 'tdeio-umountwrapper' package.
-%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
-%__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives"
-%__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop"
-
-# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
-#  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
-%if 0%{?suse_version} >= 1210
-%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"
-%__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g"
-%endif
-
-# Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM.
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
-%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
-%endif
-
-# SELINUX policy for RHEL / Fedora
-%if 0%{?with_selinux_policy}
-%__cp -f "%{SOURCE8}" "tdm.te"
-%__make -f "%{_datadir}/selinux/devel/Makefile"
-%__install -D -m 644 -D "tdm.pp" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp"
-%endif
-
-# Mageia icon for TDE menu
-%if 0%{?mgaversion} >= 3
-%__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/icons/oxygen/scalable/mgabutton.svg"
-%endif
-
-# openSUSE 11.4: tdm startup script
-%if 0%{?suse_version} == 1140
-%__install -D -m 755 "%{SOURCE7}" "%{?buildroot}%{?_sysconfdir}/init.d/xdm.tde"
-%endif
-
-# Console font to fontconfig
-%__mkdir_p "%{buildroot}%{_sysconfdir}/fonts/conf.d"
-cat <<EOF >"%{buildroot}%{_sysconfdir}/fonts/conf.d/99-konsole.conf"
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <!-- Font directory list -->
-  <dir>%{tde_datadir}/apps/konsole/fonts</dir>
-</fontconfig>
-EOF
-
-# logrotate configuration
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/trinity-tdm"
-/var/log/tdm.log {
-    weekly
-    notifempty
-    missingok
-    nocompress
-}
-EOF
-
-# Move faces icon to XDG directory '/usr/share/faces'
-if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
-  %__mkdir_p "%{?buildroot}%{_datadir}/faces"
-  %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces" 2>/dev/null
-  rmdir "%{?buildroot}%{tdm_datadir}/pics/users"
-fi
-%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users"
-
-# Adds missing icons in 'hicolor' theme
-# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
-%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"
-pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/application-vnd.tde.misc.png  hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png  ;done
-for i in {16,22,32,48,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png                      hicolor/"$i"x"$i"/apps/kcmperformance.png       ;done
-for i in 16;                   do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png                    hicolor/"$i"x"$i"/apps/kcmkded.png              ;done
-for i in {16,22,32,48};        do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/system-log-out.png              hicolor/"$i"x"$i"/apps/kcmsmserver.png          ;done
-for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/tools-check-spelling.png        hicolor/"$i"x"$i"/apps/kcmspellchecking.png     ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/desktop.png                      hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png   ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/desktop.png                      hicolor/"$i"x"$i"/apps/kcmdesktop.png           ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png                          hicolor/"$i"x"$i"/apps/kcmtaskbar.png           ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/application-x-kcsrc.png       hicolor/"$i"x"$i"/apps/kcmcolors.png            ;done
-for i in {16,22,32,48,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png                      hicolor/"$i"x"$i"/apps/kcmlaunch.png            ;done
-for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png                      hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png      ;done
-for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/system-run.png                  hicolor/"$i"x"$i"/apps/kcmcgi.png               ;done
-for i in {16,22};              do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png                     hicolor/"$i"x"$i"/apps/kcmhistory.png           ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png                      hicolor/"$i"x"$i"/apps/kcmnetpref.png           ;done
-for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png                 hicolor/"$i"x"$i"/apps/kcmkdnssd.png            ;done
-for i in {16,22,32,48,64};     do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-joystick.png              hicolor/"$i"x"$i"/apps/kcmjoystick.png          ;done
-for i in {16,32,48,64,128};    do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-mouse.png                 hicolor/"$i"x"$i"/apps/kcmmouse.png             ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/computer.png                    hicolor/"$i"x"$i"/apps/kcmmedia.png             ;done
-for i in {16,22,32};           do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png                   hicolor/"$i"x"$i"/apps/kcmcrypto.png            ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/trashcan_empty.png               hicolor/"$i"x"$i"/apps/kcmprivacy.png           ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png                      hicolor/"$i"x"$i"/apps/kcmnic.png               ;done
-popd
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Help.desktop                       Documentation Viewer
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Home.desktop                       System FileManager core
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kate.desktop                       TextEditor
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/KControl.desktop                   X-SuSE-core
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/Kfind.desktop                      System Filesystem core
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop                 PrintingUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop                    System TrayIcon
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop                  Core-Configuration
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/knetattach.desktop                 System Network
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop                WebBrowser
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop                System FileManager
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsole.desktop                    TerminalEmulator
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop                  TerminalEmulator
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpager.desktop                     Utility  DesktopUtility
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop              DesktopUtility
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop                  System Monitor
-%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop                       System Utility
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kwrite.desktop                     TextEditor
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/tdeprintfax.desktop                PrintingUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefontview.desktop                Graphics Viewer
-%{?with_tderandrtray:%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderandrtray.desktop               Applet X-TDE-settings-desktop}
-%suse_update_desktop_file    %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop   System FileManager
-%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kdcop.desktop                      System Utility
-%endif
-
-# Icons from TDE Control Center should only be displayed in TDE
-for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
-  if grep -q "^Categories=.*X-TDE-settings" "${i}"; then
-    if ! grep -q "OnlyShowIn=TDE" "${i}" ; then
-      echo "OnlyShowIn=TDE;" >>"${i}"
-    fi
-  fi
-done
-
-# Other apps that should stay in TDE
-for i in ksysguard tde-kcontrol tdefontview showdesktop; do
-  echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop"
-done
-
-# Remove setuid bit on some binaries.
-%{?with_tsak:chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"}
-chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
-%{?with_kbdledsync:chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"}
-
-# Fix permissions on shell scripts
-chmod 0755 "%{?buildroot}%{tde_datadir}/apps/tdeconf_update/move_session_config.sh"
-chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs"
-
-# Removes tderandrtray documentation, if not built.
-%if 0%{?with_tderandrtray} == 0
-%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tderandrtray"
-%endif
-
-# Remove conflicting doc
-%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tdeioslave/gopher"
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%if 0%{?suse_version}
-# Check permissions on setuid files (openSUSE specific)
-%verifyscript
-%{?with_tsak:%verify_permissions -e %{tde_bindir}/%{tdm}tsak}
-%verify_permissions -e %{tde_bindir}/kcheckpass
-%{?with_kbdledsync:%verify_permissions -e %{tde_bindir}/tdekbdledsync}
-%endif
-
-
-%changelog
diff --git a/redhat/main/tdebase/tdm.fc33.te b/redhat/main/tdebase/tdm.fc33.te
deleted file mode 100644
index afe6de52a..000000000
--- a/redhat/main/tdebase/tdm.fc33.te
+++ /dev/null
@@ -1,11 +0,0 @@
-
-module tdm 1.0;
-
-require {
-	type fprintd_t;
-	type init_t;
-	class dbus send_msg;
-}
-
-#============= fprintd_t ==============
-allow fprintd_t init_t:dbus send_msg;
diff --git a/redhat/main/tdebase/tdm.service.fc33 b/redhat/main/tdebase/tdm.service.fc33
deleted file mode 100644
index 9ef7e07ff..000000000
--- a/redhat/main/tdebase/tdm.service.fc33
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=The Trinity login manager
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
-
-[Service]
-ExecStart=/opt/trinity/bin/tdm
-Restart=always
-IgnoreSIGPIPE=no
-
-[Install]
-Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga6 b/redhat/main/tdebase/tdm.service.mga6
deleted file mode 100644
index eda2906e2..000000000
--- a/redhat/main/tdebase/tdm.service.mga6
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Trinity Display Manager
-Documentation=man:tdm(1)
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
-
-[Service]
-ExecStart=/opt/trinity/bin/tdm
-Restart=always
-
-[Install]
-Alias=display-manager.service
diff --git a/redhat/main/tdebase/tdm.service.mga7 b/redhat/main/tdebase/tdm.service.mga7
deleted file mode 100644
index eda2906e2..000000000
--- a/redhat/main/tdebase/tdm.service.mga7
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Trinity Display Manager
-Documentation=man:tdm(1)
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
-
-[Service]
-ExecStart=/opt/trinity/bin/tdm
-Restart=always
-
-[Install]
-Alias=display-manager.service
diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/main/tdebindings/tdebindings.spec
deleted file mode 100644
index 1dac5bb72..000000000
--- a/redhat/main/tdebindings/tdebindings.spec
+++ /dev/null
@@ -1,1193 +0,0 @@
-#
-# spec file for package tdebindings (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/
-#
-
-# Required for PCLinuxOS: removes the ldflag '--no-undefined'
-%if 0%{?pclinuxos}
-%define _disable_ld_no_undefined 1
-%endif
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdebindings
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Special note for RHEL4:
-#  You must create symlink 'libgcj.so' manually because it does not exist by default.
-# E.g:
-#  ln -s /usr/lib/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so
-# or 64 bits:
-#  ln -s /usr/lib64/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so
-
-Name:			trinity-%{tde_pkg}
-Summary:		TDE bindings to non-C++ languages
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	desktop-file-utils
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# ZLIB support
-BuildRequires: zlib-devel
-
-# PERL module support
-BuildRequires: perl(ExtUtils::MakeMaker)
-
-# GTK2 support
-%if 0%{?rhel} == 4
-BuildRequires:	evolution28-gtk2-devel
-Requires:		evolution28-gtk2
-BuildRequires:	evolution28-glib2-devel
-Requires:		evolution28-glib2
-BuildRequires:	evolution28-cairo-devel
-Requires:		evolution28-cairo
-BuildRequires:	evolution28-pango-devel
-Requires:		evolution28-pango
-BuildRequires:	evolution28-atk-devel
-Requires:		evolution28-atk
-%else
-BuildRequires:	gtk2-devel
-%endif
-
-# XULRUNNER support
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-#BuildRequires: xulrunner-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires: mozilla-xulrunner20-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# GTK1 support
-%if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7)
-%define with_gtk1 1
-BuildRequires: glib-devel
-BuildRequires: gtk+-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6
-%if 0%{?with_gtk1}
-%define with_gtk1 1
-BuildRequires: glib-devel
-BuildRequires: gtk+-devel
-%endif
-%endif
-%if 0%{?mdkversion} == 201100
-%define with_gtk1 1
-BuildRequires: %{_lib}glib1.2-devel
-BuildRequires: %{_lib}gtk+-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libgdk_pixbuf2.0-devel
-%else
-BuildRequires:	%{_lib}gdk_pixbuf2.0-devel
-%endif
-%endif
-%if 0%{?fedora}
-%if 0%{?fedora} >= 17
-BuildRequires: gdk-pixbuf2-devel
-%else
-BuildRequires: gdk-pixbuf-devel
-%endif
-%endif
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-
-# PYTHON support
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-## ruby
-BuildRequires:	ruby-devel >= 1.8
-BuildRequires:	ruby >= 1.8
-%if 0%{?fedora} >= 19
-BuildRequires:	rubypick
-%endif
-
-# Check for Ruby library directory
-%if "%{?ruby_libarchdir}" != ""
-%define ruby_arch %{?ruby_libarchdir}
-%else
-%if "%{?rb_archdir}" != ""
-%define ruby_arch %{?rb_archdir}
-%else
-%if "%{%ruby_archdir}" != ""
-%define ruby_arch %{?ruby_archdir}
-%else
-%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')}
-%endif
-%endif
-%endif
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6
-%define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')
-%endif
-%if 0%{?pclinuxos}
-%define ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')
-%endif
-
-%if "%{?ruby_libdir}" != ""
-%define ruby_rubylibdir %{?ruby_libdir}
-%else
-%if "%{?rb_libdir}" != ""
-%define ruby_rubylibdir %{?rb_libdir}
-%else
-%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubylibdir"]')}
-%endif
-%endif
-
-# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
-%global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
-
-## java
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-BuildRequires:	java-1.4.2-gcj-compat-devel
-BuildRequires:	libgcj-devel
-BuildRequires:	gcc-java
-%endif
-
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-
-# PCLinuxOS use SUN's Java
-%if 0%{?pclinuxos}
-BuildRequires:	java-devel
-%else
-
-# Others use OpenJDK
-BuildRequires: java-openjdk
-BuildRequires: java-devel >= 1.4.2
-%if 0%{?suse_version} >= 1320
-BuildRequires:	java-1_8_0-openjdk-devel
-%endif
-%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8
-BuildRequires: java-1.8.0-openjdk-devel
-%endif
-%if 0%{?fedora} == 17 ||  0%{?fedora} == 18 ||  0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7
-BuildRequires: java-1.7.0-openjdk-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6
-BuildRequires: java-1.6.0-openjdk-devel
-%endif
-
-%endif
-%endif
-
-%if 0%{?suse_version}
-%define java_home %{_usr}/%{_lib}/jvm/java
-%else
-%if 0%{?rhel} == 4
-%define java_home %{_usr}/lib/jvm/java-1.4.2-gcj-1.4.2.0
-%else
-%define java_home %{_usr}/lib/jvm/java
-%endif
-%endif
-%if 0%{?pclinuxos} == 0
-%define _with_java --with-java=%{java_home}
-%endif
-
-## Perl
-# There is no 'perl-devel' package on RHEL5
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	perl-devel
-%endif
-%define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)}
-
-## QScintilla
-BuildRequires:	libtqscintilla-devel >= %{?tde_epoch:%{tde_epoch}:}1.7.1
-%define _enable_qscintilla --enable-qscintilla
-
-Obsoletes:	trinity-kdebindings < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdebindings = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# Metapackage requires
-%if "%{?_with_java}" != ""
-Requires: trinity-tdebindings-java = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-Requires: trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: python-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kjscmd = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{?_with_java}" != ""
-Requires: trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-Requires: trinity-libkorundum0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-TDE/DCOP bindings to non-C++ languages
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package java
-Summary:	TDE Java bindings metapackage [Trinity]
-Group:		System/Libraries
-Requires:	trinity-libdcop3-java = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libqt3-java = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtrinity-java = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description java
-A metapackage depending on all TDE, Qt and DCOP bindings libraries
-related to the Java language.
-
-This package is part of the official TDE bindings module.
-
-%files java
-%defattr(-,root,root,-)
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-libdcop3-java
-Summary:	DCOP bindings for Java [Trinity]
-Group:		System/Libraries
-
-Requires:	trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libdcop3-java
-This package contains the Java classes necessary to run Java programs
-using the Java DCOP bindings. DCOP is the TDE Desktop COmmunications
-Protocol, used for communicating with running TDE applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libdcop3-java
-%defattr(-,root,root,-)
-%{tde_libdir}/java/org/
-%endif
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-libdcop3-java-devel
-Summary:	DCOP bindings for Java (dcopidl2java program) [Trinity]
-Group:		Development/Languages/Java
-Requires:	trinity-libdcop3-java = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libdcop3-java-devel
-This package contains the dcopidl2java program which generates Java 
-stubs from DCOP IDL files, necessary to do development with the DCOP Java
-bindings. DCOP is the TDE Desktop COmmunications Protocol, used for
-communicating with running TDE applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libdcop3-java-devel
-%defattr(-,root,root,-)
-%{tde_bindir}/dcopidl2java
-%endif
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-libdcop3-jni
-Summary:	DCOP bindings for Java ( Native libraries ) [Trinity]
-Group:		System/Libraries
-
-%description -n trinity-libdcop3-jni
-This package contains the shared libraries and scripts necessary to
-run programs using the Java DCOP bindings. DCOP is the TDE Desktop
-COmmunications Protocol, used for communicating with running TDE
-applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libdcop3-jni
-%defattr(-,root,root,-)
-%{tde_libdir}/libjavadcop.la
-%{tde_libdir}/libjavadcop.so
-%endif
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-libqt3-java
-Summary:	Java bindings for Qt [Trinity]
-Group:		System/Libraries
-Requires:	trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libqt3-java
-This package contains the Java classes necessary to run Java programs
-using the Java Qt bindings. Qt is a very popular GUI toolkit, used by
-the TDE desktop environment.
-
-It also includes many example programs that make use of these bindings,
-plus many of the Qt Tutorial examples translated into Java.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libqt3-java
-%defattr(-,root,root,-)
-%{tde_libdir}/java/qtjava*.jar
-%{tde_tdedocdir}/HTML/en/javalib/
-%endif
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-libtqt3-jni
-Summary:	Java bindings for TQt ( Native libraries ) [Trinity]
-Group:		System/Libraries
-
-Obsoletes:	trinity-libqt3-jni < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libtqt3-jni
-This package contains the shared libraries necessary to run Java
-programs using the Java Qt bindings. Qt is a very popular GUI
-toolkit, used by the TDE desktop environment.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libtqt3-jni
-%defattr(-,root,root,-)
-%{tde_libdir}/lib*qtjavasupport.la
-%{tde_libdir}/lib*qtjavasupport.so.*
-%{tde_libdir}/jni/lib*qtjava.la
-%{tde_libdir}/jni/lib*qtjava.so.*
-%doc qtjava/ChangeLog
-%endif
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-libtqt3-jni-devel
-Summary:	Development files fo Java bindings for TQt ( Native libraries ) [Trinity]
-Group:		Development/Languages/Java
-Requires:	trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-libqt3-jni-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libtqt3-jni-devel
-This package contains the development files for trinity-libtqt3-jni.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libtqt3-jni-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/lib*qtjavasupport.so
-%{tde_libdir}/jni/lib*qtjava.so
-%endif
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-libtrinity-java
-Summary:	Tdelibs bindings for Java [Trinity]
-Group:		System/Libraries
-
-Requires:	trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libtrinity-java
-This package contains the Java classes necessary to run Java programs
-using the Java tdelibs bindings. TDE is the Trinity Desktop Environment, a
-very popular UNIX Desktop Environment.
-
-It also includes some example applications that use these Java
-classes, and multiple usage samples of the most common TDE classes.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libtrinity-java
-%defattr(-,root,root,-)
-%{tde_libdir}/java/koala*.jar
-%endif
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-libtrinity-jni
-Summary:	Tdelibs bindings for java ( Native libraries ) [Trinity]
-Group:		System/Libraries
-
-%description -n trinity-libtrinity-jni
-This package contains the shared libraries necessary to run Java
-programs using the Java tdelibs bindings. TDE is the Trinity Desktop
-Environment, a very popular UNIX Desktop Environment.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libtrinity-jni
-%defattr(-,root,root,-)
-%{tde_libdir}/jni/libtdejava.la
-%{tde_libdir}/jni/libtdejava.so.*
-%doc tdejava/ChangeLog
-%endif
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-libtrinity-jni-devel
-Summary:	Development files for tdelibs bindings for java ( Native libraries ) [Trinity]
-Group:		Development/Languages/Java
-Requires:	trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libtrinity-jni-devel
-This package contains the development files for trinity-libtrinity-jni.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libtrinity-jni-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/jni/libtdejava.so
-%endif
-
-##########
-
-%package -n trinity-libsmoketqt
-Summary:	SMOKE Binding Library to Qt
-Group:		System/Libraries
-
-Obsoletes:	trinity-libsmokeqt1 < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libsmokeqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libsmoketqt
-The "Scripting Meta Object Kompiler Engine" library is used by
-various TDE language bindings packages to provide interfaces to the
-Qt library.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libsmoketqt
-%defattr(-,root,root,-)
-%{tde_libdir}/libsmoketqt.so.*
-
-##########
-
-%package -n trinity-libsmoketqt-devel
-Summary:	SMOKE Binding Library to TQt - Development Files
-Group:		Development/Languages/Other
-Requires:	trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-libsmokeqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libsmokeqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libsmoketqt-devel
-The "Scripting Meta Object Kompiler Engine" library is used by
-various TDE language bindings packages to provide interfaces to the
-Qt library. This package contains the development files for the
-library.
-
-If you are a normal user, you probably don't need this
-package.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libsmoketqt-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/smoke.h
-%{tde_libdir}/libsmoketqt.so
-%{tde_libdir}/libsmoketqt.la
-
-##########
-
-%package -n trinity-libsmoketde
-Summary:	SMOKE Binding Library to TDE
-Group:		System/Libraries
-
-Obsoletes:	trinity-libsmokekde1 < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libsmokekde1 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libsmoketde
-The "Scripting Meta Object Kompiler Engine" library is used by
-various TDE language bindings packages to provide interfaces to the
-TDE libraries.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libsmoketde
-%defattr(-,root,root,-)
-%{tde_libdir}/libsmoketde.so.*
-
-##########
-
-%package -n trinity-libsmoketde-devel
-Summary:	SMOKE Binding Library to TDE - Development Files
-Group:		Development/Languages/Other
-Requires:	trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-libsmokekde-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libsmokekde-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libsmoketde-devel
-The "Scripting Meta Object Kompiler Engine" library is used by
-various TDE language bindings packages to provide interfaces to the
-Qt and TDE libraries. This package contains the development files for
-the library.
-
-If you are a normal user, you probably don't need this
-package.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libsmoketde-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libsmoketde.so
-%{tde_libdir}/libsmoketde.la
-
-##########
-
-%package -n perl-dcop
-Summary:	DCOP Bindings for Perl 
-Group:		System/Libraries
-%if 0%{?suse_version}
-Requires:	perl-base
-%else
-Requires:	perl
-%endif
-
-Obsoletes:	trinity-kdebindings-dcopperl < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdebindings-dcopperl = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-perl-dcop < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n perl-dcop
-Perl bindings to the DCOP interprocess communication protocol used by TDE
-
-%files -n perl-dcop
-%defattr(-,root,root,-)
-%{perl_vendorarch}/auto/DCOP/
-%{perl_vendorarch}/DCOP.pm
-%{perl_vendorarch}/DCOP/
-%doc dcopperl/AUTHORS dcopperl/Changes dcopperl/README dcopperl/TODO
-%{tde_mandir}/man3/DCOP.3pm*
-
-##########
-
-%package -n python-dcop
-Summary:	DCOP bindings for Python
-Group:		System/Libraries
-Requires:	%{python}
-
-Obsoletes:	trinity-python-dcop < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-python-dcop = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n python-dcop
-This package contains the shared libraries necessary to run and
-develop Python programs using the Python DCOP bindings
-libraries. DCOP is the TDE Desktop COmmunications Protocol, used for
-communicating with running TDE applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n python-dcop
-%defattr(-,root,root,-)
-%{python_sitearch}/pcop.la
-%{python_sitearch}/pcop.so
-%{python_sitearch}/pydcop.py*
-
-##########
-
-%package -n trinity-libkjsembed1
-Summary:	Embedded JavaScript library
-Group:		System/Libraries
-
-%description -n trinity-libkjsembed1
-This package contains the shared libraries necessary to run programs
-linked with the KJSEmbed library. This library provides JavaScript
-embedded scripting facilities to TDE applications.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libkjsembed1
-%defattr(-,root,root,-)
-%{tde_libdir}/libkjsembed.so.*
-%{tde_tdelibdir}/libimagefxplugin.la
-%{tde_tdelibdir}/libimagefxplugin.so
-%{tde_datadir}/services/imagefx_plugin.desktop
-%{tde_tdelibdir}/libqprocessplugin.so
-%{tde_tdelibdir}/libqprocessplugin.la
-%{tde_datadir}/services/qprocess_plugin.desktop
-%{tde_tdelibdir}/libfileitemplugin.la
-%{tde_tdelibdir}/libfileitemplugin.so
-%{tde_datadir}/services/tdefileitem_plugin.desktop
-%{tde_datadir}/apps/kjsembed/
-%{tde_datadir}/servicetypes/binding_type.desktop
-%{tde_bindir}/embedjs
-%{tde_datadir}/apps/embedjs/
-%{tde_tdeappdir}/embedjs.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/embedjs.png
-%{tde_datadir}/icons/hicolor/32x32/apps/embedjs.png
-%{tde_tdelibdir}/libjavascript.la
-%{tde_tdelibdir}/libjavascript.so
-%dir %{tde_datadir}/apps/kate
-%dir %{tde_datadir}/apps/kate/scripts
-%{tde_datadir}/apps/kate/scripts/swaptabs.js
-%{tde_datadir}/apps/kate/scripts/swaptabs.ui
-%{tde_datadir}/apps/kate/scripts/swaptabs.desktop
-%{tde_datadir}/services/javascript.desktop
-%doc kjsembed/docs/ChangeLog
-
-##########
-
-%package -n trinity-libkjsembed-devel
-Summary:	Embedded JavaScript library (Development files)
-Group:		Development/Libraries/Other
-Requires:	trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkjsembed-devel
-This package contains the header files and symbolic links necessary
-to develop and compile programs using the KJSEmbed library. This
-library provides JavaScript embedded scripting facilities to TDE
-applications.
-
-It also includes lots of example programs that make use of these
-bindings, plus comprehensive documentation of the bindings.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libkjsembed-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kjsembed/
-%{tde_libdir}/libkjsembed.so
-%{tde_libdir}/libkjsembed.la
-%{tde_docdir}/trinity-libkjsembed-devel/
-
-##########
-
-%package -n trinity-kjscmd
-Summary:	A script interpreter using the TDE JavaScript library
-Group:		System/Libraries
-Provides:	%{tde_bindir}/kjscmd
-
-%description -n trinity-kjscmd
-This package contains the kjscmd program, which is a standalone
-JavaScript interpreter using the KJSEmbed library.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-kjscmd
-%defattr(-,root,root,-)
-%{tde_bindir}/kjscmd
-%{tde_tdeappdir}/kjscmd.desktop
-%{tde_mandir}/man1/kjscmd.*
-%{tde_tdelibdir}/libjsconsoleplugin.la
-%{tde_tdelibdir}/libjsconsoleplugin.so
-
-##########
-
-%if "%{?_with_java}" != ""
-%package -n trinity-juic
-Summary:	The Qt Java UI Compiler
-Group:		Development/Languages/Java
-Requires:	trinity-libqt3-java = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-juic
-This package contains the juic program, which is used to convert
-a UI description file generated by the Qt Designer, and converts
-it into a Qt Java class. It is necessary for compiling and 
-developing programs using the Qt Java bindings together with Qt
-Designer.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-juic
-%defattr(-,root,root,-)
-%{tde_bindir}/juic
-%{tde_datadir}/juic/
-%endif
-
-##########
-
-%package -n trinity-libkorundum0-ruby
-Summary:	TDE bindings for Ruby [Trinity]
-Group:		System/Libraries
-Requires:	trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkorundum0-ruby
-This package contains the files necessary for running and developing
-Ruby code using the Korundum TDE Ruby bindings.
-
-It also includes some example programs and templates that make use of
-these bindings.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libkorundum0-ruby
-%defattr(-,root,root,-)
-%{tde_bindir}/rbtdesh
-%{tde_bindir}/rbtdeapi
-%{tde_bindir}/krubyinit
-%{tde_bindir}/rbtdeconfig_compiler
-%{ruby_rubylibdir}/Korundum.rb
-%dir %{ruby_rubylibdir}/TDE
-%{ruby_rubylibdir}/TDE/korundum.rb
-%{ruby_arch}/korundum.la
-%{ruby_arch}/korundum.so*
-%doc korundum/ChangeLog
-
-##########
-
-%package -n trinity-libqt0-ruby
-Summary:	Qt bindings for Ruby [Trinity]
-Group:		System/Libraries
-Requires:	ruby
-
-%description -n trinity-libqt0-ruby
-This package contains the files necessary for running and developing
-Ruby code using the Qt Ruby bindings.
-
-It also includes some example programs that make use of these bindings,
-plus many of the Qt Tutorial examples translated into Ruby.
-
-This package is part of the official TDE bindings module.
-
-%files -n trinity-libqt0-ruby
-%defattr(-,root,root,-)
-%{tde_bindir}/rbqtsh
-%{tde_bindir}/rbqtapi
-%{tde_bindir}/rbuic
-%{tde_bindir}/qtrubyinit
-%dir %{ruby_rubylibdir}/Qt
-%{ruby_rubylibdir}/Qt/qtruby.rb
-%{ruby_rubylibdir}/Qt.rb
-%{ruby_arch}/qtruby.so*
-%{ruby_arch}/qtruby.la
-%{ruby_arch}/tqui.so*
-%{ruby_arch}/tqui.la
-%doc qtruby/ChangeLog
-
-##########
-
-%if 0
-%package -n trinity-kmozilla
-Summary:	Kmozilla for TDE
-Group:		System/Libraries
-
-%description -n trinity-kmozilla
-This package contains the kmozilla library fro TDE.
-
-%files -n trinity-kmozilla
-%defattr(-,root,root,-)
-%{tde_bindir}/kmozilla
-%{tde_libdir}/libkmozillapart.so.*
-%{tde_libdir}/libkmozillapart.so
-%{tde_libdir}/libkmozillapart.la
-%{tde_datadir}/services/kmozilla.desktop
-%endif
-
-##########
-
-%package -n trinity-xpart-notepad
-Summary:	A small XPart editor
-Group:		Productivity/Scientific/Math
-
-%description -n trinity-xpart-notepad
-xpart_notepad is a small XPart editor. Use it to understand how to use XPart.
-
-%files -n trinity-xpart-notepad
-%defattr(-,root,root,-)
-%{tde_bindir}/shell_xparthost
-%{tde_bindir}/xp_notepad
-%{tde_libdir}/libxp_notepadpart.la
-%{tde_libdir}/libxp_notepadpart.so
-%{tde_libdir}/libxp_notepadpart.so.*
-%{tde_datadir}/services/xp_notepad.desktop
-%doc xparts/xpart_notepad/README
-
-##########
-
-%if 0%{?with_gtk1}
-%package -n trinity-libgtkxparts1
-Summary:	Xparts library for GTK
-Group:		Development/Languages/Other
-
-%description -n trinity-libgtkxparts1
-This package contains the xparts library for GTK.
-
-%files -n trinity-libgtkxparts1
-%defattr(-,root,root,-)
-%{tde_libdir}/libgtkxparts.so.*
-%{tde_libdir}/libgtkxparts.la
-
-%endif
-
-##########
-
-%package -n trinity-libtdexparts
-Summary:	Xparts library for TDE
-Group:		Development/Languages/Other
-
-Obsoletes:	trinity-libkdexparts1 < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-libkdexparts1 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libtdexparts
-This package contains the xparts library for TDE.
-
-%files -n trinity-libtdexparts
-%defattr(-,root,root,-)
-%{tde_libdir}/libtdexparts.so.*
-%{tde_libdir}/libtdexparts.la
-
-##########
-
-%package -n trinity-libxparts-devel
-Summary:	Xparts development files
-Group:		Development/Languages/Other
-%if 0%{?with_gtk1}
-Requires:	trinity-libgtkxparts1 = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-Requires:	trinity-libtdexparts = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libxparts-devel
-This package contains the development files for Xparts library.
-
-%files -n trinity-libxparts-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/xtdeparts/
-%if 0%{?with_gtk1}
-%{tde_libdir}/libgtkxparts.so
-%endif
-%{tde_libdir}/libtdexparts.so
-
-##########
-
-%package xparts-extras
-Summary:	Extra xparts for TDE [Trinity]
-Group:		Development/Languages/Other
-
-# Metapckage requires
-Requires:	trinity-xpart-notepad = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?with_gtk1}
-Requires:	trinity-libgtkxparts1 = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-Requires:	trinity-libtdexparts = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libdcop-c = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description xparts-extras
-This package contains extra xparts-based modules for Trinity
-This includes the mozilla-konqueror plugin
-
-This package is part of the official TDE bindings module.
-
-%files xparts-extras
-%defattr(-,root,root,-)
-
-###########
-
-%package -n trinity-libdcop-c
-Summary:	DCOP bindings for C [Trinity]
-Group:		System/Libraries
-
-%description -n trinity-libdcop-c
-This package contains the DCOP bindings for C.
-
-%files -n trinity-libdcop-c
-%defattr(-,root,root,-)
-%{tde_libdir}/libdcopc.so.*
-
-###########
-
-%package -n trinity-libdcop-c-devel
-Summary:	DCOP bindings for C, development files [Trinity]
-Group:		Development/Languages/C and C++
-Requires:	trinity-libdcop-c = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libdcop-c-devel
-This package contains the development files for DCOP bindings for C.
-
-%files -n trinity-libdcop-c-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libdcopc.so
-%{tde_libdir}/libdcopc.la
-%{tde_tdeincludedir}/dcopc/
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Languages/Other
-
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-kdebindings-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdebindings-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# Metapackage
-Requires:	trinity-libsmoketqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{?_with_java}" != ""
-Requires:	trinity-libdcop3-java-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-Requires:	trinity-libsmoketde-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkjsembed-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libxparts-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libdcop-c-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{?_with_java}" != ""
-Requires:	trinity-libtqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtrinity-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%description devel
-This package contains the development files for the TDE bindings.
-
-%files devel
-%defattr(-,root,root,-)
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%if "%{?perl_vendorarch}" == ""
-exit 1
-%endif
-
-%if "%{?ruby_rubylibdir}" == ""
-exit 2
-%endif
-
-%if "%{?ruby_arch}" == ""
-exit 3
-%endif
-
-# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \
-       -i "korundum/rubylib/korundum/Korundum.cpp" \
-       -e "s|rb_frame_this_func|rb_frame_last_func|g"
-%endif
-
-# Another strange FTBFS in RHEL 5
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-%__sed -i "xparts/xpart_notepad/shell_xparthost.cpp" \
-       -i "xparts/xpart_notepad/xp_notepad.cpp" \
-       -e "/TDEApplication/ s| );|, true, true, true);|"
-%endif
-
-# Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so')
-%__sed -i "xparts/Makefile.am" \
-       -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|"
-
-# Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd'
-%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8
-%__sed -i "kjsembed/tdescript/swaptabs.js" \
-       -i "kjsembed/stdlib/cmdline.js" \
-       -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|"
-%endif
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export TDEDIR=%{tde_prefix}
-
-unset JAVA_HOME ||:
-%{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
-
-# sip/PyQt/PyKDE built separately, not here
-export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
-
-# Ruby headers, strange location ...
-if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then
-  export EXTRA_INCLUDES="/usr/include/%{_normalized_cpu}-linux"
-fi
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-if [ -d "/usr/evolution28" ]; then
-  export PATH="/usr/evolution28/bin:${PATH}"
-  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
-fi
-
-# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h
-%if 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320
-EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
-%endif
-%if 0%{?suse_version} >= 1330
-EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
-%endif
-
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_docdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \
-  --with-extra-libs=%{tde_libdir} \
-  --with-pythondir=%{_usr} \
-  \
-  %{?_with_java} %{!?_with_java:--without-java} \
-  %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla}
-
-# Build dcopperl with specific options
-pushd dcopperl
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3
-%__make OPTIMIZE="$RPM_OPT_FLAGS" ||:
-popd
-
-# smoke (not smp-safe)
-%__make -C smoke
-
-# The rest is smp-safe
-%__make %{?_smp_mflags} PYTHON=%{__python}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf $RPM_BUILD_ROOT
-
-%__make install DESTDIR=%{?buildroot} \
-  PYTHON=%{__python}
-
-# Removes some perl files
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-
-%if "%{?_with_java}" != ""
-# Installs juic
-%__install -D -m 755 qtjava/designer/juic/bin/juic	%{?buildroot}%{tde_bindir}/juic
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common
-%__install -m 644 qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common
-%__install -m 644 qtjava/designer/juic/common/*.xsl %{?buildroot}%{tde_datadir}/juic/common
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/java
-%__install -m 644 qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java
-%__install -m 644 qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java
-%__install -m 644 qtjava/designer/juic/juic.xsl  %{?buildroot}%{tde_datadir}/juic
-%endif
-
-# kjsembed sample files
-%__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-%__install -m 644 kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
-
-# Move 'embedjs.desktop' to correct location
-%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop"
-%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -u kjscmd  Development 
-%suse_update_desktop_file -u embedjs Development 
-%endif
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec
deleted file mode 100644
index e8118eff5..000000000
--- a/redhat/main/tdeedu/tdeedu.spec
+++ /dev/null
@@ -1,1222 +0,0 @@
-#
-# spec file for package tdeedu (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeedu
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Educational/Edutainment applications
-Group:			System/GUI/Other
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires: desktop-file-utils
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	gcc-c++
-BuildRequires:	fdupes
-BuildRequires:	doxygen
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# LIBUSB support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
-BuildRequires:	%{_lib}usb1.0-devel
-BuildRequires:	%{_lib}usb-compat0.1-devel
-%else
-BuildRequires:	libusb-devel
-%endif
-
-# PYTHON3 support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8
-%global python python3
-%global __python %__python3
-%global python_sitearch %{python3_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-# BOOST support
-BuildRequires:	boost-devel
-%if 0%{?mgaversion} >= 7
-BuildRequires:	%{_lib}boost_python3-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libboost_%{python}-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:	boost-%{python}-devel
-%endif
-
-# OCAML support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-BuildRequires: ocaml(compiler)
-#BuildRequires: ocaml-facile-devel
-%else
-BuildRequires: ocaml
-#BuildRequires: ocaml-facile-devel
-%endif
-
-# KIG python scripting support
-%if 0%{?rhel} != 5
-%define with_kig 1
-%endif
-
-# V4L support
-%if 0%{?rhel} != 5
-%define with_v4l 1
-%endif
-
-Obsoletes:		trinity-kdeedu < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdeedu = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kdeedu-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdeedu-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# Meta-package
-Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-blinken = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kalzium = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kanagram = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kbruch = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-keduca = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kgeography = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-khangman = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?with_kig}
-Requires: trinity-kig = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-Requires: trinity-kiten = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-klatin = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-klettres = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmplot = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kpercentage = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kstars = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ktouch = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kturtle = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kverbos = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kvoctrain = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kwordquiz = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-Educational/Edutainment applications, including:
-* blinken: Simon Says Game
-* kalzium: Periodic Table of Elements
-* kanagram: Letter Order Game
-* kbruch: Exercise Fractions
-* keduca: Tests and Exams
-* kgeography: Geography Trainer
-* khangman: Hangman Game
-%if 0%{?with_kig}
-* kig: Interactive Geometry
-%endif
-* kiten: Japanese Reference/Study Tool
-* klatin: Latin Reviser
-* klettres: French alphabet tutor
-* kmplot: Mathematical Function Plotter
-* kpercentage: Excersie Percentages
-* kstars: Desktop Planetarium
-* ktouch: Touch Typing Tutor
-* kturtle: Logo Programming Environment
-* kverbos: Study Spanish Verbforms
-* kvoctrain: Vocabulary Trainer
-* kwordquiz: Vocabulary Trainer
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING README
-
-##########
-
-%package data
-Summary:	Shared data for Trinity educational applications
-Group:		System/GUI/Other
-
-%description data
-This package contains shared data necessary for running the
-educational applications provided with TDE (the Trinity Desktop
-Environment).
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files data
-%defattr(-,root,root,-)
-%{tde_datadir}/applnk/Edutainment/Languages/.directory
-%{tde_datadir}/applnk/Edutainment/Miscellaneous/.directory
-%{tde_datadir}/applnk/Edutainment/Mathematics/.directory
-%{tde_datadir}/applnk/Edutainment/Science/.directory
-%{tde_datadir}/applnk/Edutainment/Tools/.directory
-
-##########
-
-%package -n trinity-blinken
-Summary:	Trinity version of the Simon Says electronic memory game
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-blinken
-Blinken is based on an electronic game released in 1978, which
-challenges players to remember sequences of increasing length.  On
-the face of the device, there are 4 different color buttons, each
-with its own distinctive sound.  These buttons light up randomly,
-creating the sequence that the player must then recall.  If the
-player is successful in remembering the sequence of lights in the
-correct order, they advance to the next stage, where an identical
-sequence with one extra step is presented.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-blinken
-%defattr(-,root,root,-)
-%{tde_bindir}/blinken
-%{tde_tdeappdir}/blinken.desktop
-%{tde_datadir}/apps/blinken/
-%{tde_datadir}/config.kcfg/blinken.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/blinken.png
-%{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz
-%{tde_tdedocdir}/HTML/en/blinken/
-%{tde_mandir}/man1/blinken*
-
-##########
-
-%package -n trinity-kalzium
-Summary:	Chemistry teaching tool for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kalzium
-Kalzium is a program which shows you the Periodic System of Elements
-(PSE).  You can use Kalzium to search for information about the
-elements or to learn facts about the PSE.
-
-Kalzium provides you with all kinds of information about the PSE.
-You can look up lots of information about the elements and also use
-visualisations to show them.
-
-You can visualise the Periodic Table of the Elements by blocks,
-groups, acidic behavior or different states of matter.  You can also
-plot data for a range of elements (weight, mean weight, density, IE1,
-IE2, electronegativity), and you can go back in time to see what
-elements were known at a given date.  In addition, on platforms where
-OCaml supports native code generation, Kalzium includes a chemical
-equation solver.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kalzium
-%defattr(-,root,root,-)
-%{tde_bindir}/kalzium
-%{tde_tdeappdir}/kalzium.desktop
-%{tde_datadir}/config.kcfg/kalzium.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kalzium.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz
-%{tde_tdedocdir}/HTML/en/kalzium/
-%{tde_mandir}/man1/kalzium*
-
-##########
-
-%package -n trinity-kalzium-data
-Summary:	Data files for Kalzium
-Group:		System/GUI/Other
-
-%description -n trinity-kalzium-data
-This package contains architecture-independent data files for
-Kalzium, the TDE periodic table application.  This includes pictures
-of various chemical equipment and of samples of several elements, in
-addition to the actual chemical data.
-
-See the kalzium package for further information.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kalzium-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kalzium/
-
-##########
-
-%package -n trinity-kanagram
-Summary:	Letter order game for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kanagram
-KAnagram is a game that is based on the word/letter puzzles that the
-author played as a child.  A word is picked at random and displayed
-with its letters in a messed order, with difficulty dependent on the
-chosen level.  You have an unlimited number of attempts, and scores
-are kept.
-
-It is a very simply constructed game, with 3 difficulty levels of
-play.  It is fully customizable, allowing you to write in your own
-words and set your own 'look and feel' of the game.  It is aimed for
-children aged 10+ because of the difficulty, but of course everyone
-is welcome to try.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kanagram
-%defattr(-,root,root,-)
-%{tde_bindir}/kanagram
-%{tde_tdeappdir}/kanagram.desktop
-%{tde_datadir}/apps/kanagram/
-%{tde_datadir}/config.kcfg/kanagram.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kanagram.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz
-%{tde_tdedocdir}/HTML/en/kanagram/
-%{tde_mandir}/man1/kanagram*
-
-##########
-
-%package -n trinity-kbruch
-Summary:	Fraction calculation teaching tool for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kbruch
-KBruch is a small program to practice calculating with fractions.
-Different exercises are provided for this purpose.  The program
-checks the user's input and gives feedback.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kbruch
-%defattr(-,root,root,-)
-%{tde_bindir}/kbruch
-%{tde_datadir}/apps/kbruch/
-%{tde_tdeappdir}/kbruch.desktop
-%{tde_datadir}/config.kcfg/kbruch.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kbruch.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kbruch.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png
-%{tde_tdedocdir}/HTML/en/kbruch/
-%{tde_mandir}/man1/kbruch*
-
-##########
-
-%package -n trinity-keduca
-Summary:	Interactive form-based tests for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-keduca
-KEduca is a flash-card application which allows you to make
-interactive form-based tests.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-keduca
-%defattr(-,root,root,-)
-%{tde_bindir}/keduca
-%{tde_bindir}/keducabuilder
-%{tde_bindir}/keduca-shrinker
-%{tde_tdelibdir}/libkeducapart.la
-%{tde_tdelibdir}/libkeducapart.so
-%{tde_tdeappdir}/keduca.desktop
-%{tde_tdeappdir}/keducabuilder.desktop
-%{tde_datadir}/apps/keduca/
-%{tde_datadir}/config.kcfg/keduca.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/keduca.png
-%{tde_datadir}/mimelnk/application/x-edu.desktop
-%{tde_datadir}/mimelnk/application/x-edugallery.desktop
-%{tde_datadir}/services/keduca_part.desktop
-%{tde_tdedocdir}/HTML/en/keduca/
-%{tde_mandir}/man1/keduca*
-
-##########
-
-%package -n trinity-kgeography
-Summary:	Geography learning tool for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kgeography
-KGeography contains maps allowing you to learn various countries or
-the political divisions of several countries.  It has several modes,
-including a map browser and games involving the names, capitals, or
-flags of the map divisions.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kgeography
-%defattr(-,root,root,-)
-%{tde_bindir}/kgeography
-%{tde_bindir}/kgeography_gen_map.pl
-%{tde_tdeappdir}/kgeography.desktop
-%{tde_datadir}/config.kcfg/kgeography.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kgeography.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/kgeography.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kgeography.png
-%{tde_tdedocdir}/HTML/en/kgeography
-%{tde_mandir}/man1/kgeography*
-
-##########
-
-%package -n trinity-kgeography-data
-Summary:	Data files for KGeography
-Group:		System/GUI/Other
-
-%description -n trinity-kgeography-data
-This package contains architecture-independent data files for
-KGeography, the geography learning tool for TDE. This includes map
-and flag images.
-
-See the kgeography package for further information.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kgeography-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kgeography/
-
-##########
-
-%package -n trinity-khangman
-Summary:	The classical hangman game for Trinity
-Group:		System/GUI/Other
-#Requires:	dustin-dustismo-sans-fonts
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-khangman
-KHangMan is a game based on the well known hangman game.  It is aimed
-for children aged 6 and above.  It has four levels of difficulty:
-Animals (animals words), Easy, Medium and Hard.
-
-A word is picked at random and the letters are hidden.  You must
-guess the word by trying one letter after another.  Each time you
-guess a wrong letter, a picture of a hangman is drawn.  You must
-guess the word before getting hanged!  You have 10 tries.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-khangman
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/khangmanrc
-%{tde_bindir}/khangman
-%{tde_tdeappdir}/khangman.desktop
-%{tde_datadir}/apps/khangman/
-%{tde_datadir}/config.kcfg/khangman.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/khangman.png
-%{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz
-%{tde_tdedocdir}/HTML/en/khangman/
-%{tde_mandir}/man1/khangman*
-
-##########
-
-%if 0%{?with_kig}
-%package -n trinity-kig
-Summary:	Interactive geometry program for TDE
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kig
-Kig is an application for interactive geometry.  It is intended to
-serve two purposes:
-
-- to allow students to interactively explore mathematical figures and
-  concepts using the computer;
-- to serve as a WYSIWYG tool for drawing mathematical figures and
-  including them in other documents.
-
-With this program you can do geometry on a computer just like you
-would on a blackboard in a classroom.  However, the program allows
-you to move and change parts of a geometrical drawing so that you can
-see how the other parts change as a result.
-
-Kig supports loci and user-defined macros.  It also supports imports
-and exports to/from foreign file formats including Cabri, Dr. Geo,
-KGeo, KSeg and XFig.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kig
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/magic/cabri.magic
-%config(noreplace) %{tde_confdir}/magic/drgeo.magic
-%{tde_bindir}/kig
-%{tde_bindir}/pykig.py*
-%{tde_tdelibdir}/tdefile_drgeo.la
-%{tde_tdelibdir}/tdefile_drgeo.so
-%{tde_tdelibdir}/tdefile_kig.la
-%{tde_tdelibdir}/tdefile_kig.so
-%{tde_tdelibdir}/libkigpart.la
-%{tde_tdelibdir}/libkigpart.so
-%{tde_tdeappdir}/kig.desktop
-%if 0%{?with_kig}
-%{tde_datadir}/apps/katepart/syntax/python-kig.xml
-%endif
-%{tde_datadir}/apps/kig/
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kig_doc.png
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kig_doc.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kig.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kig.svgz
-%{tde_datadir}/mimelnk/application/x-cabri.desktop
-%{tde_datadir}/mimelnk/application/x-drgeo.desktop
-%{tde_datadir}/mimelnk/application/x-kig.desktop
-%{tde_datadir}/mimelnk/application/x-kgeo.desktop
-%{tde_datadir}/mimelnk/application/x-kseg.desktop
-%{tde_datadir}/services/tdefile_drgeo.desktop
-%{tde_datadir}/services/tdefile_kig.desktop
-%{tde_datadir}/services/kig_part.desktop
-%{tde_tdedocdir}/HTML/en/kig/
-%config(noreplace) %{tde_confdir}/magic/cabri.magic.mgc
-%config(noreplace) %{tde_confdir}/magic/drgeo.magic.mgc
-%{tde_mandir}/man1/kig*
-%endif
-
-##########
-
-%package -n trinity-kiten
-Summary:	Japanese reference/study tool for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-#Requires:	ttf-kochi-gothic | ttf-kochi-mincho
-
-%description -n trinity-kiten
-Kiten is a Japanese reference and study tool for TDE.  It is an
-application with multiple functions.  Firstly, it is a convenient
-English to Japanese and Japanese to English dictionary.  Secondly, it
-is a Kanji dictionary, with multiple ways to look up specific
-characters.  Thirdly, it is a tool to help you learn Kanji.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kiten
-%defattr(-,root,root,-)
-%{tde_bindir}/kiten
-%{tde_bindir}/kitengen
-%{tde_tdeappdir}/kiten.desktop
-%{tde_tdedocdir}/HTML/en/kiten/
-%{tde_datadir}/icons/hicolor/*/apps/kiten.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz
-%{tde_mandir}/man1/kiten*
-
-##########
-
-%package -n trinity-klatin
-Summary:	Application to help revise/teach Latin
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-klatin
-KLatin is a program to help revise Latin.  There are three "sections"
-in which different aspects of the language can be revised.  These are
-the vocabulary, grammar and verb testing sections.  In addition there
-is a set of revision notes that can be used for self-guided revision.
-
-In the vocabulary section an XML file is loaded containing various
-words and their local language translations.  KLatin asks you what
-each of these words translate into.  The questions take place in a
-multiple-choice environment.
-
-In the grammar and verb sections KLatin asks for a particular part of
-a noun or a verb, such as the "ablative singular", or the "1st person
-indicative passive plural", and is not multiple choice.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-klatin
-%defattr(-,root,root,-)
-%{tde_bindir}/klatin
-%{tde_tdeappdir}/klatin.desktop
-%{tde_datadir}/apps/klatin/
-%{tde_datadir}/config.kcfg/klatin.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/klatin.png
-%{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz
-%{tde_tdedocdir}/HTML/en/klatin/
-%{tde_mandir}/man1/klatin*
-
-##########
-
-%package -n trinity-klettres
-Summary:	Foreign alphabet tutor for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-klettres
-KLettres is an application specially designed to help the user to
-learn the alphabet in a new language and then to learn to read simple
-syllables.  The user can be a young child aged from two and a half or
-an adult that wants to learn the basics of a foreign language.
-
-Seven languages are currently available: Czech, Danish, Dutch,
-English, French, Italian and Slovak.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-klettres
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/klettresrc
-%{tde_bindir}/klettres
-%{tde_tdeappdir}/klettres.desktop
-%{tde_datadir}/config.kcfg/klettres.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/klettres.png
-%{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz
-%{tde_tdedocdir}/HTML/en/klettres/
-%{tde_mandir}/man1/klettres*
-
-##########
-
-%package -n trinity-klettres-data
-Summary:	Data files for KLettres foreign alphabet tutor
-Group:		System/GUI/Other
-
-%description -n trinity-klettres-data
-This package contains architecture-independent data files for
-KLettres, the foreign alphabet tutor for TDE.  This includes sound
-files and graphics.
-
-See the klettres package for further information.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-klettres-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/klettres/
-
-##########
-
-%package -n trinity-kmplot
-Summary:	Mathematical function plotter for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kmplot
-KmPlot is a mathematical function plotter for TDE.  It has a powerful
-built-in parser.  You can plot different functions simultaneously and
-combine them to build new functions.
-
-KmPlot supports parametric functions and functions in polar
-coordinates.  Several grid modes are supported.  Plots may be printed
-with high precision in the correct scale.
-
-KmPlot also provides some numerical and visual features, like filling
-and calculating the area between the plot and the first axis, finding
-maximum and minimum values, changing function parameters dynamically
-and plotting derivatives and integral functions.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kmplot
-%defattr(-,root,root,-)
-%{tde_bindir}/kmplot
-%{tde_tdelibdir}/libkmplotpart.la
-%{tde_tdelibdir}/libkmplotpart.so
-%{tde_tdeappdir}/kmplot.desktop
-%{tde_datadir}/apps/kmplot/
-%{tde_datadir}/config.kcfg/kmplot.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kmplot.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kmplot.svgz
-%{tde_datadir}/mimelnk/application/x-kmplot.desktop
-%{tde_datadir}/services/kmplot_part.desktop
-%{tde_tdedocdir}/HTML/en/kmplot/
-%{tde_mandir}/man1/kmplot*
-
-##########
-
-%package -n trinity-kpercentage
-Summary:	Percentage calculation teaching tool for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kpercentage
-KPercentage is a small math application that will help pupils to
-improve their skills in calculating percentages.
-
-There is a special training section for the three basic tasks.
-Finally the pupil can select a random mode, in which all three tasks
-are mixed randomly.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kpercentage
-%defattr(-,root,root,-)
-%{tde_bindir}/kpercentage
-%{tde_tdeappdir}/kpercentage.desktop
-%{tde_datadir}/apps/kpercentage/
-%{tde_datadir}/icons/hicolor/*/apps/kpercentage.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz
-%{tde_tdedocdir}/HTML/en/kpercentage/
-%{tde_mandir}/man1/kpercentage*
-
-##########
-
-%package -n trinity-kstars
-Summary:	Desktop planetarium for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kstars
-KStars is a graphical desktop planetarium for TDE.  It depicts an
-accurate simulation of the night sky, including stars,
-constellations, star clusters, nebulae, galaxies, all planets, the
-Sun, the Moon, comets and asteroids.  You can see the sky as it
-appears from any location on Earth, on any date.
-
-The user interface is highly intuitive and flexible.  The display can
-be panned and zoomed with the mouse, and you can easily identify
-objects and track their motion across the sky.  KStars includes many
-powerful features, yet the interface is clean and simple and fun to
-use.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kstars
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/kstarsrc
-%{tde_bindir}/kstars
-%{tde_tdeappdir}/kstars.desktop
-%{tde_datadir}/config.kcfg/kstars.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kstars.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz
-%{tde_tdedocdir}/HTML/en/kstars/
-%{tde_mandir}/man1/kstars*
-
-##########
-
-%package -n trinity-kstars-data
-Summary:	Data files for KStars desktop planetarium
-Group:		System/GUI/Other
-
-%description -n trinity-kstars-data
-This package contains architecture-independent data files for KStars,
-the graphical desktop planetarium for TDE.  This includes star
-catalogues and astronomical images.
-
-See the kstars package for further information.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kstars-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kstars/
-
-##########
-
-%package -n trinity-ktouch
-Summary:	Touch typing tutor for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-ktouch
-KTouch is a program for learning touch typing - it helps you learn to
-type on a keyboard quickly and correctly.  Every finger has its place
-on the keyboard with associated keys to press.
-
-KTouch helps you learn to touch type by providing you with text to
-train on, and adjusts to different levels depending on how good you
-are.  It can display which key to press next, and the correct finger
-to use.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-ktouch
-%defattr(-,root,root,-)
-%{tde_bindir}/ktouch
-%{tde_tdeappdir}/ktouch.desktop
-%{tde_datadir}/apps/ktouch/
-%{tde_datadir}/config.kcfg/ktouch.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ktouch.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz
-%{tde_tdedocdir}/HTML/en/ktouch/
-%{tde_mandir}/man1/ktouch*
-
-##########
-
-%package -n trinity-kturtle
-Summary:	Educational Logo programming environment
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kturtle
-KTurtle is an educational programming environment using the Logo
-programming language.  It tries to make programming as easy and
-accessible as possible.  This makes KTurtle suitable for teaching
-kids the basics of mathematics, geometry and programming.
-
-The commands used to program are in the style of the Logo programming
-language.  The unique feature of Logo is that the commands are often
-translated into the speaking language of the programmer.
-
-KTurtle is named after "the turtle" that plays a central role in the
-programming environment.  The user programs the turtle, using the
-Logo commands, to draw a picture on the canvas.
-
-Note that this version of Logo is only focused on the educational
-qualities of the programming language and will not try to suit
-professional programmers' needs.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kturtle
-%defattr(-,root,root,-)
-%{tde_bindir}/kturtle
-%{tde_tdeappdir}/kturtle.desktop
-%{tde_datadir}/apps/katepart/syntax/logohighlightstyle*
-%{tde_datadir}/apps/kturtle/
-%{tde_datadir}/config.kcfg/kturtle.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kturtle.png
-%{tde_tdedocdir}/HTML/en/kturtle/
-%{tde_mandir}/man1/kturtle*
-
-##########
-
-%package -n trinity-kverbos
-Summary:	Spanish verb form study application for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kverbos
-Kverbos allows the user to learn the forms of Spanish verbs.  The
-program suggests a verb and a time and the user enters the different
-verb forms.  The program corrects the user input and gives feedback.
-
-The user can edit the list of the verbs that can be studied.  The
-program can build regular verb forms by itself.  Irregular verb forms
-have to be entered by the user.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kverbos
-%defattr(-,root,root,-)
-%{tde_bindir}/kverbos
-%{tde_tdeappdir}/kverbos.desktop
-%{tde_datadir}/apps/kverbos/
-%{tde_datadir}/config.kcfg/kverbos.kcfg
-%{tde_datadir}/icons/crystalsvg/16x16/actions/kverbosuser.png
-%{tde_datadir}/icons/hicolor/*/apps/kverbos.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz
-%{tde_tdedocdir}/HTML/en/kverbos/
-%{tde_mandir}/man1/kverbos*
-
-##########
-
-%package -n trinity-kvoctrain
-Summary:	Vocabulary trainer for Trinity
-Group:		System/GUI/Other
-Requires:	perl
-Requires:	perl-libwww-perl
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kvoctrain
-KVocTrain is a little utility to help you train your vocabulary when
-you are trying to learn a foreign language.  You can create your own
-database with the words you need.  It is intended as a replacement
-for index (flash) cards.
-
-You probably remember flashcards from school.  The teacher would
-write the original expression on the front side of the card and the
-translation on the back.  Then look at the cards one after another.
-If you knew the translation, you could put it away.  If you failed,
-you put it back to try again.
-
-KVocTrain is not intended to teach you grammar or other sophisticated
-things.  This is and probably will stay beyond the scope of this
-application.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kvoctrain
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/kvoctrainrc
-%{tde_bindir}/kvoctrain
-%{tde_bindir}/spotlight2kvtml
-%{tde_libdir}/libkvoctraincore.so.*
-%{tde_tdeappdir}/kvoctrain.desktop
-%{tde_datadir}/apps/kvoctrain/
-%{tde_datadir}/mimelnk/text/x-kvtml.desktop
-%{tde_datadir}/config.kcfg/kvoctrain.kcfg
-%{tde_datadir}/config.kcfg/languagesettings.kcfg
-%{tde_datadir}/config.kcfg/presettings.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png
-%{tde_tdedocdir}/HTML/en/kvoctrain/
-%{tde_mandir}/man1/kvoctrain*
-%{tde_mandir}/man1/spotlight2kvtml*
-
-##########
-
-%package -n trinity-kwordquiz
-Summary:	Flashcard and vocabulary learning program for Trinity
-Group:		System/GUI/Other
-Requires:	trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kwordquiz
-KWordQuiz is a flashcard-based tool that helps you to master new
-vocabularies. It may be a language or any other kind of terminology.
-
-KWordQuiz can open several types of vocabulary data.  Supported are
-kvtml files used by other TDE programs such as KVocTrain, wql files
-used by WordQuiz for Windows, csv files with comma-separated text,
-and xml.gz files created by Pauker (http://pauker.sourceforge.net).
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-kwordquiz
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/kwordquizrc
-%{tde_bindir}/kwordquiz
-%{tde_tdeappdir}/kwordquiz.desktop
-%{tde_datadir}/apps/kwordquiz/
-%{tde_datadir}/config.kcfg/kwordquiz.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kwordquiz.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kwordquiz.svg
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kwordquiz_doc.png
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
-%{tde_datadir}/mimelnk/application/x-kwordquiz.desktop
-%{tde_tdedocdir}/HTML/en/kwordquiz/
-%{tde_mandir}/man1/kwordquiz*
-%{tde_mandir}/man1/langen*
-
-##########
-
-%package -n trinity-libtdeedu3
-Summary:	Library for use with Trinity educational apps
-Group:		System/GUI/Other
-
-%description -n trinity-libtdeedu3
-The TDE-based library libtdeedu is used with educational
-applications.  It currently provides support for data plotting and
-vocabulary items (including a parser for kvtml vocabulary files).
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-libtdeedu3
-%defattr(-,root,root,-)
-%{tde_libdir}/libextdate.so.*
-%{tde_libdir}/libtdeeducore.so.*
-%{tde_libdir}/libtdeeduplot.so.*
-%{tde_libdir}/libtdeeduui.so.*
-
-##########
-
-%package -n trinity-libtdeedu-devel
-Summary:	Development files for Trinity educational library
-Group:		Development/Libraries/Other
-Requires:	trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libtdeedu-devel
-The TDE-based library libtdeedu is used with educational
-applications.  It currently provides support for data plotting and
-vocabulary items (including a parser for kvtml vocabulary files).
-
-Development files for libtdeedu are included in this package.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-libtdeedu-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/libtdeedu/
-%{tde_libdir}/libextdate.la
-%{tde_libdir}/libextdate.so
-%{tde_libdir}/libtdeeducore.la
-%{tde_libdir}/libtdeeducore.so
-%{tde_libdir}/libtdeeduui.la
-%{tde_libdir}/libtdeeduui.so
-%{tde_libdir}/libtdeeduplot.la
-%{tde_libdir}/libtdeeduplot.so
-
-##########
-
-%package -n trinity-libkiten1
-Summary:	Library for Kiten Japanese reference/study tool
-Group:		System/GUI/Other
-#Requires:	kanjidic
-
-%description -n trinity-libkiten1
-Kiten is a Japanese reference/study tool for TDE.  The library
-libkiten contains portions of Kiten that may be useful for other
-applications.  These portions include dictionary, character lookup
-and widget classes.
-
-This package contains the libkiten library along with supporting
-data, such as Japanese language data files and GUI resource files.
-For further information, see the kiten package.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-libkiten1
-%defattr(-,root,root,-)
-%{tde_libdir}/libkiten.so.*
-%{tde_datadir}/apps/kiten/
-%{tde_datadir}/config.kcfg/kiten.kcfg
-%{tde_datadir}/icons/crystalsvg/16x16/actions/kanjidic.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_add.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_remove.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/kanjidic.png
-%{tde_datadir}/icons/locolor/16x16/actions/edit_add.png
-%{tde_datadir}/icons/locolor/16x16/actions/edit_remove.png
-
-##########
-
-%package -n trinity-libkiten-devel
-Summary:	Development files for Kiten library
-Group:		Development/Libraries/Other
-Requires:	trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{version}
-
-%description -n trinity-libkiten-devel
-Kiten is a Japanese reference/study tool for TDE.  The library
-libkiten contains portions of Kiten that may be useful for other
-applications.  These portions include dictionary, character lookup
-and widget classes.
-
-Development files for libkiten are included in this package.  For
-further information, see the kiten package.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-libkiten-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/libkiten/
-%{tde_libdir}/libkiten.la
-%{tde_libdir}/libkiten.so
-
-##########
-
-%package -n trinity-indi
-Summary:	Instrument Neutral Distributed Interface for astronomical devices
-Group:		System/GUI/Other
-
-%description -n trinity-indi
-INDI is an Instrument Neutral Distributed Interface control protocol for
-astronomical devices, which provides a framework that decouples low level
-hardware drivers from high level front end clients. Clients that use the
-device drivers are completely unaware of the device capabilities and
-communicate with the device drivers and build a completely dynamic GUI
-based on the services provided by the device.
-
-This package is part of Trinity, as a component of the TDE education module.
-
-%files -n trinity-indi
-%defattr(-,root,root,-)
-%{tde_bindir}/apmount
-%{tde_bindir}/apogee_ppi
-%{tde_bindir}/celestrongps
-%{tde_bindir}/fliccd
-%{tde_bindir}/fliwheel
-%{tde_bindir}/indiserver
-%{tde_bindir}/lx200_16
-%{tde_bindir}/lx200autostar
-%{tde_bindir}/lx200basic
-%{tde_bindir}/lx200classic
-%{tde_bindir}/lx200generic
-%{tde_bindir}/lx200gps
-%{tde_bindir}/sbigccd
-%{tde_bindir}/skycommander
-%{tde_bindir}/temma
-%if 0%{?with_v4l}
-%{tde_bindir}/meade_lpi
-%{tde_bindir}/v4ldriver
-%{tde_bindir}/v4lphilips
-%endif
-%{tde_mandir}/man1/celestrongps*
-%{tde_mandir}/man1/fliccd*
-%{tde_mandir}/man1/indi*
-%{tde_mandir}/man1/lx200*
-%{tde_mandir}/man1/temma*
-%{tde_mandir}/man1/v4l*
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries/Other
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkiten-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-kdeedu-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains the development files for tdeedu.
-
-%files devel
-%defattr(-,root,root,-)
-%doc libtdeedu/AUTHORS libtdeedu/README
-# kstars
-%{tde_tdeincludedir}/kstarsinterface.h
-%{tde_tdeincludedir}/simclockinterface.h
-# kvoctrain
-%{tde_libdir}/libkvoctraincore.la
-%{tde_libdir}/libkvoctraincore.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-# Fix shebangs
-sed -i "kig/pykig/pykig.py" \
-    -e "s|env python|env %{python}|"
-%endif
-
-
-%build
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \
-  -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  %{?!with_kig:-DBUILD_KIG=OFF} \
-  -DWITH_OCAML_SOLVER=OFF \
-  %{?!with_kig:-DWITH_KIG_PYTHON_SCRIPTING=OFF} \
-  %{?!with_v4l:-DWITH_V4L=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r khangman      Education Languages Game KidsGame
-%suse_update_desktop_file    kiten         Education Languages
-%suse_update_desktop_file    klatin        Education Languages
-%suse_update_desktop_file    klettres      Education Languages
-%suse_update_desktop_file    kverbos       Education Languages
-%suse_update_desktop_file    kvoctrain     Education Languages
-%suse_update_desktop_file    kwordquiz     Education Languages
-%suse_update_desktop_file    kbruch        Education Math
-%suse_update_desktop_file    kig           Education Math
-%suse_update_desktop_file    kmplot        Education Math
-%suse_update_desktop_file    kturtle       Education Math
-%suse_update_desktop_file    kpercentage   Education Math
-%suse_update_desktop_file    kalzium       Education Chemistry
-%suse_update_desktop_file    kstars        Education Astronomy
-%suse_update_desktop_file    keduca        Education Teaching
-%suse_update_desktop_file    keducabuilder Education Teaching
-%suse_update_desktop_file    ktouch        Education Teaching
-%suse_update_desktop_file -r blinken       Education Teaching Game KidsGame
-%suse_update_desktop_file    kgeography    Education Teaching
-%suse_update_desktop_file -r kanagram      Education Languages Game KidsGame
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec
deleted file mode 100644
index 86a84f171..000000000
--- a/redhat/main/tdegames/tdegames.spec
+++ /dev/null
@@ -1,1265 +0,0 @@
-#
-# spec file for package tdegames (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdegames
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		Trinity Desktop Environment - Games
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-tdemultimedia-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	desktop-file-utils
-BuildRequires:	fdupes
-BuildRequires:	libtool
-
-# AVAHI support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_avahi 1
-BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# ATTR support
-BuildRequires:	libattr-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-Obsoletes:		trinity-kdegames < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdegames = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kdegames-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdegames-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdegames-card-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kasteroids = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-katomic = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kbackgammon = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kbattleship = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kblackbox = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kbounce = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kenolaba = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kfouleggs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kgoldrunner = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kjumpingcube = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-klickety = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-klines = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmahjongg = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmines = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-knetwalk = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-konquest = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kpat = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kpoker = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kreversi = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksame = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kshisen = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksirtet = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksmiletris = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksnake = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksokoban = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kspaceduel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ktron = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ktuberling = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-twin4 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-lskat = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdefifteen = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-Games and gaming libraries for the Trinity Desktop Environment.
-Included with this package are: kenolaba, kasteroids, kblackbox, kmahjongg,
-kmines, konquest, kpat, kpoker, kreversi, ksame, kshisen, ksmiletris,
-ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
-
-%files
-
-##########
-
-%package devel
-Summary:	Development files for %{name} 
-Group:		Amusements/Games/Other
-
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	trinity-libtdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-atlantik-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kolf-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:		trinity-kdegames-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Install %{name}-devel if you wish to develop or compile games for the
-TDE desktop.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_datadir}/cmake/libtdegames.cmake
-%{tde_libdir}/pkgconfig/libtdegames.pc
-
-##########
-
-%package -n trinity-libtdegames1
-Summary:	Trinity games library and common files
-Group:		Amusements/Games/Other
-
-%description -n trinity-libtdegames1
-This library provides a common infrastructure for several of the
-games in the TDE distribution. Features include standardized menu
-items, high score handling, card display, and network connections
-including chat capabilities.
-
-This package is part of TDE, and a component of the TDE games module.
-
-%files -n trinity-libtdegames1
-%defattr(-,root,root,-)
-%{tde_libdir}/libtdegames.so.*
-%dir %{tde_datadir}/apps/tdegames
-%dir %{tde_datadir}/apps/tdegames/pics
-%{tde_datadir}/apps/tdegames/pics/star.png
-%{tde_datadir}/icons/crystalsvg/*/actions/roll.png
-%{tde_datadir}/icons/crystalsvg/*/actions/highscore.png
-
-##########
-
-%package -n trinity-libtdegames-devel
-Summary:	Trinity games library headers
-Group:		Development/Libraries/Other
-Requires:	trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libtdegames-devel
-This package is necessary if you want to develop your own games using
-the TDE games library.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-libtdegames-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdeincludedir}/kgame
-%{tde_libdir}/libtdegames.so
-%{tde_libdir}/libtdegames.la
-
-##########
-
-%package card-data
-Summary:	Card decks for Trinity games
-Group:		Amusements/Games/Other
-
-%description card-data
-Several different collections of card images for use by TDE games.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files card-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/carddecks/
-
-##########
-
-%package -n trinity-atlantik
-Summary:	TDE client for Monopoly-like network games
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-atlantik
-This is a TDE client for playing Monopoly-like boardgames on the
-monopd network.  It can play any board supported by the network
-server, including the classic Monopoly game, as well as the Atlantik
-game in which the property includes several major cities in North
-America and Europe.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-atlantik
-%defattr(-,root,root,-)
-%{tde_bindir}/atlantik
-%{tde_libdir}/libatlantic.so.*
-%{tde_libdir}/libatlantikclient.so.*
-%{tde_libdir}/libatlantikui.so.*
-%{tde_tdelibdir}/tdeio_atlantik.la
-%{tde_tdelibdir}/tdeio_atlantik.so
-%{tde_datadir}/services/atlantik.protocol
-%{tde_tdeappdir}/atlantik.desktop
-%{tde_datadir}/icons/hicolor/*/apps/atlantik.png
-%{tde_datadir}/apps/atlantik/
-%{tde_tdedocdir}/HTML/en/atlantik/
-%{tde_mandir}/man*/atlantik.*
-
-##########
-
-%package -n trinity-atlantik-devel
-Summary:	Development files for Atlantik
-Group:		Development/Libraries/Other
-Requires:	trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-atlantik-devel
-This package contains header files for compiling programs against the
-libraries which come with Atlantik.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-atlantik-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/atlantik
-%{tde_tdeincludedir}/atlantic
-%{tde_libdir}/libatlantic.so
-%{tde_libdir}/libatlantic.la
-%{tde_libdir}/libatlantikclient.so
-%{tde_libdir}/libatlantikclient.la
-%{tde_libdir}/libatlantikui.so
-%{tde_libdir}/libatlantikui.la
-
-##########
-
-%package -n trinity-kasteroids
-Summary:	Asteroids for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kasteroids
-You know this game.  It is based on Warwick Allison's QwSpriteField
-widget.
-
-The objective of kasteroids is to destroy all the asteroids on the
-screen to advance to the next level. Your ship is destroyed if it
-makes contact with an asteroid.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kasteroids
-%defattr(-,root,root,-)
-%{tde_bindir}/kasteroids
-%{tde_datadir}/icons/hicolor/*/apps/kasteroids.png
-%{tde_tdeappdir}/kasteroids.desktop
-%{tde_datadir}/apps/kasteroids/
-%{tde_datadir}/config.kcfg/kasteroids.kcfg
-%{tde_tdedocdir}/HTML/en/kasteroids/
-%{tde_mandir}/man*/kasteroids.*
-
-##########
-
-%package -n trinity-katomic
-Summary:	Atomic Entertainment game for Trinity
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-katomic
-This is a puzzle game, in which the object is to assemble a molecule
-from its atoms on a Sokoban-like board.  On each move, an atom goes
-as far as it can in a specified direction before being stopped by a
-wall or another atom.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-katomic
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/katomic/
-%{tde_datadir}/icons/hicolor/*/apps/katomic.png
-%{tde_tdeappdir}/katomic.desktop
-%{tde_bindir}/katomic
-%{tde_tdedocdir}/HTML/en/katomic/
-%{tde_mandir}/man*/katomic.*
-
-##########
-
-%package -n trinity-kbackgammon
-Summary:	A Backgammon game for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kbackgammon
-KBackgammon is a backgammon program for Trinity. It is based on the
-code, ideas and concepts of KFibs (which is a FIBS client for
-TDE1). For a short time, KBackgammon was called bacKgammon (if you
-know somebody who is still using bacKgammon, please force them to
-upgrade :-)).
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kbackgammon
-%defattr(-,root,root,-)
-%{tde_bindir}/kbackgammon
-%{tde_tdeappdir}/kbackgammon.desktop
-%{tde_datadir}/apps/kbackgammon/
-%{tde_datadir}/icons/hicolor/*/apps/kbackgammon.png
-%{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png
-%{tde_tdedocdir}/HTML/en/kbackgammon/
-%{tde_mandir}/man*/kbackgammon.*
-
-##########
-
-%package -n trinity-kbattleship
-Summary:	Battleship game for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kbattleship
-This is an implementation of the Battleship game.  Each player tries
-to be the first to sink all the opponent's ships by firing "blindly"
-at them.  The game has options to play over a network connection or
-against the computer.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kbattleship
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kbattleship/
-%{tde_datadir}/apps/zeroconf/_kbattleship._tcp
-%{tde_datadir}/icons/hicolor/*/apps/kbattleship.png
-%{tde_tdeappdir}/kbattleship.desktop
-%{tde_bindir}/kbattleship
-%{tde_tdedocdir}/HTML/en/kbattleship/
-%{tde_mandir}/man*/kbattleship.*
-
-##########
-
-%package -n trinity-kblackbox
-Summary:	A simple logical game for the Trinity project
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kblackbox
-KBlackBox is a game of hide and seek played on an grid of boxes. Your
-opponent (Random number generator, in this case) has hidden several
-balls within this box. By shooting rays into the box and observing
-where they emerge it is possible to deduce the positions of the
-hidden balls. The fewer rays you use to find the balls, the lower
-your score.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kblackbox
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kblackbox/
-%{tde_datadir}/icons/hicolor/*/apps/kblackbox.png
-%{tde_tdeappdir}/kblackbox.desktop
-%{tde_bindir}/kblackbox
-%{tde_tdedocdir}/HTML/en/kblackbox/
-%{tde_mandir}/man*/kblackbox.*
-
-##########
-
-%package -n trinity-kbounce
-Summary:	Jezzball clone for the K Desktop Environment
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kbounce
-This is a clone of the popular Jezzball game originally created by
-Microsoft. Jezzball is one of the rare and simple games requiring
-skill, timing, and patience in order to be successful.  A ball begins
-to bounce off of an area enclosed by four borders (like a
-square). You must move your pointer to certain areas within the
-square. Upon clicking, a new border is constructed at a relatively
-quick pace. You can change the direction of the borders by 90 degrees
-as well. Ultimately, you must force the ball to bounce around in a
-smaller, and smaller area as time goes by without the ball ever
-touching the borders as they are being constructed. If a ball touches
-a certain part of the border as it is being built, the game is over.
-After 75% of the original space has been blocked off from the moving
-ball, you advance one level, and one more ball is added to the mix in
-the following level.
-
-This game was previously known as kjezz.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kbounce
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kbounce/
-%{tde_tdeappdir}/kbounce.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kbounce.png
-%{tde_bindir}/kbounce
-%{tde_tdedocdir}/HTML/en/kbounce/
-%{tde_mandir}/man*/kbounce.*
-
-##########
-
-%package -n trinity-kenolaba
-Summary:	Enolaba board game for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kenolaba
-kenolaba is a simple board strategy game that is played by two
-players. There are red and yellow pieces for each player. Beginning
-from a start position where each player has 14 pieces, moves are
-drawn until one player has pushed 6 pieces of his opponent out of the
-board.
-
-This game was previously known as kabalone, and was inspired by the
-board game Abalone by Abalone SA, France.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kenolaba
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kenolaba/
-%{tde_datadir}/icons/hicolor/*/apps/kenolaba.png
-%{tde_tdeappdir}/kenolaba.desktop
-%{tde_bindir}/kenolaba
-%{tde_tdedocdir}/HTML/en/kenolaba/
-%{tde_mandir}/man*/kenolaba.*
-
-##########
-
-%package -n trinity-kfouleggs
-Summary:	A TDE clone of the Japanese PuyoPuyo game
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kfouleggs
-KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
-features such as multiplayer games against human or AI, and network
-play.  If you have played Tetris or one of its many clones, you will
-find KFouleggs easy to learn.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kfouleggs
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/kfouleggs.desktop
-%{tde_datadir}/apps/kfouleggs/
-%{tde_datadir}/config.kcfg/kfouleggs.kcfg
-%{tde_bindir}/kfouleggs
-%{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png
-%{tde_tdedocdir}/HTML/en/kfouleggs/
-%{tde_mandir}/man*/kfouleggs.*
-
-##########
-
-%package -n trinity-kgoldrunner
-Summary:	A Trinity clone of the Loderunner arcade game
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kgoldrunner
-KGoldrunner, a game of action and puzzle solving.  Run through the
-maze, dodge your enemies, collect all the gold and climb up to the
-next level.
-
-You must guide the hero with the mouse or keyboard and collect all
-the gold nuggets, then you can climb up into the next level.  Your
-enemies are also after the gold and they will kill you if they catch
-you!
-
-The problem is you have no weapon to kill them.  All you can do is
-run away, dig holes in the floor to trap them or lure them into some
-area where they cannot hurt you.  After a short time a trapped enemy
-climbs out of his hole, but if it closes before that, he will die and
-reappear somewhere else.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kgoldrunner
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kgoldrunner/
-%{tde_datadir}/icons/hicolor/*/apps/kgoldrunner.png
-%{tde_tdeappdir}/KGoldrunner.desktop
-%{tde_bindir}/kgoldrunner
-%{tde_tdedocdir}/HTML/en/kgoldrunner/
-%{tde_mandir}/man*/kgoldrunner.*
-
-##########
-
-%package -n trinity-kjumpingcube
-Summary:	Tactical one or two player game
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-kjumpingcube
-KJumpingCube is a simple tactical game. You can play it against the
-computer or against a friend. The playing field consists of squares
-that contains points.  By clicking on the squares you can increase
-the points and if the points reach a maximum the points will jump to
-the squares neighbours and take them over. Winner is the one, who
-owns all squares.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kjumpingcube
-%defattr(-,root,root,-)
-%{tde_bindir}/kjumpingcube
-%{tde_datadir}/icons/hicolor/*/apps/kjumpingcube.png
-%{tde_datadir}/apps/kjumpingcube/
-%{tde_tdeappdir}/kjumpingcube.desktop
-%{tde_datadir}/config.kcfg/kjumpingcube.kcfg
-%{tde_tdedocdir}/HTML/en/kjumpingcube/
-%{tde_mandir}/man*/kjumpingcube.*
-
-##########
-
-%package -n trinity-klickety
-Summary:	A Clickomania-like game for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-klickety
-Klickety is an adaptation of the (perhaps) well-known Clickomania
-game; it is very similar to the "same" game.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-klickety
-%defattr(-,root,root,-)
-%{tde_bindir}/klickety
-%{tde_tdeappdir}/klickety.desktop
-%{tde_datadir}/icons/hicolor/*/apps/klickety.png
-%{tde_datadir}/icons/crystalsvg/*/actions/endturn.png
-%{tde_datadir}/apps/klickety/
-%{tde_tdedocdir}/HTML/en/klickety/
-%{tde_mandir}/man*/klickety.*
-
-##########
-
-%package -n trinity-klines
-Summary:	Color lines for Trinity
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-klines
-KLines is a simple game. It is played by one player, so there is only
-one winner :-). You play for fun and against the high score. It was
-inspired by a well known game - "Color lines", written for DOS by
-Olga Demina, Igor Demina, Igor Ivkin and Gennady Denisov back in
-1992.
-
-The main rules of the game are as simple as possible: you move (using
-the mouse) marbles from cell to cell and build lines (horizontal,
-vertical or diagonal). When a line contains 5 or more marbles, they
-are removed and your score grows. After each turn the computer drops
-three more marbles.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-klines
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/klines/
-%{tde_tdeappdir}/klines.desktop
-%{tde_bindir}/klines
-%{tde_datadir}/config.kcfg/klines.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/klines.png
-%{tde_tdedocdir}/HTML/en/klines/
-%{tde_mandir}/man*/klines.*
-
-##########
-
-%package -n trinity-kmahjongg
-Summary:	The classic mahjongg game for Trinity project
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kmahjongg
-Your mission in this game is to remove all tiles from the game board. A
-matching pair of tiles can be removed, if they are 'free', which means that
-no other tiles block them on the left or right side.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kmahjongg
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kmahjongg/
-%{tde_datadir}/icons/hicolor/*/apps/kmahjongg.png
-%{tde_tdeappdir}/kmahjongg.desktop
-%{tde_bindir}/kmahjongg
-%{tde_datadir}/config.kcfg/kmahjongg.kcfg
-%{tde_tdedocdir}/HTML/en/kmahjongg/
-%{tde_mandir}/man*/kmahjongg.*
-
-##########
-
-%package -n trinity-kmines
-Summary:	Minesweeper for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kmines
-KMines is the classic Minesweeper game. You must uncover all the
-empty cases without blowing on a mine.
-
-When you uncover a case, a number appears : it indicates how many
-mines surround this case. If there is no number the neighbour cases
-are automatically uncovered. In your process of uncovering secure
-cases, it is very useful to put a flag on the cases which contain a
-mine.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kmines
-%defattr(-,root,root,-)
-%{tde_datadir}/icons/hicolor/*/apps/kmines.png
-%{tde_tdeappdir}/kmines.desktop
-%{tde_datadir}/apps/kmines/
-%{tde_bindir}/kmines
-%{tde_tdedocdir}/HTML/en/kmines/
-%{tde_mandir}/man*/kmines.*
-
-##########
-
-%package -n trinity-knetwalk
-Summary:	A game for system administrators
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-knetwalk
-This game presents the player with a rectangular field consisting of
-a server, several clients, and pieces of wire.  The object is to
-rotate these elements until every client is connected to the server,
-and no wires are left unconnected.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-knetwalk
-%defattr(-,root,root,-)
-%{tde_bindir}/knetwalk
-%{tde_datadir}/apps/knetwalk
-%{tde_datadir}/icons/hicolor/*/apps/knetwalk.png
-%{tde_tdeappdir}/knetwalk.desktop
-%{tde_tdedocdir}/HTML/en/knetwalk/
-%{tde_mandir}/man*/knetwalk.*
-
-##########
-
-%package -n trinity-kolf
-Summary:	Minigolf game for TDE
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kolf
-This is a minigolf game for TDE that allows you to go through different
-golf courses and waste an exorbitant amount of time.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kolf
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/magic/kolf.magic
-%{tde_datadir}/apps/kolf/
-%{tde_bindir}/kolf
-%{tde_tdeappdir}/kolf.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kolf.png
-%{tde_datadir}/mimelnk/application/x-kolf.desktop
-%{tde_datadir}/mimelnk/application/x-kourse.desktop
-%{tde_libdir}/libtdeinit_kolf.so
-%{tde_libdir}/libtdeinit_kolf.la
-%{tde_tdelibdir}/kolf.la
-%{tde_tdelibdir}/kolf.so
-%{tde_libdir}/libkolf.so.1
-%{tde_libdir}/libkolf.so.1.2.0
-%{tde_tdedocdir}/HTML/en/kolf/
-%config(noreplace) %{tde_confdir}/magic/kolf.magic.mgc
-%{tde_mandir}/man*/kolf.*
-
-##########
-
-%package -n trinity-kolf-devel
-Summary:	Development files for Kolf
-Group:		Development/Libraries/Other
-Requires:	trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kolf-devel
-This package contains headers and development libraries for compiling
-Kolf plugins.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kolf-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kolf
-%{tde_libdir}/libkolf.la
-%{tde_libdir}/libkolf.so
-
-##########
-
-%package -n trinity-konquest
-Summary:	TDE based GNU-Lactic Konquest game
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-konquest
-This the TDE version of Gnu-Lactic Konquest, a multi-player strategy
-game. The goal of the game is to expand your interstellar empire
-across the galaxy and, of course, crush your rivals in the process.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-konquest
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/konquest/
-%{tde_datadir}/icons/hicolor/*/apps/konquest.png
-%{tde_tdeappdir}/konquest.desktop
-%{tde_bindir}/konquest
-%{tde_tdedocdir}/HTML/en/konquest/
-%{tde_mandir}/man*/konquest.*
-
-##########
-
-%package -n trinity-kpat
-Summary:	Trinity solitaire patience game
-Group:		Amusements/Games/Board/Card
-
-%description -n trinity-kpat
-KPatience is a collection of 14 card games. All the games are single
-player games.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kpat
-%defattr(-,root,root,-)
-%{tde_datadir}/icons/hicolor/*/apps/kpat.png
-%{tde_datadir}/apps/kpat/
-%{tde_tdeappdir}/kpat.desktop
-%{tde_bindir}/kpat
-%{tde_tdedocdir}/HTML/en/kpat/
-%{tde_mandir}/man*/kpat.*
-
-##########
-
-%package -n trinity-kpoker
-Summary:	Trinity based Poker clone
-Group:		Amusements/Games/Board/Card
-
-%description -n trinity-kpoker
-KPoker is a TDE compliant clone of those highly addictive pocket
-video poker games which are sometimes called "Videopoker" as well.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kpoker
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kpoker/
-%{tde_datadir}/icons/hicolor/*/apps/kpoker.png
-%{tde_tdeappdir}/kpoker.desktop
-%{tde_bindir}/kpoker
-%{tde_tdedocdir}/HTML/en/kpoker/
-%{tde_mandir}/man*/kpoker.*
-
-##########
-
-%package -n trinity-kreversi
-Summary:	Reversi for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kreversi
-Reversi is a simple strategy game that is played by two
-players. There is only one type of piece - one side of it is black,
-the other white. If a player captures a piece on the board, that
-piece is turned and belongs to that player. The winner is the person
-that has more pieces of his own color on the board and if there are
-no more moves possible.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kreversi
-%defattr(-,root,root,-)
-%{tde_bindir}/kreversi
-%{tde_tdeappdir}/kreversi.desktop
-%{tde_datadir}/apps/kreversi/
-%{tde_datadir}/config.kcfg/kreversi.kcfg
-%{tde_datadir}/icons/crystalsvg/*/actions/lastmoves.png
-%{tde_datadir}/icons/crystalsvg/*/actions/legalmoves.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/lastmoves.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/legalmoves.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kreversi.png
-%{tde_tdedocdir}/HTML/en/kreversi/
-%{tde_mandir}/man*/kreversi.*
-
-##########
-
-%package -n trinity-ksame
-Summary:	SameGame for Trinity
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-ksame
-KSame is a simple game. It's played by one player, so there is only
-one winner :-) You play for fun and against the high score. It has
-been inspired by SameGame, that is only famous on the Macintosh
-platform.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksame
-%defattr(-,root,root,-)
-%{tde_bindir}/ksame
-%{tde_datadir}/icons/hicolor/*/apps/ksame.png
-%{tde_datadir}/apps/ksame/
-%{tde_tdeappdir}/ksame.desktop
-%{tde_tdedocdir}/HTML/en/ksame/
-%{tde_mandir}/man*/ksame.*
-
-##########
-
-%package -n trinity-kshisen
-Summary:	Shisen-Sho for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-kshisen
-KShisen-Sho is a single-player-game similar to Mahjongg and uses the
-same set of tiles as Mahjongg.
-
-The object of the game is to remove all tiles from the field.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kshisen
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kshisen/
-%{tde_datadir}/config.kcfg/kshisen.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kshisen.png
-%{tde_tdeappdir}/kshisen.desktop
-%{tde_bindir}/kshisen
-%{tde_tdedocdir}/HTML/en/kshisen/
-%{tde_mandir}/man*/kshisen.*
-
-##########
-
-%package -n trinity-ksirtet
-Summary:	Tetris and Puyo-Puyo games for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-ksirtet
-This program is a clone of the well known game Tetris. You must fit
-the falling pieces to form full lines. You can rotate and translate
-the falling piece. The game ends when no more piece can fall ie when
-your incomplete lines reach the top of the board.
-
-Every time you have destroyed 10 lines, you gain a level and the
-pieces fall quicker (exactly the piece falls from a line each
-1/(1+level) second).
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksirtet
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/ksirtet.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksirtet.png
-%{tde_datadir}/apps/ksirtet/
-%{tde_bindir}/ksirtet
-%{tde_datadir}/config.kcfg/ksirtet.kcfg
-%{tde_tdedocdir}/HTML/en/ksirtet/
-%{tde_mandir}/man*/ksirtet.*
-
-##########
-
-%package -n trinity-ksmiletris
-Summary:	Tetris like game for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-ksmiletris
-This is a game with falling blocks composed of different types of
-smilies. The object of the game is to "crack a smile" by guiding
-blocks so there are two or more of the same symbol vertically.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksmiletris
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/ksmiletris/
-%{tde_datadir}/icons/hicolor/*/apps/ksmiletris.png
-%{tde_tdeappdir}/ksmiletris.desktop
-%{tde_bindir}/ksmiletris
-%{tde_tdedocdir}/HTML/en/ksmiletris/
-%{tde_mandir}/man*/ksmiletris.*
-
-##########
-
-%package -n trinity-ksnake
-Summary:	Snake Race for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-ksnake
-Snake Race is a game of speed and agility. You are a hungry snake and
-are trying to eat all the apples in the room before getting out!
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksnake
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/ksnake/
-%{tde_datadir}/config.kcfg/ksnake.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ksnake.png
-%{tde_tdeappdir}/ksnake.desktop
-%{tde_bindir}/ksnake
-%{tde_tdedocdir}/HTML/en/ksnake/
-%{tde_mandir}/man*/ksnake.*
-
-##########
-
-%package -n trinity-ksokoban
-Summary:	Sokoban game for Trinity
-Group:		Amusements/Games/Strategy/Other
-
-%description -n trinity-ksokoban
-The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
-the Japanese company Thinking Rabbit, Inc. "Sokoban" is japanese for
-"warehouse keeper". The idea is that you are a warehouse keeper
-trying to push crates to their proper locations in a warehouse.
-
-The problem is that you cannot pull the crates or step over them. If
-you are not careful, some of the crates can get stuck in wrong places
-and/or block your way.
-
-It can be rather difficult just to solve a level. But if you want to
-make it even harder, you can try to minimise the number of moves
-and/or pushes you use to solve the level.
-
-To make the game more fun for small kids (below 10 years or so), some
-collections with easier levels are also included in KSokoban. These
-are marked (easy) in the level collection menu. Of course, these
-levels can be fun for adults too, for example if you don't want to
-expose yourself to too much mental strain.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ksokoban
-%defattr(-,root,root,-)
-%{tde_tdeappdir}/ksokoban.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksokoban.png
-%{tde_bindir}/ksokoban
-%{tde_tdedocdir}/HTML/en/ksokoban/
-%{tde_mandir}/man*/ksokoban.*
-
-##########
-
-%package -n trinity-kspaceduel
-Summary:	Arcade two-player space game for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-kspaceduel
-KSpaceduel is an space arcade game for two players.
-
-Each player controls a ship that flies around the sun and tries to
-shoot at the other ship. You can play KSpaceduel with another person,
-against the computer, or you can have the computer control both ships
-and play each other.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-kspaceduel
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kspaceduel/
-%{tde_datadir}/icons/hicolor/*/apps/kspaceduel.png
-%{tde_tdeappdir}/kspaceduel.desktop
-%{tde_bindir}/kspaceduel
-%{tde_datadir}/config.kcfg/kspaceduel.kcfg
-%{tde_tdedocdir}/HTML/en/kspaceduel/
-%{tde_mandir}/man*/kspaceduel.*
-
-##########
-
-%package -n trinity-ktron
-Summary:	Tron clone for the K Desktop Environment
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-ktron
-The object of the game is to avoid running into walls, your own tail,
-and that of your opponent.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ktron
-%defattr(-,root,root,-)
-%{tde_bindir}/ktron
-%{tde_datadir}/icons/hicolor/*/apps/ktron.png
-%{tde_tdeappdir}/ktron.desktop
-%{tde_datadir}/apps/ktron/
-%{tde_datadir}/config.kcfg/ktron.kcfg
-%{tde_tdedocdir}/HTML/en/ktron/
-%{tde_mandir}/man*/ktron.*
-
-##########
-
-%package -n trinity-ktuberling
-Summary:	Potato Guy for Trinity
-Group:		Amusements/Games/Action/Arcade
-
-%description -n trinity-ktuberling
-KTuberling is a game intended for small children. Of course, it may
-be suitable for adults who have remained young at heart.
-
-It is a potato editor. That means that you can drag and drop eyes,
-mouths, moustache, and other parts of face and goodies onto a
-potato-like guy.  Similarly, you have a penguin on which you can drop
-other stuff.
-
-There is no winner for the game. The only purpose is to make the
-funniest faces you can.
-
-There is a museum (like a "Madame Tusseau" gallery) where you can
-find many funny examples of decorated potatoes. Of course, you can
-send your own creations to the programmer, Eric Bischoff, who will
-include them in the museum if he gets some spare time.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-ktuberling
-%defattr(-,root,root,-)
-%{tde_bindir}/ktuberling
-%{tde_datadir}/icons/hicolor/*/apps/ktuberling.png
-%{tde_tdeappdir}/ktuberling.desktop
-%{tde_datadir}/apps/ktuberling/
-%{tde_datadir}/mimelnk/application/x-tuberling.desktop
-%{tde_tdedocdir}/HTML/en/ktuberling/
-%{tde_mandir}/man*/ktuberling.*
-
-##########
-
-%package -n trinity-twin4
-Summary:	Connect Four clone for Trinity
-Group:		Amusements/Games/Board/Other
-
-%description -n trinity-twin4
-Four wins is a game for two players. Each player is represented by a
-colour (yellow and red). The goal of the game is to get four
-connected pieces of your colour into a row, column or any
-diagonal. This is done by placing one of your pieces into any of the
-seven columns. A piece will begin to fill a column from the bottom,
-i.e. it will fall down until it reaches the ground level or another
-stone. After a move is done it is the turn of the other player. This
-is repeated until the game is over, i.e. one of the players has four
-pieces in a row, column or diagonal or no more moves are possible
-because the board is filled.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-twin4
-%defattr(-,root,root,-)
-%{tde_bindir}/twin4
-%{tde_bindir}/twin4proc
-%{tde_datadir}/apps/twin4/
-%{tde_datadir}/config.kcfg/twin4.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/twin4.png
-%{tde_tdeappdir}/twin4.desktop
-%{tde_tdedocdir}/HTML/en/twin4/
-%{tde_mandir}/man*/twin4.*
-%{tde_mandir}/man*/twin4proc.*
-
-##########
-
-%package -n trinity-lskat
-Summary:	Lieutnant Skat card game for Trinity
-Group:		Amusements/Games/Board/Card
-
-%description -n trinity-lskat
-Lieutnant Skat (from German Offiziersskat) is a card game for two
-players. It is roughly played according to the rules of Skat but with
-only two players and simplified rules.
-
-Every player has a set of cards in front of him/her, half of them
-covered and half of them open. Both players try to win more than 60
-of the 120 possible points. After 16 moves all cards are played and
-the game ends.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-lskat
-%defattr(-,root,root,-)
-%{tde_bindir}/lskat
-%{tde_bindir}/lskatproc
-%{tde_datadir}/apps/lskat/
-%{tde_datadir}/icons/hicolor/*/apps/lskat.png
-%{tde_tdeappdir}/lskat.desktop
-%{tde_tdedocdir}/HTML/en/lskat/
-%{tde_mandir}/man*/lskat.*
-%{tde_mandir}/man*/lskatproc.*
-
-##########
-
-%package -n trinity-tdefifteen
-Summary:	Puzzle-solving game for Trinity
-Group:		Amusements/Games
-
-%description -n trinity-tdefifteen
-TDEFifteen is a sliding puzzle that consists of a frame of numbered square
-tiles in random order with one tile missing.
-
-This package is part of Trinity, and a component of the TDE games module.
-
-%files -n trinity-tdefifteen
-%defattr(-,root,root,-)
-%{tde_bindir}/tdefifteen
-%{tde_tdeappdir}/tdefifteen.desktop
-%{tde_datadir}/icons/hicolor/*/apps/tdefifteen.png
-%{tde_mandir}/man*/tdefifteen.*
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DBUILD_ALL="ON" \
-  -DWITH_ALL_OPTIONS="ON" \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r kasteroids      Game ArcadeGame
-%suse_update_desktop_file -r KGoldrunner     Game ArcadeGame
-%suse_update_desktop_file -r ksnake          Game ArcadeGame
-%suse_update_desktop_file -r kspaceduel      Game ArcadeGame
-%suse_update_desktop_file -r ktron           Game ArcadeGame
-%suse_update_desktop_file -r kfouleggs       Game BlocksGame
-%suse_update_desktop_file -r ksirtet         Game BlocksGame
-%suse_update_desktop_file -r klickety        Game BoardGame
-%suse_update_desktop_file -r ksmiletris      Game BlocksGame
-%suse_update_desktop_file -r ktuberling      Game KidsGame
-%suse_update_desktop_file -r atlantik        Game BoardGame
-%suse_update_desktop_file -r kbackgammon     Game BoardGame
-%suse_update_desktop_file -r kbattleship     Game BoardGame
-%suse_update_desktop_file -r kblackbox       Game BoardGame
-%suse_update_desktop_file -r kenolaba        Game BoardGame
-%suse_update_desktop_file -r kmahjongg       Game BoardGame
-%suse_update_desktop_file -r kreversi        Game BoardGame
-%suse_update_desktop_file -r kshisen         Game BoardGame
-%suse_update_desktop_file -r twin4           Game BoardGame
-%suse_update_desktop_file -r kpat            Game CardGame
-%suse_update_desktop_file -r kpoker          Game CardGame
-%suse_update_desktop_file -r lskat           Game CardGame
-%suse_update_desktop_file -r katomic         Game LogicGame
-%suse_update_desktop_file -r kjumpingcube    Game LogicGame
-%suse_update_desktop_file -r klines          Game LogicGame
-%suse_update_desktop_file -r -G "Tactical Game" knetwalk Game LogicGame
-%suse_update_desktop_file -r kmines          Game LogicGame
-%suse_update_desktop_file -r konquest        Game LogicGame
-%suse_update_desktop_file -r ksame           Game LogicGame
-%suse_update_desktop_file -r ksokoban        Game LogicGame
-%suse_update_desktop_file -r kbounce         Game LogicGame
-%suse_update_desktop_file -r kolf            Game SportsGame
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec
deleted file mode 100644
index 0ba833bac..000000000
--- a/redhat/main/tdegraphics/tdegraphics.spec
+++ /dev/null
@@ -1,1116 +0,0 @@
-#
-# spec file for package tdegraphics (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/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdegraphics
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:    Trinity Desktop Environment - Graphics Applications
-Group:      Productivity/Graphics/Viewers
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:		GPL-2.0+
-%else
-License:		GPLv2+
-%endif
-
-#Vendor:			Trinity Desktop
-#Packager:		Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	%{name}-rpmlintrc
-
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	gettext
-BuildRequires:	libtool
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# LIBUSB support
-BuildRequires: libusb-devel
-
-# MNG support
-BuildRequires: libmng-devel
-
-# TIFF support
-BuildRequires: libtiff-devel
-
-# PCRE support
-BuildRequires: pcre-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# GIF support
-%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-BuildRequires: giflib-devel
-%else
-BuildRequires: libungif-devel
-%endif
-
-# GPHOTO2 support
-%if 0%{?suse_version}
-BuildRequires: libgphoto2-devel
-%else
-BuildRequires: gphoto2-devel
-%endif
-
-# PAPER support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_paper 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}paper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	libpaper-devel
-%endif
-%endif
-
-# T1LIB support
-%if 0%{?suse_version} && 0%{?suse_version} <= 1230
-%define with_t1lib 1
-BuildRequires:	t1lib-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) || 0%{?fedora}
-%define with_t1lib 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}t1lib-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	t1lib-devel
-%endif
-%endif
-
-# SANE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}sane1-devel
-%else
-BuildRequires:	sane-backends-devel
-%endif
-
-# LIBXXF86VM support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xxf86vm-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires:	libXxf86vm-devel
-%endif
-
-# XMU support
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXmu-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires: libXmu-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
-%endif
-%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
-BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
-%endif
-
-# MESA support
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libGLU-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: mesaglu-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: Mesa-libGL-devel
-BuildRequires: Mesa-libGLU-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-Mesa-libGLU
-%endif
-
-# DRM support
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%else
-BuildRequires: libdrm-devel
-%endif
-
-# OPENEXR support
-BuildRequires:	OpenEXR-devel
-
-# POPPLER support
-%define with_pdf 1
-%if 0%{?with_pdf}
-%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%if 0%{?suse_version} >= 1500
-BuildRequires: libpoppler-devel >= 0.12
-%else
-BuildRequires: poppler-devel >= 0.12
-%endif
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}poppler-devel
-%endif
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
-BuildRequires:	trinity-poppler-devel >= 0.12
-%endif
-%endif
-
-# LCMS support
-%if 0%{?suse_version} || 0%{?rhel} >= 7
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-
-# FRIBIDI support
-BuildRequires: fribidi-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# kamera
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-%define build_kamera 1
-%endif
-
-# kmrml (deprecated)
-#define build_kmrml 1
-%if 0%{?build_kmrml}
-#Requires:		gift
-%else
-Obsoletes:		trinity-kmrml < %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-Obsoletes:	trinity-kdegraphics < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdegraphics = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdegraphics-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdegraphics-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdegraphics-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdegraphics-extras = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%{?build_kamera:Requires: trinity-kamera = %{?epoch:%{epoch}:}%{version}-%{release}}
-Requires: trinity-kcoloredit = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kdvi = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kfax = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kfaxview = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kgamma = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kghostview = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?build_kmrml:Requires: trinity-kmrml = %{?epoch:%{epoch}:}%{version}-%{release}}
-Requires: trinity-kolourpaint = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kooka = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kpdf = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kpovmodeler = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kruler = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksnapshot = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksvg = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kview = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kviewshell = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?with_pdf}
-Requires: trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%description
-Graphics applications for the Trinity Desktop Environment, including
-%if 0%{?build_kamera}
-* kamera (digital camera support)
-%endif
-* kcoloredit (palette editor and color chooser)
-* kdvi (displays TeX .dvi files)
-* kfax
-* kfaxview
-* kghostview (displays postscript files)
-* kiconedit (icon editor)
-* kooka (scanner application)
-* kpdf (displays PDF files)
-* kpovmodler
-* kruler (screen ruler and color measurement tool)
-* ksnapshot (screen capture utility)
-* kview (image viewer for GIF, JPEG, TIFF, etc.)
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README
-
-##########
-
-%if 0%{?build_kamera}
-
-%package -n trinity-kamera
-Summary:	Digital camera io_slave for Konqueror
-Group:		Hardware/Camera
-
-%description -n trinity-kamera
-This is a digital camera io_slave for TDE which uses gphoto2 and libgpio
-to allow access to your camera's pictures with the URL camera:/
-
-%files -n trinity-kamera
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kamera.la
-%{tde_tdelibdir}/kcm_kamera.so
-%{tde_tdelibdir}/tdeio_kamera.la
-%{tde_tdelibdir}/tdeio_kamera.so
-%{tde_tdeappdir}/kamera.desktop
-%{tde_datadir}/services/camera.protocol
-%{tde_tdedocdir}/HTML/en/kamera/
-%{tde_tdedocdir}/HTML/en/tdeioslave/camera/
-
-%endif
-
-##########
-
-%package -n trinity-kcoloredit
-Summary:	A color palette editor and color picker for TDE
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kcoloredit
-This package contains two programs, a color palette editor and also a color
-picker.
-
-%files -n trinity-kcoloredit
-%defattr(-,root,root,-)
-%{tde_bindir}/kcolorchooser
-%{tde_bindir}/kcoloredit
-%{tde_tdeappdir}/kcolorchooser.desktop
-%{tde_tdeappdir}/kcoloredit.desktop
-%{tde_datadir}/apps/kcoloredit/
-%{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
-%{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
-%{tde_tdedocdir}/HTML/en/kcoloredit/
-
-##########
-
-%package kfile-plugins
-Summary:	TDE metainfo plugins for graphic files
-Group:		System/GUI/Other
- 
-%description kfile-plugins
-This packages provides meta information for graphic files (file sizes,
-tags, etc. all from within the file manager).
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/gsthumbnail.la
-%{tde_tdelibdir}/gsthumbnail.so
-%{tde_tdelibdir}/tdefile_bmp.la
-%{tde_tdelibdir}/tdefile_bmp.so
-%{tde_tdelibdir}/tdefile_dds.la
-%{tde_tdelibdir}/tdefile_dds.so
-%{tde_tdelibdir}/tdefile_dvi.la
-%{tde_tdelibdir}/tdefile_dvi.so
-%{tde_tdelibdir}/tdefile_exr.la
-%{tde_tdelibdir}/tdefile_exr.so
-%{tde_tdelibdir}/tdefile_gif.la
-%{tde_tdelibdir}/tdefile_gif.so
-%{tde_tdelibdir}/tdefile_ico.la
-%{tde_tdelibdir}/tdefile_ico.so
-%{tde_tdelibdir}/tdefile_jpeg.la
-%{tde_tdelibdir}/tdefile_jpeg.so
-%{tde_tdelibdir}/tdefile_pcx.la
-%{tde_tdelibdir}/tdefile_pcx.so
-%if 0%{?with_pdf}
-%{tde_tdelibdir}/tdefile_pdf.la
-%{tde_tdelibdir}/tdefile_pdf.so
-%endif
-%{tde_tdelibdir}/tdefile_png.la
-%{tde_tdelibdir}/tdefile_png.so
-%{tde_tdelibdir}/tdefile_pnm.la
-%{tde_tdelibdir}/tdefile_pnm.so
-%{tde_tdelibdir}/tdefile_ps.la
-%{tde_tdelibdir}/tdefile_ps.so
-%{tde_tdelibdir}/tdefile_raw.la
-%{tde_tdelibdir}/tdefile_raw.so
-%{tde_tdelibdir}/tdefile_rgb.la
-%{tde_tdelibdir}/tdefile_rgb.so
-%{tde_tdelibdir}/tdefile_tga.la
-%{tde_tdelibdir}/tdefile_tga.so
-%{tde_tdelibdir}/tdefile_tiff.la
-%{tde_tdelibdir}/tdefile_tiff.so
-%{tde_tdelibdir}/tdefile_xbm.la
-%{tde_tdelibdir}/tdefile_xbm.so
-%{tde_tdelibdir}/tdefile_xpm.la
-%{tde_tdelibdir}/tdefile_xpm.so
-%{tde_datadir}/services/gsthumbnail.desktop
-%{tde_datadir}/services/tdefile_bmp.desktop
-%{tde_datadir}/services/tdefile_dds.desktop
-%{tde_datadir}/services/tdefile_dvi.desktop
-%{tde_datadir}/services/tdefile_exr.desktop
-%{tde_datadir}/services/tdefile_gif.desktop
-%{tde_datadir}/services/tdefile_ico.desktop
-%{tde_datadir}/services/tdefile_jpeg.desktop
-%{tde_datadir}/services/tdefile_pcx.desktop
-%if 0%{?with_pdf}
-%{tde_datadir}/services/tdefile_pdf.desktop
-%endif
-%{tde_datadir}/services/tdefile_png.desktop
-%{tde_datadir}/services/tdefile_pnm.desktop
-%{tde_datadir}/services/tdefile_ps.desktop
-%{tde_datadir}/services/tdefile_raw.desktop
-%{tde_datadir}/services/tdefile_rgb.desktop
-%{tde_datadir}/services/tdefile_tga.desktop
-%{tde_datadir}/services/tdefile_tiff.desktop
-%{tde_datadir}/services/tdefile_xbm.desktop
-%{tde_datadir}/services/tdefile_xpm.desktop
-
-##########
-
-%package -n trinity-kdvi
-Summary:	Dvi viewer for TDE
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kdvi
-This program and KPart allow the user to display *.DVI files from TeX.
-
-%files -n trinity-kdvi
-%defattr(-,root,root,-)
-%{tde_bindir}/kdvi
-%{tde_tdelibdir}/kdvipart.la
-%{tde_tdelibdir}/kdvipart.so
-%{tde_tdeappdir}/kdvi.desktop
-%{tde_datadir}/apps/kdvi/
-%{tde_datadir}/config.kcfg/kdvi.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kdvi.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
-%{tde_datadir}/services/kdvimultipage.desktop
-%{tde_tdedocdir}/HTML/en/kdvi/
-
-##########
-
-%package -n trinity-kfax
-Summary:	G3/G4 fax viewer for Trinity
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kfax
-A fax viewer for Trinity, supporting the display of raw and tiffed fax images
-(g3, g3-2d, g4).
-
-%files -n trinity-kfax
-%defattr(-,root,root,-)
-%{tde_bindir}/kfax
-%{tde_tdeappdir}/kfax.desktop
-%{tde_datadir}/apps/kfax/
-%{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
-%{tde_tdedocdir}/HTML/en/kfax/
-
-##########
-
-%package -n trinity-kfaxview
-Summary:	G3/G4 fax viewer for Trinity using kviewshell
-Group:		Productivity/Publishing/TeX/Frontends
-
-%description -n trinity-kfaxview
-A fax viewer for Trinity, supporting the display of raw and tiffed fax images
-(g3, g3-2d, g4).
-
-This faxviewer uses kviewshell and is intended to replace the standalone
-kfax application once it reproduces all of kfax's features.
-
-%files -n trinity-kfaxview
-%defattr(-,root,root,-)
-%{tde_bindir}/kfaxview
-%{tde_libdir}/libkfaximage.so.*
-%{tde_tdelibdir}/kfaxviewpart.*
-%{tde_tdeappdir}/kfaxview.desktop
-%{tde_datadir}/apps/kfaxview/
-%{tde_datadir}/icons/hicolor/??x??/apps/kfaxview.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz
-%{tde_datadir}/services/kfaxmultipage.desktop
-%{tde_datadir}/services/kfaxmultipage_tiff.desktop
-%{tde_tdedocdir}/HTML/en/kfaxview/
-
-##########
-
-%package -n trinity-kgamma
-Summary:	Gamma correction module for the Trinity Control Center
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kgamma
-KGamma is a Trinity Control Center module for gamma calibration/correction
-of XFree86. With proper gamma settings, your display (websites, images,
-etc.) will look the same on your monitor as on other monitors.
-
-Homepage: http://kgamma.berlios.de/index2.php
-
-%files -n trinity-kgamma
-%defattr(-,root,root,-)
-%{tde_bindir}/xf86gammacfg
-%{tde_tdelibdir}/kcm_kgamma.la
-%{tde_tdelibdir}/kcm_kgamma.so
-%{tde_datadir}/applnk/.hidden/kgamma.desktop
-%{tde_datadir}/apps/kgamma/
-%{tde_datadir}/icons/hicolor/*/apps/kgamma.png
-%{tde_tdedocdir}/HTML/en/kgamma/
-
-##########
-
-%package -n trinity-kghostview
-Summary:	PostScript viewer for Trinity
-Group:		Productivity/Graphics/Viewers
-Requires:	ghostscript
-
-%description -n trinity-kghostview
-KGhostview is Trinity's PostScript viewer. It is a port of Tim Theisen's
-Ghostview program which is used to view documents prepared in Adobe's
-PostScript page description language. PostScript is the major page
-description language for printing on UNIX systems, and this application is
-useful to preview material intended for printing, or for reading documents
-online.
-
-%files -n trinity-kghostview
-%defattr(-,root,root,-)
-%{tde_bindir}/kghostview
-%{tde_tdelibdir}/libkghostviewpart.la
-%{tde_tdelibdir}/libkghostviewpart.so
-%{tde_libdir}/libkghostviewlib.so.*
-%{tde_tdeappdir}/kghostview.desktop
-%{tde_datadir}/apps/tdeconf_update/kghostview.upd
-%{tde_datadir}/apps/tdeconf_update/update-to-xt-names.pl
-%{tde_datadir}/apps/kghostview/
-%{tde_datadir}/config.kcfg/kghostview.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kghostview.png
-%{tde_datadir}/services/kghostview_part.desktop
-%{tde_tdedocdir}/HTML/en/kghostview/
-
-##########
-
-%package -n trinity-tdeiconedit
-Summary:	An icon editor for Trinity
-Group:		Productivity/Graphics/Viewers
-
-Obsoletes:	trinity-kiconedit < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdeiconedit
-TDEIconedit allows you easily to create and edit icons.
-
-%files -n trinity-tdeiconedit
-%defattr(-,root,root,-)
-%{tde_bindir}/tdeiconedit
-%{tde_tdeappdir}/tdeiconedit.desktop
-%{tde_datadir}/apps/tdeiconedit/
-%{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png
-%{tde_tdedocdir}/HTML/en/tdeiconedit/
-
-##########
-
-%if 0%{?build_kmrml}
-
-%package -n trinity-kmrml
-Summary: 	A Konqueror plugin for searching pictures
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kmrml
-MRML is short for Multimedia Retrieval Markup Language, which defines a
-protocol for querying a server for images based on their content. See 
-http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an 
-MRML server.
-
-%files -n trinity-kmrml
-%defattr(-,root,root,-)
-%{tde_bindir}/mrmlsearch
-%{tde_tdelibdir}/kcm_kmrml.la
-%{tde_tdelibdir}/kcm_kmrml.so
-%{tde_tdelibdir}/kded_daemonwatcher.la
-%{tde_tdelibdir}/kded_daemonwatcher.so
-%{tde_tdelibdir}/tdeio_mrml.la
-%{tde_tdelibdir}/tdeio_mrml.so
-%{tde_tdelibdir}/libkmrmlpart.la
-%{tde_tdelibdir}/libkmrmlpart.so
-%{tde_tdelibdir}/mrmlsearch.la
-%{tde_tdelibdir}/mrmlsearch.so
-%{tde_libdir}/libtdeinit_mrmlsearch.so
-%{tde_tdeappdir}/kcmkmrml.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
-%{tde_datadir}/mimelnk/text/mrml.desktop
-%{tde_datadir}/services/kded/daemonwatcher.desktop
-%{tde_datadir}/services/mrml.protocol
-%{tde_datadir}/services/mrml_part.desktop
-
-%endif
-
-##########
-
-%package -n trinity-kolourpaint
-Summary:	A simple paint program for Trinity
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kolourpaint
-KolourPaint is a very simple paint program for Trinity. It aims to be
-conceptually simple to understand; providing a level of functionality
-targeted towards the average user. It's designed for daily tasks like:
-
-* Painting - drawing diagrams and "finger painting" 
-* Image Manipulation - editing screenshots and photos; applying effects 
-* Icon Editing - drawing clipart and logos with transparency 
-
-It's not an unusable and monolithic program where simple tasks like
-drawing lines become near impossible. Nor is it so simple that it lacks
-essential features like Undo/Redo.
-
-Homepage: http://kolourpaint.sourceforge.net
-
-%files -n trinity-kolourpaint
-%defattr(-,root,root,-)
-%{tde_bindir}/kolourpaint
-%{tde_tdeappdir}/kolourpaint.desktop
-%{tde_datadir}/apps/kolourpaint/
-%{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
-%{tde_tdedocdir}/HTML/en/kolourpaint/
-
-##########
-
-%package -n trinity-kooka
-Summary:	Scanner program for Trinity
-Group:		Hardware/Scanner
-
-%description -n trinity-kooka
-Kooka is an open source GNU/Linux scan program based on SANE and
-KScan library.
-
-Kooka helps you to handle the most important scan parameters, find the
-correct image file format to save and manage your scanned images. It
-offers support for different OCR modules. Libkscan, a autonomous part
-of Kooka, provides a scan service for easy and consistent use to all
-KDE applications.
-
-Install ocrad or gocr if you wish to enable optical character recognition
-in kooka.
-
-Homepage: http://kooka.kde.org/
-
-%files -n trinity-kooka
-%defattr(-,root,root,-)
-%{tde_bindir}/kooka
-%{tde_tdeappdir}/kooka.desktop
-%{tde_datadir}/apps/kooka/
-%config(noreplace) %{tde_confdir}/kookarc
-%{tde_datadir}/icons/hicolor/*/apps/kooka.png
-%{tde_tdedocdir}/HTML/en/kooka/
-
-##########
-
-%package -n trinity-kpdf
-Summary:	PDF viewer for Trinity
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kpdf
-KPDF allows you to view PDF (Portable Document Format) files. This package
-includes kpdfpart so you can embed in konqueror or run as a standalone
-application.
-
-%files -n trinity-kpdf
-%defattr(-,root,root,-)
-%{tde_bindir}/kpdf
-%{tde_tdelibdir}/libkpdfpart.la
-%{tde_tdelibdir}/libkpdfpart.so
-%{tde_tdeappdir}/kpdf.desktop
-%{tde_datadir}/apps/kpdf/
-%{tde_datadir}/apps/kpdfpart/
-%{tde_datadir}/config.kcfg/kpdf.kcfg
-%{tde_tdedocdir}/HTML/en/kpdf/
-%{tde_datadir}/icons/hicolor/*/apps/kpdf.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
-%{tde_datadir}/services/kpdf_part.desktop
-
-##########
-
-%package -n trinity-kpovmodeler
-Summary:	A graphical editor for povray scenes
-Group:		Productivity/Graphics/Viewers
-#Requires:	povray
-
-%description -n trinity-kpovmodeler
-KPovmodeler is KDE's graphical editor for povray scenes. KPovModeler is a
-modeling and composition program for creating POV-Ray scenes in KDE.
-
-For most modelers, POV-Ray is nothing but a rendering engine. This greatly
-limits the innate possibilities of the POV-Ray scripted language. This
-is not the case for KPovModeler, which allows you to use all the features
-of POV-Ray through the translation of POV-Ray language into a graphical
-tree.
-
-kpovmodeler uses the povray package, currently available only in Debian's
-non-free, unsupported repository.
-
-Homepage: http://www.kpovmodeler.org
-
-%files -n trinity-kpovmodeler
-%defattr(-,root,root,-)
-%{tde_bindir}/kpovmodeler
-%{tde_libdir}/libkpovmodeler.so.*
-%{tde_tdelibdir}/libkpovmodelerpart.*
-%{tde_tdeappdir}/kpovmodeler.desktop
-%{tde_datadir}/apps/kpovmodeler/
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
-%{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
-%doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
-
-##########
-
-%package -n trinity-kruler
-Summary:	A screen ruler and color measurement tool for Trinity
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kruler
-Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
-
-%files -n trinity-kruler
-%defattr(-,root,root,-)
-%{tde_bindir}/kruler
-%{tde_tdeappdir}/kruler.desktop
-%{tde_datadir}/applnk/Graphics/kruler.desktop
-%{tde_datadir}/apps/kruler/
-%{tde_datadir}/icons/hicolor/*/apps/kruler.png
-%{tde_tdedocdir}/HTML/en/kruler/
-
-##########
-
-%package -n trinity-ksnapshot
-Summary:	Screenshot utility for Trinity
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-ksnapshot
-KSnapshot is a simple applet for taking screenshots. It is capable of 
-capturing images of either the whole desktop or just a single window. 
-The images can then be saved in a variety of formats.
-
-%files -n trinity-ksnapshot
-%defattr(-,root,root,-)
-%{tde_bindir}/ksnapshot
-%{tde_tdeappdir}/ksnapshot.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
-%{tde_tdedocdir}/HTML/en/ksnapshot/
-
-##########
-
-%package -n trinity-ksvg
-Summary:	SVG viewer for Trinity
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-ksvg
-KSVG allows you view SVG (scalable vector graphics) files. This package
-includes kpart so you can embed it in konqueror and a standalone
-application.
-
-%files -n trinity-ksvg
-%defattr(-,root,root,-)
-%{tde_bindir}/printnodetest
-%{tde_bindir}/svgdisplay
-%{tde_tdelibdir}/libksvgplugin.la
-%{tde_tdelibdir}/libksvgplugin.so
-%{tde_tdelibdir}/libksvgrendererlibart.la
-%{tde_tdelibdir}/libksvgrendererlibart.so
-%{tde_tdelibdir}/svgthumbnail.la
-%{tde_tdelibdir}/svgthumbnail.so
-%{tde_libdir}/libksvg.so.0
-%{tde_libdir}/libksvg.so.0.0.1
-%{tde_libdir}/libtext2path.so.0
-%{tde_libdir}/libtext2path.so.0.0.0
-%{tde_datadir}/apps/ksvg/
-%{tde_datadir}/services/ksvglibartcanvas.desktop
-%{tde_datadir}/services/ksvgplugin.desktop
-%{tde_datadir}/services/svgthumbnail.desktop
-%{tde_datadir}/servicetypes/ksvgrenderer.desktop
-
-##########
-
-%package -n trinity-kview
-Summary:	Simple image viewer/converter for Trinity
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kview
-KView is a simple image viewer and converter application. It supports
-a number of plugins, which add an array of basic editing capabilities
-as well.
-
-%files -n trinity-kview
-%defattr(-,root,root,-)
-%{tde_bindir}/kview
-%{tde_tdelibdir}/kcm_kviewcanvasconfig.la
-%{tde_tdelibdir}/kcm_kviewcanvasconfig.so
-%{tde_tdelibdir}/kcm_kviewgeneralconfig.la
-%{tde_tdelibdir}/kcm_kviewgeneralconfig.so
-%{tde_tdelibdir}/kcm_kviewpluginsconfig.la
-%{tde_tdelibdir}/kcm_kviewpluginsconfig.so
-%{tde_tdelibdir}/kcm_kviewpresenterconfig.la
-%{tde_tdelibdir}/kcm_kviewpresenterconfig.so
-%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.la
-%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.so
-%{tde_tdelibdir}/kview.la
-%{tde_tdelibdir}/kview.so
-%{tde_tdelibdir}/kview_browserplugin.la
-%{tde_tdelibdir}/kview_browserplugin.so
-%{tde_tdelibdir}/kview_effectsplugin.la
-%{tde_tdelibdir}/kview_effectsplugin.so
-%{tde_tdelibdir}/kview_presenterplugin.la
-%{tde_tdelibdir}/kview_presenterplugin.so
-%{tde_tdelibdir}/kview_scannerplugin.la
-%{tde_tdelibdir}/kview_scannerplugin.so
-%{tde_tdelibdir}/libkviewcanvas.la
-%{tde_tdelibdir}/libkviewcanvas.so
-%{tde_tdelibdir}/libkviewviewer.la
-%{tde_tdelibdir}/libkviewviewer.so
-%{tde_libdir}/libtdeinit_kview.so
-%{tde_libdir}/libkimageviewer.so.*
-%{tde_tdelibdir}/libphotobook.la
-%{tde_tdelibdir}/libphotobook.so
-%{tde_tdeappdir}/kview.desktop
-%{tde_datadir}/apps/kview/
-%{tde_datadir}/apps/kviewviewer/
-%{tde_datadir}/apps/photobook/
-%{tde_datadir}/icons/crystalsvg/*/apps/photobook.png
-%{tde_datadir}/icons/hicolor/*/apps/kview.png
-%{tde_datadir}/services/tdeconfiguredialog/
-%{tde_datadir}/services/kviewcanvas.desktop
-%{tde_datadir}/services/kviewviewer.desktop
-%{tde_datadir}/services/photobook.desktop
-%{tde_datadir}/servicetypes/kimageviewer.desktop
-%{tde_datadir}/servicetypes/kimageviewercanvas.desktop
-%{tde_tdedocdir}/HTML/en/kview/
-
-##########
-
-%package -n trinity-kviewshell
-Summary:	Generic framework for viewer applications in Trinity
-Group:		Productivity/Graphics/Viewers
-
-%description -n trinity-kviewshell
-KViewShell is a generic viewing framework that allows the graphical
-applications, such as the kview image viewer, to be embedded in other
-KDE applications, such as Konqueror.
-
-KViewShell comes with a djvuviewpart plugin included, for viewing
-DjVu images.
-
-%files -n trinity-kviewshell
-%defattr(-,root,root,-)
-%{tde_bindir}/kviewshell
-%{tde_libdir}/libdjvu.la
-%{tde_libdir}/libdjvu.so
-%{tde_tdelibdir}/djvuviewpart.so
-%{tde_tdelibdir}/djvuviewpart.la
-%{tde_tdelibdir}/emptymultipagepart.la
-%{tde_tdelibdir}/emptymultipagepart.so
-%{tde_tdelibdir}/kviewerpart.la
-%{tde_tdelibdir}/kviewerpart.so
-%{tde_libdir}/libtdemultipage.so.*
-%{tde_datadir}/apps/djvumultipage.rc
-%{tde_datadir}/apps/kviewerpart/
-%{tde_datadir}/apps/kviewshell/
-%{tde_datadir}/config.kcfg/djvumultipage.kcfg
-%{tde_datadir}/config.kcfg/kviewshell.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kviewshell.png
-%{tde_datadir}/services/emptymultipage.desktop
-%{tde_datadir}/services/djvumultipage.desktop
-%{tde_datadir}/servicetypes/tdemultipage.desktop
-
-##########
-
-%package -n trinity-libkscan
-Summary:	Scanner library for Trinity
-Group:		Hardware/Scanner
-
-%description -n trinity-libkscan
-KScan is TDE's scanner library. It's used by kooka and by koffice currently.
-It provides an easy-to-use library, which allows you to access your scanner
-(as long as it's sane compatible).
-
-%files -n trinity-libkscan
-%defattr(-,root,root,-)
-%{tde_libdir}/libkscan.so.*
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_color.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png
-%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png
-%{tde_datadir}/services/scanservice.desktop
-
-##########
-
-%package -n trinity-libkscan-devel
-Summary:	Development files for the Trinity scanner library
-Group:		Development/Libraries/Other
-Requires:	trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkscan-devel
-This package contains development files for Trinity's scanner library.
-
-%files -n trinity-libkscan-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkscan.la
-%{tde_libdir}/libkscan.so
-
-##########
-
-%if 0%{?with_pdf}
-%package -n trinity-libpoppler-tqt
-Summary:	TQt support for Poppler
-Group:		Productivity/Graphics/Viewers
-Obsoletes:	poppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	poppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	%{name}-libpoppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	%{name}-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libpoppler-tqt
-TQt support library for Poppler.
-This library is used by the Trinity graphics file plugins for PDF support.
-
-%files -n trinity-libpoppler-tqt
-%defattr(-,root,root,-)
-%{tde_libdir}/libpoppler-tqt.so.*
-%endif
-
-##########
-
-%if 0%{?with_pdf}
-%package -n trinity-libpoppler-tqt-devel
-Summary:	Development files for TQt support for Poppler
-Group:		Development/Libraries/Other
-Requires:	trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	poppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	poppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	%{name}-libpoppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	%{name}-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libpoppler-tqt-devel
-Development files of TQt support library for Poppler.
-This package contains the development files needed to compile applications against poppler-tqt.
-
-%files -n trinity-libpoppler-tqt-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/poppler-link-qt3.h
-%{tde_tdeincludedir}/poppler-page-transition.h
-%{tde_tdeincludedir}/poppler-qt.h
-%{tde_libdir}/libpoppler-tqt.la
-%{tde_libdir}/libpoppler-tqt.so
-%{tde_libdir}/pkgconfig/poppler-tqt.pc
-%endif
-
-##########
-
-%package devel
-Summary:	Development files for tdegraphics
-Group:		Development/Libraries/Other
-
-Obsoletes:	trinity-kdegraphics-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdegraphics-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-libkscan-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?with_pdf}
-Requires: trinity-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%description devel
-This package contains the development files needed to compile 
-applications against tdegraphics libraries.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/dom/
-%{tde_tdeincludedir}/kfaximage.h
-%{tde_tdeincludedir}/tdemultipageInterface.h
-%{tde_tdeincludedir}/ksvg/
-%{tde_tdeincludedir}/kviewshell/
-%{tde_tdeincludedir}/libtext2path-0.1/
-%{tde_libdir}/libtdeinit_kview.la
-%if 0%{?build_kmrml}
-%{tde_libdir}/libtdeinit_mrmlsearch.la
-%endif
-%{tde_libdir}/libkghostviewlib.la
-%{tde_libdir}/libkghostviewlib.so
-%{tde_libdir}/libkimageviewer.la
-%{tde_libdir}/libkimageviewer.so
-%{tde_libdir}/libtdemultipage.la
-%{tde_libdir}/libtdemultipage.so
-%{tde_libdir}/libkpovmodeler.la
-%{tde_libdir}/libkpovmodeler.so
-%{tde_libdir}/libksvg.la
-%{tde_libdir}/libksvg.so
-%{tde_libdir}/libtext2path.la
-%{tde_libdir}/libtext2path.so
-# kfaxview
-%{tde_libdir}/libkfaximage.so
-%{tde_libdir}/libkfaximage.la
-# cmake
-%{tde_datadir}/cmake/*
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%if 0%{?build_kamera} == 0
-%__rm -rf doc/kamera/
-%endif
-
-# Fix applications icons
-%__sed -i "kooka/kooka.desktop" -e "s|^Icon=.*|Icon=kooka|"
-
-# Fix FTBFS in RHEL 5
-%if 0%{?rhel} && 0%{?rhel} <= 5
-%__sed -i "kpdf/xpdf/aconf.h" \
-       -e "s|#define HAVE_MKSTEMPS 1|#define HAVE_MKSTEMPS 0|"
-%__sed -i "tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt" \
-       -e "/link_directories/ s|$|\n  \${POPPLER_LIBRARY_DIRS}|" \
-       -e "/{POPPLER_INCLUDE_DIRS/ s|$|\n  \${POPPLER_INCLUDE_DIRS}/..|"
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  \
-  %{?with_t1lib:-DWITH_T1LIB=ON} \
-  %{?with_paper:-DWITH_LIBPAPER=ON} \
-  -DWITH_TIFF=ON \
-  -DWITH_OPENEXR=ON \
-  -DWITH_PDF=%{?with_pdf:ON}%{?!with_pdf:OFF} \
-  -DBUILD_ALL=ON \
-  -DBUILD_KUICKSHOW=OFF \
-  %{!?build_kmrml:-DBUILD_KMRML=OFF} \
-  %{!?build_kamera:-DBUILD_KAMERA=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Adds missing icons in 'hicolor' theme
-%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,32x32,48x48,64x64}"/apps/"
-pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,32,48,64}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/scanner.png %{buildroot}%{tde_datadir}/icons/hicolor/"$i"x"$i"/apps/kooka.png; done
-popd
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpovmodeler.desktop    Graphics 3DGraphics
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kolourpaint.desktop    Graphics RasterGraphics
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/tdeiconedit.desktop    Graphics RasterGraphics
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kview.desktop          Graphics Viewer
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kooka.desktop          Graphics Scanning
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kruler.desktop         Utility DesktopUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/ksnapshot.desktop      Utility DesktopUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kcolorchooser.desktop  Utility DesktopUtility
-%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kcoloredit.desktop     Utility DesktopUtility
-%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/kfax.desktop           Office Viewer
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kghostview.desktop     Office Viewer
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kdvi.desktop           Office Viewer
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kpdf.desktop           Office Viewer
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kfaxview.desktop       Office Viewer
-%suse_update_desktop_file    %{?buildroot}%{tde_tdeappdir}/kamera.desktop
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec
deleted file mode 100644
index f9eaea472..000000000
--- a/redhat/main/tdelibs/tdelibs.spec
+++ /dev/null
@@ -1,762 +0,0 @@
-#
-# spec file for package tdelibs (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdelibs
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:		TDE Libraries
-Group:			System/GUI/Other
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:		GPL-2.0+
-%else
-License:		GPLv2+
-%endif
-
-#Vendor:			Trinity Desktop
-#Packager:		Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-Obsoletes:		tdelibs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		tdelibs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kdelibs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdelibs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kdelibs-apidocs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdelibs-apidocs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# for set_permissions macro
-%if 0%{?suse_version}
-PreReq: permissions
-%endif
-
-# Trinity dependencies
-BuildRequires:	libtqt4-devel = %{tde_epoch}:4.2.0
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
-BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
-BuildRequires:	trinity-filesystem >= %{tde_version}
-
-Requires:		trinity-arts >= %{tde_epoch}:1.5.10
-Requires:		trinity-filesystem >= %{tde_version}
-%if 0%{?mgaversion} >= 6
-%else
-Requires:		fileshareset >= 2.0
-%endif
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# KRB5 support
-BuildRequires:	krb5-devel
-
-# XSLT support
-BuildRequires:	libxslt-devel
-
-# ALSA support
-BuildRequires:	alsa-lib-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# CUPS support
-BuildRequires:	cups-devel
-
-# TIFF support
-BuildRequires:	libtiff-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-# LUA support are not ready yet
-#BuildRequires:	lua-devel
-
-# LIBART_LGPL support
-BuildRequires:	libart_lgpl-devel
-
-# ASPELL support
-BuildRequires:	aspell
-BuildRequires:	aspell-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_pcre 1
-BuildRequires:	pcre-devel
-%endif
-
-# INOTIFY support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_inotify 1
-%endif
-
-# BZIP2 support
-%if 0%{?suse_version}
-BuildRequires:	libbz2-devel
-%else
-BuildRequires:	bzip2-devel
-%endif
-
-# UTEMPTER support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}utempter-devel
-%endif
-%if 0%{?rhel} >=5 || 0%{?fedora}
-BuildRequires:	libutempter-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	utempter
-%endif
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-%endif
-
-# HSPELL support
-%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_hspell 1
-BuildRequires:	hspell-devel
-%endif
-
-# JASPER support
-%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_jasper 1
-%if 0%{?suse_version}
-BuildRequires:	libjasper-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jasper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	jasper-devel
-%endif
-%endif
-
-# AVAHI support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_avahi 1
-BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# OPENEXR support
-%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_openexr 1
-BuildRequires:	OpenEXR-devel
-%if 0%{?pclinuxos}
-BuildRequires:  libpthread-stubs
-%endif
-%endif
-
-# LIBTOOL
-BuildRequires:	libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-# X11 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	x11-proto-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xorg-x11-proto-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-
-# ICEAUTH
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-Requires:		iceauth
-BuildRequires:	iceauth
-%endif
-%if 0%{?rhel} >= 5 || ( 0%{?fedora} && 0%{?fedora} <= 33 )
-Requires:		xorg-x11-server-utils
-BuildRequires:	xorg-x11-server-utils
-%endif
-%if 0%{?rhel} == 4 || 0%{?suse_version}
-Requires:		xorg-x11
-BuildRequires:	xorg-x11
-%endif
-
-# XZ support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-%define with_lzma 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}lzma-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	xz-devel
-%endif
-%endif
-
-# Certificates support
-%if 0%{?fedora} || 0%{?rhel} >= 6
-BuildRequires:	ca-certificates
-Requires:		ca-certificates
-%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6
-%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
-%endif
-%if 0%{?fedora} == 18 || 0%{?fedora} == 19
-%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
-%endif
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-Requires:		rootcerts
-%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
-%else
-%define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
-Requires:		openssl
-%endif
-%endif
-%if 0%{?rhel} == 5
-%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
-Requires:		openssl
-%endif
-%if 0%{?suse_version}
-%define cacert	%{_sysconfdir}/ssl/ca-bundle.pem
-BuildRequires:	ca-certificates
-Requires:		ca-certificates
-%endif
-%if "%{cacert}" != ""
-Requires:		%{cacert}
-%endif
-
-# XRANDR support
-#  On RHEL5, xrandr library is too old.
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define with_xrandr 1
-%endif
-
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-%define xcomposite_devel %{_lib}xcomposite-devel
-%else
-%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-%define xcomposite_devel libXcomposite-devel
-%endif
-%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
-
-# XT support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%define xt_devel libXt-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define xt_devel libxt-devel
-%endif
-%{?xt_devel:BuildRequires: %{xt_devel}}
-
-### New features in TDE R14
-
-# LIBMAGIC support
-%if 0%{?rhel} != 5
-BuildRequires:	file-devel
-%endif
-
-# NETWORKMANAGER support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
-%define with_nm 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} != 8
-BuildRequires:	%{_lib}nm-util-devel
-%endif
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
-BuildRequires:	NetworkManager-libnm-devel
-%else
-BuildRequires:	NetworkManager-glib-devel
-%endif
-%endif
-%if 0%{?suse_version}
-BuildRequires:	NetworkManager-devel
-%endif
-%endif
-
-# UDEV support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-%define with_tdehwlib 1
-BuildRequires:	libudev-devel
-%endif
-
-# HAL support
-%if 0%{?rhel} == 5
-%define with_hal 1
-%endif
-
-# UDISKS support
-%if 0%{?rhel} == 6
-%if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310
-%define with_udisks 1
-BuildRequires:	udisks-devel
-Requires:		udisks
-%endif
-%endif
-
-# UDISKS2 support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
-%define with_udisks2 1
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-BuildRequires:	libudisks2-devel
-%else
-%if 0%{?suse_version} >= 1550
-BuildRequires:	libudisks2-0-devel
-%else
-BuildRequires:	udisks2-devel
-%endif
-%endif
-Requires:		udisks2
-%endif
-
-# DEVICEKIT POWER support
-%if 0%{?rhel} == 6
-%define with_devkitpower 1
-Requires:		DeviceKit-power
-%endif
-
-# UPOWER support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
-%define with_upower 1
-Requires:		upower
-%endif
-
-# SYSTEMD support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
-%define with_systemd 1
-%endif
-
-# PCSCLITE support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}pcsclite-devel
-%else
-BuildRequires:	pcsc-lite-devel
-%endif
-
-# PKCS11 support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}pkcs11-helper-devel
-%else
-BuildRequires:	pkcs11-helper-devel
-%endif
-
-# OPENSC support
-BuildRequires:	opensc
-
-# CRYPTSETUP support
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	%{_lib}cryptsetup-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libcryptsetup-devel
-%endif
-%if 0%{?rhel} >= 7 || 0%{?fedora}
-BuildRequires:	cryptsetup-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6
-BuildRequires:	cryptsetup-luks-devel
-%endif
-
-# ELFICON support
-%if 0
-%define with_elficon 1
-BuildRequires:		libr-devel >= 0.6.0
-%endif
-
-# ATTR support
-BuildRequires:	libattr-devel
-
-# INTLTOOL support
-BuildRequires:	intltool
-
-
-%description
-Libraries for the Trinity Desktop Environment:
-TDE Libraries included: tdecore (TDE core library), tdeui (user interface),
-kfm (file manager), tdehtmlw (HTML widget), tdeio (Input/Output, networking),
-kspell (spelling checker), jscript (javascript), kab (addressbook),
-kimgio (image manipulation).
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
-%{tde_bindir}/artsmessage
-%{tde_bindir}/cupsdconf
-%{tde_bindir}/cupsdoprint
-%{tde_bindir}/dcop
-%{tde_bindir}/dcopclient
-%{tde_bindir}/dcopfind
-%{tde_bindir}/dcopobject
-%{tde_bindir}/dcopquit
-%{tde_bindir}/dcopref
-%{tde_bindir}/dcopserver
-%{tde_bindir}/dcopserver_shutdown
-%{tde_bindir}/dcopstart
-%{tde_bindir}/imagetops
-%{tde_bindir}/tdeab2tdeabc
-%{tde_bindir}/kaddprinterwizard
-%{tde_bindir}/tdebuildsycoca
-%{tde_bindir}/tdecmshell
-%{tde_bindir}/tdeconf_update
-%{tde_bindir}/kcookiejar
-%{tde_bindir}/tde-config
-%{tde_bindir}/tde-menu
-%{tde_bindir}/kded
-%{tde_bindir}/tdeinit
-%{tde_bindir}/tdeinit_shutdown
-%{tde_bindir}/tdeinit_wrapper
-%{tde_bindir}/tdesu_stub
-%{tde_bindir}/kdetcompmgr
-%{tde_bindir}/kdontchangethehostname
-%{tde_bindir}/tdedostartupconfig
-%{tde_bindir}/tdefile
-%{tde_bindir}/kfmexec
-%{tde_bindir}/tdehotnewstuff
-%{tde_bindir}/kinstalltheme
-%{tde_bindir}/tdeio_http_cache_cleaner
-%{tde_bindir}/tdeio_uiserver
-%{tde_bindir}/tdeioexec
-%{tde_bindir}/tdeioslave
-%{tde_bindir}/tdeiso_info
-%{tde_bindir}/tdelauncher
-%if 0%{?with_elficon}
-%{tde_bindir}/tdelfeditor
-%endif
-%{tde_bindir}/tdemailservice
-%{tde_bindir}/tdemimelist
-%{tde_bindir}/tdesendbugmail
-%{tde_bindir}/kshell
-%{tde_bindir}/tdestartupconfig
-%{tde_bindir}/tdetelnetservice
-%{tde_bindir}/tdetradertest
-%{tde_bindir}/kwrapper
-%{tde_bindir}/lnusertemp
-%{tde_bindir}/make_driver_db_cups
-%{tde_bindir}/make_driver_db_lpr
-%{tde_bindir}/meinproc
-%{tde_bindir}/networkstatustestservice
-%{tde_bindir}/start_tdeinit_wrapper
-%{tde_bindir}/checkXML
-%{tde_bindir}/ksvgtopng
-%{tde_bindir}/tdeunittestmodrunner
-%{tde_bindir}/preparetips
-%{tde_tdelibdir}/*
-%{tde_libdir}/lib*.so.*
-%{tde_libdir}/libtdeinit_*.la
-%{tde_libdir}/libtdeinit_*.so
-%{tde_datadir}/applications/tde/*.desktop
-%{tde_datadir}/autostart/tdeab2tdeabc.desktop
-%{tde_datadir}/applnk/tdeio_iso.desktop
-%{tde_datadir}/apps/*
-%exclude %{tde_datadir}/apps/ksgmltools2/
-%{tde_datadir}/emoticons/*
-%{tde_datadir}/icons/crystalsvg/
-%{tde_datadir}/icons/default.tde
-%{tde_datadir}/icons/hicolor/index.theme
-%{tde_datadir}/locale/all_languages
-%{tde_datadir}/mimelnk/*/*.desktop
-%{tde_datadir}/services/*
-%{tde_datadir}/servicetypes/*
-%{tde_tdedocdir}/HTML/en/common/*
-%{tde_tdedocdir}/HTML/en/tdespell/
-
-# Global Trinity configuration
-%config(noreplace) %{tde_confdir}
-
-# Some setuid binaries need special care
-%if 0%{?suse_version}
-%verify(not mode) %{tde_bindir}/kgrantpty
-%verify(not mode) %{tde_bindir}/kpac_dhcp_helper
-%verify(not mode) %{tde_bindir}/start_tdeinit
-%else
-%attr(4755,root,root) %{tde_bindir}/kgrantpty
-%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
-%attr(4711,root,root) %{tde_bindir}/start_tdeinit
-%endif
-
-%config %{_sysconfdir}/xdg/menus/tde-applications.menu
-%config %{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde
-
-# DBUS stuff, related to TDE hwlib
-%if 0%{?with_tdehwlib}
-%{tde_bindir}/tde_dbus_hardwarecontrol
-%config %{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf
-%{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service
-%endif
-
-%pre
-# TDE Bug #1074
-if [ -d "%{tde_datadir}/locale/all_languages" ]; then
-  rm -rf "%{tde_datadir}/locale/all_languages"
-fi
-
-%post
-%if 0%{?suse_version}
-# Sets permissions on setuid files (openSUSE specific)
-%set_permissions %{tde_bindir}/kgrantpty
-%set_permissions %{tde_bindir}/kpac_dhcp_helper
-%set_permissions %{tde_bindir}/start_tdeinit
-%endif
-
-##########
-
-%package devel
-Summary:	TDE Libraries (Development files)
-Group:		Development/Libraries/X11
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	tdelibs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdelibs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdelibs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdelibs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires:	libtqt3-mt-devel >= 3.5.0
-Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
-Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-Requires:	libart_lgpl-devel
-Requires:	libattr-devel
-Requires:	intltool
-%{?xcomposite_devel:Requires: %{xcomposite_devel}}
-%{?xt_devel:Requires: %{xt_devel}}
-
-%description devel
-This package includes the header files you will need to compile
-applications for TDE.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/dcopidl*
-%{tde_bindir}/*config_compiler
-%{tde_bindir}/maketdewidgets
-%{tde_datadir}/apps/ksgmltools2/
-%{tde_tdeincludedir}/*
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/*.a
-%exclude %{tde_libdir}/libtdeinit_*.la
-%exclude %{tde_libdir}/libtdeinit_*.so
-%{tde_datadir}/cmake/tdelibs.cmake
-%{tde_libdir}/pkgconfig/tdelibs.pc
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings
-%if 0%{?rhel} == 5
-%__sed -i "tdecore/kinstance.h" \
-       -i "tdecore/tdeglobal.h" \
-       -e "/#ifdef __TDE_HAVE_TDEHWLIB/,/#endif/d"
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
-fi
-
-export TDEDIR="%{tde_prefix}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_ARTS=ON \
-  -DWITH_ALSA=ON \
-  -DWITH_LIBART=ON \
-  -DWITH_LIBIDN=ON \
-  -DWITH_SSL=ON \
-  -DWITH_CUPS=ON \
-  -DWITH_LUA=OFF \
-  -DWITH_TIFF=ON \
-  %{?!with_jasper:-DWITH_JASPER=OFF} \
-  %{?!with_openexr:-DWITH_OPENEXR=OFF} \
-  -DWITH_UTEMPTER=ON \
-  %{?!with_avahi:-DWITH_AVAHI=OFF} \
-  %{?!with_elficon:-DWITH_ELFICON=OFF} \
-  %{?!with_pcre:-DWITH_PCRE=OFF} \
-  %{?!with_inotify:-DWITH_INOTIFY=OFF} \
-  %{?!with_gamin:-DWITH_GAMIN=OFF} \
-  %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
-  %{?!with_tdehwlib:-DWITH_TDEHWLIB_DAEMONS=OFF} \
-  %{?with_hal:-DWITH_HAL=ON} \
-  %{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \
-  %{?with_systemd:-DWITH_LOGINDPOWER=ON} \
-  %{?!with_upower:-DWITH_UPOWER=OFF} \
-  %{?!with_udisks:-DWITH_UDISKS=OFF} \
-  %{?!with_udisks2:-DWITH_UDISKS2=OFF} \
-  -DWITH_UDEVIL=OFF \
-  -DWITH_CONSOLEKIT=ON \
-  %{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \
-  -DWITH_SUDO_TDESU_BACKEND=OFF \
-  -DWITH_OLD_XDG_STD=OFF \
-  -DWITH_PCSC=ON \
-  -DWITH_PKCS=ON \
-  -DWITH_CRYPTSETUP=ON \
-  %{?!with_lzma:-DWITH_LZMA=OFF} \
-  -DWITH_LIBBFD=OFF \
-  %{?!with_xrandr:-DWITH_XRANDR=OFF} \
-  -DWITH_XCOMPOSITE=ON \
-  -DWITH_KDE4_MENU_SUFFIX=OFF \
-  \
-  -DWITH_ASPELL=ON \
-  %{?!with_hspell:-DWITH_HSPELL=OFF} \
-  -DWITH_TDEICONLOADER_DEBUG=OFF \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf "%{?buildroot}"
-%__make install DESTDIR="%{?buildroot}" -C build
-
-# Use system-wide CA certificates
-%if "%{?cacert}" != ""
-%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
-%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
-%endif
-
-# Symlinks duplicate files (mostly under 'ksgmltools2')
-%fdupes -s "%{?buildroot}"
-
-# Fix 'tderesources.desktop' (openSUSE only)
-%if 0%{?suse_version}
-%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
-%endif
-
-# Remove setuid bit on some binaries.
-chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty"
-chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
-chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
-
-# fileshareset 2.0 is provided separately.
-# Remove integrated fileshareset 1.0 .
-%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
-%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
-
-
-%clean
-%__rm -rf "%{?buildroot}"
-
-%if 0%{?suse_version}
-# Check permissions on setuid files (openSUSE specific)
-%verifyscript
-%verify_permissions -e %{tde_bindir}/kgrantpty
-%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper
-%verify_permissions -e %{tde_bindir}/start_tdeinit
-%endif
-
-
-%changelog
diff --git a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc b/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
deleted file mode 100644
index cd73a0285..000000000
--- a/redhat/main/tdelibs/trinity-tdelibs-rpmlintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-setBadness('suse-dbus-unauthorized-service', 0)
-setBadness('permissions-file-setuid-bit', 0)
-setBadness('non-position-independent-executable', 0)
-setBadness('library-without-ldconfig-postun', 0)
diff --git a/redhat/main/tdemultimedia/tdemultimedia.spec b/redhat/main/tdemultimedia/tdemultimedia.spec
deleted file mode 100644
index 309f71a20..000000000
--- a/redhat/main/tdemultimedia/tdemultimedia.spec
+++ /dev/null
@@ -1,1151 +0,0 @@
-#
-# spec file for package tdemultimedia (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdemultimedia
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Multimedia applications for the Trinity Desktop Environment
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:		Productivity/Multimedia/Sound/Utilities
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	%{name}-rpmlintrc
-
-Obsoletes:	trinity-kdemultimedia < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdemultimedia = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdemultimedia-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdemultimedia-extras = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdemultimedia-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdemultimedia-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	cmake
-BuildRequires:	gcc-c++
-BuildRequires:	fdupes
-BuildRequires:	desktop-file-utils
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# TAGLIB support
-%define with_taglib 1
-BuildRequires: taglib-devel
-
-# AKODE support
-%define with_akode 1
-BuildRequires: trinity-akode-devel
-
-# MAD support
-%ifarch %{ix86} x86_64
-%define with_libmad 1
-%{?with_libmad:BuildRequires: libakode_mpeg_decoder}
-%endif
-
-# ZLIB support
-BuildRequires:	zlib-devel
-
-# MUSICBRAINZ support
-## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
-#define with_musicbrainz 1
-#BuildRequires: libmusicbrainz-devel libtunepimp-devel
-
-# Audio libraries
-BuildRequires:	libvorbis-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	libtheora-devel
-BuildRequires:	alsa-lib-devel 
-BuildRequires:	cdparanoia
-#BuildRequires:	libmpg123-devel
-
-# CDDA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libcdda-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	cdparanoia-devel
-%endif
-
-# FLAC support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libflac-devel
-%else
-BuildRequires:	%{_lib}flac-devel
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	flac-devel
-%endif
-
-# GSTREAMER support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}gstreamer1.0-devel
-BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-%endif
-%if 0%{?rhel} >= 7 || 0%{?fedora}
-BuildRequires:	gstreamer1-devel >= 1.0
-BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
-%endif
-
-# X11 Libraries
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xxf86dga-devel
-BuildRequires:	%{_lib}xxf86vm-devel
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xtst-devel
-%else
-BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXxf86dga-devel
-BuildRequires:	libXxf86vm-devel
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
-%define with_xine 1
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# LAME support
-%if 0%{?opensuse_bs} == 0
-%define with_lame 1
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:		liblame-devel
-%else
-%if 0%{?mgaversion} >= 6
-BuildRequires:		%{_lib}mp3lame-devel
-%else
-BuildRequires:		%{_lib}lame-devel
-%endif
-%endif
-%endif
-%if 0%{?suse_version}
-BuildRequires:		libmp3lame-devel
-%endif
-%endif
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# ATTR support
-BuildRequires:	libattr-devel
-
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires:		lame-devel
-%endif
-
-
-Requires: trinity-artsbuilder = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-juk = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kaboodle = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kaudiocreator = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-kappfinder-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdemid = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmix = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-krec = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kscd = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?with_akode:Requires: trinity-libarts-akode = %{?epoch:%{epoch}:}%{version}-%{release}}
-Requires: trinity-libarts-audiofile = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?with_xine:Requires: trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}}
-Requires: trinity-libkcddb = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?with_mpeg:Requires: trinity-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}}
-Requires: trinity-noatun = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window
-System. The tdemultimedia package contains multimedia applications for
-TDE, including:
-  artsbuilder, Synthesizer designer for aRts
-  juk, a media player
-  tdemid, a midi player
-  kmix, an audio mixer
-  arts, additional functionality for the aRts sound system
-  krec, a recording tool
-  kscd, an Audio-CD player
-  kaudiocreator, a graphical frontend for audio file creation 
-  kaboodle, a media player
-  noatun, a media player
-
-%files
-
-##########
-
-%package -n trinity-artsbuilder
-Summary:	Synthesizer designer for aRts
-Group:		Productivity/Multimedia/Sound/Mixers
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-artsbuilder
-This is the analog Realtime synthesizer's graphical design tool.
-
-%files -n trinity-artsbuilder
-%defattr(-,root,root,-)
-%{tde_bindir}/artsbuilder
-%{tde_bindir}/artscontrol
-%{tde_bindir}/midisend
-%{tde_libdir}/libartsbuilder.la
-%{tde_libdir}/libartsbuilder.so.*
-%{tde_libdir}/libartscontrolapplet.la
-%{tde_libdir}/libartscontrolapplet.so.*
-%{tde_libdir}/libartscontrolsupport.la
-%{tde_libdir}/libartscontrolsupport.so.*
-%{tde_libdir}/libartsgui_idl.la
-%{tde_libdir}/libartsgui_idl.so.*
-%{tde_libdir}/libartsgui_kde.la
-%{tde_libdir}/libartsgui_kde.so.*
-%{tde_libdir}/libartsgui.la
-%{tde_libdir}/libartsgui.so.*
-%{tde_libdir}/libartsmidi_idl.la
-%{tde_libdir}/libartsmidi_idl.so.*
-%{tde_libdir}/libartsmidi.la
-%{tde_libdir}/libartsmidi.so.*
-%{tde_libdir}/libartsmodulescommon.la
-%{tde_libdir}/libartsmodulescommon.so.*
-%{tde_libdir}/libartsmoduleseffects.la
-%{tde_libdir}/libartsmoduleseffects.so.*
-%{tde_libdir}/libartsmodulesmixers.la
-%{tde_libdir}/libartsmodulesmixers.so.*
-%{tde_libdir}/libartsmodules.la
-%{tde_libdir}/libartsmodules.so.*
-%{tde_libdir}/libartsmodulessynth.la
-%{tde_libdir}/libartsmodulessynth.so.*
-%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcopclass
-%{tde_libdir}/mcop/artsbuilder.mcoptype
-%{tde_libdir}/mcop/Arts/Button.mcopclass
-%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass
-%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass
-%{tde_libdir}/mcop/Arts/Fader.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
-%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/GraphLine.mcopclass
-%{tde_libdir}/mcop/artsgui.mcopclass
-%{tde_libdir}/mcop/artsgui.mcoptype
-%{tde_libdir}/mcop/Arts/HBox.mcopclass
-%{tde_libdir}/mcop/Arts/Label.mcopclass
-%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass
-%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass
-%{tde_libdir}/mcop/Arts/LineEdit.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MidiManager.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcopclass
-%{tde_libdir}/mcop/artsmidi.mcoptype
-%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcopclass
-%{tde_libdir}/mcop/artsmodulescommon.mcoptype
-%{tde_libdir}/mcop/artsmoduleseffects.mcopclass
-%{tde_libdir}/mcop/artsmoduleseffects.mcoptype
-%{tde_libdir}/mcop/artsmodules.mcopclass
-%{tde_libdir}/mcop/artsmodules.mcoptype
-%{tde_libdir}/mcop/artsmodulesmixers.mcopclass
-%{tde_libdir}/mcop/artsmodulesmixers.mcoptype
-%{tde_libdir}/mcop/artsmodulessynth.mcopclass
-%{tde_libdir}/mcop/artsmodulessynth.mcoptype
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass
-%{tde_libdir}/mcop/Arts/PopupBox.mcopclass
-%{tde_libdir}/mcop/Arts/Poti.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass
-%{tde_libdir}/mcop/Arts/SpinBox.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass
-%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass
-%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass
-%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass
-%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass
-%{tde_libdir}/mcop/Arts/VBox.mcopclass
-%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
-%{tde_libdir}/mcop/Arts/Widget.mcopclass
-%{tde_tdeappdir}/artsbuilder.desktop
-%{tde_tdeappdir}/artscontrol.desktop
-%{tde_datadir}/apps/artsbuilder/
-%{tde_datadir}/apps/artscontrol/
-%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png
-%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
-%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png
-%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png
-%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz
-%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz
-%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop
-%{tde_tdedocdir}/HTML/en/artsbuilder/
-
-##########
-
-%package -n trinity-juk
-Summary:	Music organizer and player for Trinity
-Group:		Productivity/Multimedia/Sound/Players
-
-%description -n trinity-juk
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-Some of JuK's features include:
-* Support for Ogg Vorbis and MP3 formats
-* Tag editing support for both formats, including ID3v2 for MP3 files.
-  Multitagging or editing a selection of multiple files at once is also
-  supported
-* Output to either the aRts, default KDE sound system, or GStreamer
-* Management of your "collection" and multiple playlists
-* Import and export to m3u playlists
-* Binary caching of audio meta-data and playlist information for faster
-  load times (starting with the second time you run JuK)
-* Integration into TDE that allows drag-and-drop and clipboard usage
-  with other TDE and X apps
-
-%files -n trinity-juk
-%defattr(-,root,root,-)
-%{tde_bindir}/juk
-%{tde_tdeappdir}/juk.desktop
-%{tde_datadir}/apps/juk/
-%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png
-%{tde_datadir}/icons/hicolor/*/apps/juk.png
-%{tde_tdedocdir}/HTML/en/juk/
-
-##########
-
-%package -n trinity-kaboodle
-Summary:	Light, embedded media player for Trinity
-Group:		System/GUI/Other
-
-%if 0%{?with_xine}
-Requires:	trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%description -n trinity-kaboodle
-Kaboodle is a light, embedded media player, supporting both video and audio,
-for TDE. It uses the aRts framework for playing media files.
-
-%files -n trinity-kaboodle
-%defattr(-,root,root,-)
-%{tde_bindir}/kaboodle
-%{tde_tdelibdir}/libkaboodlepart.la
-%{tde_tdelibdir}/libkaboodlepart.so
-%{tde_tdeappdir}/kaboodle.desktop
-%{tde_datadir}/apps/kaboodle/
-%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png
-%{tde_datadir}/services/kaboodle_component.desktop
-%{tde_datadir}/services/kaboodleengine.desktop
-%{tde_tdedocdir}/HTML/en/kaboodle/
-
-##########
-
-%package -n trinity-kaudiocreator
-Summary:	CD ripper and audio encoder frontend for Trinity
-Group:		Productivity/Multimedia/CD/Grabbers
-
-Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	vorbis-tools
-Requires:	flac
-
-%description -n trinity-kaudiocreator
-KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
-keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
-searches CDDB to retrieve the information of the disk.
-
-%files -n trinity-kaudiocreator
-%defattr(-,root,root,-)
-%{tde_bindir}/kaudiocreator
-%{tde_tdeappdir}/kaudiocreator.desktop
-%{tde_datadir}/apps/kaudiocreator/
-%{tde_datadir}/apps/tdeconf_update/kaudiocreator-libkcddb.upd
-%{tde_datadir}/apps/tdeconf_update/kaudiocreator-meta.upd
-%{tde_datadir}/apps/tdeconf_update/upgrade-kaudiocreator-metadata.sh
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop
-%{tde_datadir}/config.kcfg/kaudiocreator.kcfg
-%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png
-%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png
-%{tde_tdedocdir}/HTML/en/kaudiocreator/
-
-##########
-
-%package kfile-plugins
-Summary:	An au/avi/m3u/mp3/ogg/wav plugins for kfile
-Group:		Productivity/Multimedia/Sound/Utilities
-
-%description kfile-plugins
-au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdefile_au.la
-%{tde_tdelibdir}/tdefile_au.so
-%{tde_tdelibdir}/tdefile_avi.la
-%{tde_tdelibdir}/tdefile_avi.so
-%{tde_tdelibdir}/tdefile_flac.la
-%{tde_tdelibdir}/tdefile_flac.so
-%{tde_tdelibdir}/tdefile_m3u.la
-%{tde_tdelibdir}/tdefile_m3u.so
-%{tde_tdelibdir}/tdefile_mp3.la
-%{tde_tdelibdir}/tdefile_mp3.so
-%{tde_tdelibdir}/tdefile_mpc.la
-%{tde_tdelibdir}/tdefile_mpc.so
-%{tde_tdelibdir}/tdefile_mpeg.la
-%{tde_tdelibdir}/tdefile_mpeg.so
-%{tde_tdelibdir}/tdefile_ogg.la
-%{tde_tdelibdir}/tdefile_ogg.so
-%{tde_tdelibdir}/tdefile_sid.la
-%{tde_tdelibdir}/tdefile_sid.so
-%{tde_tdelibdir}/tdefile_theora.la
-%{tde_tdelibdir}/tdefile_theora.so
-%{tde_tdelibdir}/tdefile_wav.la
-%{tde_tdelibdir}/tdefile_wav.so
-%{tde_datadir}/services/tdefile_au.desktop
-%{tde_datadir}/services/tdefile_avi.desktop
-%{tde_datadir}/services/tdefile_flac.desktop
-%{tde_datadir}/services/tdefile_m3u.desktop
-%{tde_datadir}/services/tdefile_mp3.desktop
-%{tde_datadir}/services/tdefile_mpc.desktop
-%{tde_datadir}/services/tdefile_mpeg.desktop
-%{tde_datadir}/services/tdefile_ogg.desktop
-%{tde_datadir}/services/tdefile_sid.desktop
-%{tde_datadir}/services/tdefile_theora.desktop
-%{tde_datadir}/services/tdefile_wav.desktop
-
-##########
-
-%package kappfinder-data
-Summary:	Multimedia data for kappfinder
-Group:		Productivity/Multimedia/Sound/Utilities
-
-Requires: 	trinity-kappfinder >= %{tde_version}
-Requires:	trinity-tdebase-runtime-data-common >= %{tde_version}
-
-%description kappfinder-data
-This package provides data on multimedia applications for kappfinder.
-
-%files kappfinder-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kappfinder/
-%{tde_datadir}/desktop-directories/tde-multimedia-music.directory
-%config %{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
-
-##########
-
-%package tdeio-plugins
-Summary:	Enables the browsing of audio CDs under Konqueror
-Group:		Productivity/Multimedia/Sound/Utilities
-Requires:	trinity-tdebase-tdeio-plugins >= %{tde_version}
-
-Obsoletes:	trinity-tdemultimedia-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tdemultimedia-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tdeio-plugins
-This package allow audio CDs to be browsed like a file system using
-Konqueror and the audiocd:/ URL.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_audiocd.la
-%{tde_tdelibdir}/kcm_audiocd.so
-%{tde_tdelibdir}/tdeio_audiocd.la
-%{tde_tdelibdir}/tdeio_audiocd.so
-%{tde_tdelibdir}/libaudiocd_encoder_flac.la
-%{tde_tdelibdir}/libaudiocd_encoder_flac.so
-%{tde_tdelibdir}/libaudiocd_encoder_lame.la
-%{tde_tdelibdir}/libaudiocd_encoder_lame.so
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la
-%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so
-%{tde_tdelibdir}/libaudiocd_encoder_wav.la
-%{tde_tdelibdir}/libaudiocd_encoder_wav.so
-%{tde_libdir}/libaudiocdplugins.so.*
-%{tde_tdeappdir}/audiocd.desktop
-%{tde_datadir}/apps/tdeconf_update/audiocd.upd
-%{tde_datadir}/apps/tdeconf_update/upgrade-metadata.sh
-%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg
-%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg
-%{tde_datadir}/services/audiocd.protocol
-%{tde_tdedocdir}/HTML/en/tdeioslave/audiocd/
-%{tde_tdedocdir}/HTML/en/kcontrol/audiocd/
-
-##########
-
-%package -n trinity-tdemid
-Summary:	MIDI/karaoke player for Trinity
-Group:		Productivity/Multimedia/Sound/Midi
-
-Obsoletes:	trinity-kmid < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kmid = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdemid
-This package provides a MIDI and karaoke player for TDE.
-
-%files -n trinity-tdemid
-%defattr(-,root,root,-)
-%{tde_bindir}/tdemid
-%{tde_tdelibdir}/libtdemidpart.la
-%{tde_tdelibdir}/libtdemidpart.so
-%{tde_libdir}/libtdemidlib.so.*
-%{tde_tdeappdir}/tdemid.desktop
-%{tde_datadir}/apps/tdemid/
-%{tde_datadir}/icons/hicolor/*/apps/tdemid.png
-%{tde_datadir}/mimelnk/audio/x-karaoke.desktop
-%{tde_datadir}/servicetypes/audiomidi.desktop
-%{tde_tdedocdir}/HTML/en/tdemid/
-
-##########
-
-%package -n trinity-kmix
-Summary:	Sound mixer applet for Trinity
-Group:		Productivity/Multimedia/Sound/Mixers
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-kmix
-This package includes TDE's dockable sound mixer applet.
-
-%files -n trinity-kmix
-%defattr(-,root,root,-)
-%{tde_bindir}/kmix
-%{tde_bindir}/kmixctrl
-%{tde_tdelibdir}/kmix.la
-%{tde_tdelibdir}/kmix.so
-%{tde_tdelibdir}/kmix_panelapplet.la
-%{tde_tdelibdir}/kmix_panelapplet.so
-%{tde_tdelibdir}/kmixctrl.la
-%{tde_tdelibdir}/kmixctrl.so
-%{tde_libdir}/libtdeinit_kmix.so
-%{tde_libdir}/libtdeinit_kmixctrl.so
-%{tde_tdeappdir}/kmix.desktop
-%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
-%{tde_datadir}/apps/kmix/
-%{tde_datadir}/autostart/kmix.desktop
-%{tde_datadir}/autostart/restore_kmix_volumes.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kmix.png
-%{tde_datadir}/services/kmixctrl_restore.desktop
-%{tde_tdedocdir}/HTML/en/kmix/
-
-##########
-
-%package -n trinity-krec
-Summary:	Sound recorder utility for Trinity
-Group:		Productivity/Multimedia/CD/Record
-
-%description -n trinity-krec
-This is a sound recording utility for Trinity.
-
-%files -n trinity-krec
-%defattr(-,root,root,-)
-%{tde_bindir}/krec
-%{tde_tdelibdir}/kcm_krec.la
-%{tde_tdelibdir}/kcm_krec.so
-%{tde_tdelibdir}/kcm_krec_files.la
-%{tde_tdelibdir}/kcm_krec_files.so
-%{tde_tdelibdir}/krec.la
-%{tde_tdelibdir}/krec.so
-%if 0%{?with_lame}
-%{tde_tdelibdir}/libkrecexport_mp3.la
-%{tde_tdelibdir}/libkrecexport_mp3.so
-%{tde_datadir}/services/krec_exportmp3.desktop
-%endif
-%{tde_tdelibdir}/libkrecexport_ogg.la
-%{tde_tdelibdir}/libkrecexport_ogg.so
-%{tde_tdelibdir}/libkrecexport_wave.la
-%{tde_tdelibdir}/libkrecexport_wave.so
-%{tde_libdir}/libtdeinit_krec.so
-%{tde_tdeappdir}/krec.desktop
-%{tde_datadir}/apps/krec/
-%{tde_datadir}/icons/hicolor/*/apps/krec.png
-%{tde_datadir}/services/kcm_krec.desktop
-%{tde_datadir}/services/kcm_krec_files.desktop
-%{tde_datadir}/services/krec_exportogg.desktop
-%{tde_datadir}/services/krec_exportwave.desktop
-%{tde_datadir}/servicetypes/krec_exportitem.desktop
-%{tde_tdedocdir}/HTML/en/krec/
-
-##########
-
-%package -n trinity-kscd
-Summary:	Audio CD player for Trinity
-Group:		Productivity/Multimedia/CD/Players
-
-%description -n trinity-kscd
-This is Trinity's audio CD player.
-
-%files -n trinity-kscd
-%defattr(-,root,root,-)
-%{tde_bindir}/kscd
-%{tde_bindir}/workman2cddb.pl
-%{tde_tdeappdir}/kscd.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop
-%{tde_datadir}/apps/kscd/
-%{tde_datadir}/apps/profiles/kscd.profile.xml
-%{tde_datadir}/config.kcfg/kscd.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kscd.png
-%{tde_datadir}/mimelnk/text/xmcd.desktop
-%{tde_tdedocdir}/HTML/en/kscd/
-
-##########
-
-%if 0%{?with_akode}
-%package -n trinity-libarts-akode
-Summary:	Akode plugin for aRts
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-akode
-This package contains akode plugins for aRts.
-
-%files -n trinity-libarts-akode
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_akode.so.*
-%{tde_libdir}/libarts_akode.la
-%{tde_libdir}/mcop/akodearts.mcoptype
-%{tde_libdir}/mcop/akodearts.mcopclass
-%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass
-%{tde_libdir}/mcop/akodePlayObject.mcopclass
-%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
-%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass
-
-# Requires MAD support
-%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass}
-
-%endif
-
-##########
-
-%package -n trinity-libarts-audiofile
-Summary:	Audiofile plugin for aRts
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-audiofile
-This package contains audiofile plugins for aRts.
-
-%files -n trinity-libarts-audiofile
-%defattr(-,root,root,-)
-%{tde_libdir}/libarts_audiofile.so.*
-%{tde_libdir}/libarts_audiofile.la
-%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcopclass
-%{tde_libdir}/mcop/audiofilearts.mcoptype
-
-##########
-
-%if 0%{?with_mpeg}
-%package -n trinity-libarts-mpeglib
-Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-mpeglib
-This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
-audio and video.
-
-This is the arts (TDE Sound daemon) plugin.
-
-%files -n trinity-libarts-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so*
-%{tde_libdir}/libarts_mpeglib.la
-%{tde_libdir}/libarts_splay.so.*
-%{tde_libdir}/libarts_splay.la
-%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-
-%endif
-
-##########
-
-%if 0%{?with_xine}
-%package -n trinity-libarts-xine
-Summary:	ARTS plugin enabling xine support
-Group:		Productivity/Multimedia/Other
-
-%description -n trinity-libarts-xine
-This package contains aRts' xine plugin, allowing the use of the xine
-multimedia engine though aRts.
-
-%files -n trinity-libarts-xine
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/videothumbnail.la
-%{tde_tdelibdir}/videothumbnail.so
-%{tde_libdir}/libarts_xine.so.*
-%{tde_libdir}/libarts_xine.la
-%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass
-%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass
-%{tde_datadir}/apps/videothumbnail/sprocket-large.png
-%{tde_datadir}/apps/videothumbnail/sprocket-medium.png
-%{tde_datadir}/apps/videothumbnail/sprocket-small.png
-%{tde_datadir}/services/videothumbnail.desktop
-
-%endif
-
-##########
-
-%package -n trinity-libkcddb
-Summary:	CDDB library for Trinity
-Group:		Productivity/Multimedia/Other
-Requires:	trinity-kcontrol >= %{tde_version}
-
-%description -n trinity-libkcddb
-The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
-CD meta-information (track titles, artist information, etc.) from on-line
-databases, for TDE applications.
-
-%files -n trinity-libkcddb
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_cddb.la
-%{tde_tdelibdir}/kcm_cddb.so
-%{tde_libdir}/libkcddb.so.*
-%{tde_tdeappdir}/libkcddb.desktop
-%{tde_datadir}/apps/tdeconf_update/kcmcddb-emailsettings.upd
-%{tde_datadir}/config.kcfg/libkcddb.kcfg
-%{tde_tdedocdir}/HTML/en/kcontrol/cddb/
-
-##########
-
-%if 0%{?with_mpeg}
-
-%package -n trinity-mpeglib
-Summary:	MP3 and MPEG-1 audio and video library
-Group:		Productivity/Multimedia/Other
-%if 0%{?with_mpeg}
-Requires:	trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%description -n trinity-mpeglib
-mpeglib is a MPEG-1 and MP3 audio and video library. It supports
-MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer,
-and WAV playback
-
-%files -n trinity-mpeglib
-%defattr(-,root,root,-)
-%{tde_bindir}/yaf-cdda
-%{tde_bindir}/yaf-mpgplay
-%{tde_bindir}/yaf-splay
-%{tde_bindir}/yaf-tplay
-%{tde_bindir}/yaf-vorbis
-%{tde_bindir}/yaf-yuv
-%{tde_libdir}/libmpeg-0.3.0.so
-%{tde_libdir}/libyafcore.so
-%{tde_libdir}/libyafxplayer.so
-
-%endif
-
-##########
-
-%package -n trinity-noatun
-Summary:	Media player for Trinity
-Group:		Productivity/Multimedia/Video/Players
-Requires:	trinity-tdebase-bin >= %{tde_version}
-
-# 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:	devel(libnoatunarts)
-Provides:	devel(libnoatunarts(64bit))
-%endif
-
-%description -n trinity-noatun
-Noatun is an aRts-based audio and video player for Trinity. It supports all
-formats supported by your installation of aRts (including aRts plugins).
-
-%files -n trinity-noatun
-%defattr(-,root,root,-)
-%{tde_bindir}/noatun
-%{tde_libdir}/tdeconf_update_bin/noatun20update
-%{tde_tdelibdir}/noatun.la
-%{tde_tdelibdir}/noatun.so
-%{tde_tdelibdir}/noatun_dcopiface.la
-%{tde_tdelibdir}/noatun_dcopiface.so
-%{tde_tdelibdir}/noatun_excellent.la
-%{tde_tdelibdir}/noatun_excellent.so
-%{tde_tdelibdir}/noatun_htmlexport.la
-%{tde_tdelibdir}/noatun_htmlexport.so
-%{tde_tdelibdir}/noatun_infrared.la
-%{tde_tdelibdir}/noatun_infrared.so
-%{tde_tdelibdir}/noatun_kaiman.la
-%{tde_tdelibdir}/noatun_kaiman.so
-%{tde_tdelibdir}/noatun_keyz.la
-%{tde_tdelibdir}/noatun_keyz.so
-%{tde_tdelibdir}/noatun_kjofol.la
-%{tde_tdelibdir}/noatun_kjofol.so
-%{tde_tdelibdir}/noatun_marquis.la
-%{tde_tdelibdir}/noatun_marquis.so
-%{tde_tdelibdir}/noatun_metatag.la
-%{tde_tdelibdir}/noatun_metatag.so
-%{tde_tdelibdir}/noatun_monoscope.la
-%{tde_tdelibdir}/noatun_monoscope.so
-%{tde_tdelibdir}/noatun_net.la
-%{tde_tdelibdir}/noatun_net.so
-%{tde_tdelibdir}/noatun_splitplaylist.la
-%{tde_tdelibdir}/noatun_splitplaylist.so
-%{tde_tdelibdir}/noatun_systray.la
-%{tde_tdelibdir}/noatun_systray.so
-%{tde_tdelibdir}/noatun_ui.la
-%{tde_tdelibdir}/noatun_ui.so
-%{tde_tdelibdir}/noatun_voiceprint.la
-%{tde_tdelibdir}/noatun_voiceprint.so
-%{tde_tdelibdir}/noatun_winskin.la
-%{tde_tdelibdir}/noatun_winskin.so
-%{tde_tdelibdir}/noatunsimple.la
-%{tde_tdelibdir}/noatunsimple.so
-%{tde_libdir}/libartseffects.la
-%{tde_libdir}/libartseffects.so
-%{tde_libdir}/libtdeinit_noatun.so
-%{tde_libdir}/libnoatun.so.*
-%{tde_libdir}/libnoatunarts.la
-%{tde_libdir}/libnoatunarts.so
-%{tde_libdir}/libnoatuncontrols.so.*
-%{tde_libdir}/libnoatuntags.so.*
-%{tde_libdir}/libwinskinvis.la
-%{tde_libdir}/libwinskinvis.so
-%{tde_libdir}/mcop/ExtraStereo.mcopclass
-%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass
-%{tde_libdir}/mcop/Noatun/
-%{tde_libdir}/mcop/RawWriter.mcopclass
-%{tde_libdir}/mcop/VoiceRemoval.mcopclass
-%{tde_libdir}/mcop/artseffects.mcopclass
-%{tde_libdir}/mcop/artseffects.mcoptype
-%{tde_libdir}/mcop/noatunarts.mcopclass
-%{tde_libdir}/mcop/noatunarts.mcoptype
-%{tde_libdir}/mcop/winskinvis.mcopclass
-%{tde_libdir}/mcop/winskinvis.mcoptype
-%{tde_tdeappdir}/noatun.desktop
-%{tde_datadir}/apps/tdeconf_update/noatun.upd
-%{tde_datadir}/apps/noatun/
-%{tde_datadir}/icons/hicolor/*/apps/noatun.png
-%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop
-%{tde_tdedocdir}/HTML/en/noatun/
-
-##########
-
-%package devel
-Summary:	Development files for %{name}, aRts and noatun plugins
-Group:		Development/Libraries/Other
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-
-Obsoletes:	trinity-kdemultimedia-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdemultimedia-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-{summary}.
-
-Install %{name}-devel if you wish to develop or compile any
-applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
-noatun plugins.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*
-%if 0%{?with_akode}
-%{tde_libdir}/libarts_akode.so
-%endif
-%{tde_libdir}/libarts_audiofile.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libarts_mpeglib.so
-%{tde_libdir}/libarts_splay.so
-%endif
-%if 0%{?with_xine}
-%{tde_libdir}/libarts_xine.so
-%endif
-%{tde_libdir}/libartsbuilder.so
-%{tde_libdir}/libartscontrolapplet.so
-%{tde_libdir}/libartscontrolsupport.so
-%{tde_libdir}/libartsgui.so
-%{tde_libdir}/libartsgui_idl.so
-%{tde_libdir}/libartsgui_kde.so
-%{tde_libdir}/libartsmidi.so
-%{tde_libdir}/libartsmidi_idl.so
-%{tde_libdir}/libartsmodules.so
-%{tde_libdir}/libartsmodulescommon.so
-%{tde_libdir}/libartsmoduleseffects.so
-%{tde_libdir}/libartsmodulesmixers.so
-%{tde_libdir}/libartsmodulessynth.so
-%{tde_libdir}/libaudiocdplugins.la
-%{tde_libdir}/libaudiocdplugins.so
-%{tde_libdir}/libkcddb.la
-%{tde_libdir}/libkcddb.so
-%{tde_libdir}/libtdeinit_kmix.la
-%{tde_libdir}/libtdeinit_kmixctrl.la
-%{tde_libdir}/libtdeinit_krec.la
-%{tde_libdir}/libtdeinit_noatun.la
-%{tde_libdir}/libtdemidlib.la
-%{tde_libdir}/libtdemidlib.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libmpeg.la
-%{tde_libdir}/libmpeg.so
-%endif
-%{tde_libdir}/libnoatun.la
-%{tde_libdir}/libnoatun.so
-%{tde_libdir}/libnoatuncontrols.la
-%{tde_libdir}/libnoatuncontrols.so
-%{tde_libdir}/libnoatuntags.la
-%{tde_libdir}/libnoatuntags.so
-%if 0%{?with_mpeg}
-%{tde_libdir}/libyafcore.la
-%{tde_libdir}/libyafxplayer.la
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# Update icons for some control center modules
-%__sed -i "tdeioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DWITH_ALL_OPTIONS=ON \
-  -DWITH_ALSA=ON \
-  -DWITH_ARTS_AKODE=ON \
-  -DWITH_ARTS_AUDIOFILE=ON \
-  -DWITH_ARTS_MPEGLIB=ON \
-  -DWITH_ARTS_XINE=ON \
-  -DWITH_CDPARANOIA=ON \
-  -DWITH_FLAC=ON \
-  -DWITH_GSTREAMER=ON \
-  -DWITH_KSCD_CDDA=ON \
-  -DWITH_LAME=%{?with_lame:ON}%{!?with_lame:OFF} \
-  -DWITH_MUSICBRAINZ=%{?with_musicbrainz:ON}%{!?with_musicbrainz:OFF} \
-  -DWITH_TAGLIB=%{?with_taglib:ON}%{!?with_taglib:OFF} \
-  -DWITH_THEORA=ON \
-  -DWITH_VORBIS=ON \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot} 
-%__make install DESTDIR="%{?buildroot}" -C build
-
-# Disable MPEG support entirely
-%if 0%{?with_mpeg} == 0
-%__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay
-%__rm %{?buildroot}%{tde_bindir}/yaf-*
-%__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib*
-%__rm %{?buildroot}%{tde_libdir}/libarts_splay.*
-%__rm %{?buildroot}%{tde_libdir}/libmpeg*
-%__rm %{?buildroot}%{tde_libdir}/libyaf*
-%__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass
-%__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass
-%endif
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file krec           AudioVideo Recorder
-%suse_update_desktop_file tdemid         AudioVideo Midi
-%suse_update_desktop_file artsbuilder    AudioVideo AudioVideoEditing
-%suse_update_desktop_file artscontrol    AudioVideo AudioVideoEditing
-%suse_update_desktop_file kmix           AudioVideo Mixer
-%suse_update_desktop_file kaboodle       AudioVideo Player
-%suse_update_desktop_file kaudiocreator  AudioVideo CD
-%suse_update_desktop_file kscd           AudioVideo Player CD
-%suse_update_desktop_file noatun         AudioVideo Player Video
-%suse_update_desktop_file juk            AudioVideo Player Jukebox
-%suse_update_desktop_file audiocd
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
deleted file mode 100644
index 5c4c8b761..000000000
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ /dev/null
@@ -1,1214 +0,0 @@
-%if 0%{?fedora} >= 23
-%define _hardened_ldflags %nil
-%endif
-
-#
-# spec file for package tdenetwork (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdenetwork
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_sbindir %{tde_prefix}/sbin
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-
-# Disable AIM support
-%define with_aim 1
-
-Name:			trinity-%{tde_pkg}
-Summary:		Trinity Desktop Environment - Network Applications
-Group:			Applications/Internet
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	kppp.pamd
-Source2:	ktalk
-Source3:	trinity-tdenetwork-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gettext
-BuildRequires:	coreutils 
-BuildRequires:	gcc-c++
-BuildRequires:	desktop-file-utils
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# for set_permissions macro
-%if 0%{?suse_version}
-PreReq: permissions
-%endif
-
-# AVAHI support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_avahi 1
-BuildRequires:	libavahi-tqt-devel >= 1:0.6.30
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-Requires:		%{_lib}avahi-client3
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	avahi-devel
-Requires:		avahi
-%endif
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# TLS support
-BuildRequires:	gnutls-devel
-
-# SQLITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	sqlite3-devel
-%else
-BuildRequires:	sqlite-devel
-%endif
-
-# GADU support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_gadu 1
-BuildRequires:	libgadu-devel
-%endif
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# XTST support
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210
-BuildRequires:	libXtst-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	libxtst-devel
-%endif
-
-# XMU support
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXmu-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires: libXmu-devel
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
-%endif
-%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
-BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
-%endif
-
-# Other stuff
-%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	libXxf86vm-devel
-%endif
-
-# Fedora review:  http://bugzilla.redhat.com/195486
-
-## Conditional build:
-# RHEL6: xmms is outdated !
-#define _with_xmms --with-xmms
-%ifnarch s390 s390x
-%define _with_wifi --with-wifi
-%endif
-
-# Wifi support
-%if "%{?_with_wifi:1}" == "1"
-%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
-%endif
-%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires:	%{_lib}iw29-devel
-%endif
-%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
-%endif
-%if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires:	libiw-devel
-%endif
-%endif
-
-# OpenSLP support
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_openslp 1
-BuildRequires: openslp-devel
-%endif
-
-%ifarch %{ix86}
-# BR: /usr/include/valgrind/valgrind.h
-BuildRequires: valgrind
-%endif
-
-%{?_with_xmms:BuildRequires: xmms-devel}
-
-# V4L support
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-BuildRequires:	libv4l-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}v4l-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires:	kernel-headers
-%endif
-
-# XML support
-BuildRequires:	libxml2-devel
-BuildRequires:	libxslt-devel
-
-#jabber
-BuildRequires:	libidn-devel
-#jabber/jingle
-%if 0%{?suse_version}
-BuildRequires:	libexpat-devel
-%else
-BuildRequires:	expat-devel
-%endif
-BuildRequires:	glib2-devel
-BuildRequires:	speex-devel
-# jabber/ssl
-#{?fedora:Requires(hint): qca-tls}
-#Requires:		jasper
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# MEANWHILE support
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%define with_meanwhile 1
-BuildRequires:	meanwhile-devel
-%endif
-
-# SPEEX support
-%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
-%define with_speex 1
-BuildRequires:	speex-devel
-%endif
-
-# CONSOLEHELPER (usermode) support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_consolehelper 1
-
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-%endif
-
-# Build kopete motionaway plugin
-%if 0%{?rhel} != 5
-%define build_kopete_motionaway 1
-%endif
-
-Obsoletes:	trinity-kdenetwork < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdenetwork = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdenetwork-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdenetwork-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdenetwork-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdenetwork-extras = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdenetwork < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdenetwork = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: trinity-dcoprss = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-filesharing = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-tdefile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kget = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-knewsticker = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kopete-nowlistening = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kpf = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kppp = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-krdc = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-krfb = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ktalkd = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kwifimanager = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-lisa = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-This metapackage includes a collection of network and networking related
-applications provided with the official release of Trinity.
-
-Networking applications, including:
-* dcoprss: RSS utilities for Trinity
-* filesharing: Network filesharing configuration module for Trinity
-* kdict: Dictionary client for Trinity
-* tdefile-plugins: Torrent metainfo plugin for Trinity
-* kget: downloader manager
-* knewsticker: RDF newsticker applet
-* kopete: chat client
-* kopete-nowlistening: (xmms) plugin for Kopete.
-* kpf: Public fileserver for Trinity
-* kppp: dialer and front end for pppd
-* krdc: a client for Desktop Sharing and other VNC servers
-* krfb: Desktop Sharing server, allow others to access your desktop via VNC
-* ksirc: IRC client for Trinity
-* ktalkd: Talk daemon for Trinity
-* kwifimanager: Wireless lan manager for Trinity
-* librss: RSS library for Trinity
-* lisa: lan information server
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-
-
-##########
-
-%package -n trinity-dcoprss
-Summary:		RSS utilities for Trinity
-Group:			Applications/Internet
-
-%description -n trinity-dcoprss
-dcoprss is a RSS to DCOP bridge, allowing all
-DCOP aware applications to access RSS news feeds. There is also
-a few sample utilities provided.
-RSS is a standard for publishing news headlines.
-DCOP is the TDE interprocess communication protocol.
-
-%files -n trinity-dcoprss
-%defattr(-,root,root,-)
-%{tde_bindir}/feedbrowser
-%{tde_bindir}/rssclient
-%{tde_bindir}/rssservice
-%{tde_datadir}/services/rssservice.desktop
-
-##########
-
-%package devel
-Summary:		Development files for the Trinity network module
-Group:			Development/Libraries/Other
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-tdelibs-devel >= %{tde_version}
-
-Obsoletes:	trinity-kdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This is the development package which contains the headers for the TDE RSS
-library as well as the Kopete chat client, as well as miscellaneous
-development-related files for the TDE network module.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kopete/
-%{tde_tdeincludedir}/rss/
-%{tde_libdir}/libkopete.la
-%{tde_libdir}/libkopete.so
-%if 0%{?with_aim}
-%{tde_libdir}/libkopete_msn_shared.la
-%{tde_libdir}/libkopete_msn_shared.so
-%endif
-%{tde_libdir}/libkopete_oscar.la
-%{tde_libdir}/libkopete_oscar.so
-%{tde_libdir}/libkopete_videodevice.la
-%{tde_libdir}/libkopete_videodevice.so
-%{tde_libdir}/librss.la
-%{tde_libdir}/librss.so
-
-##########
-
-%package filesharing
-#Recommends:	perl-suid
-Summary:		Network filesharing configuration module for Trinity
-Group:   		Applications/Internet
-
-Obsoletes:		tdenetwork-filesharing < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		tdenetwork-filesharing = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description filesharing
-This package provides a Trinity Control Center module to configure
-NFS and Samba.
-
-%files filesharing
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/fileshare_propsdlgplugin.la
-%{tde_tdelibdir}/fileshare_propsdlgplugin.so
-%{tde_tdelibdir}/kcm_fileshare.la
-%{tde_tdelibdir}/kcm_fileshare.so
-%{tde_tdelibdir}/kcm_kcmsambaconf.la
-%{tde_tdelibdir}/kcm_kcmsambaconf.so
-%{tde_tdeappdir}/fileshare.desktop
-%{tde_tdeappdir}/kcmsambaconf.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kcmfileshare.png
-%{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png
-%{tde_datadir}/services/fileshare_propsdlgplugin.desktop
-%{tde_tdedocdir}/HTML/en/kcontrol/fileshare/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmsambaconf/
-
-##########
-
-%package -n trinity-kdict
-Summary:		Dictionary client for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kicker >= %{tde_version}
-
-%description -n trinity-kdict
-KDict is an advanced TDE graphical client for the DICT Protocol, with full
-Unicode support. It enables you to search through dictionary databases for a
-word or phrase, then displays suitable definitions. KDict tries to ease
-basic as well as advanced queries.
-
-%files -n trinity-kdict
-%defattr(-,root,root,-)
-%{tde_bindir}/kdict
-%{tde_tdelibdir}/kdict.*
-%{tde_tdelibdir}/kdict_panelapplet.*
-%{tde_libdir}/libtdeinit_kdict.*
-%{tde_tdeappdir}/kdict.desktop
-%{tde_datadir}/apps/kdict
-%{tde_datadir}/apps/kicker/applets/kdictapplet.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kdict.*
-%{tde_tdedocdir}/HTML/en/kdict
-
-##########
-
-%package tdefile-plugins
-Summary:		Torrent metainfo plugin for Trinity
-Group:			Applications/Internet
-
-Obsoletes:		tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tdefile-plugins
-This package provides a metainformation plugin for bittorrent files.
-TDE uses tdefile-plugins to provide metainfo tab in the files properties
-dialog in konqueror and other file-handling applications.
-
-%files tdefile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdefile_torrent.la
-%{tde_tdelibdir}/tdefile_torrent.so
-%{tde_datadir}/services/tdefile_torrent.desktop
-
-##########
-
-%package -n trinity-kget
-Summary:		Download manager for Trinity
-Group:			Applications/Internet
-Requires:		trinity-tdebase-data >= %{tde_version}
-Requires:		trinity-konqueror >= %{tde_version}
-
-%description -n trinity-kget
-KGet is a a download manager similar to GetRight or Go!zilla. It keeps
-all your downloads in one dialog and you can add and remove transfers.
-Transfers can be paused, resumed, queued or scheduled.
-Dialogs display info about status of transfers - progress, size, speed
-and remaining time. Program supports drag & drop from TDE
-applications and Netscape.
-
-%files -n trinity-kget
-%defattr(-,root,root,-)
-%{tde_bindir}/kget
-%{tde_tdelibdir}/tdehtml_kget.la
-%{tde_tdelibdir}/tdehtml_kget.so
-%{tde_tdeappdir}/kget.desktop
-%{tde_datadir}/apps/kget
-%{tde_datadir}/apps/tdehtml/kpartplugins/kget_plug_in.desktop
-%{tde_datadir}/apps/tdehtml/kpartplugins/kget_plug_in.rc
-%{tde_datadir}/apps/konqueror/servicemenus/kget_download.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/tdehtml_kget.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kget.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kget_list.png
-%{tde_datadir}/icons/hicolor/*/apps/kget.png
-%{tde_datadir}/mimelnk/application/x-kgetlist.desktop
-%{tde_datadir}/sounds/KGet_Added.ogg
-%{tde_datadir}/sounds/KGet_Finished.ogg
-%{tde_datadir}/sounds/KGet_Finished_All.ogg
-%{tde_datadir}/sounds/KGet_Started.ogg
-%{tde_tdedocdir}/HTML/en/kget
-
-##########
-
-%package -n trinity-knewsticker
-Summary:		News ticker applet for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kicker >= %{tde_version}
-
-%description -n trinity-knewsticker
-This is a news ticker applet for the Trinity panel. It can scroll news from
-your favorite news sites, such as lwn.net, /. and freshmeat.net.
-To achieve this, KNewsTicker requires the news sites to provide a
-RSS feed to newsitems. KNewsTicker already comes with a selection of
-good news sources which provide such files.
-
-%files -n trinity-knewsticker
-%defattr(-,root,root,-)
-%{tde_bindir}/knewstickerstub
-%{tde_tdelibdir}/knewsticker_panelapplet.la
-%{tde_tdelibdir}/knewsticker_panelapplet.so
-%{tde_tdelibdir}/libkntsrcfilepropsdlg.la
-%{tde_tdelibdir}/libkntsrcfilepropsdlg.so
-%{tde_tdeappdir}/knewsticker-standalone.desktop
-%{tde_datadir}/applnk/.hidden/knewstickerstub.desktop
-%{tde_datadir}/apps/tdeconf_update/knewsticker.upd
-%{tde_datadir}/apps/tdeconf_update/knt-0.1-0.2.pl
-%{tde_datadir}/apps/kicker/applets/knewsticker.desktop
-%{tde_datadir}/apps/knewsticker/
-%{tde_datadir}/icons/hicolor/*/apps/knewsticker.png
-%{tde_datadir}/services/kntsrcfilepropsdlg.desktop
-%{tde_tdedocdir}/HTML/en/knewsticker
-
-##########
-
-%package -n trinity-kopete
-Summary:		Instant messenger for Trinity
-Group:			Applications/Internet
-Requires:		trinity-tdebase-bin >= %{tde_version}
-Requires:		trinity-tdebase-data >= %{tde_version}
-Requires:		trinity-filesystem >= %{tde_version}
-
-%description -n trinity-kopete
-Kopete is an instant messenger program which can communicate with a variety
-of IM systems, such as Yahoo, ICQ, IRC and Jabber.
-
-Support for more IM protocols can be added through a plugin system.
-
-%files -n trinity-kopete
-%defattr(-,root,root,-)
-# nowlistening support
-%exclude %{tde_datadir}/apps/kopete/*nowlisteningchatui*
-%exclude %{tde_datadir}/apps/kopete/*nowlisteningui*
-%exclude %{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg
-%exclude %{tde_datadir}/services/tdeconfiguredialog/*nowlistening*
-%exclude %{tde_datadir}/services/*nowlistening*
-%exclude %{tde_tdelibdir}/*nowlistening*
-# Main kopete package
-%{tde_bindir}/kopete
-%{tde_bindir}/kopete_latexconvert.sh
-%{tde_libdir}/tdeconf_update_bin/kopete-account-tdeconf_update
-%{tde_libdir}/tdeconf_update_bin/kopete-nameTracking-tdeconf_update
-%{tde_libdir}/tdeconf_update_bin/kopete-pluginloader2-tdeconf_update
-%{tde_tdelibdir}/kcm_kopete_*.so
-%{tde_tdelibdir}/kcm_kopete_*.la
-%{tde_tdelibdir}/tdeio_jabberdisco.la
-%{tde_tdelibdir}/tdeio_jabberdisco.so
-%{tde_tdelibdir}/kopete_*.la
-%{tde_tdelibdir}/kopete_*.so
-%{tde_tdelibdir}/libkrichtexteditpart.la
-%{tde_tdelibdir}/libkrichtexteditpart.so
-%{tde_libdir}/libkopete_oscar.so.*
-%{tde_libdir}/libkopete.so.*
-%{tde_libdir}/libkopete_videodevice.so.*
-%{tde_tdeappdir}/kopete.desktop
-%{tde_datadir}/apps/tdeconf_update/kopete-*
-%{tde_datadir}/apps/kopete/
-%{tde_datadir}/apps/kopete_*/
-%{tde_datadir}/apps/kopeterichtexteditpart/
-%{tde_datadir}/config.kcfg/historyconfig.kcfg
-%{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg
-%{tde_datadir}/config.kcfg/kopete.kcfg
-%{tde_datadir}/config.kcfg/latexconfig.kcfg
-%{tde_datadir}/icons/crystalsvg/*/actions/voicecall.png
-%{tde_datadir}/icons/crystalsvg/*/actions/webcamreceive.png
-%{tde_datadir}/icons/crystalsvg/*/actions/webcamsend.png
-%{tde_datadir}/icons/crystalsvg/*/actions/account_offline_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/add_user.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_away_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_busy_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_food_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_invisible_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_phone_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/contact_xa_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/delete_user.png
-%{tde_datadir}/icons/crystalsvg/*/actions/edit_user.png
-%{tde_datadir}/icons/crystalsvg/*/actions/emoticon.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_chatty.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_connecting.mng
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_group.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_invisible.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_na.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_offline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_online.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_original.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_raw.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png
-%{tde_datadir}/icons/crystalsvg/*/actions/jabber_xa.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kopeteavailable.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kopeteaway.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kopeteeditstatusmessage.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kopetestatusmessage.png
-%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_offline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_online.png
-%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_unknown.png
-%{tde_datadir}/icons/crystalsvg/*/actions/newmsg.png
-%{tde_datadir}/icons/crystalsvg/*/actions/search_user.png
-%{tde_datadir}/icons/crystalsvg/*/actions/show_offliners.png
-%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown_overlay.png
-%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_aim.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_gadu.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_http-ws.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_icq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_irc.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_msn.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_qq.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_smtp.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_tlen.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_yahoo.png
-%{tde_datadir}/icons/crystalsvg/*/apps/jabber_protocol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kopete_all_away.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kopete_offline.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_away.png
-%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_online.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/kopete_emoticons.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kopete.png
-%{tde_datadir}/icons/hicolor/*/actions/emoticon.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_away.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_chatty.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_connecting.mng
-%{tde_datadir}/icons/hicolor/*/actions/jabber_group.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_invisible.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_na.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_offline.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_online.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_original.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_raw.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_off.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_on.png
-%{tde_datadir}/icons/hicolor/*/actions/jabber_xa.png
-%{tde_datadir}/icons/hicolor/*/actions/kopeteavailable.png
-%{tde_datadir}/icons/hicolor/*/actions/kopeteaway.png
-%{tde_datadir}/icons/hicolor/*/actions/newmsg.png
-%{tde_datadir}/icons/hicolor/*/actions/status_unknown_overlay.png
-%{tde_datadir}/icons/hicolor/*/actions/status_unknown.png
-%{tde_datadir}/icons/hicolor/*/apps/jabber_protocol.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz
-%{tde_datadir}/icons/crystalsvg/*/actions/newmessage.mng
-%{tde_datadir}/icons/hicolor/*/actions/newmessage.mng
-%{tde_datadir}/icons/crystalsvg/*/apps/icq_protocol.png
-%{tde_datadir}/icons/crystalsvg/*/apps/irc_protocol.png
-%{tde_datadir}/icons/crystalsvg/*/actions/icq_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/icq_connecting.mng
-%{tde_datadir}/icons/crystalsvg/*/actions/icq_dnd.png
-%{tde_datadir}/icons/crystalsvg/*/actions/icq_ffc.png
-%{tde_datadir}/icons/crystalsvg/*/actions/icq_invisible.png
-%{tde_datadir}/icons/crystalsvg/*/actions/icq_na.png
-%{tde_datadir}/icons/crystalsvg/*/actions/icq_occupied.png
-%{tde_datadir}/icons/crystalsvg/*/actions/icq_offline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/icq_online.png
-%{tde_datadir}/icons/crystalsvg/*/actions/irc_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/irc_channel.png
-%{tde_datadir}/icons/crystalsvg/*/actions/irc_connecting.mng
-%{tde_datadir}/icons/crystalsvg/*/actions/irc_normal.png
-%{tde_datadir}/icons/crystalsvg/*/actions/irc_online.png
-%{tde_datadir}/icons/crystalsvg/*/actions/irc_op.png
-%{tde_datadir}/icons/crystalsvg/*/actions/irc_server.png
-%{tde_datadir}/icons/crystalsvg/*/actions/irc_voice.png
-%{tde_datadir}/icons/hicolor/*/actions/icq_away.png
-%{tde_datadir}/icons/hicolor/*/actions/icq_connecting.mng
-%{tde_datadir}/icons/hicolor/*/actions/icq_dnd.png
-%{tde_datadir}/icons/hicolor/*/actions/icq_ffc.png
-%{tde_datadir}/icons/hicolor/*/actions/icq_invisible.png
-%{tde_datadir}/icons/hicolor/*/actions/icq_na.png
-%{tde_datadir}/icons/hicolor/*/actions/icq_occupied.png
-%{tde_datadir}/icons/hicolor/*/actions/icq_offline.png
-%{tde_datadir}/icons/hicolor/*/actions/icq_online.png
-%{tde_datadir}/icons/hicolor/*/apps/icq_protocol.png
-%{tde_datadir}/mimelnk/application/x-icq.desktop
-%{tde_datadir}/mimelnk/application/x-kopete-emoticons.desktop
-%{tde_datadir}/services/chatwindow.desktop
-%{tde_datadir}/services/emailwindow.desktop
-%{tde_datadir}/services/jabberdisco.protocol
-%{tde_datadir}/services/tdeconfiguredialog/kopete_*.desktop
-%{tde_datadir}/services/kopete_*.desktop
-%{tde_datadir}/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png
-%{tde_datadir}/servicetypes/kopete*.desktop
-%{tde_datadir}/sounds/Kopete_*.ogg
-%{tde_tdedocdir}/HTML/en/kopete
-# jingle support for kopete
-%{tde_bindir}/relayserver
-%{tde_bindir}/stunserver
-# winpopup support for kopete
-%{tde_bindir}/winpopup-install.sh
-%{tde_bindir}/winpopup-send.sh
-%if 0%{?build_kopete_motionaway}
-# motionaway plugin for kopete
-%{tde_datadir}/config.kcfg/motionawayconfig.kcfg
-%endif
-# smpp plugin for kopete
-%{tde_datadir}/config.kcfg/smpppdcs.kcfg
-# aim support is deprecated in TDE 14.1.0
-%if 0%{?with_aim}
-%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_away.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng
-%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_online.png
-%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png
-%{tde_datadir}/services/aim.protocol
-%{tde_libdir}/libkopete_msn_shared.so.0
-%{tde_libdir}/libkopete_msn_shared.so.0.0.0
-%endif
-
-##########
-
-%package -n trinity-kopete-nowlistening
-Summary:		Nowlistening (xmms) plugin for Kopete
-Group:			Applications/Internet
-Requires:		trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-filesystem >= %{tde_version}
-
-%description -n trinity-kopete-nowlistening
-Kopete includes the "Now Listening" plug-in that can report what music you
-are currently listening to, in a number of different players, including
-noatun, kscd, juk, kaffeine and amarok.
-
-%files -n trinity-kopete-nowlistening
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/kopete/*nowlisteningchatui*
-%{tde_datadir}/apps/kopete/*nowlisteningui*
-%{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg
-%{tde_datadir}/services/tdeconfiguredialog/*nowlistening*
-%{tde_datadir}/services/*nowlistening*
-%{tde_tdelibdir}/*nowlistening*
-
-##########
-
-%package -n trinity-kpf
-Summary:		Public fileserver for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kicker >= %{tde_version}
-
-%description -n trinity-kpf
-kpf provides simple file sharing using HTTP. kpf is strictly a public
-fileserver, which means that there are no access restrictions to shared
-files. Whatever you select for sharing is available to anyone. kpf is
-designed to be used for sharing files with friends.
-
-%files -n trinity-kpf
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kpf*
-%{tde_datadir}/apps/kicker/applets/kpfapplet.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/kpf.*
-%{tde_datadir}/services/kpfpropertiesdialogplugin.desktop
-%{tde_tdedocdir}/HTML/en/kpf
-
-##########
-
-%package -n trinity-kppp
-Summary:		Modem dialer and ppp frontend for Trinity
-Group:			Applications/Internet
-BuildRequires:	ppp
-Requires:		ppp
-
-%if 0%{?with_consolehelper}
-# package 'usermode' provides '/usr/bin/consolehelper-gtk'
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	usermode-gtk
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	usermode
-%endif
-%endif
-
-%description -n trinity-kppp
-KPPP is a dialer and front end for pppd. It allows for interactive
-script generation and network setup. It will automate the dialing in
-process to your ISP while letting you conveniently monitor the entire
-process.
-
-Once connected KPPP will provide a rich set of statistics and keep
-track of the time spent online for you.
-
-%files -n trinity-kppp
-%defattr(-,root,root,-)
-%if 0%{?with_consolehelper} == 0
-# Some setuid binaries need special care
-%if 0%{?suse_version}
-%verify(not mode) %{tde_bindir}/kppp
-%else
-%attr(4711,root,root) %{tde_bindir}/kppp
-%endif
-%endif
-%{tde_bindir}/kppplogview
-%{tde_tdeappdir}/Kppp.desktop
-%{tde_tdeappdir}/kppplogview.desktop
-%{tde_datadir}/apps/kppp/
-%{tde_datadir}/icons/hicolor/*/apps/kppp.png
-%{tde_tdedocdir}/HTML/en/kppp/
-%dir %{_sysconfdir}/ppp/peers
-%{_sysconfdir}/ppp/peers/kppp-options
-
-%if 0%{?with_consolehelper}
-%config(noreplace) /etc/security/console.apps/kppp3
-%config(noreplace) /etc/pam.d/kppp3
-%{_sbindir}/kppp3
-%{tde_bindir}/kppp3
-%{tde_sbindir}/kppp3
-%endif
-
-%post -n trinity-kppp
-%if 0%{?suse_version}
-# Sets permissions on setuid files (openSUSE specific)
-%set_permissions %{tde_bindir}/kppp
-%endif
-
-##########
-
-%package -n trinity-krdc
-Summary:		Remote Desktop Connection for Trinity
-Group:			Applications/Internet
-Requires:		rdesktop
-
-%description -n trinity-krdc
-krdc is an TDE graphical client for the rfb protocol, used by VNC,
-and if rdesktop is installed, krdc can connect to Windows Terminal
-Servers using RDP.
-
-%files -n trinity-krdc
-%defattr(-,root,root,-)
-%{tde_bindir}/krdc
-%{tde_tdeappdir}/krdc.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop
-%{tde_datadir}/apps/krdc/
-%{tde_datadir}/icons/crystalsvg/*/apps/krdc.png
-%{tde_datadir}/icons/hicolor/*/apps/krdc.png
-%{tde_datadir}/services/rdp.protocol
-%{tde_datadir}/services/vnc.protocol
-%{tde_tdedocdir}/HTML/en/krdc/
-%{tde_tdedocdir}/HTML/en/tdeioslave/rdp/
-%{tde_tdedocdir}/HTML/en/tdeioslave/vnc/
-
-##########
-
-%package -n trinity-krfb
-Summary:		Desktop Sharing for Trinity
-Group:			Applications/Internet
-
-%description -n trinity-krfb
-Desktop Sharing (krfb) is a server application that allows you to share
-your current session with a user on another machine, who can use a
-VNC client like krdc to view or even control the desktop. It doesn't
-require you to start a new X session - it can share the current session.
-This makes it very useful when you want someone to help you perform a
-task.
-
-%files -n trinity-krfb
-%defattr(-,root,root,-)
-%{tde_bindir}/krfb
-%{tde_bindir}/krfb_httpd
-%{tde_tdelibdir}/kcm_krfb.la
-%{tde_tdelibdir}/kcm_krfb.so
-%{tde_tdelibdir}/kded_kinetd.la
-%{tde_tdelibdir}/kded_kinetd.so
-%{tde_tdeappdir}/kcmkrfb.desktop
-%{tde_tdeappdir}/krfb.desktop
-%{tde_datadir}/apps/kinetd/
-%{tde_datadir}/apps/krfb
-%{tde_datadir}/icons/crystalsvg/*/apps/krfb.png
-%{tde_datadir}/icons/hicolor/*/apps/krfb.png
-%{tde_datadir}/icons/locolor/*/apps/krfb.png
-%{tde_datadir}/services/kded/kinetd.desktop
-%{tde_datadir}/services/kinetd_krfb.desktop
-%{tde_datadir}/services/kinetd_krfb_httpd.desktop
-%{tde_datadir}/servicetypes/kinetdmodule.desktop
-%{tde_tdedocdir}/HTML/en/krfb/
-
-##########
-
-%package -n trinity-ksirc
-Summary:		IRC client for Trinity
-Group:			Applications/Internet
-
-%description -n trinity-ksirc
-KSirc is an IRC chat client for TDE. It supports scripting with Perl and has a
-lot of compatibility with mIRC for general use.
-
-If you want to connect to an IRC server via SSL, you will need to install the
-recommended package libio-socket-ssl-perl.
-
-%files -n trinity-ksirc
-%defattr(-,root,root,-)
-%{tde_bindir}/dsirc
-%{tde_bindir}/ksirc
-%{tde_libdir}/libtdeinit_ksirc.*
-%{tde_tdelibdir}/ksirc.*
-%{tde_tdeappdir}/ksirc.desktop
-%{tde_datadir}/apps/ksirc/
-%config(noreplace) %{tde_confdir}/ksircrc
-%{tde_datadir}/icons/hicolor/*/apps/ksirc.*
-%{tde_tdedocdir}/HTML/??/ksirc/
-
-##########
-
-%package -n trinity-ktalkd
-Summary:		Talk daemon for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kcontrol >= %{tde_version}
-Requires:		trinity-tdebase-data >= %{tde_version}
-%if 0%{?fedora} == 0 || 0%{?fedora} <= 33
-Requires:		xinetd
-%endif
-
-%description -n trinity-ktalkd
-KTalkd is an enhanced talk daemon - a program to handle incoming talk
-requests, announce them and allow you to respond to it using a talk
-client. Note that KTalkd is designed to run on a single-user workstation,
-and shouldn't be run on a multi-user machine.
-
-%files -n trinity-ktalkd
-%defattr(-,root,root,-)
-%{tde_bindir}/ktalkd*
-%{tde_bindir}/mail.local
-%{tde_tdelibdir}/kcm_ktalkd.*
-%{tde_tdeappdir}/kcmktalkd.desktop
-%config(noreplace) %{tde_confdir}/ktalkdrc
-%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
-%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
-%{tde_datadir}/sounds/ktalkd.wav
-%if 0%{?fedora} == 0 || 0%{?fedora} <= 30
-%dir %{_sysconfdir}/xinetd.d
-%endif
-%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
-%{tde_tdedocdir}/HTML/en/ktalkd
-
-##########
-
-%if "%{?_with_wifi:1}" == "1"
-%package -n trinity-kwifimanager
-Summary:		Wireless lan manager for Trinity
-Group:			Applications/Internet
-Requires:		trinity-kicker >= %{tde_version}
-
-%description -n trinity-kwifimanager
-KWiFiManager suite is a set of tools which allows you to manage your
-wireless LAN connection under the K Desktop Environment. It provides
-information about your current connection. KWiFiManager supports every
-wavelan card that uses the wireless extensions interface.
-
-%files -n trinity-kwifimanager
-%defattr(-,root,root,-)
-%{tde_bindir}/kwifimanager
-%{tde_tdelibdir}/kcm_wifi.*
-%{tde_libdir}/libkwireless.la
-%{tde_libdir}/libkwireless.so
-%{tde_tdeappdir}/kcmwifi.desktop
-%{tde_tdeappdir}/kwifimanager.desktop
-%{tde_datadir}/apps/kicker/applets/kwireless.desktop
-%{tde_datadir}/apps/kwifimanager
-%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png
-%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
-%{tde_tdedocdir}/HTML/en/kwifimanager/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/
-%endif
-
-##########
-
-%package -n trinity-librss
-Summary:		RSS library for Trinity
-Group:			Environment/Libraries
-
-%description -n trinity-librss
-This is the runtime package for programs that use the TDE RSS library.
-End users should not need to install this, it should get installed
-automatically when needed.
-
-%files -n trinity-librss
-%defattr(-,root,root,-)
-%{tde_libdir}/librss.so.*
-%{tde_datadir}/cmake/librss.cmake
-
-##########
-
-%package -n trinity-lisa
-Summary:			LAN information server for Trinity
-Group:				Applications/Internet
-Requires:		trinity-konqueror >= %{tde_version}
-Requires:		trinity-tdebase-data >= %{tde_version}
-
-%description -n trinity-lisa
-LISa is intended to provide TDE with a kind of "network neighborhood"
-but relying only on the TCP/IP protocol.
-
-%files -n trinity-lisa
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_lanbrowser.la
-%{tde_tdelibdir}/kcm_lanbrowser.so
-%{tde_tdelibdir}/tdeio_lan.la
-%{tde_tdelibdir}/tdeio_lan.so
-%{tde_datadir}/applnk/.hidden/kcmtdeiolan.desktop
-%{tde_datadir}/applnk/.hidden/kcmlisa.desktop
-%{tde_datadir}/applnk/.hidden/kcmreslisa.desktop
-%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop
-%{tde_datadir}/apps/konqueror/dirtree/remote/lan.desktop
-%{tde_datadir}/apps/lisa/
-%{tde_datadir}/apps/remoteview/lan.desktop
-%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/
-%{tde_tdedocdir}/HTML/en/lisa/
-%{tde_datadir}/services/lan.protocol
-%{tde_datadir}/services/rlan.protocol
-%{tde_bindir}/lisa
-%{tde_bindir}/reslisa
-
-##########
-
-%package -n trinity-kdnssd
-Summary: Zeroconf support for TDE
-Group:			Applications/Internet
-
-%description -n trinity-kdnssd
-A tdeioslave and tded module that provide Zeroconf support. Try
-"zeroconf:/" in Konqueror.
-
-%files -n trinity-kdnssd
-%defattr(-,root,root,-)
-%{tde_datadir}/services/zeroconf.protocol
-%{tde_datadir}/services/invitation.protocol
-%{tde_datadir}/services/kded/dnssdwatcher.desktop
-%{tde_datadir}/apps/remoteview/zeroconf.desktop
-%{tde_datadir}/apps/zeroconf/_http._tcp
-%{tde_datadir}/apps/zeroconf/_ftp._tcp
-%{tde_datadir}/apps/zeroconf/_ldap._tcp
-%{tde_datadir}/apps/zeroconf/_webdav._tcp
-%{tde_datadir}/apps/zeroconf/_nfs._tcp
-%{tde_datadir}/apps/zeroconf/_ssh._tcp
-%{tde_datadir}/apps/zeroconf/_rfb._tcp
-%{tde_tdelibdir}/tdeio_zeroconf.so
-%{tde_tdelibdir}/tdeio_zeroconf.la
-%{tde_tdelibdir}/kded_dnssdwatcher.so
-%{tde_tdelibdir}/kded_dnssdwatcher.la
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# Workaround libiw detection failure on opensuse
-%if 0%{?suse_version}
-%__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|"
-%endif
-
-# Update icons for some control center modules
-%__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_JINGLE=ON \
-  %{?with_speex:-DWITH_SPEEX=ON} \
-  -DWITH_WEBCAM=ON \
-  -DWITH_GSM=OFF \
-  -DWITH_XMMS=OFF \
-  -DWITH_ARTS=ON \
-  %{?with_openslp:-DWITH_SLP=ON} \
-  -DBUILD_ALL=ON \
-  -DBUILD_KOPETE_PLUGIN_ALL=ON \
-  -DBUILD_KOPETE_PROTOCOL_ALL=ON \
-  %{!?build_kopete_motionaway:-DBUILD_KOPETE_PLUGIN_MOTIONAUTOAWAY=OFF} \
-  %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \
-  %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \
-  ..
-
-# Tdenetwork is not smp safe !
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Adds missing icons in 'hicolor' theme
-# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
-pushd %{buildroot}%{tde_datadir}/icons
-for i in {16,22,32,48}; do        %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kget.png    hicolor/"$i"x"$i"/apps/kget.png          ;done
-for i in {32,48}; do              %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krdc.png    hicolor/"$i"x"$i"/apps/krdc.png          ;done
-for i in {16,32,48}; do           %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krfb.png    hicolor/"$i"x"$i"/apps/krfb.png          ;done
-for i in {16,22,32,48,128}; do    %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/ktalkd.png  hicolor/"$i"x"$i"/apps/ktalkd.png        ;done
-for i in {16,22,32,48,64,128}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/share.png  hicolor/"$i"x"$i"/apps/kcmfileshare.png  ;done
-popd
-
-%if 0%{?with_consolehelper}
-# Run kppp through consolehelper, and rename it to 'kppp3'
-%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
-%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir}
-%__mv %{buildroot}%{tde_bindir}/kppp %{buildroot}%{tde_sbindir}/kppp3
-%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kppp3
-%if "%{tde_prefix}" != "/usr"
-%__ln_s %{tde_sbindir}/kppp3 %{?buildroot}%{_sbindir}/kppp3
-%endif
-%__mkdir_p %{buildroot}%{_sysconfdir}/security/console.apps
-cat > %{buildroot}%{_sysconfdir}/security/console.apps/kppp3 <<EOF
-USER=root
-PROGRAM=%{tde_sbindir}/kppp3
-SESSION=true
-EOF
-
-# Renames 'kppp' as 'kppp3' in launch icon
-%__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|"
-%endif
-
-# Remove setuid bit on some binaries.
-if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then
-  chmod 0755 "%{?buildroot}%{tde_bindir}/kppp"
-fi
-
-# ktalk
-%__install -p -m 0644 -D  %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
-
-# Avoids conflict with trinity-kvirc
-%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
-
-# Icons from TDE Control Center should only be displayed in TDE
-for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
-  if grep -q "^Categories=.*X-TDE-settings" "${i}"; then
-    if ! grep -q "OnlyShowIn=TDE" "${i}" ; then
-      echo "OnlyShowIn=TDE;" >>"${i}"
-    fi
-  fi
-done
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file    kcmkrfb
-%suse_update_desktop_file    fileshare
-%suse_update_desktop_file    kopete        Network  InstantMessaging
-%suse_update_desktop_file    ksirc         Network  IRCClient
-%suse_update_desktop_file    Kppp          Network  Dialup
-%suse_update_desktop_file -r kppplogview   System   Monitor
-%suse_update_desktop_file    kdict         Office   Dictionary
-%suse_update_desktop_file -r krdc          System   RemoteAccess
-%suse_update_desktop_file -r krfb          System   RemoteAccess
-%suse_update_desktop_file -r kget          System   TrayIcon
-%suse_update_desktop_file -r kwifimanager  System   Network
-%suse_update_desktop_file    kcmwifi
-%suse_update_desktop_file -u knewsticker-standalone Network  News
-%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%if 0%{?suse_version}
-# Check permissions on setuid files (openSUSE specific)
-%verifyscript
-%verify_permissions -e %{tde_bindir}/kppp
-%endif
-
-
-%changelog
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec
deleted file mode 100644
index d1ba88aec..000000000
--- a/redhat/main/tdepim/tdepim.spec
+++ /dev/null
@@ -1,1936 +0,0 @@
-#
-# spec file for package tdepim (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdepim
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-# TDEPIM optional features
-#define		with_kitchensync 1
-
-Name:		trinity-%{tde_pkg}
-Summary:	Personal Information Management apps from the official Trinity release
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:		Applications/Productivity
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	%{name}-rpmlintrc
-
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	libcaldav-devel >= %{tde_epoch}:0.6.5
-BuildRequires:	libcarddav-devel >= %{tde_epoch}:0.6.2
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	fdupes
-BuildRequires:	desktop-file-utils
-BuildRequires:	make
-
-BuildRequires:	gpgme-devel
-BuildRequires:	libgpg-error-devel
-BuildRequires:	flex
-BuildRequires:	libical-devel
-BuildRequires:	boost-devel
-BuildRequires:	pcre-devel
-BuildRequires:	libidn-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# KDEPIM specific features
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
-%define with_gnokii 1
-BuildRequires:	gnokii-devel
-%endif
-%endif
-
-
-# FLEX support
-%if 0%{?fedora} >= 15
-BuildRequires:	flex-static
-%endif
-
-# BISON support
-BuildRequires:	bison
-
-# CURL support
-BuildRequires:	curl-devel
-
-# GLIB2 support
-BuildRequires:	glib2-devel
-
-# SASL support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}sasl2-devel
-%else
-BuildRequires:	cyrus-sasl-devel
-%endif
-
-# XCOMPOSITE support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xcomposite-devel
-%else
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires:	libXcomposite-devel
-%endif
-
-# XSCREENSAVER support
-#  RHEL 4: disabled
-#  RHEL 6: available in EPEL
-#  RHEL 7: available in NUX
-#  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-BuildRequires:	xscreensaver-extras
-%if 0%{?fedora}
-BuildRequires:	xscreensaver-extras-base
-%endif
-BuildRequires:	xscreensaver-gl-base
-BuildRequires:	xscreensaver-gl-extras
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-data
-BuildRequires:	xscreensaver-data-extra
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-BuildRequires:	xscreensaver
-BuildRequires:	xscreensaver-base
-%if 0%{?pclinuxos} == 0
-BuildRequires:	xscreensaver-extrusion
-%endif
-BuildRequires:	xscreensaver-gl
-%endif
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-
-Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-wizards = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kalarm = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kandy = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-karm = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kmailcvt = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kmobile = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-konsolekalendar = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-korn = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-ktnef = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-kdepim < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdepim = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdepim < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdepim = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description
-This metapackage includes a collection of Personal Information Management
-(PIM) applications provided with the official release of Trinity.
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries/Other
-
-Obsoletes:	tdepim-cmake < %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-kdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-akregator-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kaddressbook-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-karm-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kmail-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-knode-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-knotes-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kode-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kontact-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-korganizer-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libindex-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkgantt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkleopatra-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkmime-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkpimexchange-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkpimidentities-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libksieve-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libmimelib-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This metapackage includes all development files for TDE PIM.
-It also contains the CMAKE macros.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_datadir}/cmake/*
-
-##########
-
-%package -n trinity-akregator
-Summary:	RSS feed aggregator for TDE
-Group:		Applications/Internet
-Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-akregator
-aKregator is a fast, lightweight, and intuitive feed reader program
-for TDE.  It allows you to quickly browse through hundreds of
-thousands of internet feeds in a quick, efficient, and familiar way.
-
-%files -n trinity-akregator
-%defattr(-,root,root,-)
-%{tde_bindir}/akregator
-%{tde_tdelibdir}/libakregatorpart.la
-%{tde_tdelibdir}/libakregatorpart.so
-%{tde_tdelibdir}/libakregator_mk4storage_plugin.la
-%{tde_tdelibdir}/libakregator_mk4storage_plugin.so
-%{tde_libdir}/libakregatorprivate.so.*
-%{tde_tdeappdir}/akregator.desktop
-%{tde_datadir}/apps/akregator
-%{tde_datadir}/config.kcfg/akregator.kcfg
-%{tde_datadir}/config.kcfg/mk4config.kcfg
-%{tde_datadir}/icons/crystalsvg/*/actions/rss_tag.png
-%{tde_datadir}/icons/crystalsvg/16x16/apps/akregator_empty.png
-%{tde_datadir}/icons/hicolor/*/apps/akregator.png
-%{tde_datadir}/icons/hicolor/scalable/apps/akregator.svgz
-%{tde_datadir}/services/akregator_mk4storage_plugin.desktop
-%{tde_datadir}/services/akregator_part.desktop
-%{tde_datadir}/services/feed.protocol
-%{tde_datadir}/services/kontact/akregatorplugin*.desktop
-%{tde_datadir}/servicetypes/akregator_plugin.desktop
-%{tde_tdedocdir}/HTML/en/akregator/
-%{tde_tdedocdir}/HTML/en/tdeioslave/feed/
-
-##########
-
-%package -n trinity-akregator-devel
-Summary:	Development files for trinity-akregator
-Group:		Development/Libraries/Other
-Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-akregator-devel
-%{summary}
-
-%files -n trinity-akregator-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/akregator/
-%{tde_libdir}/libakregatorprivate.la
-%{tde_libdir}/libakregatorprivate.so
-
-##########
-
-%package -n trinity-kaddressbook
-Summary:	TDE addressbook application
-Group:		Applications/Communications
-Requires:	trinity-tdebase-tdeio-pim-plugins
-Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kaddressbook
-KAddressBook is the main address book application for TDE; it enables you
-to manage your contacts efficiently and comfortably. It can load and save
-your contacts to many different locations, including the local file system,
-LDAP servers, and SQL databases.
-
-%files -n trinity-kaddressbook
-%defattr(-,root,root,-)
-%{tde_bindir}/tdeabc2mutt
-%{tde_bindir}/kaddressbook
-%{tde_bindir}/tdeabcdistlistupdater
-%{tde_tdelibdir}/kcm_kabconfig.la
-%{tde_tdelibdir}/kcm_kabconfig.so
-%{tde_tdelibdir}/kcm_kabcustomfields.la
-%{tde_tdelibdir}/kcm_kabcustomfields.so
-%{tde_tdelibdir}/kcm_kabldapconfig.la
-%{tde_tdelibdir}/kcm_kabldapconfig.so
-%{tde_tdelibdir}/ldifvcardthumbnail.la
-%{tde_tdelibdir}/ldifvcardthumbnail.so
-%{tde_tdelibdir}/libkaddrbk_*.la
-%{tde_tdelibdir}/libkaddrbk_*.so
-%{tde_tdelibdir}/libkaddressbookpart.la
-%{tde_tdelibdir}/libkaddressbookpart.so
-%{tde_libdir}/libkabinterfaces.so.*
-%{tde_libdir}/libkaddressbook.so.*
-%{tde_tdeappdir}/kaddressbook.desktop
-%{tde_datadir}/apps/kaddressbook
-%{tde_datadir}/icons/hicolor/*/apps/kaddressbook.png
-%{tde_datadir}/services/kabconfig.desktop
-%{tde_datadir}/services/kabcustomfields.desktop
-%{tde_datadir}/services/kabldapconfig.desktop
-%{tde_datadir}/services/kaddressbook
-%{tde_datadir}/services/kontact/kaddressbookplugin.desktop
-%{tde_datadir}/services/tderesources/tdeabc/imap.desktop
-%{tde_datadir}/services/ldifvcardthumbnail.desktop
-%{tde_datadir}/servicetypes/dcopaddressbook.desktop
-%{tde_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop
-%{tde_datadir}/servicetypes/kaddressbookimprotocol.desktop
-%{tde_datadir}/servicetypes/kaddressbook_extension.desktop
-%{tde_datadir}/servicetypes/kaddressbook_view.desktop
-%{tde_datadir}/servicetypes/kaddressbook_xxport.desktop
-%{tde_tdedocdir}/HTML/en/kaddressbook/
-%{tde_datadir}/autostart/tdeabcdistlistupdater.desktop
-%{tde_tdeincludedir}/kaddressbook/
-%{tde_tdeincludedir}/tdeabc/
-
-##########
-
-%package -n trinity-kaddressbook-devel
-Summary:	Development files for trinity-kaddressbook
-Group:		Development/Libraries/Other
-Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kaddressbook-devel
-%{summary}
-
-%files -n trinity-kaddressbook-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkabinterfaces.la
-%{tde_libdir}/libkabinterfaces.so
-%{tde_libdir}/libkaddressbook.la
-%{tde_libdir}/libkaddressbook.so
-
-##########
-
-%package -n trinity-kalarm
-Summary:	Trinity alarm message, command and email scheduler
-Group:		Applications/Communications
-Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kalarm
-KAlarm provides a graphical interface to schedule personal timed events -
-pop-up alarm messages, command execution and sending emails. There is a
-range of options for configuring recurring events.
-
-A pop-up alarm can show either a simple text message, or the contents of a
-text or image file, It can optionally be spoken, or play a sound file. You
-can choose its appearance, and set reminders. Among KAlarm's other
-facilities, you can set up templates to allow KAlarm to be used as a 'tea
-timer'.
-
-As an alternative to using the graphical interface, alarms can be scheduled
-from the command line or via DCOP calls from other programs. KAlarm is
-TDE-based, but will also run on other desktops.
-
-%files -n trinity-kalarm
-%defattr(-,root,root,-)
-%{tde_bindir}/kalarm
-%{tde_bindir}/kalarmd
-%{tde_tdeappdir}/kalarm.desktop
-%{tde_datadir}/applnk/.hidden/kalarmd.desktop
-%{tde_datadir}/applnk/Applications/kalarm.desktop
-%{tde_datadir}/apps/kalarm
-%{tde_datadir}/autostart/kalarm.tray.desktop
-%{tde_datadir}/autostart/kalarmd.autostart.desktop
-%{tde_datadir}/icons/crystalsvg/*/actions/kalarm.png
-%{tde_datadir}/icons/hicolor/*/apps/kalarm.png
-%{tde_tdedocdir}/HTML/en/kalarm/
-
-##########
-
-%package -n trinity-kandy
-Summary:	Trinity mobile phone utility
-Group:		Applications/Communications
-
-%description -n trinity-kandy
-At the moment Kandy is more or less a terminal program with some special
-features to store commands and their parameters, but is also has a simple GUI
-to access the phone book of a mobile phone and it is able to save this phone
-book to the TDE address book.
-
-Kandy is aimed at mobile phones with integrated (GSM) modems.
-
-%files -n trinity-kandy
-%defattr(-,root,root,-)
-%{tde_bindir}/kandy
-%{tde_bindir}/kandy_client
-%{tde_tdeappdir}/kandy.desktop
-%{tde_datadir}/applnk/Utilities/kandy.desktop
-%{tde_datadir}/apps/kandy/
-%{tde_datadir}/icons/crystalsvg/*/apps/kandy.png
-%{tde_datadir}/icons/hicolor/*/apps/kandy.png
-%{tde_datadir}/config.kcfg/kandy.kcfg
-%{tde_tdedocdir}/HTML/en/kandy/
-
-##########
-
-%package -n trinity-karm
-Summary:	Trinity time tracker tool
-Group:		Applications/Productivity
-
-%description -n trinity-karm
-KArm is a time tracker for busy people who need to keep track of the amount of
-time they spend on various tasks.
-
-%files -n trinity-karm
-%defattr(-,root,root,-)
-%{tde_bindir}/karm
-%{tde_libdir}/libkarm.so.*
-%{tde_tdelibdir}/libkarmpart.la
-%{tde_tdelibdir}/libkarmpart.so
-%{tde_tdeappdir}/karm.desktop
-%{tde_datadir}/applnk/Utilities/karm.desktop
-%{tde_datadir}/apps/karm/
-%{tde_datadir}/apps/karmpart/
-%{tde_datadir}/icons/hicolor/*/apps/karm.png
-%{tde_datadir}/services/karm_part.desktop
-%{tde_datadir}/services/kontact/karmplugin.desktop
-%{tde_tdedocdir}/HTML/en/karm/
-
-##########
-
-%package -n trinity-karm-devel
-Summary:	Development files for karm
-Group:		Development/Libraries/Other
-
-%description -n trinity-karm-devel
-%{summary}
-
-%files -n trinity-karm-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkarm.so
-%{tde_libdir}/libkarm.la
-
-##########
-
-%package kfile-plugins
-Summary:	TDE File dialog plugins for palm and vcf files
-Group:		Environment/Libraries
-
-Obsoletes:	tdepim-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description kfile-plugins
-File dialog plugins for palm and vcf files.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdefile_ics.la
-%{tde_tdelibdir}/tdefile_ics.so
-%{tde_tdelibdir}/tdefile_vcf.la
-%{tde_tdelibdir}/tdefile_vcf.so
-%{tde_datadir}/services/tdefile_ics.desktop
-%{tde_datadir}/services/tdefile_vcf.desktop
-
-##########
-
-%package tdeio-plugins
-Summary:	Trinity PIM I/O Slaves
-Group:		Environment/Libraries
-
-Obsoletes:	tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tdepim-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tdeio-plugins
-This package includes the pim kioslaves. This includes imap4, sieve,
-and mbox.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdeio_groupwise.la
-%{tde_tdelibdir}/tdeio_groupwise.so
-%{tde_tdelibdir}/tdeio_imap4.la
-%{tde_tdelibdir}/tdeio_imap4.so
-%{tde_tdelibdir}/tdeio_mbox.la
-%{tde_tdelibdir}/tdeio_mbox.so
-%{tde_tdelibdir}/tdeio_scalix.la
-%{tde_tdelibdir}/tdeio_scalix.so
-%{tde_tdelibdir}/tdeio_sieve.la
-%{tde_tdelibdir}/tdeio_sieve.so
-%{tde_datadir}/services/groupwise.protocol
-%{tde_datadir}/services/groupwises.protocol
-%{tde_datadir}/services/imap4.protocol
-%{tde_datadir}/services/imaps.protocol
-%{tde_datadir}/services/mbox.protocol
-%{tde_datadir}/services/scalix.protocol
-%{tde_datadir}/services/scalixs.protocol
-%{tde_datadir}/services/sieve.protocol
-%{tde_tdedocdir}/HTML/en/tdeioslave/groupwise/
-%{tde_tdedocdir}/HTML/en/tdeioslave/mbox/
-%{tde_tdedocdir}/HTML/en/tdeioslave/scalix/
-
-##########
-
-%package tderesources
-Summary:	Trinity pim resource plugins
-Group:		Environment/Libraries
-#Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
-#Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
-#Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	libcaldav
-Requires:	libcarddav
-
-Obsoletes:	tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tdepim-kresources = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tderesources
-This package includes several plugins needed to interface with groupware
-servers. It also includes plugins for features such as blogging and
-tracking feature plans.
-
-%files tderesources
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcal_caldav.la
-%{tde_tdelibdir}/kcal_caldav.so
-%{tde_tdelibdir}/kcal_groupdav.la
-%{tde_tdelibdir}/kcal_groupdav.so
-%{tde_tdelibdir}/kcal_groupwise.la
-%{tde_tdelibdir}/kcal_groupwise.so
-%{tde_tdelibdir}/kcal_kolab.la
-%{tde_tdelibdir}/kcal_kolab.so
-%{tde_tdelibdir}/kcal_scalix.la
-%{tde_tdelibdir}/kcal_scalix.so
-%{tde_tdelibdir}/kcal_newexchange.la
-%{tde_tdelibdir}/kcal_newexchange.so
-%{tde_tdelibdir}/kcal_resourcefeatureplan.la
-%{tde_tdelibdir}/kcal_resourcefeatureplan.so
-%{tde_tdelibdir}/kcal_slox.la
-%{tde_tdelibdir}/kcal_slox.so
-%{tde_tdelibdir}/kcal_xmlrpc.la
-%{tde_tdelibdir}/kcal_xmlrpc.so
-%{tde_tdelibdir}/knotes_kolab.la
-%{tde_tdelibdir}/knotes_kolab.so
-%{tde_tdelibdir}/knotes_scalix.la
-%{tde_tdelibdir}/knotes_scalix.so
-%{tde_tdelibdir}/knotes_xmlrpc.la
-%{tde_tdelibdir}/knotes_xmlrpc.so
-%{tde_libdir}/libtdeabckolab.so.*
-%{tde_libdir}/libtdeabcscalix.so.*
-%{tde_libdir}/libtdeabc_groupdav.so.*
-%{tde_libdir}/libtdeabc_groupwise.so.*
-%{tde_libdir}/libtdeabc_newexchange.so.*
-%{tde_libdir}/libtdeabc_slox.so.*
-%{tde_libdir}/libtdeabc_xmlrpc.so.*
-%{tde_libdir}/libkcalkolab.so.*
-%{tde_libdir}/libkcalscalix.so.*
-%{tde_libdir}/libkcal_caldav.so.*
-%{tde_libdir}/libtdeabc_carddav.so.*
-%{tde_libdir}/libkcal_groupdav.so.*
-%{tde_libdir}/libkcal_groupwise.so.*
-%{tde_libdir}/libkcal_newexchange.so.*
-%{tde_libdir}/libkcal_resourcefeatureplan.so.*
-%{tde_libdir}/libkcal_slox.so.*
-%{tde_libdir}/libkcal_xmlrpc.so.*
-%{tde_libdir}/libkgroupwarebase.so.*
-%{tde_libdir}/libkgroupwaredav.so.*
-%{tde_libdir}/libknoteskolab.so.*
-%{tde_libdir}/libknotesscalix.so.*
-%{tde_libdir}/libknotes_xmlrpc.so.*
-%{tde_libdir}/libkslox.so.*
-%{tde_libdir}/libgwsoap.so.*
-%{tde_datadir}/services/tderesources/tdeabc/tdeabc_groupdav.desktop
-%{tde_datadir}/services/tderesources/tdeabc/tdeabc_groupwise.desktop
-%{tde_datadir}/services/tderesources/tdeabc/tdeabc_newexchange.desktop
-%{tde_datadir}/services/tderesources/tdeabc/tdeabc_opengroupware.desktop
-%{tde_datadir}/services/tderesources/tdeabc/tdeabc_ox.desktop
-%{tde_datadir}/services/tderesources/tdeabc/tdeabc_slox.desktop
-%{tde_datadir}/services/tderesources/tdeabc/tdeabc_xmlrpc.desktop
-%{tde_datadir}/services/tderesources/tdeabc/kolab.desktop
-%{tde_datadir}/services/tderesources/tdeabc/scalix.desktop
-%dir %{tde_datadir}/services/tderesources/kcal
-%{tde_datadir}/services/tderesources/kcal/exchange.desktop
-%{tde_datadir}/services/tderesources/kcal/kcal_caldav.desktop
-%{tde_datadir}/services/tderesources/tdeabc/tdeabc_carddav.desktop
-%{tde_datadir}/services/tderesources/kcal/kcal_groupdav.desktop
-%{tde_datadir}/services/tderesources/kcal/kcal_groupwise.desktop
-%{tde_datadir}/services/tderesources/kcal/kcal_newexchange.desktop
-%{tde_datadir}/services/tderesources/kcal/kcal_opengroupware.desktop
-%{tde_datadir}/services/tderesources/kcal/kcal_ox.desktop
-%{tde_datadir}/services/tderesources/kcal/kcal_resourcefeatureplan.desktop
-%{tde_datadir}/services/tderesources/kcal/kcal_slox.desktop
-%{tde_datadir}/services/tderesources/kcal/kcal_xmlrpc.desktop
-%{tde_datadir}/services/tderesources/kcal/kolab.desktop
-%{tde_datadir}/services/tderesources/kcal/scalix.desktop
-%dir %{tde_datadir}/services/tderesources/knotes
-%{tde_datadir}/services/tderesources/knotes/knotes_xmlrpc.desktop
-%{tde_datadir}/services/tderesources/knotes/kolabresource.desktop
-%{tde_datadir}/services/tderesources/knotes/scalix.desktop
-
-%{tde_datadir}/apps/tdeconf_update/upgrade-resourcetype.pl
-%{tde_datadir}/apps/tdeconf_update/kolab-resource.upd
-
-%{tde_tdelibdir}/tdeabc_carddav.la
-%{tde_tdelibdir}/tdeabc_carddav.so
-%{tde_tdelibdir}/tdeabc_groupdav.la
-%{tde_tdelibdir}/tdeabc_groupdav.so
-%{tde_tdelibdir}/tdeabc_groupwise.la
-%{tde_tdelibdir}/tdeabc_groupwise.so
-%{tde_tdelibdir}/tdeabc_kolab.la
-%{tde_tdelibdir}/tdeabc_kolab.so
-%{tde_tdelibdir}/tdeabc_newexchange.la
-%{tde_tdelibdir}/tdeabc_newexchange.so
-%{tde_tdelibdir}/tdeabc_scalix.la
-%{tde_tdelibdir}/tdeabc_scalix.so
-%{tde_tdelibdir}/tdeabc_slox.la
-%{tde_tdelibdir}/tdeabc_slox.so
-%{tde_tdelibdir}/tdeabc_xmlrpc.la
-%{tde_tdelibdir}/tdeabc_xmlrpc.so
-
-##########
-
-%package tderesources-devel
-Summary:	Development files for tderesources
-Group:		Development/Libraries/Other
-Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	libcaldav
-Requires:	libcarddav
-
-Obsoletes:	tdepim-tderesources-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-tdepim-kresources-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tdepim-kresources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tderesources-devel
-%{summary}
-
-%files tderesources-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkslox.la
-%{tde_libdir}/libkslox.so
-%{tde_libdir}/libtdeabc_groupdav.la
-%{tde_libdir}/libtdeabc_groupdav.so
-%{tde_libdir}/libtdeabc_groupwise.la
-%{tde_libdir}/libtdeabc_groupwise.so
-%{tde_libdir}/libgwsoap.la
-%{tde_libdir}/libgwsoap.so
-%{tde_libdir}/libtdeabc_carddav.la
-%{tde_libdir}/libtdeabc_carddav.so
-%{tde_libdir}/libtdeabc_newexchange.la
-%{tde_libdir}/libtdeabc_newexchange.so
-%{tde_libdir}/libtdeabc_slox.la
-%{tde_libdir}/libtdeabc_slox.so
-%{tde_libdir}/libtdeabc_xmlrpc.la
-%{tde_libdir}/libtdeabc_xmlrpc.so
-%{tde_libdir}/libtdeabckolab.la
-%{tde_libdir}/libtdeabckolab.so
-%{tde_libdir}/libtdeabcscalix.la
-%{tde_libdir}/libtdeabcscalix.so
-%{tde_libdir}/libkcal_caldav.la
-%{tde_libdir}/libkcal_caldav.so
-%{tde_libdir}/libkcal_groupdav.la
-%{tde_libdir}/libkcal_groupdav.so
-%{tde_libdir}/libkcal_groupwise.la
-%{tde_libdir}/libkcal_groupwise.so
-%{tde_libdir}/libkcal_newexchange.la
-%{tde_libdir}/libkcal_newexchange.so
-%{tde_libdir}/libkcal_resourcefeatureplan.la
-%{tde_libdir}/libkcal_resourcefeatureplan.so
-%{tde_libdir}/libkcal_slox.la
-%{tde_libdir}/libkcal_slox.so
-%{tde_libdir}/libkcal_xmlrpc.la
-%{tde_libdir}/libkcal_xmlrpc.so
-%{tde_libdir}/libkcalkolab.la
-%{tde_libdir}/libkcalkolab.so
-%{tde_libdir}/libkcalscalix.la
-%{tde_libdir}/libkcalscalix.so
-%{tde_libdir}/libkgroupwarebase.la
-%{tde_libdir}/libkgroupwarebase.so
-%{tde_libdir}/libkgroupwaredav.la
-%{tde_libdir}/libkgroupwaredav.so
-%{tde_libdir}/libknotes_xmlrpc.la
-%{tde_libdir}/libknotes_xmlrpc.so
-%{tde_libdir}/libknoteskolab.la
-%{tde_libdir}/libknoteskolab.so
-%{tde_libdir}/libknotesscalix.la
-%{tde_libdir}/libknotesscalix.so
-%{tde_tdeincludedir}/kpimprefs.h
-
-##########
-
-%package wizards
-Summary:	Trinity server configuration wizards
-Group:		Applications/Communications
-
-Obsoletes:	tdepim-wizards < %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description wizards
-This package contains TDE-based wizards for configuring eGroupware,
-Kolab, and SUSE Linux Openexchange servers.
-
-%files wizards
-%defattr(-,root,root,-)
-%{tde_bindir}/egroupwarewizard
-%{tde_bindir}/exchangewizard
-%{tde_bindir}/groupwarewizard
-%{tde_bindir}/groupwisewizard
-%{tde_bindir}/kolabwizard
-%{tde_bindir}/scalixadmin
-%{tde_bindir}/scalixwizard
-%{tde_bindir}/sloxwizard
-%{tde_tdelibdir}/libegroupwarewizard.la
-%{tde_tdelibdir}/libegroupwarewizard.so
-%{tde_tdelibdir}/libexchangewizard.la
-%{tde_tdelibdir}/libexchangewizard.so
-%{tde_tdelibdir}/libgroupwisewizard.la
-%{tde_tdelibdir}/libgroupwisewizard.so
-%{tde_tdelibdir}/libkolabwizard.la
-%{tde_tdelibdir}/libkolabwizard.so
-%{tde_tdelibdir}/libscalixwizard.la
-%{tde_tdelibdir}/libscalixwizard.so
-%{tde_tdelibdir}/libsloxwizard.la
-%{tde_tdelibdir}/libsloxwizard.so
-%{tde_tdeappdir}/groupwarewizard.desktop
-%{tde_datadir}/config.kcfg/egroupware.kcfg
-%{tde_datadir}/config.kcfg/groupwise.kcfg
-%{tde_datadir}/config.kcfg/kolab.kcfg
-%{tde_datadir}/config.kcfg/scalix.kcfg
-%{tde_datadir}/config.kcfg/slox.kcfg
-
-##########
-
-%if 0%{?with_kitchensync}
-%package -n trinity-kitchensync
-Summary:	Synchronization framework
-Group:		Applications/Communications
-BuildRequires:	opensync-devel
-#Suggests: konqueror-trinity
-#Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity
-
-%description -n trinity-kitchensync
-This package contains a synchronization framework, still under heavy
-development (?).  Kitchensync uses opensync.
-
-%files -n trinity-kitchensync
-%defattr(-,root,root,-)
-%{tde_bindir}/kitchensync
-%{tde_tdelibdir}/libkitchensyncpart.la
-%{tde_tdelibdir}/libkitchensyncpart.so
-%{tde_datadir}/apps/kitchensync
-%{tde_libdir}/libkitchensync.so.*
-%{tde_libdir}/libqopensync.so.*
-%{tde_tdeappdir}/kitchensync.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kitchensync.png
-%endif
-
-##########
-
-%package -n trinity-kleopatra
-Summary:	Trinity Certificate Manager
-Group:		Applications/Communications
-
-# GPG support
-%if 0%{?suse_version}
-Requires:	gpg2
-%endif
-%if 0%{?rhel} == 4
-Requires:	gnupg
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-Requires:	gnupg2
-%endif
-
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-Requires:	pinentry
-Requires:	dirmngr
-%endif
-
-%description -n trinity-kleopatra
-Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
-keybox and for retrieving certificates from LDAP servers.
-
-%files -n trinity-kleopatra
-%defattr(-,root,root,-)
-%{tde_bindir}/kleopatra
-%{tde_bindir}/kwatchgnupg
-%{tde_tdelibdir}/kcm_kleopatra.la
-%{tde_tdelibdir}/kcm_kleopatra.so
-%{tde_tdeappdir}/kleopatra_import.desktop
-%{tde_datadir}/apps/kleopatra
-%{tde_datadir}/apps/kwatchgnupg
-%{tde_datadir}/services/kleopatra_config_*.desktop
-%{tde_tdeappdir}/kleopatra.desktop
-%{tde_tdedocdir}/HTML/en/kleopatra/
-%{tde_tdedocdir}/HTML/en/kwatchgnupg/
-%{tde_datadir}/icons/hicolor/*/apps/kleopatra.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kleopatra.svgz
-
-##########
-
-%package -n trinity-kmail
-Summary:	Trinity Email client
-Group:		Applications/Communications
-Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
-
-# GPG support
-%if 0%{?suse_version}
-Requires:	gpg2
-%endif
-%if 0%{?rhel} == 4
-Requires:	gnupg
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-Requires:	gnupg2
-%endif
-
-# Pinentry
-%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-Requires:	pinentry
-%endif
-
-Requires:	procmail
-Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
-
-Provides: imap-client, mail-reader
-
-%description -n trinity-kmail
-KMail is a fully-featured email client that fits nicely into the TDE
-desktop. It has features such as support for IMAP, POP3, multiple accounts,
-mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
-
-You need to install %{name}-tdeio-plugins if you want to use IMAP or
-mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3.
-
-%files -n trinity-kmail
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/kmail.antispamrc
-%config(noreplace) %{tde_confdir}/kmail.antivirusrc
-%{tde_bindir}/kmail
-%{tde_bindir}/kmail_*.sh
-%{tde_tdelibdir}/kcm_kmail.la
-%{tde_tdelibdir}/kcm_kmail.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.so
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.la
-%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.so
-%{tde_tdelibdir}/libkmailpart.la
-%{tde_tdelibdir}/libkmailpart.so
-%{tde_tdeappdir}/KMail.desktop
-%{tde_tdeappdir}/kmail_view.desktop
-%{tde_datadir}/apps/tdeconf_update/kmail-3.1-update-new-mail-notification-settings.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.1-use-UOID-for-identities.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.2-misc.sh
-%{tde_datadir}/apps/tdeconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
-%{tde_datadir}/apps/tdeconf_update/kmail-3.3-aegypten.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.3-misc.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.3-move-identities.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.3-split-sign-encr-keys.sh
-%{tde_datadir}/apps/tdeconf_update/kmail-3.3-use-ID-for-accounts.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.3b1-misc.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.4-misc.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.4.1-update-status-filters.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.5-trigger-flag-migration.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-3.5-filter-icons.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-pgpidentity.pl
-%{tde_datadir}/apps/tdeconf_update/kmail-upd-identities.pl
-%{tde_datadir}/apps/tdeconf_update/kmail.upd
-%{tde_datadir}/apps/tdeconf_update/upgrade-signature.pl
-%{tde_datadir}/apps/tdeconf_update/upgrade-transport.pl
-%{tde_datadir}/apps/kmail
-%{tde_datadir}/apps/konqueror/servicemenus/email.desktop
-%{tde_datadir}/config.kcfg/custommimeheader.kcfg
-%{tde_datadir}/config.kcfg/kmail.kcfg
-%{tde_datadir}/config.kcfg/customtemplates_kfg.kcfg
-%{tde_datadir}/config.kcfg/replyphrases.kcfg
-%{tde_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg
-%{tde_datadir}/icons/crystalsvg/*/apps/kmaillight.png
-%{tde_datadir}/icons/hicolor/*/apps/kmail.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kmail.svgz
-%{tde_datadir}/services/kmail_config_*.desktop
-%{tde_datadir}/services/kontact/kmailplugin.desktop
-%{tde_datadir}/servicetypes/dcopimap.desktop
-%{tde_datadir}/servicetypes/dcopmail.desktop
-# 'libkmailprivate.so' is required at runtime, not devel !
-%{tde_libdir}/libkmailprivate.so
-%{tde_libdir}/libkmailprivate.la
-%{tde_tdedocdir}/HTML/en/kmail/
-
-##########
-
-%package -n trinity-kmail-devel
-Summary:	Development files for kmail
-Group:		Development/Libraries/Other
-
-%description -n trinity-kmail-devel
-%{summary}
-
-%files -n trinity-kmail-devel
-%defattr(-,root,root,-)
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kmail/
-%{tde_tdeincludedir}/kmail*.h
-
-##########
- 
-%package -n trinity-kmailcvt
-Summary:	Trinity KMail mail folder converter
-Group:		Applications/Communications
-Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kmailcvt
-Converts mail folders to KMail format.  Formats supported for import
-include Outlook Express, Evolution, and plain mbox.
-
-%files -n trinity-kmailcvt
-%defattr(-,root,root,-)
-%{tde_bindir}/kmailcvt
-%{tde_datadir}/applnk/Utilities/kmailcvt.desktop
-%{tde_datadir}/apps/kmailcvt
-%{tde_datadir}/icons/crystalsvg/*/apps/kmailcvt.png
-
-##########
-
-%package -n trinity-knode
-Summary:	Trinity news reader
-Group:		Applications/Internet
-
-%description -n trinity-knode
-KNode is an easy-to-use, convenient newsreader. It is intended to be usable
-by inexperienced users, but also includes support for such features as
-MIME attachments, article scoring, and creating and verifying GnuPG
-signatures.
-
-%files -n trinity-knode
-%defattr(-,root,root,-)
-%{tde_bindir}/knode
-%{tde_tdelibdir}/kcm_knode.la
-%{tde_tdelibdir}/kcm_knode.so
-%{tde_tdelibdir}/libknodepart.la
-%{tde_tdelibdir}/libknodepart.so
-%{tde_libdir}/libknodecommon.so.*
-%{tde_tdeappdir}/KNode.desktop
-%{tde_datadir}/apps/knode/
-%{tde_datadir}/icons/hicolor/*/apps/knode.png
-%{tde_datadir}/icons/hicolor/*/apps/knode2.png
-%{tde_datadir}/services/knewsservice.protocol
-%{tde_datadir}/services/knode_config_*.desktop
-%{tde_datadir}/services/kontact/knodeplugin.desktop
-%{tde_tdedocdir}/HTML/en/knode/
-
-##########
-
-%package -n trinity-knode-devel
-Summary:	Development files for trinity-knode
-Group:		Development/Libraries/Other
-Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-knode-devel
-%{summary}
-
-%files -n trinity-knode-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libknodecommon.la
-%{tde_libdir}/libknodecommon.so
-
-##########
-
-%package -n trinity-knotes
-Summary:	Trinity sticky notes
-Group:		Applications/Utilities
-Requires:	trinity-tdepim-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-knotes
-KNotes is a program that lets you write sticky notes. The notes are saved
-automatically when you exit the program, and they display when you open the
-program.  The program supports printing and mailing your notes.
-
-%files -n trinity-knotes
-%defattr(-,root,root,-)
-%{tde_bindir}/knotes
-%{tde_tdelibdir}/knotes_local.la
-%{tde_tdelibdir}/knotes_local.so
-%{tde_libdir}/libknotes.so.*
-%{tde_tdeappdir}/knotes.desktop
-%{tde_datadir}/apps/knotes/
-%{tde_datadir}/config.kcfg/knoteconfig.kcfg
-%{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/knotes.png
-%{tde_datadir}/services/tderesources/knotes/imap.desktop
-%{tde_datadir}/services/tderesources/knotes/local.desktop
-%{tde_datadir}/services/tderesources/knotes_manager.desktop
-%{tde_datadir}/services/kontact/knotesplugin.desktop
-%{tde_tdedocdir}/HTML/en/knotes/
-
-##########
-
-%package -n trinity-knotes-devel
-Summary:	Development files for knots
-Group:		Development/Libraries/Other
-Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-knotes-devel
-%{summary}
-
-%files -n trinity-knotes-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libknotes.so
-%{tde_libdir}/libknotes.la
-%{tde_tdeincludedir}/KNotesAppIface.h
-%{tde_tdeincludedir}/KNotesIface.h
-
-##########
-
-%package -n trinity-kode
-Summary:	Helper library for programmatic generation of C++ code
-Group:		Development/Libraries
-
-%description -n trinity-kode
-This package includes a program kode for generation of C++ template files
-and kxml_compiler for generation of C++ classes representing XML data
-described by RelaxNG schemes.
-
-%files -n trinity-kode
-%defattr(-,root,root,-)
-%{tde_bindir}/kode
-%{tde_bindir}/kxml_compiler
-%{tde_libdir}/libkode.so.*
-
-##########
-
-%package -n trinity-kode-devel
-Summary:	Development files for trinity-kode
-Group:		Development/Libraries/Other
-Requires:	trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kode-devel
-%{summary}
-
-%files -n trinity-kode-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkode.la
-%{tde_libdir}/libkode.so
-
-##########
-
-%package -n trinity-konsolekalendar
-Summary:	Trinity konsole personal organizer
-Group:		Applications/Productivity
-
-%description -n trinity-konsolekalendar
-KonsoleKalendar is a command-line interface to TDE calendars.
-Konsolekalendar complements the TDE KOrganizer by providing a console
-frontend to manage your calendars.
-
-%files -n trinity-konsolekalendar
-%defattr(-,root,root,-)
-%{tde_bindir}/konsolekalendar
-%{tde_tdeappdir}/konsolekalendar.desktop
-%{tde_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png
-%{tde_tdedocdir}/HTML/en/konsolekalendar/
-
-##########
-
-%package -n trinity-kontact
-Summary:	Trinity pim application
-Group:		Applications/Communications
-Requires:	trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kontact
-Kontact is the integrated solution to your personal information management
-needs. It combines TDE applications like KMail, KOrganizer, and
-KAddressBook into a single interface to provide easy access to mail,
-scheduling, address book and other PIM functionality.
-
-%files -n trinity-kontact
-%defattr(-,root,root,-)
-%{tde_bindir}/kontact
-%{tde_tdelibdir}/kcm_kmailsummary.la
-%{tde_tdelibdir}/kcm_kmailsummary.so
-%{tde_tdelibdir}/kcm_kontact.la
-%{tde_tdelibdir}/kcm_kontact.so
-%{tde_tdelibdir}/kcm_kontactknt.la
-%{tde_tdelibdir}/kcm_kontactknt.so
-%{tde_tdelibdir}/kcm_kontactsummary.la
-%{tde_tdelibdir}/kcm_kontactsummary.so
-%{tde_tdelibdir}/kcm_korgsummary.la
-%{tde_tdelibdir}/kcm_korgsummary.so
-%{tde_tdelibdir}/kcm_sdsummary.la
-%{tde_tdelibdir}/kcm_sdsummary.so
-%{tde_tdelibdir}/libkontact_*.la
-%{tde_tdelibdir}/libkontact_*.so
-%{tde_libdir}/libkontact.so.*
-%{tde_libdir}/libkpinterfaces.so.*
-%{tde_tdeappdir}/Kontact.desktop
-%{tde_tdeappdir}/kontactdcop.desktop
-%{tde_datadir}/apps/kontact/
-%{tde_datadir}/apps/kontactsummary/
-%{tde_datadir}/config.kcfg/kontact.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kontact.png
-%{tde_datadir}/icons/crystalsvg/*/actions/kontact_*.png
-%{tde_datadir}/services/kcmkmailsummary.desktop
-%{tde_datadir}/services/kcmkontactknt.desktop
-%{tde_datadir}/services/kcmkontactsummary.desktop
-%{tde_datadir}/services/kcmkorgsummary.desktop
-%{tde_datadir}/services/kcmsdsummary.desktop
-%dir %{tde_datadir}/services/kontact
-%{tde_datadir}/services/kontact/newstickerplugin.desktop
-%{tde_datadir}/services/kontact/specialdatesplugin.desktop
-%{tde_datadir}/services/kontact/summaryplugin.desktop
-%{tde_datadir}/services/kontact/weatherplugin.desktop
-%{tde_datadir}/services/kontactconfig.desktop
-%{tde_datadir}/servicetypes/kontactplugin.desktop
-%{tde_tdedocdir}/HTML/en/kontact/
-
-##########
-
-%package -n trinity-kontact-devel
-Summary:	Development files for kontact
-Group:		Development/Libraries/Other
-Requires:	trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kontact-devel
-%{summary}
-
-%files -n trinity-kontact-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkontact.la
-%{tde_libdir}/libkontact.so
-%{tde_libdir}/libkpinterfaces.la
-%{tde_libdir}/libkpinterfaces.so
-%{tde_tdeincludedir}/kontact/
-
-##########
-
-%package -n trinity-korganizer
-Summary:	Trinity personal organizer
-Group:		Applications/Productivity
-Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	perl
-
-%description -n trinity-korganizer
-This package contains KOrganizer, a calendar and scheduling program.
-
-KOrganizer aims to be a complete program for organizing appointments,
-contacts, projects, etc. KOrganizer natively supports information interchange
-with other calendar applications, through the industry standard vCalendar
-personal data interchange file format. This eases the move from other
-modern PIMs to KOrganizer.
-
-KOrganizer offers full synchronization with Palm Pilots, if kpilot is
-installed.
-
-%files -n trinity-korganizer
-%defattr(-,root,root,-)
-%{tde_bindir}/ical2vcal
-%{tde_bindir}/korgac
-%{tde_bindir}/korganizer
-%{tde_tdelibdir}/kcm_korganizer.la
-%{tde_tdelibdir}/kcm_korganizer.so
-%{tde_tdelibdir}/libkorg_*.la
-%{tde_tdelibdir}/libkorg_*.so
-%{tde_tdelibdir}/libkorganizerpart.la
-%{tde_tdelibdir}/libkorganizerpart.so
-%{tde_libdir}/libkocorehelper.so.*
-%{tde_libdir}/libkorg_stdprinting.so.*
-%{tde_libdir}/libkorganizer.so.*
-%{tde_libdir}/libkorganizer_calendar.so.*
-%{tde_libdir}/libkorganizer_eventviewer.so.*
-%{tde_tdeappdir}/korganizer.desktop
-%{tde_datadir}/apps/tdeconf_update/korganizer.upd
-%{tde_datadir}/apps/korgac/
-%{tde_datadir}/apps/korganizer/
-%{tde_datadir}/autostart/korgac.desktop
-%{tde_datadir}/config.kcfg/korganizer.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/korganizer.png
-%dir %{tde_datadir}/services/kontact
-%{tde_datadir}/services/kontact/korganizerplugin.desktop
-%{tde_datadir}/services/kontact/journalplugin.desktop
-%{tde_datadir}/services/kontact/todoplugin.desktop
-%{tde_datadir}/services/korganizer_*.desktop
-%{tde_datadir}/services/korganizer
-%{tde_datadir}/services/webcal.protocol
-%{tde_datadir}/servicetypes/calendardecoration.desktop
-%{tde_datadir}/servicetypes/calendarplugin.desktop
-%{tde_datadir}/servicetypes/dcopcalendar.desktop
-%{tde_datadir}/servicetypes/korganizerpart.desktop
-%{tde_datadir}/servicetypes/korgprintplugin.desktop
-%{tde_tdedocdir}/HTML/en/korganizer/
-%{tde_tdedocdir}/HTML/en/tdeioslave/webcal/
-
-##########
-
-%package -n trinity-korganizer-devel
-Summary:	Development files for korganizer
-Group:		Development/Libraries/Other
-Requires:	trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-korganizer-devel
-%{summary}
-
-%files -n trinity-korganizer-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/korganizer/
-%{tde_tdeincludedir}/calendar/
-%{tde_libdir}/libkocorehelper.la
-%{tde_libdir}/libkocorehelper.so
-%{tde_libdir}/libkorg_stdprinting.la
-%{tde_libdir}/libkorg_stdprinting.so
-%{tde_libdir}/libkorganizer.la
-%{tde_libdir}/libkorganizer.so
-%{tde_libdir}/libkorganizer_calendar.la
-%{tde_libdir}/libkorganizer_calendar.so
-%{tde_libdir}/libkorganizer_eventviewer.la
-%{tde_libdir}/libkorganizer_eventviewer.so
-
-##########
-
-%package -n trinity-korn
-Summary:	Trinity mail checker
-Group:		Applications/Communications
-Requires:	%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-korn
-Korn is a TDE mail checker that can display a small summary in the Kicker
-tray.  It supports checking mbox, pop3, imap4, and nntp sources.
-
-Once mail is received you can have Korn run a third party program or change
-the color/icon of the Kicker display.  In addition to this you can have
-Korn run a program once you click on the docked icon in Kicker.
-
-%files -n trinity-korn
-%defattr(-,root,root,-)
-%{tde_bindir}/korn
-%{tde_libdir}/tdeconf_update_bin/korn-3-4-config_change
-%{tde_tdeappdir}/KOrn.desktop
-%{tde_datadir}/apps/tdeconf_update/korn-3-4-config_change.upd
-%{tde_datadir}/apps/tdeconf_update/korn-3-5-metadata-update.pl
-%{tde_datadir}/apps/tdeconf_update/korn-3-5-ssl-update.pl
-%{tde_datadir}/apps/tdeconf_update/korn-3-5-update.upd
-%{tde_datadir}/icons/hicolor/*/apps/korn.png
-%{tde_tdedocdir}/HTML/en/korn/
-
-##########
-
-%package -n trinity-ktnef
-Summary:	Trinity TNEF viewer
-Group:		Applications/Communications
-
-%description -n trinity-ktnef
-The TNEF File Viewer allows you to handle mail attachments using the TNEF
-format. These attachments are usually found in mails coming from Microsoft
-mail servers and embed the mail properties as well as the actual attachments.
-
-%files -n trinity-ktnef
-%defattr(-,root,root,-)
-%{tde_bindir}/ktnef
-%{tde_tdeappdir}/ktnef.desktop
-%{tde_datadir}/apps/ktnef
-%{tde_datadir}/icons/hicolor/*/apps/ktnef.png
-%{tde_datadir}/icons/locolor/*/apps/ktnef.png
-%{tde_datadir}/mimelnk/application/ms-tnef.desktop
-%{tde_tdedocdir}/HTML/en/ktnef/
-
-##########
-
-%package -n trinity-libindex
-Summary:	Trinity indexing library
-Group:		Environment/Libraries
-
-%description -n trinity-libindex
-This library provides text indexing and is currently used by KMail
-to implement fast searches in mail bodies.
-
-This is the runtime package for programs that use the libindex library.
-
-%files -n trinity-libindex
-%defattr(-,root,root,-)
-%{tde_libdir}/libindex.so.*
-
-##########
-
-%package -n trinity-libindex-devel
-Summary:	Trinity indexing library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libindex-devel
-This library provides text indexing and is currently used by KMail
-to implement searching through mail text.
-
-This is the development package which contains the headers for the libindex-trinity
-library.
-
-%files -n trinity-libindex-devel
-%defattr(-,root,root,-)
-%{tde_bindir}/indexlib-config
-%{tde_tdeincludedir}/index
-%{tde_libdir}/libindex.la
-%{tde_libdir}/libindex.so
-
-##########
-
-%package -n trinity-libkcal
-Summary:	Trinity calendaring library
-Group:		Environment/Libraries
-#Requires:	%{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkcal
-This library provides a C++ API for handling the vCalendar and iCalendar
-formats.
-
-This is the runtime package for programs that use the libkcal-trinity library.
-
-%files -n trinity-libkcal
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcal_tdeabc.la
-%{tde_tdelibdir}/kcal_tdeabc.so
-%{tde_tdelibdir}/kcal_localdir.la
-%{tde_tdelibdir}/kcal_localdir.so
-%{tde_tdelibdir}/kcal_local.la
-%{tde_tdelibdir}/kcal_local.so
-%{tde_tdelibdir}/kcal_remote.la
-%{tde_tdelibdir}/kcal_remote.so
-%{tde_libdir}/libkcal.so.*
-%{tde_libdir}/libkcal_resourceremote.so.*
-%{tde_libdir}/libkholidays.so.*
-%{tde_datadir}/apps/libkholidays/
-%dir %{tde_datadir}/services/tderesources/kcal
-%{tde_datadir}/services/tderesources/kcal/imap.desktop
-%{tde_datadir}/services/tderesources/kcal/tdeabc.desktop
-%{tde_datadir}/services/tderesources/kcal/local.desktop
-%{tde_datadir}/services/tderesources/kcal/localdir.desktop
-%{tde_datadir}/services/tderesources/kcal/remote.desktop
-%{tde_datadir}/services/tderesources/kcal_manager.desktop
-
-##########
-
-%package -n trinity-libkcal-devel
-Summary:	Trinity calendaring library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkcal-devel
-This library provides a C++ API for handling the vCalendar and iCalendar
-formats.
-
-This is the development package which contains the headers for the libkcal-trinity
-library.
-
-%files -n trinity-libkcal-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/libemailfunctions/
-%{tde_tdeincludedir}/libkcal
-%{tde_libdir}/libkcal.la
-%{tde_libdir}/libkcal.so
-%{tde_libdir}/libkcal_resourceremote.la
-%{tde_libdir}/libkcal_resourceremote.so
-%{tde_libdir}/libkholidays.la
-%{tde_libdir}/libkholidays.so
-
-##########
-
-%package -n trinity-libtdepim
-Summary:	Trinity PIM library
-Group:		Environment/Libraries
-Requires:	trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	libtdepim < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libtdepim
-This is the runtime package for programs that use the trinity-libtdepim library.
-
-%files -n trinity-libtdepim
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/plugins/designer/tdepimwidgets.la
-%{tde_tdelibdir}/plugins/designer/tdepimwidgets.so
-%{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.la
-%{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.so
-%{tde_libdir}/libtdepim.so.*
-%{tde_datadir}/apps/tdepimwidgets
-%{tde_datadir}/apps/libtdepim
-%{tde_datadir}/apps/tdepim
-%{tde_datadir}/config.kcfg/pimemoticons.kcfg
-%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
-%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
-
-##########
-
-%package -n trinity-libtdepim-devel
-Summary:	Trinity PIM library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdelibs-devel >= %{version}
-
-Obsoletes:	libtdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libtdepim-devel
-This is the development package which contains the headers for the libtdepim-trinity
-library.
-
-%files -n trinity-libtdepim-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libtdepim.la
-%{tde_libdir}/libtdepim.so
-
-##########
-
-%package -n trinity-libkgantt
-Summary:	Trinity gantt charting library
-Group:		Environment/Libraries
-
-%description -n trinity-libkgantt
-This is the runtime package for programs that use the libkgantt-trinity library.
-
-%files -n trinity-libkgantt
-%defattr(-,root,root,-)
-%{tde_libdir}/libkgantt.so.*
-%{tde_datadir}/apps/kgantt
-
-##########
-
-%package -n trinity-libkgantt-devel
-Summary:	Trinity gantt charting library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkgantt-devel
-This is the development package which contains the headers for the libkgantt-trinity
-library.
-
-%files -n trinity-libkgantt-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kgantt
-%{tde_libdir}/libkgantt.la
-%{tde_libdir}/libkgantt.so
-
-##########
-
-%package -n trinity-libkleopatra
-Summary:	TDE GnuPG interface libraries
-Group:		Environment/Libraries
-Requires:	gnupg
-
-%description -n trinity-libkleopatra
-This library is used by several TDE applications to interface to the
-GnuPG program.
-
-This is the runtime package for programs that use the libkleopatra-trinity library.
-
-%files -n trinity-libkleopatra
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/libkleopatrarc
-%{tde_libdir}/libgpgme++.so.*
-%{tde_libdir}/libkleopatra.so.*
-%{tde_libdir}/libkpgp.so.*
-%{tde_libdir}/libqgpgme.so.*
-%{tde_datadir}/apps/tdeconf_update/kpgp-3.1-upgrade-address-data.pl
-%{tde_datadir}/apps/tdeconf_update/kpgp.upd
-%{tde_datadir}/apps/libkleopatra/
-%{tde_datadir}/icons/crystalsvg/*/apps/dirmngr.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gpg.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gpg_agent.png
-%{tde_datadir}/icons/crystalsvg/*/apps/gpgsm.png
-%{tde_datadir}/icons/crystalsvg/*/apps/pinentry.png
-%{tde_datadir}/icons/crystalsvg/*/apps/scdaemon.png
-
-##########
-
-%package -n trinity-libkleopatra-devel
-Summary:	Trinity GnuPG interface libraries [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkleopatra-devel
-This library is used by several TDE applications to interface to the
-GnuPG program.
-
-This is the development package which contains the headers for the
-libkleopatra-trinity library.
-
-%files -n trinity-libkleopatra-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/gpgme++/
-%{tde_tdeincludedir}/kleo/
-%{tde_tdeincludedir}/qgpgme/
-%{tde_libdir}/libgpgme++.la
-%{tde_libdir}/libgpgme++.so
-%{tde_libdir}/libkleopatra.la
-%{tde_libdir}/libkleopatra.so
-%{tde_libdir}/libkpgp.la
-%{tde_libdir}/libkpgp.so
-%{tde_libdir}/libqgpgme.la
-%{tde_libdir}/libqgpgme.so
-
-##########
-
-%package -n trinity-libkmime
-Summary:	Trinity MIME interface library
-Group:		Environment/Libraries
-#Conflicts:	trinity-libmimelib
-
-%description -n trinity-libkmime
-This library provides a C++ interface to MIME messages, parsing them into
-an object tree.
-
-%files -n trinity-libkmime
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmime.so.*
-
-##########
-
-%package -n trinity-libkmime-devel
-Summary:	Development files for libkmime
-Group:		Development/Libraries/Other
-Requires:	trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkmime-devel
-%{summary}
-
-%files -n trinity-libkmime-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmime.la
-%{tde_libdir}/libkmime.so
-
-##########
-
-%package -n trinity-libkpimexchange
-Summary:	Trinity PIM Exchange library
-Group:		Development/Libraries/Other
-
-%description -n trinity-libkpimexchange
-This is the runtime package for programs that use the libkpimexchange-trinity
-library. 
-
-%files -n trinity-libkpimexchange
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/resourcecalendarexchange.la
-%{tde_tdelibdir}/resourcecalendarexchange.so
-%{tde_libdir}/libkpimexchange.so.*
-
-##########
-
-%package -n trinity-libkpimexchange-devel
-Summary:	Trinity PIM Exchange library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkpimexchange-devel
-This is the development package which contains the headers for the
-libkpimexchange-trinity library.
-
-%files -n trinity-libkpimexchange-devel
-%defattr(-,root,root,-)
-%dir %{tde_tdeincludedir}/tdepim
-%{tde_tdeincludedir}/tdepim/exchangeaccount.h
-%{tde_tdeincludedir}/tdepim/exchangeclient.h
-%{tde_libdir}/libkpimexchange.la
-%{tde_libdir}/libkpimexchange.so
-
-##########
-
-%package -n trinity-libkpimidentities
-Summary:	Trinity PIM user identity information library
-Group:		Environment/Libraries
-
-%description -n trinity-libkpimidentities
-This library provides information to TDE programs about user identity,
-such as email address, organization, etc.
-
-This is the runtime package for programs that use the libkpimidentities-trinity
-library.
-
-%files -n trinity-libkpimidentities
-%defattr(-,root,root,-)
-%{tde_libdir}/libkpimidentities.so.*
-
-##########
-
-%package -n trinity-libkpimidentities-devel
-Summary:	Development files for libkpimidentities
-Group:		Development/Libraries/Other
-Requires:	trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libkpimidentities-devel
-%{summary}
-
-%files -n trinity-libkpimidentities-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkpimidentities.la
-%{tde_libdir}/libkpimidentities.so
-
-##########
-
-%package -n trinity-libksieve
-Summary:	Trinity mail/news message filtering library
-Group:		Environment/Libraries
-
-%description -n trinity-libksieve
-This is the runtime package for programs that use the libksieve-trinity library.
-
-%files -n trinity-libksieve
-%defattr(-,root,root,-)
-%{tde_libdir}/libksieve.so.*
-%{tde_tdedocdir}/HTML/en/tdeioslave/sieve/
-
-##########
-
-%package -n trinity-libksieve-devel
-Summary:	Trinity mail/news message filtering library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libksieve-devel
-This is the development package which contains the headers for the libksieve-trinity
-library.
-
-%files -n trinity-libksieve-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ksieve
-%{tde_libdir}/libksieve.la
-%{tde_libdir}/libksieve.so
-
-##########
-
-%package -n trinity-libktnef
-Summary:	Library for handling KTNEF email attachments
-Group:		Environment/Libraries
-
-%description -n trinity-libktnef
-This library handles mail attachments using the TNEF format. These
-attachments are usually found in mails coming from Microsoft mail
-servers and embed the mail properties as well as the actual
-attachments.
-.
-This is the runtime library for packages using the ktnef-trinity library.
-
-%files -n trinity-libktnef
-%defattr(-,root,root,-)
-%{tde_libdir}/libktnef.so.*
-
-##########
-
-%package -n trinity-libktnef-devel
-Summary:	KTNEF handler library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libktnef-devel
-This library handles mail attachments using the TNEF format. These
-attachments are usually found in mails coming from Microsoft mail
-servers and embed the mail properties as well as the actual
-attachments.
-
-This is the development package which contains the headers for the
-ktnef-trinity library.
-
-%files -n trinity-libktnef-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/ktnef
-%{tde_libdir}/libktnef.la
-%{tde_libdir}/libktnef.so
-
-##########
-
-%package -n trinity-libmimelib
-Summary:	Trinity mime library
-Group:		Environment/Libraries
-
-%description -n trinity-libmimelib
-This library is used by several Trinity applications to handle mime types.
-
-This is the runtime package for programs that use the libmimelib-trinity library.
-
-%files -n trinity-libmimelib
-%defattr(-,root,root,-)
-%{tde_libdir}/libmimelib.so.*
-
-##########
-
-%package -n trinity-libmimelib-devel
-Summary:	Trinity mime library [development]
-Group:		Development/Libraries/Other
-Requires:	trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libmimelib-devel
-This library is used by several TDE applications to handle mime types.
-
-This is the development package which contains the headers for the
-libmimelib library.
-
-%files -n trinity-libmimelib-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/mimelib/
-%{tde_libdir}/libmimelib.la
-%{tde_libdir}/libmimelib.so
-
-##########
-
-%package -n trinity-kmobile
-Summary:	Synchronize and manage mobile phone with your PC.
-Group:		Applications/Communications
-
-%description -n trinity-kmobile
-KMobileTools is a nice TDE-based application that allows to synchronize 
-and manage mobile phones with your PC. It handles full SMS control, 
-dialing calls, phonebook, and phone status monitoring.
-
-%files -n trinity-kmobile
-%defattr(-,root,root,-)
-%{tde_bindir}/kmobile
-%{tde_datadir}/icons/default.tde/32x32/devices/mobile_camera.png
-%{tde_datadir}/icons/default.tde/32x32/devices/mobile_musicplayer.png
-%{tde_datadir}/icons/default.tde/32x32/devices/mobile_organizer.png
-%{tde_datadir}/icons/default.tde/32x32/devices/mobile_phone.png
-%{tde_datadir}/icons/default.tde/32x32/devices/mobile_unknown.png
-%{tde_datadir}/icons/hicolor/*/apps/kmobile.png
-%{tde_datadir}/services/libkmobile_digicam.desktop
-%{tde_datadir}/services/libkmobile_gammu.desktop
-%{tde_datadir}/services/libkmobile_skeleton.desktop
-%{tde_datadir}/servicetypes/libkmobile.desktop
-%{tde_datadir}/apps/kmobile/
-%{tde_tdeappdir}/kmobile.desktop
-%{tde_tdelibdir}/libkmobile_skeleton.la
-%{tde_tdelibdir}/libkmobile_skeleton.so
-%{tde_libdir}/libkmobileclient.la
-%{tde_libdir}/libkmobileclient.so
-%{tde_libdir}/libkmobiledevice.la
-%{tde_libdir}/libkmobiledevice.so
-%{tde_tdedocdir}/HTML/en/kmobile/
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl'
-if [ -x /usr/bin/perl ]; then
-  %__sed -i "korganizer/ical2vcal.in" -e "s|@PERL@|/usr/bin/perl|"
-fi
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_ARTS=ON \
-  -DWITH_SASL=ON \
-  -DWITH_NEWDISTRLISTS=ON  \
-  %{?with_gnokii:-DWITH_GNOKII=ON} \
-  -DWITH_EXCHANGE=ON \
-  -DWITH_EGROUPWARE=ON \
-  -DWITH_KOLAB=ON \
-  -DWITH_SLOX=ON \
-  -DWITH_GROUPWISE=ON \
-  -DWITH_FEATUREPLAN=ON \
-  -DWITH_GROUPDAV=ON \
-  -DWITH_BIRTHDAYS=ON \
-  -DWITH_NEWEXCHANGE=ON \
-  -DWITH_SCALIX=ON \
-  -DWITH_CALDAV=ON \
-  -DWITH_CARDDAV=ON \
-  -DWITH_INDEXLIB=ON \
-  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-  %{?with_kitchensync:-DBUILD_KITCHENSYNC=ON} \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/akregator.desktop       Network  RSS-News
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/groupwarewizard.desktop Utility  DesktopSettings X-TDE-Utilities-PIM
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kaddressbook.desktop
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kalarm.desktop          Utility  TimeUtility X-TDE-Utilities-PIM
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kandy.desktop           Utility  Telephony X-TDE-Utilities-Peripherals
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/karm.desktop            Utility  TimeUtility X-TDE-Utilities-PIM
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/kleopatra.desktop       Network  System
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KNode.desktop
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/knotes.desktop          Utility  DesktopUtility X-TDE-Utilities-Desktop
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/KMail.desktop
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/Kontact.desktop         Office   Core-Office
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/korganizer.desktop      Office   Calendar
-%suse_update_desktop_file -r    %{?buildroot}%{tde_tdeappdir}/KOrn.desktop            Utility  Applet X-TDE-More
-%suse_update_desktop_file -u    %{?buildroot}%{tde_tdeappdir}/ktnef.desktop           Network  Email
-%if 0%{?with_kitchensync}
-%suse_update_desktop_file       %{?buildroot}%{tde_tdeappdir}/kitchensync.desktop     Utility  X-SuSE-SyncUtility
-%endif
-%endif
-
-# Adds missing icons in 'hicolor' theme
-pushd "%{?buildroot}%{tde_datadir}/icons"
-for i in {16,32,48};           do %__cp crystalsvg/"$i"x"$i"/apps/kandy.png                           hicolor/"$i"x"$i"/apps/kandy.png      ;done
-for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png  hicolor/"$i"x"$i"/apps/kleopatra.png  ;done
-popd
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/main/tdesdk/tdesdk.spec
deleted file mode 100644
index dcd43e072..000000000
--- a/redhat/main/tdesdk/tdesdk.spec
+++ /dev/null
@@ -1,1130 +0,0 @@
-#
-# spec file for package tdesdk (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdesdk
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		The Trinity Software Development Kit (SDK)
-Group:			Development/Tools/Other
-Version:		%{tde_version}
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-URL:			http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:		GPL-2.0+
-%else
-License:		GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:		Francois Andriot <francois.andriot@free.fr>
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-perl-dcop >= %{tde_version}
-BuildRequires:	trinity-tdepim-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	libtool
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# for kbugbuster/libkcal
-BuildRequires:	desktop-file-utils
-
-# DB5 support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 33
-BuildRequires:	libdb-devel
-
-# DB4 support
-%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-#BuildRequires:	%{_lib}db4.8-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	db4-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libdb-4_8-devel
-%endif
-%endif
-
-# kbabel,  F-7+: flex >= 2.5.33-9
-BuildRequires:	flex
-# umbrello
-BuildRequires:	libxslt-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	subversion-devel
-BuildRequires:	neon-devel
-
-# PERL support
-BuildRequires:	perl
-%if 0%{?fedora} >= 19
-BuildRequires:	perl-podlators
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
-%define python python3
-%else
-%define python python
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-BuildRequires:	%{_lib}binutils-devel
-%endif
-%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 || 0%{?suse_version}
-BuildRequires:	binutils-devel
-%endif
-%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires:	libtool-ltdl-devel
-%endif
-
-# KIOSLAVE
-# Does not build on RHEL4
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define build_kioslave 1
-%endif
-
-Obsoletes:		trinity-kdesdk < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdesdk = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:		trinity-kdesdk-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdesdk-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: trinity-cervisia = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kapptemplate = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kbugbuster = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdecachegrind = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdecachegrind-converters = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kuiviewer = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-poxml = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-umbrello = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}}
-Requires: trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-A collection of applications and tools used by developers, including:
-* cervisia: a CVS frontend
-* kbabel: PO file management
-* kbugbuster: a tool to manage the TDE bug report system
-* tdecachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
-* kompare: diff tool
-* kuiviewer: displays designer's UI files
-* umbrello: UML modeller and UML diagram tool
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package -n trinity-cervisia
-Summary:	A graphical CVS front end for Trinity
-Group:		Development/Tools/Version Control
-
-%description -n trinity-cervisia
-Cervisia is a TDE-based graphical front end for the CVS client.
-
-As well as providing both common and advanced CVS operations, it offers
-a variety of methods for graphically viewing information about the CVS
-repository, your own sandbox and the relationships between different
-versions of files.  A Changelog editor is also included and is coupled
-with the commit dialog.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-cervisia
-%defattr(-,root,root,-)
-%{tde_bindir}/cervisia
-%{tde_libdir}/libtdeinit_cervisia.la
-%{tde_libdir}/libtdeinit_cervisia.so
-%{tde_tdelibdir}/cervisia.la
-%{tde_tdelibdir}/cervisia.so
-%{tde_tdelibdir}/libcervisiapart.la
-%{tde_tdelibdir}/libcervisiapart.so
-%{tde_tdeappdir}/cervisia.desktop
-%{tde_datadir}/apps/cervisia/
-%{tde_datadir}/apps/cervisiapart/
-%{tde_datadir}/apps/tdeconf_update/cervisia.upd
-%{tde_datadir}/apps/tdeconf_update/cervisia-change_repos_list.pl
-%{tde_datadir}/apps/tdeconf_update/cervisia-normalize_cvsroot.pl
-%{tde_datadir}/apps/tdeconf_update/move_repositories.pl
-%{tde_datadir}/apps/tdeconf_update/change_colors.pl
-%{tde_datadir}/config.kcfg/cervisiapart.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/cervisia.png
-%{tde_datadir}/icons/crystalsvg/*/actions/vcs_*.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/vcs_*.svgz
-%{tde_mandir}/man1/cervisia.1*
-%{tde_tdedocdir}/HTML/en/cervisia/
-
-##########
-
-%package -n trinity-kapptemplate
-Summary:	Creates a framework to develop a Trinity application
-Group:		Development/Languages/Other
-
-%description -n trinity-kapptemplate
-KAppTemplate is a shell script that will create the necessary
-framework to develop various TDE applications.  It takes care of the
-autoconf/automake code as well as providing a skeleton and example of
-what the code typically looks like.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kapptemplate
-%defattr(-,root,root,-)
-%{tde_bindir}/kapptemplate
-%{tde_datadir}/apps/kapptemplate/
-
-%pre -n trinity-kapptemplate
-if [ -d "%{tde_bindir}/kapptemplate" ]; then
-  rm -rf "%{tde_bindir}/kapptemplate"
-fi
-
-##########
-
-%package -n trinity-kbabel
-Summary:	PO-file editing suite for Trinity
-Group:		Development/Languages/Other
-
-%description -n trinity-kbabel
-This is a suite of programs for editing gettext message files (PO-files).
-It is designed to help you translate fast and consistently.
-
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager is a multi
-functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kbabel
-%defattr(-,root,root,-)
-%{tde_bindir}/catalogmanager
-%{tde_bindir}/kbabel
-%{tde_bindir}/kbabeldict
-%{tde_libdir}/libkbabelcommon.so.*
-%{tde_libdir}/libkbabeldictplugin.so.*
-%{tde_tdelibdir}/tdefile_po.la
-%{tde_tdelibdir}/tdefile_po.so
-%{tde_tdelibdir}/pothumbnail.la
-%{tde_tdelibdir}/pothumbnail.so
-%{tde_tdelibdir}/kbabel_accelstool.la
-%{tde_tdelibdir}/kbabel_accelstool.so
-%{tde_tdelibdir}/kbabel_argstool.la
-%{tde_tdelibdir}/kbabel_argstool.so
-%{tde_tdelibdir}/kbabel_contexttool.la
-%{tde_tdelibdir}/kbabel_contexttool.so
-%{tde_tdelibdir}/kbabel_equationstool.la
-%{tde_tdelibdir}/kbabel_equationstool.so
-%{tde_tdelibdir}/kbabel_gettextexport.la
-%{tde_tdelibdir}/kbabel_gettextexport.so
-%{tde_tdelibdir}/kbabel_gettextimport.la
-%{tde_tdelibdir}/kbabel_gettextimport.so
-%{tde_tdelibdir}/kbabel_lengthtool.la
-%{tde_tdelibdir}/kbabel_lengthtool.so
-%{tde_tdelibdir}/kbabel_linguistexport.la
-%{tde_tdelibdir}/kbabel_linguistexport.so
-%{tde_tdelibdir}/kbabel_linguistimport.la
-%{tde_tdelibdir}/kbabel_linguistimport.so
-%{tde_tdelibdir}/kbabel_nottranslatedtool.la
-%{tde_tdelibdir}/kbabel_nottranslatedtool.so
-%{tde_tdelibdir}/kbabel_pluraltool.la
-%{tde_tdelibdir}/kbabel_pluraltool.so
-%{tde_tdelibdir}/kbabel_punctuationtool.la
-%{tde_tdelibdir}/kbabel_punctuationtool.so
-%{tde_tdelibdir}/kbabel_regexptool.la
-%{tde_tdelibdir}/kbabel_regexptool.so
-%{tde_tdelibdir}/kbabel_setfuzzytool.la
-%{tde_tdelibdir}/kbabel_setfuzzytool.so
-%{tde_tdelibdir}/kbabel_whitespacetool.la
-%{tde_tdelibdir}/kbabel_whitespacetool.so
-%{tde_tdelibdir}/kbabel_xliffexport.la
-%{tde_tdelibdir}/kbabel_xliffexport.so
-%{tde_tdelibdir}/kbabel_xliffimport.la
-%{tde_tdelibdir}/kbabel_xliffimport.so
-%{tde_tdelibdir}/kbabel_xmltool.la
-%{tde_tdelibdir}/kbabel_xmltool.so
-%{tde_tdelibdir}/kbabeldict_dbsearchengine.la
-%{tde_tdelibdir}/kbabeldict_dbsearchengine.so
-%{tde_tdelibdir}/kbabeldict_poauxiliary.la
-%{tde_tdelibdir}/kbabeldict_poauxiliary.so
-%{tde_tdelibdir}/kbabeldict_pocompendium.la
-%{tde_tdelibdir}/kbabeldict_pocompendium.so
-%{tde_tdelibdir}/kbabeldict_tmxcompendium.la
-%{tde_tdelibdir}/kbabeldict_tmxcompendium.so
-%{tde_tdeappdir}/catalogmanager.desktop
-%{tde_tdeappdir}/kbabel.desktop
-%{tde_tdeappdir}/kbabeldict.desktop
-%{tde_datadir}/apps/catalogmanager/
-%{tde_datadir}/apps/kbabel/
-%{tde_datadir}/apps/tdeconf_update/kbabel-difftoproject.upd
-%{tde_datadir}/apps/tdeconf_update/kbabel-project.upd
-%{tde_datadir}/apps/tdeconf_update/kbabel-projectrename.upd
-%{tde_datadir}/config.kcfg/kbabel.kcfg
-%{tde_datadir}/config.kcfg/kbprojectsettings.kcfg
-%{tde_tdedocdir}/HTML/en/kbabel/
-%{tde_datadir}/icons/hicolor/*/apps/catalogmanager.png
-%{tde_datadir}/icons/hicolor/*/apps/kbabel.png
-%{tde_datadir}/icons/hicolor/*/apps/kbabeldict.png
-%{tde_datadir}/icons/locolor/*/apps/catalogmanager.png
-%{tde_datadir}/icons/locolor/*/apps/kbabel.png
-%{tde_datadir}/icons/locolor/*/apps/kbabeldict.png
-%{tde_datadir}/services/dbsearchengine.desktop
-%{tde_datadir}/services/tdefile_po.desktop
-%{tde_datadir}/services/pothumbnail.desktop
-%{tde_datadir}/services/kbabel_accelstool.desktop
-%{tde_datadir}/services/kbabel_argstool.desktop
-%{tde_datadir}/services/kbabel_contexttool.desktop
-%{tde_datadir}/services/kbabel_equationstool.desktop
-%{tde_datadir}/services/kbabel_gettext_export.desktop
-%{tde_datadir}/services/kbabel_gettext_import.desktop
-%{tde_datadir}/services/kbabel_lengthtool.desktop
-%{tde_datadir}/services/kbabel_linguist_export.desktop
-%{tde_datadir}/services/kbabel_linguist_import.desktop
-%{tde_datadir}/services/kbabel_nottranslatedtool.desktop
-%{tde_datadir}/services/kbabel_pluralformstool.desktop
-%{tde_datadir}/services/kbabel_punctuationtool.desktop
-%{tde_datadir}/services/kbabel_regexptool.desktop
-%{tde_datadir}/services/kbabel_setfuzzytool.desktop
-%{tde_datadir}/services/kbabel_whitespacetool.desktop
-%{tde_datadir}/services/kbabel_xliff_export.desktop
-%{tde_datadir}/services/kbabel_xliff_import.desktop
-%{tde_datadir}/services/kbabel_xmltool.desktop
-%{tde_datadir}/services/pocompendium.desktop
-%{tde_datadir}/services/poauxiliary.desktop
-%{tde_datadir}/services/tmxcompendium.desktop
-%{tde_datadir}/servicetypes/kbabel_tool.desktop
-%{tde_datadir}/servicetypes/kbabel_validator.desktop
-%{tde_datadir}/servicetypes/kbabeldict_module.desktop
-%{tde_datadir}/servicetypes/kbabelfilter.desktop
-
-##########
-
-%package -n trinity-kbabel-devel
-Summary:	PO-file editing suite for Trinity (development files)
-Group:		Development/Libraries/Other
-Requires:	trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kbabel-devel
-This is a suite of programs for editing gettext message files (PO-files).
-It is designed to help you translate fast and consistently.
-
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager is a multi
-functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-
-This package contains the KBabel development files.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kbabel-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kbabel/
-%{tde_libdir}/libkbabelcommon.la
-%{tde_libdir}/libkbabelcommon.so
-%{tde_libdir}/libkbabeldictplugin.la
-%{tde_libdir}/libkbabeldictplugin.so
-
-##########
-
-%package -n trinity-kbugbuster
-Summary:	A front end for the Trinity bug tracking system
-Group:		Development/Languages/Other
-Requires:	trinity-libkcal >= %{tde_version}
-
-%description -n trinity-kbugbuster
-KBugBuster is a GUI front end for the TDE bug tracking system.
-It allows the user to view and manipulate bug reports and provides a
-variety of options for searching through reports.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kbugbuster
-%defattr(-,root,root,-)
-%{tde_bindir}/kbugbuster
-%{tde_tdelibdir}/kcal_bugzilla.la
-%{tde_tdelibdir}/kcal_bugzilla.so
-%{tde_tdeappdir}/kbugbuster.desktop
-%{tde_datadir}/apps/kbugbuster/
-%{tde_datadir}/icons/hicolor/*/apps/kbugbuster.png
-%{tde_datadir}/icons/locolor/*/apps/kbugbuster.png
-%{tde_datadir}/services/tderesources/kcal/bugzilla.desktop
-%{tde_tdedocdir}/HTML/en/kbugbuster/
-
-##########
-
-%package -n trinity-tdecachegrind
-Summary:	Visualisation tool for valgrind profiling output
-Group:		Development/Languages/Other
-
-%description -n trinity-tdecachegrind
-tdecachegrind is a visualisation tool for the profiling data generated
-by calltree, a profiling skin for valgrind.  Applications can be
-profiled using calltree without being recompiled, and shared libraries
-and plugin architectures are supported.
-
-For visualising the output from other profiling tools, several converters
-can be found in the tdecachegrind-converters package.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-tdecachegrind
-%defattr(-,root,root,-)
-%{tde_bindir}/tdecachegrind
-%{tde_tdeappdir}/tdecachegrind.desktop
-%{tde_datadir}/apps/tdecachegrind/
-%{tde_datadir}/icons/locolor/*/apps/tdecachegrind.png
-%{tde_datadir}/icons/hicolor/*/apps/tdecachegrind.png
-%{tde_datadir}/mimelnk/application/x-tdecachegrind.desktop
-%{tde_tdedocdir}/HTML/en/tdecachegrind/
-
-##########
-
-%package -n trinity-tdecachegrind-converters
-Summary:	Format converters for tdecachegrind profiling visualisation tool
-Group:		Development/Languages/Other
-Requires:	%{python}
-%if 0%{?suse_version} || 0%{?rhel} == 4
-Requires:	php
-%else
-Requires:	php-cli
-%endif
-
-%description -n trinity-tdecachegrind-converters
-This is a collection of scripts for converting the output from
-different profiling tools into a format that tdecachegrind can use.
-
-tdecachegrind is a visualisation tool for the profiling data generated
-by calltree, a profiling skin for valgrind.  Applications can be
-profiled using calltree without being recompiled, and shared libraries
-and plugin architectures are supported.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-tdecachegrind-converters
-%defattr(-,root,root,-)
-%{tde_bindir}/dprof2calltree
-%{tde_bindir}/hotshot2calltree
-%{tde_bindir}/memprof2calltree
-%{tde_bindir}/op2calltree
-%{tde_bindir}/pprof2calltree
-
-##########
-
-%package kfile-plugins
-Summary:	Trinity file dialog plugins for software development files
-Group:		Development/Languages/Other
-
-%description kfile-plugins
-This is a collection of plugins for the TDE file dialog.  These plugins
-extend the file dialog to offer advanced meta-information for source files,
-patch files and Qt Linguist data.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files kfile-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdefile_cpp.so
-%{tde_tdelibdir}/tdefile_cpp.la
-%{tde_tdelibdir}/tdefile_diff.so
-%{tde_tdelibdir}/tdefile_diff.la
-%{tde_tdelibdir}/tdefile_ts.so
-%{tde_tdelibdir}/tdefile_ts.la
-%{tde_datadir}/services/tdefile_cpp.desktop
-%{tde_datadir}/services/tdefile_diff.desktop
-%{tde_datadir}/services/tdefile_h.desktop
-%{tde_datadir}/services/tdefile_ts.desktop
-
-##########
-
-%package misc
-Summary:	Various goodies from the Trinity Software Development Kit
-Group:		Development/Languages/Other
-
-%description misc
-This package contains miscellaneous goodies provided with the official
-TDE release to assist with TDE software development.
-
-Included are:
-- headers to assist with profiling TDE code;
-- a widget style for checking conformity with the TDE/Qt style guide;
-- palettes that match the KDE standard colour palette;
-- a TDE address book plugin that reads the list of TDE CVS accounts.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files misc
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/tdeabcformat_kdeaccounts.la
-%{tde_tdelibdir}/tdeabcformat_kdeaccounts.so
-%{tde_tdelibdir}/plugins/styles/scheck.so
-%{tde_tdelibdir}/plugins/styles/scheck.la
-%{tde_datadir}/apps/tdeabc/formats/kdeaccountsplugin.desktop
-%{tde_datadir}/apps/tdestyle/themes/scheck.themerc
-%{tde_datadir}/kdepalettes/
-
-%{tde_libdir}/libkstartperf.so.*
-%{tde_libdir}/libkstartperf.la
-%{tde_bindir}/kstartperf
-
-##########
-
-%package scripts
-Summary:	a set of useful development scripts for Trinity
-Group:		Development/Languages/Other
-Requires:	%{python}
-
-%description scripts
-This package contains a number of scripts which can be used to help in
-developing TDE-based applications.  Many of these scripts however are
-not specific to TDE, and in particular there are several general-use
-scripts to help users in working with SVN and CVS repositories.
-
-In addition to these scripts, this package provides:
-- gdb macros for Qt/TDE programming;
-- vim and emacs helper files for Qt/TDE programming;
-- bash and zsh completion controls for TDE apps;
-- valgrind error suppressions for TDE apps.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_bindir}/adddebug
-%{tde_bindir}/build-progress.sh
-%{tde_bindir}/cheatmake
-%{tde_bindir}/create_cvsignore
-%{tde_bindir}/create_makefile
-%{tde_bindir}/create_makefiles
-%{tde_bindir}/cvs-clean
-%{tde_bindir}/cvs2dist
-%{tde_bindir}/cvsbackport
-%{tde_bindir}/cvsblame
-%{tde_bindir}/cvscheck
-%{tde_bindir}/cvsforwardport
-%{tde_bindir}/cvslastchange
-%{tde_bindir}/cvslastlog
-%{tde_bindir}/cvsrevertlast
-%{tde_bindir}/cvsversion
-%{tde_bindir}/cxxmetric
-%{tde_bindir}/extend_dmalloc
-%{tde_bindir}/extractattr
-%{tde_bindir}/extractrc
-%{tde_bindir}/findmissingcrystal
-%{tde_bindir}/fixkdeincludes
-%{tde_bindir}/fixuifiles
-%{tde_bindir}/includemocs
-%{tde_bindir}/kde-build
-%{tde_bindir}/kdedoc
-%{tde_bindir}/tdekillall
-%{tde_bindir}/kdelnk2desktop.py*
-%{tde_bindir}/kdemangen.pl
-%{tde_bindir}/makeobj
-%{tde_bindir}/noncvslist
-%{tde_bindir}/package_crystalsvg
-%{tde_bindir}/png2mng.pl
-%{tde_bindir}/pruneemptydirs
-%{tde_bindir}/qtdoc
-%{tde_bindir}/zonetab2pot.py*
-%{tde_bindir}/svn2dist
-%{tde_bindir}/svnrevertlast
-%{tde_bindir}/svnforwardport
-%{tde_bindir}/nonsvnlist
-%{tde_bindir}/tdesvn-build
-%{tde_bindir}/svnlastlog
-%{tde_bindir}/svnversions
-%{tde_bindir}/create_svnignore
-%{tde_bindir}/svnlastchange
-%{tde_bindir}/colorsvn
-%{tde_bindir}/svnaddcurrentdir
-%{tde_bindir}/svnbackport
-%{tde_bindir}/svngettags
-%{tde_bindir}/svnchangesince
-%{tde_bindir}/svn-clean
-%{tde_datadir}/apps/katepart/syntax/tdesvn-buildrc.xml
-%{tde_mandir}/man1/cvsblame.1
-%{tde_mandir}/man1/cvscheck.1
-%{tde_mandir}/man1/cvsversion.1
-%{tde_mandir}/man1/kde-build.1
-%{tde_mandir}/man1/includemocs.1
-%{tde_mandir}/man1/noncvslist.1
-%{tde_mandir}/man1/tdesvn-build.1
-%{tde_tdedocdir}/HTML/en/tdesvn-build/
-#scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
-#scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
-#scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
-#scripts/kde.supp /opt/trinity/lib/valgrind
-#scripts/completions /opt/trinity/share/tdesdk-scripts
-
-#debian/desktop-i18n/createdesktop.pl /opt/trinity/lib/kubuntu-desktop-i18n/
-#debian/desktop-i18n/findfiles /opt/trinity/lib/kubuntu-desktop-i18n/
-#debian/desktop-i18n/msgsplit /opt/trinity/lib/kubuntu-desktop-i18n/
-
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/licensecheck
-%else
-%exclude %{tde_bindir}/licensecheck
-%endif
-
-##########
-
-%package -n trinity-kmtrace
-Summary:	A Trinity memory leak tracer
-Group:		Development/Languages/Other
-Requires:	less
-
-%description -n trinity-kmtrace
-KMtrace is a TDE tool to assist with malloc debugging using glibc's
-"mtrace" functionality.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kmtrace
-%defattr(-,root,root,-)
-%{tde_bindir}/demangle
-%{tde_bindir}/kminspector
-%{tde_bindir}/kmmatch
-%{tde_bindir}/kmtrace
-%dir %{tde_libdir}/kmtrace
-%{tde_libdir}/kmtrace/libktrace.la
-%{tde_libdir}/kmtrace/libktrace.so
-%{tde_datadir}/apps/kmtrace/
-
-##########
-
-%package -n trinity-kompare
-Summary:	A Trinity GUI for viewing differences between files
-Group:		Development/Languages/Other
-
-%description -n trinity-kompare
-Kompare is a graphical user interface for viewing the differences between
-files.  It can compare two documents, create a diff file, display a diff
-file and/or blend a diff file back into the original documents.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kompare
-%defattr(-,root,root,-)
-%{tde_bindir}/kompare
-%{tde_libdir}/libkompareinterface.la
-%{tde_libdir}/libkompareinterface.so.*
-%{tde_tdelibdir}/libkomparenavtreepart.la
-%{tde_tdelibdir}/libkomparenavtreepart.so
-%{tde_tdelibdir}/libkomparepart.la
-%{tde_tdelibdir}/libkomparepart.so
-%{tde_tdeappdir}/kompare.desktop
-%{tde_datadir}/apps/kompare/
-%{tde_datadir}/services/komparenavtreepart.desktop
-%{tde_datadir}/services/komparepart.desktop
-%{tde_datadir}/servicetypes/komparenavigationpart.desktop
-%{tde_datadir}/servicetypes/kompareviewpart.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kompare.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz
-%{tde_tdedocdir}/HTML/en/kompare/
-
-##########
-
-%package -n trinity-kspy
-Summary:	Examines the internal state of a Qt/TDE app
-Group:		Development/Languages/Other
-Requires:	trinity-tdelibs-devel
-
-%description -n trinity-kspy
-KSpy is a tiny library which can be used to graphically display
-the QObjects in use by a Qt/TDE app.  In addition to the object tree,
-you can also view the properties, signals and slots of any QObject.
-
-Basically it provides much the same info as QObject::dumpObjectTree() and
-QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
-minimal overhead for the application, because the kspy library is
-loaded dynamically using KLibLoader.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kspy
-%defattr(-,root,root,-)
-%{tde_libdir}/libkspy.la
-%{tde_libdir}/libkspy.so.*
-
-##########
-
-%package -n trinity-kuiviewer
-Summary:	Viewer for Qt Designer user interface files
-Group:		Development/Languages/Other
-
-%description -n trinity-kuiviewer
-KUIViewer is a utility to display and test the user interface (.ui) files
-generated by Qt Designer.  The interfaces can be displayed in a variety of
-different widget styles.
-
-The Qt Designer itself is in the package qt3-designer.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-kuiviewer
-%defattr(-,root,root,-)
-%{tde_bindir}/kuiviewer
-%{tde_tdelibdir}/libkuiviewerpart.so
-%{tde_tdelibdir}/libkuiviewerpart.la
-%{tde_tdelibdir}/quithumbnail.so
-%{tde_tdelibdir}/quithumbnail.la
-%{tde_tdeappdir}/kuiviewer.desktop
-%{tde_datadir}/apps/kuiviewer/
-%{tde_datadir}/apps/kuiviewerpart/
-%{tde_datadir}/icons/hicolor/*/apps/kuiviewer.png
-%{tde_datadir}/icons/locolor/*/apps/kuiviewer.png
-%{tde_datadir}/services/designerthumbnail.desktop
-%{tde_datadir}/services/kuiviewer_part.desktop
-%{tde_tdedocdir}/HTML/en/kuiviewer/
-
-##########
-
-%package -n trinity-libcvsservice0
-Summary:	DCOP service for accessing CVS repositories
-Group:		Development/Languages/Other
-Requires:	cvs
-
-%description -n trinity-libcvsservice0
-This library provides a DCOP service for accessing and working with
-remote CVS repositories.  Applications may link with this library to
-access the DCOP service directly from C++.  Alternatively, scripts may
-access the service using the standard "dcop" command-line tool.
-
-DCOP is the Desktop Communication Protocol used throughout TDE.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-libcvsservice0
-%defattr(-,root,root,-)
-%{tde_bindir}/cvsaskpass
-%{tde_bindir}/cvsservice
-%{tde_libdir}/libcvsservice.so.*
-%{tde_libdir}/libtdeinit_cvsaskpass.so
-%{tde_libdir}/libtdeinit_cvsservice.so
-%{tde_tdelibdir}/cvsaskpass.la
-%{tde_tdelibdir}/cvsaskpass.so
-%{tde_tdelibdir}/cvsservice.la
-%{tde_tdelibdir}/cvsservice.so
-%{tde_datadir}/services/cvsservice.desktop
-
-##########
-
-%package -n trinity-libcvsservice-devel
-Summary:	Development files for CVS DCOP service
-Group:		Development/Libraries/Other
-Requires:	trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-libcvsservice-devel
-The library libcvsservice provides a DCOP service for accessing and
-working with remote CVS repositories.  Applications may link with this
-library to access the DCOP service directly from C++.  Alternatively,
-scripts may access the service using the standard "dcop" command-line
-tool.
-
-Development files for libcvsservice are included in this package.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-libcvsservice-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/cvsjob_stub.h
-%{tde_tdeincludedir}/cvsservice_stub.h
-%{tde_tdeincludedir}/repository_stub.h
-%{tde_libdir}/libcvsservice.la
-%{tde_libdir}/libcvsservice.so
-%{tde_libdir}/libtdeinit_cvsaskpass.la
-%{tde_libdir}/libtdeinit_cvsservice.la
-%{tde_datadir}/cmake/cervisia.cmake
-
-##########
-
-%package -n trinity-poxml
-Summary:	Tools for using PO-files to translate DocBook XML files
-Group:		Development/Languages/Other
-
-%description -n trinity-poxml
-This is a collection of tools that facilitate translating DocBook XML
-files using gettext message files (PO-files).
-
-Also included are some miscellaneous command-line utilities for
-manipulating DocBook XML files, PO-files and PO-template files.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-poxml
-%defattr(-,root,root,-)
-%{tde_bindir}/po2xml
-%{tde_bindir}/split2po
-%{tde_bindir}/swappo
-%{tde_bindir}/transxx
-%{tde_bindir}/xml2pot
-
-##########
-
-%package -n trinity-umbrello
-Summary:	UML modelling tool and code generator
-Group:		Development/Languages/Other
-
-%description -n trinity-umbrello
-Umbrello UML Modeller is a Unified Modelling Language editor for TDE.
-With UML you can create diagrams of software and other systems in an
-industry standard format.  Umbrello can also generate code from your
-UML diagrams in a number of programming languages.
-
-The program supports class diagrams, sequence diagrams, collaboration
-diagrams, use case diagrams, state diagrams, activity diagrams, component
-diagrams and deployment diagrams.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-umbrello
-%defattr(-,root,root,-)
-%{tde_bindir}/umbodoc
-%{tde_bindir}/umbrello
-%{tde_tdeappdir}/umbrello.desktop
-%{tde_datadir}/apps/umbrello/
-%{tde_datadir}/icons/crystalsvg/*/actions/umbrello_*.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/umbrellofile.png
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz
-%{tde_datadir}/icons/hicolor/*/apps/umbrello.png
-%{tde_datadir}/icons/hicolor/scalable/apps/umbrello.svgz
-%{tde_datadir}/icons/hicolor/*/mimetypes/umbrellofile.png
-%{tde_datadir}/mimelnk/application/x-umbrello.desktop
-%{tde_tdedocdir}/HTML/en/umbrello/
-
-##########
-
-%if 0%{?build_kioslave}
-
-%package tdeio-plugins
-Summary:	Subversion ioslave for Trinity
-Group:		Development/Languages/Other
-Requires:	subversion
-
-Obsoletes:	trinity-tdesdk-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-tdesdk-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tdeio-plugins
-This package provides easy access to remote SVN repositories from within
-Konqueror, and TDE generally, by browsing them as if they were a
-filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files tdeio-plugins
-%defattr(-,root,root,-)
-%{tde_bindir}/tdeio_svn_helper
-%{tde_tdelibdir}/kded_ksvnd.la
-%{tde_tdelibdir}/kded_ksvnd.so
-%{tde_tdelibdir}/tdeio_svn.la
-%{tde_tdelibdir}/tdeio_svn.so
-%{tde_datadir}/apps/konqueror/servicemenus/subversion_toplevel.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/subversion.desktop
-%{tde_datadir}/services/kded/ksvnd.desktop
-%{tde_datadir}/services/svn+file.protocol_tdesdk
-%{tde_datadir}/services/svn+http.protocol_tdesdk
-%{tde_datadir}/services/svn+https.protocol_tdesdk
-%{tde_datadir}/services/svn+ssh.protocol_tdesdk
-%{tde_datadir}/services/svn.protocol_tdesdk
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_remove.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_add.png
-%{tde_datadir}/icons/crystalsvg/*/actions/svn_status.png
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_add.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_status.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_remove.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_switch.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_branch.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_merge.svgz
-
-%post tdeio-plugins
-for proto in svn+file svn+http svn+https svn+ssh svn; do
-  update-alternatives --install \
-    %{tde_datadir}/services/${proto}.protocol \
-    ${proto}.protocol \
-    %{tde_datadir}/services/${proto}.protocol_tdesdk \
-    10
-done
-
-%preun tdeio-plugins
-if [ $1 -eq 0 ]; then
-  for proto in svn+file svn+http svn+https svn+ssh svn; do
-    update-alternatives --remove \
-      ${proto}.protocol \
-      %{tde_datadir}/services/${proto}.protocol_tdesdk || :
-  done
-fi
-
-%endif
-
-##########
-
-%package -n trinity-tdeunittest
-Summary:	Unit testing library for Trinity
-Group:		Development/Languages/Other
-
-Obsoletes:	trinity-kunittest < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kunittest = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdeunittest
-tdeunittest is a small library that facilitates the writing of tests for
-TDE developers. There are two ways to use the tdeunittest library. One is
-to create dynamically loadable modules and use the tdeunittestmodrunner or
-tdeunittestguimodrunner programs to run the tests. The other is to use the
-libraries to create your own testing application.
-
-This package is part of Trinity, and a component of the TDE SDK module.
-
-%files -n trinity-tdeunittest
-%defattr(-,root,root,-)
-%{tde_bindir}/tdeunittest
-%{tde_bindir}/tdeunittest_debughelper
-%{tde_bindir}/tdeunittestmod
-%{tde_bindir}/tdeunittestguimodrunner
-%{tde_libdir}/libtdeunittestgui.la
-%{tde_libdir}/libtdeunittestgui.so.*
-
-##########
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries/Other
-
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kbabel-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	%{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-libcvsservice-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-kdesdk-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdesdk-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains the development files for tdesdk.
-
-%files devel
-%defattr(-,root,root,-)
-# misc
-%{tde_tdeincludedir}/kprofilemethod.h
-%{tde_libdir}/libkstartperf.so
-# kspy
-%{tde_tdeincludedir}/kspy.h
-%{tde_libdir}/libkspy.so
-# kmtrace
-%{tde_libdir}/kmtrace/libktrace_s.a
-%{tde_tdeincludedir}/ktrace.h
-# tdeunittest
-%{tde_libdir}/libtdeunittestgui.so
-%{tde_tdeincludedir}/tdeunittest/runnergui.h
-# kompare
-%{tde_libdir}/libkompareinterface.so
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8
-# Fix shebangs
-sed -i "scripts/kdelnk2desktop.py" \
-       "scripts/zonetab2pot.py" \
-       "tdecachegrind/converters/hotshot2calltree" \
-       "umbrello/umbrello/headings/heading.py" \
-    -e "s|env python|env %{python}|"
-%endif
-
-
-%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
-
-# FIXME PCLinuxOS: '/usr/bin/ld: cannot find -ltdeabc'
-%if 0%{?pclinuxos}
-export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L%{tde_libdir}"
-%endif
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DMAN_INSTALL_DIR=%{tde_mandir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_DBSEARCHENGINE=ON \
-  -DWITH_KCAL=ON \
-  -DBUILD_ALL=ON \
-  %{!?build_kioslave:-DBUILD_KIOSLAVE=OFF} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot} 
-
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-# Installs kdepalettes
-%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes/kde_xpaintrc
-%__install -D -m 644 kdepalettes/KDE_Gimp %{?buildroot}%{tde_datadir}/kdepalettes/KDE_Gimp
-%__install -D -m 644 kdepalettes/README %{?buildroot}%{tde_datadir}/kdepalettes/README
-
-# Installs SVN protocols as alternatives
-%if 0%{?build_kioslave}
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesdk
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesdk
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk
-%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk
-%endif
-
-# Removes useless stuff
-%__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules
-
-# Fix permissions
-chmod 644 %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/Doxyfile.global
-
-# Make kapptemplate archive
-pushd  %{?buildroot}%{tde_datadir}/apps/kapptemplate
-mkdir kapptemplate
-mv admin appframework bin existing include kapp kpartapp kpartplugin kapptemplate/
-tar cfz kapptemplate.tar.gz kapptemplate
-rm -rf kapptemplate
-popd
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file    kuiviewer      Development GUIDesigner
-%suse_update_desktop_file    umbrello       Development Design
-%suse_update_desktop_file    kbugbuster     Development Debugger
-%suse_update_desktop_file -u catalogmanager Development Translation
-%suse_update_desktop_file    kbabel         Development Translation
-%suse_update_desktop_file -u kbabeldict     Development Translation
-%suse_update_desktop_file    cervisia       Development RevisionControl
-%suse_update_desktop_file    kompare        Development RevisionControl
-%suse_update_desktop_file    tdecachegrind  Development Profiling
-%endif
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec
deleted file mode 100644
index ce5307f42..000000000
--- a/redhat/main/tdetoys/tdetoys.spec
+++ /dev/null
@@ -1,445 +0,0 @@
-#
-# spec file for package tdetoys (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdetoys
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Trinity Desktop Environment - Toys and Amusements
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:		Amusements/Graphics
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-
-# Trinity dependencies
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-kdesktop >= %{tde_version}
-BuildRequires: trinity-kicker >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-
-Obsoletes:		trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-kdetoys = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# Metapackage
-Requires: trinity-amor = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-eyesapplet = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-fifteenapplet = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmoon = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kodo = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kteatime = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ktux = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kweather = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kworldclock = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-Includes: 
-* amor: Amusing Misuse Of Resources put's comic figures above your windows
-* eyesapplet: a kicker applet similar to XEyes
-* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them
-* kmoon: system tray applet showing the moon phase
-* kodo: mouse movement meter
-* kteatime: system tray applet that makes sure your tea doesn't get too strong
-* ktux: Tux-in-a-Spaceship screen saver
-* kweather: kicker applet that will display the current weather outside
-* kworldwatch: application and kicker applet showing daylight area on the world
-               globe
-
-NOTE: kicker applets and screen savers require tdebase to be installed, 
-and user to be logged-in to TDE.
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-
-##########
-
-%package -n trinity-amor
-Summary:	a Trinity creature for your desktop
-Group:		Amusements/Graphics
-
-%description -n trinity-amor
-AMOR stands for Amusing Misuse Of Resources. It provides several different
-characters who prance around your X screen doing tricks and giving you tips.
-
-Note that AMOR will only work with some window managers. Both TWin (the
-TDE window manager) and Metacity (a GTK2 window manager) are supported.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-amor
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/amor
-%{tde_datadir}/apps/amor/
-%{tde_tdeappdir}/amor.desktop
-%{tde_datadir}/icons/hicolor/*/apps/amor.png
-%{tde_tdedocdir}/HTML/en/amor/
-%{tde_mandir}/man*/amor.*
-
-##########
-
-%package -n trinity-eyesapplet
-Summary:	eyes applet for Trinity
-Group:		Amusements/Graphics
-
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-eyesapplet
-An applet for the TDE panel containing a pair of eyes that follow your mouse
-around the screen.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-eyesapplet
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_tdelibdir}/eyes_panelapplet.la
-%{tde_tdelibdir}/eyes_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/eyesapplet.desktop
-
-##########
-
-%package -n trinity-fifteenapplet
-Summary:	fifteen pieces puzzle for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-fifteenapplet
-An applet for the TDE panel that lets you play the Fifteen Pieces
-sliding block puzzle. You have to order 15 pieces in a 4x4 square by
-moving them around.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-fifteenapplet
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_tdelibdir}/fifteen_panelapplet.la
-%{tde_tdelibdir}/fifteen_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/kfifteenapplet.desktop
-
-##########
-
-%package -n trinity-kmoon
-Summary:	moon phase indicator for Trinity
-Group:		Amusements/Graphics
-
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-kmoon
-An applet for the TDE panel that displays the current phase of the moon.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kmoon
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_tdelibdir}/kmoon_panelapplet.la
-%{tde_tdelibdir}/kmoon_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/kmoonapplet.desktop
-%{tde_datadir}/apps/kmoon/
-%{tde_datadir}/icons/hicolor/*/apps/kmoon.png
-%{tde_tdedocdir}/HTML/en/kmoon/
-
-##########
-
-%package -n trinity-kodo
-Summary:	mouse odometer for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-kodo
-KOdometer measures your desktop mileage. It tracks the movement of your mouse
-pointer across your desktop and renders it in inches/feet/miles! It can
-do cm/metres/km too. Its most exciting feature is the tripometer.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kodo
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/kodo
-%{tde_tdeappdir}/kodo.desktop
-%{tde_datadir}/apps/kodo/
-%{tde_datadir}/icons/hicolor/*/apps/kodo.png
-%{tde_tdedocdir}/HTML/en/kodo/
-%{tde_mandir}/man*/kodo.*
-
-##########
-
-%package -n trinity-kteatime
-Summary:	Trinity utility for making a fine cup of tea
-Group:		Amusements/Graphics
-
-%description -n trinity-kteatime
-KTeaTime is a handy timer for steeping tea. No longer will you have to
-guess at how long it takes for your tea to be ready. Simply select the
-type of tea you have, and it will alert you when the tea is ready to
-drink.
-
-KTeaTime sits in the Trinity system tray.
-
-Please note that KTeaTime is written explicitly for Trinity. If you are
-using a non-TDE window manager or desktop environment then it is quite
-possible that KTeaTime will not work on your system.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kteatime
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/kteatime
-%{tde_tdeappdir}/kteatime.desktop
-%{tde_datadir}/apps/kteatime/
-%{tde_datadir}/icons/hicolor/*/apps/kteatime.png
-%{tde_tdedocdir}/HTML/en/kteatime/
-%{tde_mandir}/man*/kteatime.*
-
-##########
-
-%package -n trinity-ktux
-Summary:	Tux screensaver for Trinity
-Group:		Amusements/Graphics
-
-%description -n trinity-ktux
-A neat Tux-in-a-spaceship screensaver for the Trinity Desktop Environment (TDE).
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-ktux
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/ktux
-%{tde_datadir}/apps/ktux/
-%{tde_datadir}/applnk/System/ScreenSavers/ktux.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktux.png
-%{tde_mandir}/man*/ktux.*
-
-##########
-
-%package -n trinity-kweather
-Summary:	weather display applet for Trinity
-Group:		Amusements/Graphics
-
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-kweather
-An applet for the TDE panel that displays your area's current weather.
-Information shown includes the temperature, wind speed, air pressure
-and more. By pressing a button a full weather report can be obtained.
-
-KWeather also provides a weather service that can track multiple weather
-stations and provide this information to other applications, including
-Konqueror's sidebar and Kontact's summary page.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kweather
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/kweatherservice
-%{tde_bindir}/kweatherreport
-%{tde_libdir}/libtdeinit_kweatherreport.so
-%{tde_libdir}/libtdeinit_kweatherreport.la
-%{tde_tdelibdir}/kcm_weather.so
-%{tde_tdelibdir}/kcm_weather.la
-%{tde_tdelibdir}/kcm_weatherservice.so
-%{tde_tdelibdir}/kcm_weatherservice.la
-%{tde_tdelibdir}/kweatherreport.so
-%{tde_tdelibdir}/kweatherreport.la
-%{tde_tdelibdir}/weather_panelapplet.la
-%{tde_tdelibdir}/weather_panelapplet.so
-%{tde_datadir}/apps/kicker/applets/kweather.desktop
-%{tde_datadir}/apps/kweather/
-%{tde_datadir}/apps/kweatherservice/
-%{tde_datadir}/icons/hicolor/*/apps/kweather.png
-%{tde_datadir}/services/kweatherservice.desktop
-%{tde_datadir}/services/kcmweather.desktop
-%{tde_datadir}/services/kcmweatherservice.desktop
-%{tde_tdedocdir}/HTML/en/kweather/
-%{tde_mandir}/man*/kweatherreport.*
-%{tde_mandir}/man*/kweatherservice.*
-
-##########
-
-%package -n trinity-kworldclock
-Summary:	earth watcher for Trinity
-Group:		Amusements/Graphics
-
-Requires:	trinity-kdesktop >= %{tde_version}
-Requires:	trinity-kicker >= %{tde_version}
-
-%description -n trinity-kworldclock
-Displays where in the world it is light and dark depending on time, as
-well as offering the time in all of the major cities of the world.
-This can be run standalone, as an applet in the TDE panel or as a
-desktop background.
-
-Additional kworldclock themes are available in the tdeartwork-misc package.
-
-This package is part of Trinity, and a component of the TDE toys module.
-
-%files -n trinity-kworldclock
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%{tde_bindir}/kworldclock
-%{tde_tdelibdir}/ww_panelapplet.la
-%{tde_tdelibdir}/ww_panelapplet.so
-%{tde_tdeappdir}/kworldclock.desktop
-%{tde_datadir}/apps/kdesktop/programs/kdeworld.desktop
-%{tde_datadir}/apps/kicker/applets/kwwapplet.desktop
-%{tde_datadir}/apps/kworldclock/
-%{tde_datadir}/icons/hicolor/*/apps/kworldclock.png
-%{tde_tdedocdir}/HTML/en/kworldclock/
-%{tde_mandir}/man*/kworldclock.*
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf "%{buildroot}"
-%__make install DESTDIR=%{buildroot} -C build
-
-# Useless include file from Amor
-%__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r kworldclock Utility Clock
-%suse_update_desktop_file -r kteatime    Applet
-%suse_update_desktop_file -r amor        Amusement
-%suse_update_desktop_file -r kodo        Amusement 
-%suse_update_desktop_file ktux        Screensaver
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
deleted file mode 100644
index 2afe14451..000000000
--- a/redhat/main/tdeutils/tdeutils.spec
+++ /dev/null
@@ -1,1023 +0,0 @@
-#
-# spec file for package tdeutils (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdeutils
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_sbindir %{tde_prefix}/sbin
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	TDE Utilities
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:		Applications/System
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	klaptop_acpi_helper.pam
-Source2:	klaptop_acpi_helper.console
-Source3:	kcmlaptoprc
-Source4:	%{name}-rpmlintrc
-
-Obsoletes:	trinity-kdeutils < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdeutils = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdeutils-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdeutils-extras = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdeutils < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdeutils = %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	trinity-filesystem >= %{tde_version}
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	fdupes
-
-BuildRequires:	gettext
-BuildRequires:	net-snmp-devel
-BuildRequires:	gmp-devel
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
-%define python python2
-%define __python %__python2
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%else
-%define python python
-%endif
-BuildRequires:	%{python}
-BuildRequires:	%{python}-devel
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# XTST support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-%define xtst_devel %{_lib}xtst-devel
-%else
-%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel
-%endif
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-%define xtst_devel libXtst-devel
-%endif
-%{?xtst_devel:BuildRequires: %{xtst_devel}}
-
-# IDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# XMMS support
-#if 0#{?fedora}
-#BuildRequires:	xmms-devel
-#endif
-
-# KLAPTOPDAEMON
-#  Not for RHEL 4!
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define build_klaptopdaemon 1
-%endif
-
-# ACL support
-BuildRequires:	libacl-devel
-
-# XSCREENSAVER support
-#  RHEL 8: available in EPEL
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
-%define with_xscreensaver 1
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
-BuildRequires:	libXScrnSaver-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mgaversion} >= 4
-BuildRequires:	%{_lib}xscrnsaver-devel
-%else
-BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
-%endif
-%endif
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# CONSOLEHELPER (usermode) support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_consolehelper 1
-
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-%endif
-
-%if "%{?tde_version}" == "14.1.0"
-%define build_tdefilereplace 1
-%endif
-
-Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kcharselect = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdelirc = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdessh = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kdf = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kedit = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kfloppy = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kgpg = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-khexedit = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kjots = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{?epoch:%{epoch}:}%{version}-%{release}}
-Requires: trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kmilo-legacy = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?build_tdefilereplace}
-Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-
-%description
-Utilities for the Trinity Desktop Environment, including:
-* ark (tar/gzip archive manager)
-* kcalc (scientific calculator)
-* kcharselect (character selector)
-* tdelirc (infrared control)
-* tdessh (ssh front end)
-* kdf (view disk usage)
-* kedit (simple text editor)
-* kfloppy (floppy formatting tool)
-* kgpg (gpg gui)
-* khexedit (hex editor)
-* kjots (note taker)
-%if 0%{?build_klaptopdaemon}
-* klaptopdaemon (battery monitoring and management for laptops);
-%endif
-* kmilo
-* kregexpeditor (regular expression editor)
-* ksim (system information monitor);
-* ktimer (task scheduler)
-* kwikdisk (removable media utility)
-* tdefilereplace: batch search and replace tool
-
-%files
-
-##########
-
-%package -n trinity-ark
-Summary:	Graphical archiving tool for Trinity
-Group:		Applications/Utilities
-#Requires:	ncompress
-Requires:	unzip
-Requires:	zip
-#Requires:	zoo
-Requires:	bzip2
-#Requires:	p7zip
-#Requires:	xz
-#Requires:	lzma
-#Requires:	rar, unrar
-
-%description -n trinity-ark
-Ark is a graphical program for managing various archive formats within the
-TDE environment. Archives can be viewed, extracted, created and modified
-from within Ark.
-
-The program can handle various formats such as tar, gzip, bzip2, zip, rar and
-lha (if appropriate command-line programs are installed).
-
-Ark can work closely with Konqueror in the TDE environment to handle archives,
-if you install the Konqueror Integration plugin available in the konq-plugins
-package.
-
-%files -n trinity-ark
-%defattr(-,root,root,-)
-%{tde_bindir}/ark
-%{tde_tdelibdir}/ark.la
-%{tde_tdelibdir}/ark.so
-%{tde_tdelibdir}/libarkpart.la
-%{tde_tdelibdir}/libarkpart.so
-%{tde_libdir}/libtdeinit_ark.so
-%{tde_tdeappdir}/ark.desktop
-%{tde_datadir}/apps/ark/
-%{tde_datadir}/config.kcfg/ark.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/ark.png
-%{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz
-%{tde_datadir}/services/ark_part.desktop
-%{tde_tdedocdir}/HTML/en/ark/
-
-##########
-
-%package -n trinity-kcalc
-Summary:	Calculator for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kcalc
-KCalc is TDE's scientific calculator.
-
-It provides:
-* trigonometric functions, logic operations, and statistical calculations
-* easy cut and paste of numbers from/into its display
-* a results-stack which lets you conveniently recall previous results
-* configurable precision, and number of digits after the period
-
-%files -n trinity-kcalc
-%defattr(-,root,root,-)
-%{tde_bindir}/kcalc
-%{tde_tdelibdir}/kcalc.la
-%{tde_tdelibdir}/kcalc.so
-%{tde_libdir}/libtdeinit_kcalc.so
-%{tde_tdeappdir}/kcalc.desktop
-%{tde_datadir}/apps/kcalc/
-%{tde_datadir}/apps/tdeconf_update/kcalcrc.upd
-%{tde_datadir}/config.kcfg/kcalc.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kcalc.png
-%{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
-%{tde_tdedocdir}/HTML/en/kcalc/
-
-##########
-
-%package -n trinity-kcharselect
-Summary:	Character selector for Trinity
-Group:		Applications/Utilities
-Requires:	trinity-kicker
-
-%description -n trinity-kcharselect
-This package contains kcharselect, a character set selector for TDE.
-
-%files -n trinity-kcharselect
-%defattr(-,root,root,-)
-%{tde_bindir}/kcharselect
-%{tde_tdelibdir}/kcharselect_panelapplet.la
-%{tde_tdelibdir}/kcharselect_panelapplet.so
-%{tde_tdeappdir}/KCharSelect.desktop
-%{tde_datadir}/apps/kcharselect/
-%{tde_datadir}/apps/tdeconf_update/kcharselect.upd
-%{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kcharselect.png
-%{tde_tdedocdir}/HTML/en/kcharselect/
-
-##########
-
-%package -n trinity-tdelirc
-Summary:	Infrared control for Trinity
-Group:		Applications/Utilities
-Requires:	trinity-filesystem
-
-Obsoletes:	trinity-kdelirc < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdelirc = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdelirc
-This is a frontend for the LIRC suite to use infrared devices with TDE.
-
-%files -n trinity-tdelirc
-%defattr(-,root,root,-)
-%{tde_bindir}/irkick
-%{tde_tdelibdir}/irkick.la
-%{tde_tdelibdir}/irkick.so
-%{tde_tdelibdir}/kcm_kcmlirc.la
-%{tde_tdelibdir}/kcm_kcmlirc.so
-%{tde_libdir}/libtdeinit_irkick.so
-%{tde_tdeappdir}/irkick.desktop
-%{tde_tdeappdir}/kcmlirc.desktop
-%{tde_datadir}/apps/irkick/
-%{tde_datadir}/apps/profiles/tdelauncher.profile.xml
-%{tde_datadir}/apps/profiles/konqueror.profile.xml
-%{tde_datadir}/apps/profiles/noatun.profile.xml
-%{tde_datadir}/apps/profiles/profile.dtd
-%dir %{tde_datadir}/apps/remotes
-%{tde_datadir}/apps/remotes/RM-0010.remote.xml
-%{tde_datadir}/apps/remotes/cimr100.remote.xml
-%{tde_datadir}/apps/remotes/hauppauge.remote.xml
-%{tde_datadir}/apps/remotes/remote.dtd
-%{tde_datadir}/apps/remotes/sherwood.remote.xml
-%{tde_datadir}/apps/remotes/sonytv.remote.xml
-%{tde_datadir}/autostart/irkick.desktop
-%{tde_datadir}/icons/hicolor/*/apps/irkick.png
-%{tde_datadir}/icons/locolor/*/apps/irkick.png
-%{tde_tdedocdir}/HTML/en/irkick/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmlirc/
-
-##########
-
-%package -n trinity-tdessh
-Summary:	Ssh frontend for Trinity
-Group:		Applications/Utilities
-%if 0%{?suse_version}
-Requires:	openssh
-%else
-Requires:	openssh-clients
-%endif
-
-Obsoletes:	trinity-kdessh < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdessh = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdessh
-This package contains TDE's frontend for ssh.
-
-%files -n trinity-tdessh
-%defattr(-,root,root,-)
-%{tde_bindir}/tdessh
-
-##########
-
-%package -n trinity-kdf
-Summary:	Disk space utility for Trinity
-Group:		Applications/Utilities
-Requires:	trinity-kcontrol
-
-%description -n trinity-kdf
-KDiskFree displays the available file devices (hard drive partitions, floppy
-and CD drives, etc.) along with information on their capacity, free space, type
-and mount point. It also allows you to mount and unmount drives and view them
-in a file manager.
-
-%files -n trinity-kdf
-%defattr(-,root,root,-)
-%{tde_bindir}/kdf
-%{tde_bindir}/kwikdisk
-%{tde_tdelibdir}/kcm_kdf.la
-%{tde_tdelibdir}/kcm_kdf.so
-%{tde_tdeappdir}/kcmdf.desktop
-%{tde_tdeappdir}/kdf.desktop
-%{tde_tdeappdir}/kwikdisk.desktop
-%{tde_datadir}/apps/kdf/
-%{tde_datadir}/icons/hicolor/*/apps/kdf.png
-%{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png
-%{tde_tdedocdir}/HTML/en/kdf/
-%{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/
-
-##########
-
-%package -n trinity-kedit
-Summary:	Basic text editor for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kedit
-A simple text editor for TDE.
-
-It can be used with Konqueror for text and configuration file browsing.
-KEdit also serves well for creating small plain text documents. KEdit's
-functionality will intentionally remain rather limited to ensure a
-reasonably fast start.
-
-%files -n trinity-kedit
-%defattr(-,root,root,-)
-%{tde_bindir}/kedit
-%{tde_tdelibdir}/kedit.la
-%{tde_tdelibdir}/kedit.so
-%{tde_libdir}/libtdeinit_kedit.so
-%{tde_tdeappdir}/KEdit.desktop
-%{tde_datadir}/apps/kedit/
-%{tde_datadir}/config.kcfg/kedit.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kedit.png
-%{tde_tdedocdir}/HTML/en/kedit/
-
-##########
-
-%package -n trinity-kfloppy
-Summary:	Floppy formatter for Trinity
-Group:		Applications/Utilities
-Requires:	dosfstools
-
-%description -n trinity-kfloppy
-Kfloppy is a utility that provides a straightforward graphical means
-to format 3.5" and 5.25" floppy disks.
-
-%files -n trinity-kfloppy
-%defattr(-,root,root,-)
-%{tde_bindir}/kfloppy
-%{tde_tdeappdir}/KFloppy.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop
-%{tde_datadir}/icons/hicolor/*/apps/kfloppy.png
-%{tde_tdedocdir}/HTML/en/kfloppy/
-
-##########
-
-%package -n trinity-kgpg
-Summary:	GnuPG frontend for Trinity
-Group:		Applications/Utilities
-Requires:	trinity-konsole
-Requires:	gnupg
-
-%description -n trinity-kgpg
-Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
-encryption, file decryption and key management.
-
-Features:
-* an editor mode for easily and quickly encrypting or decrypting a file
-  or message which is typed, copied, pasted or dragged into the editor,
-  or which is double-clicked in the file manager
-* Konqueror integration for encrypting or decrypting files
-* a panel applet for encrypting / decrypting files or the clipboard
-  contents, etc.
-* key management functions (generation, import, export, deletion and
-  signing)
-* decrypting clipboard contents, including integration with Klipper
-
-%files -n trinity-kgpg
-%defattr(-,root,root,-)
-%{tde_bindir}/kgpg
-%{tde_tdeappdir}/kgpg.desktop
-%{tde_datadir}/apps/kgpg/
-%{tde_datadir}/apps/konqueror/servicemenus/encryptfile.desktop
-%{tde_datadir}/apps/konqueror/servicemenus/encryptfolder.desktop
-%{tde_datadir}/autostart/kgpg.desktop
-%{tde_datadir}/config.kcfg/kgpg.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kgpg.png
-%{tde_tdedocdir}/HTML/en/kgpg/
-
-##########
-
-%package -n trinity-khexedit
-Summary:	Trinity hex editor
-Group:		Applications/Utilities
-
-%description -n trinity-khexedit
-KHexEdit is an editor for the raw data of binary files.  It includes
-find/replace functions, bookmarks, many configuration options, drag and drop
-support and other powerful features.
-
-%files -n trinity-khexedit
-%defattr(-,root,root,-)
-%{tde_bindir}/khexedit
-%{tde_tdelibdir}/libkbyteseditwidget.la
-%{tde_tdelibdir}/libkbyteseditwidget.so
-%{tde_tdelibdir}/libkhexedit2part.la
-%{tde_tdelibdir}/libkhexedit2part.so
-%{tde_libdir}/libkhexeditcommon.so.*
-%{tde_tdeappdir}/khexedit.desktop
-%{tde_datadir}/apps/khexedit/
-%{tde_datadir}/apps/khexedit2part/
-%{tde_datadir}/icons/hicolor/*/apps/khexedit.png
-%{tde_datadir}/services/kbyteseditwidget.desktop
-%{tde_datadir}/services/khexedit2part.desktop
-%{tde_tdedocdir}/HTML/en/khexedit/
-
-##########
-
-%package -n trinity-kjots
-Summary:	Note taking utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kjots
-Kjots is a small note taker program. Name and idea are taken from the jots
-program included in the tkgoodstuff package.
-
-%files -n trinity-kjots
-%defattr(-,root,root,-)
-%{tde_bindir}/kjots
-%{tde_tdeappdir}/Kjots.desktop
-%{tde_datadir}/apps/kjots/
-%{tde_datadir}/config.kcfg/kjots.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/kjots.png
-%{tde_tdedocdir}/HTML/en/kjots/
-
-##########
-
-%if 0%{?build_klaptopdaemon}
-
-%package -n trinity-klaptopdaemon
-Summary:	Battery monitoring and management for laptops using Trinity
-Group:		Applications/Utilities
-Requires:	trinity-kcontrol
-
-%if 0%{?with_consolehelper}
-# package 'usermode' provides '/usr/bin/consolehelper-gtk'
-%if 0%{?rhel} || 0%{?fedora}
-Requires:	usermode-gtk
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Requires:	usermode
-%endif
-%endif
-
-%description -n trinity-klaptopdaemon
-This package contains utilities to monitor batteries and configure
-power management, for laptops, from within TDE.
-
-%files -n trinity-klaptopdaemon
-%defattr(-,root,root,-)
-%{tde_bindir}/klaptop_acpi_helper
-%{tde_bindir}/klaptop_check
-%{tde_tdelibdir}/kcm_laptop.la
-%{tde_tdelibdir}/kcm_laptop.so
-%{tde_tdelibdir}/kded_klaptopdaemon.la
-%{tde_tdelibdir}/kded_klaptopdaemon.so
-%{tde_libdir}/libkcmlaptop.so.*
-%{tde_tdeappdir}/laptop.desktop
-%{tde_tdeappdir}/pcmcia.desktop
-%{tde_datadir}/apps/klaptopdaemon/
-%{tde_datadir}/icons/crystalsvg/*/apps/laptop_battery.png
-%{tde_datadir}/icons/crystalsvg/*/apps/laptop_pcmcia.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
-%{tde_datadir}/services/kded/klaptopdaemon.desktop
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
-%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
-%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
-%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/
-
-# ConsoleHelper support
-%if 0%{?with_consolehelper}
-%{_sysconfdir}/pam.d/klaptop_acpi_helper
-%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
-%{tde_sbindir}/klaptop_acpi_helper
-%{_sbindir}/klaptop_acpi_helper
-%endif
-
-%config(noreplace) %{tde_confdir}/kcmlaptoprc
-
-%endif
-
-##########
-
-%package -n trinity-kmilo
-Summary:	Laptop special keys support for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kmilo
-KMilo lets you use the special keys on some keyboards and laptops.
-
-Usually this includes volume keys and other features. Currently, KMilo
-comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
-with special keys.
-
-%files -n trinity-kmilo
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kded_kmilod.la
-%{tde_tdelibdir}/kded_kmilod.so
-%{tde_tdelibdir}/kmilo_generic.la
-%{tde_tdelibdir}/kmilo_generic.so
-%{tde_libdir}/libkmilo.so.*
-%{tde_datadir}/services/kded/kmilod.desktop
-%dir %{tde_datadir}/services/kmilo
-%{tde_datadir}/services/kmilo/kmilo_generic.desktop
-%dir %{tde_datadir}/servicetypes/kmilo
-%{tde_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop
-
-##########
-
-%package -n trinity-kmilo-legacy
-Summary:	Non-standard plugins for KMilo
-Group:		Applications/Utilities
-Requires:	trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kcontrol
-
-%description -n trinity-kmilo-legacy
-KMilo lets you use the special keys on some keyboards and laptops.
-
-Usually this includes volume keys and other features. Currently, KMilo
-comes with plugins for Powerbooks, Thinkpads and Vaios.
-
-The intention is that all laptops work with the generic kmilo
-plugin, if you need this package please file a bug.
-
-%files -n trinity-kmilo-legacy
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/kcm_kvaio.la
-%{tde_tdelibdir}/kcm_kvaio.so
-%{tde_tdelibdir}/kcm_thinkpad.la
-%{tde_tdelibdir}/kcm_thinkpad.so
-%{tde_tdelibdir}/kmilo_asus.la
-%{tde_tdelibdir}/kmilo_asus.so
-%{tde_tdelibdir}/kmilo_delli8k.la
-%{tde_tdelibdir}/kmilo_delli8k.so
-%{tde_tdelibdir}/kmilo_kvaio.la
-%{tde_tdelibdir}/kmilo_kvaio.so
-%{tde_tdelibdir}/kmilo_thinkpad.la
-%{tde_tdelibdir}/kmilo_thinkpad.so
-%{tde_tdeappdir}/kvaio.desktop
-%{tde_tdeappdir}/thinkpad.desktop
-%{tde_datadir}/services/kmilo/kmilo_asus.desktop
-%{tde_datadir}/services/kmilo/kmilo_delli8k.desktop
-%{tde_datadir}/services/kmilo/kmilo_kvaio.desktop
-%{tde_datadir}/services/kmilo/kmilo_thinkpad.desktop
-%{tde_tdedocdir}/HTML/en/kcontrol/kvaio/
-%{tde_tdedocdir}/HTML/en/kcontrol/thinkpad/
-
-##########
-
-%package -n trinity-kregexpeditor
-Summary:	Graphical regular expression editor plugin for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-kregexpeditor
-This package contains a graphical regular expression editor plugin for use
-with TDE. It let you draw your regular expression in an unambiguous way.
-
-%files -n trinity-kregexpeditor
-%defattr(-,root,root,-)
-%{tde_bindir}/kregexpeditor
-%{tde_tdelibdir}/libkregexpeditorgui.la
-%{tde_tdelibdir}/libkregexpeditorgui.so
-%{tde_libdir}/libkregexpeditorcommon.so.*
-%{tde_tdeappdir}/kregexpeditor.desktop
-%{tde_datadir}/apps/kregexpeditor/
-%{tde_datadir}/icons/hicolor/*/apps/kregexpeditor.png
-%{tde_datadir}/services/kregexpeditorgui.desktop
-%{tde_tdedocdir}/HTML/en/KRegExpEditor/
-
-##########
-
-%package -n trinity-ksim
-Summary:	System information monitor for Trinity
-Group:		Applications/Utilities
-Requires:	trinity-kicker
-
-%description -n trinity-ksim
-KSim is a system monitor app which has its own plugin system with support
-for GKrellm skins. It allows users to follow uptime, memory usage, network
-connections, power, etc.
-
-%files -n trinity-ksim
-%defattr(-,root,root,-)
-%config(noreplace) %{tde_confdir}/ksim_panelextensionrc
-%{tde_tdelibdir}/ksim_*.la
-%{tde_tdelibdir}/ksim_*.so
-%{tde_libdir}/libksimcore.so.*
-%{tde_datadir}/apps/kicker/extensions/ksim.desktop
-%{tde_datadir}/apps/ksim/
-%{tde_tdedocdir}/HTML/en/ksim/
-%{tde_datadir}/icons/crystalsvg/*/apps/ksim.png
-%{tde_datadir}/icons/crystalsvg/*/devices/ksim_cpu.png
-
-##########
-
-%package -n trinity-ktimer
-Summary:	Timer utility for Trinity
-Group:		Applications/Utilities
-
-%description -n trinity-ktimer
-This is a timer application for TDE. It allows you to execute commands after
-a certain amount of time. It supports looping commands as well as delayed
-command execution.
-
-%files -n trinity-ktimer
-%defattr(-,root,root,-)
-%{tde_bindir}/ktimer
-%{tde_tdeappdir}/ktimer.desktop
-%{tde_datadir}/icons/hicolor/*/apps/ktimer.png
-%{tde_tdedocdir}/HTML/en/ktimer/
-
-##########
-
-%package -n trinity-tdewalletmanager
-Summary:	Wallet manager for Trinity
-Group:		Applications/Utilities
-
-Obsoletes:	trinity-kwalletmanager < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kwalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdewalletmanager
-This program keeps various wallets for any kind of data that the user can
-store encrypted with passwords and can also serve as a password manager that
-keeps a master password to all wallets.
-
-%files -n trinity-tdewalletmanager
-%defattr(-,root,root,-)
-%{tde_bindir}/tdewalletmanager
-%{tde_tdelibdir}/kcm_tdewallet.la
-%{tde_tdelibdir}/kcm_tdewallet.so
-%{tde_tdeappdir}/tdewalletconfig.desktop
-%{tde_tdeappdir}/tdewalletmanager.desktop
-%{tde_tdeappdir}/tdewalletmanager-tdewalletd.desktop
-%{tde_datadir}/apps/tdewalletmanager/
-%{tde_datadir}/icons/hicolor/*/apps/tdewalletmanager.png
-%{tde_datadir}/services/tdewallet_config.desktop
-%{tde_datadir}/services/tdewalletmanager_show.desktop
-%{tde_tdedocdir}/HTML/en/tdewallet/
-
-##########
-
-%package -n trinity-superkaramba
-Summary:	A program based on karamba improving the eyecandy of TDE
-Group:		Applications/Utilities
-
-%description -n trinity-superkaramba
-SuperKaramba is a tool based on karamba that allows anyone to easily create
-and run little interactive widgets on a TDE desktop. Widgets are defined in a
-simple text file and can be augmented with Python code to make them
-interactive.
-
-Here are just some examples of the things that can be done:
-* Display system information such as CPU Usage, MP3 playing, etc.
-* Create cool custom toolbars that work any way imaginable.
-* Create little games or virtual pets that live on your desktop.
-* Display information from the internet, such as weather and headlines.
-
-%files -n trinity-superkaramba
-%defattr(-,root,root,-)
-%{tde_bindir}/superkaramba
-%{tde_tdeappdir}/superkaramba.desktop
-%{tde_datadir}/apps/superkaramba/
-%{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png
-%{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png
-%{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz
-%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-%{tde_datadir}/mimelnk/application/x-superkaramba.desktop
-%{tde_tdedocdir}/HTML/en/superkaramba/
-
-##########
-
-%if 0%{?build_tdefilereplace}
-
-%package -n trinity-tdefilereplace
-Summary:	Batch search-and-replace component for TDE
-Group:		Applications/Utilities
-
-Obsoletes:	trinity-kfilereplace < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kfilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdefilereplace
-TDEFileReplace is an embedded component for TDE that acts as a batch
-search-and-replace tool. It allows you to replace one expression with
-another in many files at once.
-
-Note that at the moment TDEFileReplace does not come as a standalone
-application.
-
-This package is part of Trinity, as a component of the TDE utilities module.
-
-%files -n trinity-tdefilereplace
-%defattr(-,root,root,-)
-%{tde_bindir}/tdefilereplace
-%{tde_tdelibdir}/libtdefilereplacepart.la
-%{tde_tdelibdir}/libtdefilereplacepart.so
-%{tde_tdeappdir}/tdefilereplace.desktop
-%{tde_datadir}/apps/tdefilereplace/
-%{tde_datadir}/apps/tdefilereplacepart/
-%{tde_tdedocdir}/HTML/en/tdefilereplace/
-%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
-%{tde_datadir}/services/tdefilereplacepart.desktop
-
-%endif
-
-##########
-
-# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
-%package devel
-Summary:	Development files for %{name} 
-Group:		Development/Libraries
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-tdelibs-devel
-
-Obsoletes:	trinity-kdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	tdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	tdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains the development files for tdeutils.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*
-%if 0%{?build_klaptopdaemon}
-%{tde_libdir}/libkcmlaptop.la
-%{tde_libdir}/libkcmlaptop.so
-%endif
-%{tde_libdir}/libtdeinit_ark.la
-%{tde_libdir}/libtdeinit_irkick.la
-%{tde_libdir}/libtdeinit_kcalc.la
-%{tde_libdir}/libtdeinit_kedit.la
-%{tde_libdir}/libkmilo.la
-%{tde_libdir}/libkmilo.so
-%{tde_libdir}/libkregexpeditorcommon.la
-%{tde_libdir}/libkregexpeditorcommon.so
-%{tde_libdir}/libksimcore.la
-%{tde_libdir}/libksimcore.so
-%{tde_libdir}/libkhexeditcommon.la
-%{tde_libdir}/libkhexeditcommon.so
-%{tde_datadir}/cmake/libksimcore.cmake
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-%if 0%{?rhel} == 5
-# Reverts some older Python stuff
-%__sed -i "superkaramba/src/"*".cpp" \
-       -e "s|PyBytes_CheckExact|PyString_CheckExact|g" \
-       -e "s|PyBytes_AsString|PyString_AsString|g" \
-       -e "s|PyBytes_FromString|PyString_FromString|g" \
-%endif
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
-  export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-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}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DBIN_INSTALL_DIR="%{tde_bindir}" \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DDOC_INSTALL_DIR="%{tde_docdir}" \
-  -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-  -DLIB_INSTALL_DIR="%{tde_libdir}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  \
-  -DWITH_DPMS=ON \
-  %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
-  -DWITH_ASUS=ON \
-  -DWITH_POWERBOOK=OFF \
-  -DWITH_POWERBOOK2=OFF \
-  -DWITH_VAIO=ON \
-  -DWITH_THINKPAD=ON \
-  -DWITH_I8K=ON \
-  -DWITH_SNMP=ON \
-  -DWITH_SENSORS=ON \
-  -DWITH_XMMS=ON \
-  -DWITH_TDENEWSTUFF=ON \
-  -DBUILD_ALL=ON \
-  %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
-  ..
-   
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%if 0%{?build_klaptopdaemon}
-### Use consolehelper for 'klaptop_acpi_helper'
-%if 0%{?with_consolehelper}
-# Install configuration files
-%__install -p -D -m 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper"
-%__install -p -D -m 644 "%{SOURCE2}" "%{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper"
-# Moves the actual binary from 'bin' to 'sbin'
-%__mkdir_p "%{buildroot}%{tde_sbindir}" "%{buildroot}%{_sbindir}"
-%__mv "%{buildroot}%{tde_bindir}/klaptop_acpi_helper" "%{buildroot}%{tde_sbindir}"
-# Links to consolehelper
-%__ln_s "%{_bindir}/consolehelper" "%{buildroot}%{tde_bindir}/klaptop_acpi_helper"
-# Put another symlink under '/usr', otherwise consolehelper does not work
-%if "%{tde_prefix}" != "/usr"
-%__ln_s "%{tde_sbindir}/klaptop_acpi_helper" "%{?buildroot}%{_sbindir}/klaptop_acpi_helper"
-%endif
-%endif
-
-# klaptop settings file
-%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_confdir}/kcmlaptoprc"
-
-%else
-
-# Klaptop's documentation is installed even if we did not build the program ...
-%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
-%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
-%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/laptop/
-%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/
-
-%endif
-
-# Fix desktop shortcut location
-if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
-  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
-  %__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
-  %__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
-fi
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file KEdit              Utility TextEditor
-%suse_update_desktop_file superkaramba       Utility DesktopUtility
-%suse_update_desktop_file KCharSelect        Utility Accessibility
-%suse_update_desktop_file khexedit           Utility Editor
-%suse_update_desktop_file Kjots              Utility TimeUtility
-%suse_update_desktop_file ktimer             Utility TimeUtility
-%suse_update_desktop_file kwikdisk           System  Applet
-%suse_update_desktop_file kdf                System  Filesystem
-%suse_update_desktop_file ark                System  Archiving
-%suse_update_desktop_file kcalc              Utility Calculator
-%suse_update_desktop_file kgpg               Utility Security
-%suse_update_desktop_file irkick             Applet
-%suse_update_desktop_file tdewalletmanager   Applet
-%suse_update_desktop_file kregexpeditor      Utility Editor
-%suse_update_desktop_file kcmdf
-%suse_update_desktop_file kcmlirc
-%suse_update_desktop_file tdewalletconfig
-%suse_update_desktop_file thinkpad
-%suse_update_desktop_file kvaio
-%suse_update_desktop_file KFloppy            System  Filesystem
-%if 0%{?build_tdefilereplace}
-%suse_update_desktop_file -r tdefilereplace   System      FileManager
-%endif
-%endif
-
-# Icons from TDE Control Center should only be displayed in TDE
-for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
-  if grep -q "^Categories=.*X-TDE-settings" "${i}"; then
-    if ! grep -q "OnlyShowIn=TDE" "${i}" ; then
-      echo "OnlyShowIn=TDE;" >>"${i}"
-    fi
-  fi
-done
-
-# Other TDE-only apps
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/thinkpad.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmlirc.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kvaio.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcmdf.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/tdewalletconfig.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/khexedit.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kregexpeditor.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kgpg.desktop"
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/Kjots.desktop"
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf "%{?buildroot}"
-
-
-%changelog
diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/main/tdevelop/tdevelop.spec
deleted file mode 100644
index c8378f35e..000000000
--- a/redhat/main/tdevelop/tdevelop.spec
+++ /dev/null
@@ -1,675 +0,0 @@
-#
-# spec file for package tdevelop (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdevelop
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Integrated Development Environment for C++/C
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Group:		Development/Tools
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	%{name}-rpmlintrc
-
-Requires:	%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires:	tqt3-apps-devel >= 3.5.0
-BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
-
-Obsoletes:	trinity-kdevelop < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdevelop = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	gcc-c++
-BuildRequires:	fdupes
-BuildRequires:	desktop-file-utils
-BuildRequires:	make
-
-Requires:	make
-Requires:	perl
-Requires:	tqt3-designer >= 3.5.0
-Requires:	libtqt3-mt-devel >= 3.5.0
-Requires:	gettext
-Requires:	ctags
-
-
-# LIBIDN support
-BuildRequires:	libidn-devel
-
-# GAMIN support
-#  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_gamin 1
-BuildRequires:	gamin-devel
-%endif
-
-# PCRE support
-BuildRequires:	pcre-devel
-
-# DB5 support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 33
-BuildRequires:	libdb-devel
-
-%else
-# DB4 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-#BuildRequires:	%{_lib}db4.8-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	db4-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libdb-4_8-devel
-%endif
-%endif
-
-# FLEX support
-BuildRequires:	flex
-Requires: flex >= 2.5.4
-
-# SVN support
-BuildRequires:	subversion-devel
-
-# NEON support
-BuildRequires:	neon-devel
-
-# OPENLDAP support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	openldap-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	openldap2-devel
-%endif
-%if 0%{?rhel} == 5
-BuildRequires:	openldap24-libs-devel
-%endif
-
-# LIBACL support
-%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libacl-devel
-%endif
-
-# OPENSSL support
-BuildRequires:	openssl-devel
-
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python python2
-%else
-%global __python python2
-%endif
-
-
-%description
-The TDevelop Integrated Development Environment provides many features
-that developers need as well as providing a unified interface to programs
-like gdb, the C/C++ compiler, and make. TDevelop manages or provides:
-
-All development tools needed for C++ programming like Compiler,
-Linker, automake and autoconf; KAppWizard, which generates complete,
-ready-to-go sample applications; Classgenerator, for creating new
-classes and integrating them into the current project; File management
-for sources, headers, documentation etc. to be included in the
-project; The creation of User-Handbooks written with SGML and the
-automatic generation of HTML-output with the KDE look and feel;
-Automatic HTML-based API-documentation for your project's classes with
-cross-references to the used libraries; Internationalization support
-for your application, allowing translators to easily add their target
-language to a project;
-
-tdevelop also includes WYSIWYG (What you see is what you get)-creation
-of user interfaces with a built-in dialog editor; Debugging your
-application by integrating KDbg; Editing of project-specific pixmaps
-with KIconEdit; The inclusion of any other program you need for
-development by adding it to the "Tools"-menu according to your
-individual needs.
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/kdevassistant
-%{tde_bindir}/kdevdesigner
-%{tde_bindir}/tdevelop
-%{tde_bindir}/tdevelop-htdig
-%{tde_bindir}/kdevprj2kdevelop
-%{tde_bindir}/kdevprofileeditor
-%{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
-%config(noreplace) %{tde_confdir}/kdevassistantrc
-%config(noreplace) %{tde_confdir}/tdeveloprc
-%{tde_tdeappdir}/kdevassistant.desktop
-%{tde_tdeappdir}/kdevdesigner.desktop
-%{tde_tdeappdir}/tdevelop.desktop
-%{tde_tdeappdir}/tdevelop_c_cpp.desktop
-%{tde_tdeappdir}/tdevelop_kde_cpp.desktop
-%{tde_tdeappdir}/tdevelop_ruby.desktop
-%{tde_tdeappdir}/tdevelop_scripting.desktop
-%{tde_tdelibdir}/tdeio_chm.la
-%{tde_tdelibdir}/tdeio_chm.so
-%{tde_tdelibdir}/tdeio_csharpdoc.la
-%{tde_tdelibdir}/tdeio_csharpdoc.so
-%{tde_tdelibdir}/tdeio_perldoc.la
-%{tde_tdelibdir}/tdeio_perldoc.so
-%{tde_tdelibdir}/tdeio_pydoc.la
-%{tde_tdelibdir}/tdeio_pydoc.so
-%{tde_tdelibdir}/libdocchmplugin.la
-%{tde_tdelibdir}/libdocchmplugin.so
-%{tde_tdelibdir}/libdoccustomplugin.la
-%{tde_tdelibdir}/libdoccustomplugin.so
-%{tde_tdelibdir}/libdocdevhelpplugin.la
-%{tde_tdelibdir}/libdocdevhelpplugin.so
-%{tde_tdelibdir}/libdocdoxygenplugin.la
-%{tde_tdelibdir}/libdocdoxygenplugin.so
-%{tde_tdelibdir}/libdockdevtocplugin.la
-%{tde_tdelibdir}/libdockdevtocplugin.so
-%{tde_tdelibdir}/libdocqtplugin.la
-%{tde_tdelibdir}/libdocqtplugin.so
-%{tde_tdelibdir}/libkchmpart.la
-%{tde_tdelibdir}/libkchmpart.so
-%{tde_tdelibdir}/libkdevabbrev.la
-%{tde_tdelibdir}/libkdevabbrev.so
-%{tde_tdelibdir}/libkdevadaproject.la
-%{tde_tdelibdir}/libkdevadaproject.so
-%{tde_tdelibdir}/libkdevadasupport.la
-%{tde_tdelibdir}/libkdevadasupport.so
-%{tde_tdelibdir}/libkdevantproject.la
-%{tde_tdelibdir}/libkdevantproject.so
-%{tde_tdelibdir}/libkdevappview.la
-%{tde_tdelibdir}/libkdevappview.so
-%{tde_tdelibdir}/libkdevappwizard.la
-%{tde_tdelibdir}/libkdevappwizard.so
-%{tde_tdelibdir}/libkdevastyle.la
-%{tde_tdelibdir}/libkdevastyle.so
-%{tde_tdelibdir}/libkdevautoproject.la
-%{tde_tdelibdir}/libkdevautoproject.so
-%{tde_tdelibdir}/libkdevbashsupport.la
-%{tde_tdelibdir}/libkdevbashsupport.so
-%{tde_tdelibdir}/libkdevbookmarks.la
-%{tde_tdelibdir}/libkdevbookmarks.so
-%{tde_tdelibdir}/libkdevclassview.la
-%{tde_tdelibdir}/libkdevclassview.so
-%{tde_tdelibdir}/libkdevcppsupport.la
-%{tde_tdelibdir}/libkdevcppsupport.so
-%{tde_tdelibdir}/libkdevcsharpsupport.la
-%{tde_tdelibdir}/libkdevcsharpsupport.so
-%{tde_tdelibdir}/libkdevctags2.la
-%{tde_tdelibdir}/libkdevctags2.so
-%{tde_tdelibdir}/libkdevcustompcsimporter.la
-%{tde_tdelibdir}/libkdevcustompcsimporter.so
-%{tde_tdelibdir}/libkdevcustomproject.la
-%{tde_tdelibdir}/libkdevcustomproject.so
-%{tde_tdelibdir}/libkdevdccoptions.la
-%{tde_tdelibdir}/libkdevdccoptions.so
-%{tde_tdelibdir}/libkdevdebugger.la
-%{tde_tdelibdir}/libkdevdebugger.so
-%{tde_tdelibdir}/libkdevdesignerpart.la
-%{tde_tdelibdir}/libkdevdesignerpart.so
-%{tde_tdelibdir}/libkdevdiff.la
-%{tde_tdelibdir}/libkdevdiff.so
-%{tde_tdelibdir}/libkdevdistpart.la
-%{tde_tdelibdir}/libkdevdistpart.so
-%{tde_tdelibdir}/libkdevdocumentation.la
-%{tde_tdelibdir}/libkdevdocumentation.so
-%{tde_tdelibdir}/libkdevdoxygen.la
-%{tde_tdelibdir}/libkdevdoxygen.so
-%{tde_tdelibdir}/libkdeveditorchooser.la
-%{tde_tdelibdir}/libkdeveditorchooser.so
-%{tde_tdelibdir}/libkdevfilecreate.la
-%{tde_tdelibdir}/libkdevfilecreate.so
-%{tde_tdelibdir}/libkdevfilegroups.la
-%{tde_tdelibdir}/libkdevfilegroups.so
-%{tde_tdelibdir}/libkdevfilelist.la
-%{tde_tdelibdir}/libkdevfilelist.so
-%{tde_tdelibdir}/libkdevfileselector.la
-%{tde_tdelibdir}/libkdevfileselector.so
-%{tde_tdelibdir}/libkdevfileview.la
-%{tde_tdelibdir}/libkdevfileview.so
-%{tde_tdelibdir}/libkdevfilter.la
-%{tde_tdelibdir}/libkdevfilter.so
-%{tde_tdelibdir}/libkdevfortransupport.la
-%{tde_tdelibdir}/libkdevfortransupport.so
-%{tde_tdelibdir}/libkdevfpcoptions.la
-%{tde_tdelibdir}/libkdevfpcoptions.so
-%{tde_tdelibdir}/libkdevfullscreen.la
-%{tde_tdelibdir}/libkdevfullscreen.so
-%{tde_tdelibdir}/libkdevgccoptions.la
-%{tde_tdelibdir}/libkdevgccoptions.so
-%{tde_tdelibdir}/libkdevgrepview.la
-%{tde_tdelibdir}/libkdevgrepview.so
-%{tde_tdelibdir}/libkdevjavasupport.la
-%{tde_tdelibdir}/libkdevjavasupport.so
-%{tde_tdelibdir}/libkdevtdelibsimporter.la
-%{tde_tdelibdir}/libkdevtdelibsimporter.so
-%{tde_tdelibdir}/libkdevkonsoleview.la
-%{tde_tdelibdir}/libkdevkonsoleview.so
-%{tde_tdelibdir}/libkdevmakeview.la
-%{tde_tdelibdir}/libkdevmakeview.so
-%{tde_tdelibdir}/libkdevopenwith.la
-%{tde_tdelibdir}/libkdevopenwith.so
-%{tde_tdelibdir}/libkdevpartexplorer.la
-%{tde_tdelibdir}/libkdevpartexplorer.so
-%{tde_tdelibdir}/libkdevpascalproject.la
-%{tde_tdelibdir}/libkdevpascalproject.so
-%{tde_tdelibdir}/libkdevpascalsupport.la
-%{tde_tdelibdir}/libkdevpascalsupport.so
-%{tde_tdelibdir}/libkdevperlsupport.la
-%{tde_tdelibdir}/libkdevperlsupport.so
-%{tde_tdelibdir}/libkdevpgioptions.la
-%{tde_tdelibdir}/libkdevpgioptions.so
-%{tde_tdelibdir}/libkdevphpsupport.la
-%{tde_tdelibdir}/libkdevphpsupport.so
-%{tde_tdelibdir}/libkdevpythonsupport.la
-%{tde_tdelibdir}/libkdevpythonsupport.so
-%{tde_tdelibdir}/libkdevqt4importer.la
-%{tde_tdelibdir}/libkdevqt4importer.so
-%{tde_tdelibdir}/libkdevqtimporter.la
-%{tde_tdelibdir}/libkdevqtimporter.so
-%{tde_tdelibdir}/libkdevquickopen.la
-%{tde_tdelibdir}/libkdevquickopen.so
-%{tde_tdelibdir}/libkdevrbdebugger.la
-%{tde_tdelibdir}/libkdevrbdebugger.so
-%{tde_tdelibdir}/libkdevregexptest.la
-%{tde_tdelibdir}/libkdevregexptest.so
-%{tde_tdelibdir}/libkdevreplace.la
-%{tde_tdelibdir}/libkdevreplace.so
-%{tde_tdelibdir}/libkdevrubysupport.la
-%{tde_tdelibdir}/libkdevrubysupport.so
-%{tde_tdelibdir}/libkdevscripting.la
-%{tde_tdelibdir}/libkdevscripting.so
-%{tde_tdelibdir}/libkdevscriptproject.la
-%{tde_tdelibdir}/libkdevscriptproject.so
-%{tde_tdelibdir}/libkdevsnippet.la
-%{tde_tdelibdir}/libkdevsnippet.so
-%{tde_tdelibdir}/libkdevsqlsupport.la
-%{tde_tdelibdir}/libkdevsqlsupport.so
-%{tde_tdelibdir}/libkdevtexttools.la
-%{tde_tdelibdir}/libkdevtexttools.so
-%{tde_tdelibdir}/libkdevtipofday.la
-%{tde_tdelibdir}/libkdevtipofday.so
-%{tde_tdelibdir}/libkdevtools.la
-%{tde_tdelibdir}/libkdevtools.so
-%{tde_tdelibdir}/libkdevtrollproject.la
-%{tde_tdelibdir}/libkdevtrollproject.so
-%{tde_tdelibdir}/libkdevuichooser.la
-%{tde_tdelibdir}/libkdevuichooser.so
-%{tde_tdelibdir}/libkdevvalgrind.la
-%{tde_tdelibdir}/libkdevvalgrind.so
-%{tde_tdelibdir}/libkdevvcsmanager.la
-%{tde_tdelibdir}/libkdevvcsmanager.so
-%{tde_datadir}/apps/tdeconf_update/
-%{tde_datadir}/apps/kdevabbrev/
-%{tde_datadir}/apps/kdevadaproject/
-%{tde_datadir}/apps/kdevadasupport/
-%{tde_datadir}/apps/kdevantproject/
-%{tde_datadir}/apps/kdevappoutputview/
-%{tde_datadir}/apps/kdevappwizard/
-%{tde_datadir}/apps/kdevassistant/
-%{tde_datadir}/apps/kdevastyle/
-%{tde_datadir}/apps/kdevautoproject/
-%{tde_datadir}/apps/kdevbashsupport/
-%{tde_datadir}/apps/kdevclassview/
-%{tde_datadir}/apps/kdevcppsupport/
-%{tde_datadir}/icons/hicolor/*/actions/breakpoint_add.png
-%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete.png
-%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete_all.png
-%{tde_datadir}/icons/hicolor/*/actions/breakpoint_edit.png
-%{tde_datadir}/icons/hicolor/*/actions/ktip.png
-%{tde_datadir}/icons/hicolor/*/apps/kdevassistant.png
-%{tde_datadir}/icons/hicolor/*/apps/kdevdesigner.png
-%{tde_datadir}/icons/hicolor/*/apps/tdevelop.png
-%{tde_datadir}/icons/locolor/*/actions/tdevelop_tip.png
-%{tde_datadir}/mimelnk/application/x-tdevelop.desktop
-%{tde_datadir}/services/chm.protocol
-%{tde_datadir}/services/csharpdoc.protocol
-%{tde_datadir}/services/docchmplugin.desktop
-%{tde_datadir}/services/doccustomplugin.desktop
-%{tde_datadir}/services/docdevhelpplugin.desktop
-%{tde_datadir}/services/docdoxygenplugin.desktop
-%{tde_datadir}/services/dockdevtocplugin.desktop
-%{tde_datadir}/services/docqtplugin.desktop
-%{tde_datadir}/services/kchmpart.desktop
-%{tde_datadir}/services/kdevabbrev.desktop
-%{tde_datadir}/services/kdevadaproject.desktop
-%{tde_datadir}/services/kdevadasupport.desktop
-%{tde_datadir}/services/kdevantproject.desktop
-%{tde_datadir}/services/kdevappoutputview.desktop
-%{tde_datadir}/services/kdevappwizard.desktop
-%{tde_datadir}/services/kdevastyle.desktop
-%{tde_datadir}/services/kdevautoproject.desktop
-%{tde_datadir}/services/kdevbashsupport.desktop
-%{tde_datadir}/services/kdevbookmarks.desktop
-%{tde_datadir}/services/kdevclassview.desktop
-%{tde_datadir}/services/kdevcppsupport.desktop
-%{tde_datadir}/services/kdevcsharpsupport.desktop
-%{tde_datadir}/services/kdevcsupport.desktop
-%{tde_datadir}/services/kdevctags2.desktop
-%{tde_datadir}/services/kdevcustomproject.desktop
-%{tde_datadir}/services/kdevdccoptions.desktop
-%{tde_datadir}/services/kdevdebugger.desktop
-%{tde_datadir}/services/kdevdesigner_part.desktop
-%{tde_datadir}/services/kdevdiff.desktop
-%{tde_datadir}/services/kdevdistpart.desktop
-%{tde_datadir}/services/kdevdocumentation.desktop
-%{tde_datadir}/services/kdevdoxygen.desktop
-%{tde_datadir}/services/kdeveditorchooser.desktop
-%{tde_datadir}/services/kdevfilecreate.desktop
-%{tde_datadir}/services/kdevfilegroups.desktop
-%{tde_datadir}/services/kdevfilelist.desktop
-%{tde_datadir}/services/kdevfileselector.desktop
-%{tde_datadir}/services/kdevfileview.desktop
-%{tde_datadir}/services/kdevfilter.desktop
-%{tde_datadir}/services/kdevfortransupport.desktop
-%{tde_datadir}/services/kdevfpcoptions.desktop
-%{tde_datadir}/services/kdevfullscreen.desktop
-%{tde_datadir}/services/kdevg77options.desktop
-%{tde_datadir}/services/kdevgccoptions.desktop
-%{tde_datadir}/services/kdevgppoptions.desktop
-%{tde_datadir}/services/kdevgrepview.desktop
-%{tde_datadir}/services/kdevjavasupport.desktop
-%{tde_datadir}/services/kdevtdeautoproject.desktop
-%{tde_datadir}/services/kdevtdelibsimporter.desktop
-%{tde_datadir}/services/kdevkonsoleview.desktop
-%{tde_datadir}/services/kdevmakeview.desktop
-%{tde_datadir}/services/kdevopenwith.desktop
-%{tde_datadir}/services/kdevpartexplorer.desktop
-%{tde_datadir}/services/kdevpascalproject.desktop
-%{tde_datadir}/services/kdevpascalsupport.desktop
-%{tde_datadir}/services/kdevpcscustomimporter.desktop
-%{tde_datadir}/services/kdevperlsupport.desktop
-%{tde_datadir}/services/kdevpgf77options.desktop
-%{tde_datadir}/services/kdevpghpfoptions.desktop
-%{tde_datadir}/services/kdevphpsupport.desktop
-%{tde_datadir}/services/kdevpythonsupport.desktop
-%{tde_datadir}/services/kdevqt4importer.desktop
-%{tde_datadir}/services/kdevqtimporter.desktop
-%{tde_datadir}/services/kdevquickopen.desktop
-%{tde_datadir}/services/kdevrbdebugger.desktop
-%{tde_datadir}/services/kdevregexptest.desktop
-%{tde_datadir}/services/kdevreplace.desktop
-%{tde_datadir}/services/kdevrubysupport.desktop
-%{tde_datadir}/services/kdevscripting.desktop
-%{tde_datadir}/services/kdevscriptproject.desktop
-%{tde_datadir}/services/kdevsnippet.desktop
-%{tde_datadir}/services/kdevsqlsupport.desktop
-%{tde_datadir}/services/kdevtexttools.desktop
-%{tde_datadir}/services/kdevtipofday.desktop
-%{tde_datadir}/services/kdevtmakeproject.desktop
-%{tde_datadir}/services/kdevtools.desktop
-%{tde_datadir}/services/kdevtrollproject.desktop
-%{tde_datadir}/services/kdevuichooser.desktop
-%{tde_datadir}/services/kdevvalgrind.desktop
-%{tde_datadir}/services/kdevvcsmanager.desktop
-%{tde_datadir}/services/perldoc.protocol
-%{tde_datadir}/services/pydoc.protocol
-%{tde_datadir}/servicetypes/tdevelopappfrontend.desktop
-%{tde_datadir}/servicetypes/tdevelopcodebrowserfrontend.desktop
-%{tde_datadir}/servicetypes/tdevelopcompileroptions.desktop
-%{tde_datadir}/servicetypes/tdevelopcreatefile.desktop
-%{tde_datadir}/servicetypes/tdevelopdifffrontend.desktop
-%{tde_datadir}/servicetypes/tdevelopdocumentationplugins.desktop
-%{tde_datadir}/servicetypes/tdeveloplanguagesupport.desktop
-%{tde_datadir}/servicetypes/tdevelopmakefrontend.desktop
-%{tde_datadir}/servicetypes/tdeveloppcsimporter.desktop
-%{tde_datadir}/servicetypes/tdevelopplugin.desktop
-%{tde_datadir}/servicetypes/tdevelopproject.desktop
-%{tde_datadir}/servicetypes/tdevelopquickopen.desktop
-%{tde_datadir}/servicetypes/tdevelopsourceformatter.desktop
-%{tde_datadir}/servicetypes/tdevelopvcsintegrator.desktop
-%{tde_datadir}/servicetypes/tdevelopversioncontrol.desktop
-%{tde_datadir}/apps/kdevcsharpsupport/
-%{tde_datadir}/apps/kdevctags2/
-%{tde_datadir}/apps/kdevcustomproject/
-%{tde_datadir}/apps/kdevdebugger/
-%{tde_datadir}/apps/kdevdesigner/
-%{tde_datadir}/apps/kdevdesignerpart/
-%{tde_datadir}/apps/kdevdiff/
-%{tde_datadir}/apps/kdevdistpart/
-%{tde_datadir}/apps/kdevdocumentation/
-%{tde_datadir}/apps/kdevdoxygen/
-%{tde_datadir}/apps/tdevelop/
-%{tde_datadir}/apps/kdevfilecreate/
-%{tde_datadir}/apps/kdevfilelist/
-%{tde_datadir}/apps/kdevfilter/
-%{tde_datadir}/apps/kdevfortransupport/
-%{tde_datadir}/apps/kdevfullscreen/
-%{tde_datadir}/apps/kdevgrepview/
-%{tde_datadir}/apps/kdevjavasupport/
-%{tde_datadir}/apps/kdevmakeview/
-%{tde_datadir}/apps/kdevpartexplorer/
-%{tde_datadir}/apps/kdevpascalproject/
-%{tde_datadir}/apps/kdevpascalsupport/
-%{tde_datadir}/apps/kdevperlsupport/
-%{tde_datadir}/apps/kdevphpsupport/
-%{tde_datadir}/apps/kdevpythonsupport/
-%{tde_datadir}/apps/kdevquickopen/
-%{tde_datadir}/apps/kdevrbdebugger/
-%{tde_datadir}/apps/kdevregexptest/
-%{tde_datadir}/apps/kdevreplace/
-%{tde_datadir}/apps/kdevrubysupport/
-%{tde_datadir}/apps/kdevscripting/
-%{tde_datadir}/apps/kdevscriptproject/
-%{tde_datadir}/apps/kdevsnippet/
-%{tde_datadir}/apps/kdevsqlsupport
-%{tde_datadir}/apps/kdevtipofday/
-%{tde_datadir}/apps/kdevtools/
-%{tde_datadir}/apps/kdevtrollproject/
-%{tde_datadir}/apps/kdevvalgrind/
-%{tde_datadir}/apps/tdeio_pydoc/
-%{tde_datadir}/desktop-directories/tde-development-tdevelop.directory
-%{tde_tdedocdir}/HTML/en/tdevelop/
-%{tde_libdir}/libd.so.0
-%{tde_libdir}/libd.so.0.0.0
-%{tde_libdir}/libkinterfacedesigner.so.0
-%{tde_libdir}/libkinterfacedesigner.so.0.0.0
-%{tde_tdelibdir}/libkdevvisualboyadvance.la
-%{tde_tdelibdir}/libkdevvisualboyadvance.so
-%{tde_datadir}/apps/kdevdesignerpart/pics/
-%{tde_datadir}/apps/kdevvisualboyadvance/
-%{tde_tdedocdir}/HTML/en/tde_app_devel/
-%{tde_datadir}/mimelnk/text/x-fortran.desktop
-%{tde_datadir}/services/kdevvisualboyadvance.desktop
-%{tde_tdedocdir}/HTML/en/kdevdesigner/
-
-##########
-
-%package devel
-Summary: Development files for %{name}
-Group:		Development/Libraries/Other
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-kdevelop-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdevelop-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains the development files for tdevelop.
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/lib*.so
-%{tde_libdir}/lib*.la
-%{tde_includedir}/*
-
-##########
-
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: trinity-tdelibs >= %{tde_version}
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:	trinity-kdevelop-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdevelop-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description libs
-This package contains the libraries needed for the tdevelop programs.
-
-%files libs
-%defattr(-,root,root,-)
-%{tde_libdir}/libdesignerintegration.so.0
-%{tde_libdir}/libdesignerintegration.so.0.0.0
-%{tde_libdir}/libdocumentation_interfaces.so.0
-%{tde_libdir}/libdocumentation_interfaces.so.0.0.0
-%{tde_libdir}/libgdbmi_parser.so.0
-%{tde_libdir}/libgdbmi_parser.so.0.0.0
-%{tde_libdir}/libkdevbuildbase.so.0
-%{tde_libdir}/libkdevbuildbase.so.0.0.0
-%{tde_libdir}/libkdevbuildtoolswidgets.so.0
-%{tde_libdir}/libkdevbuildtoolswidgets.so.0.0.0
-%{tde_libdir}/libkdevcatalog.so.0
-%{tde_libdir}/libkdevcatalog.so.0.0.0
-%{tde_libdir}/libkdevcppparser.so.0
-%{tde_libdir}/libkdevcppparser.so.0.0.0
-%{tde_libdir}/libtdevelop.so.1
-%{tde_libdir}/libtdevelop.so.1.0.0
-%{tde_libdir}/libkdevextras.so.0
-%{tde_libdir}/libkdevextras.so.0.0.0
-%{tde_libdir}/libkdevpropertyeditor.so.0
-%{tde_libdir}/libkdevpropertyeditor.so.0.0.0
-%{tde_libdir}/libkdevqmakeparser.so.0
-%{tde_libdir}/libkdevqmakeparser.so.0.0.0
-%{tde_libdir}/libkdevshell.so.0
-%{tde_libdir}/libkdevshell.so.0.0.0
-%{tde_libdir}/libkdevwidgets.so.0
-%{tde_libdir}/libkdevwidgets.so.0.0.0
-%{tde_libdir}/liblang_debugger.so.0
-%{tde_libdir}/liblang_debugger.so.0.0.0
-%{tde_libdir}/liblang_interfaces.so.0
-%{tde_libdir}/liblang_interfaces.so.0.0.0
-%{tde_libdir}/libprofileengine.so.0
-%{tde_libdir}/libprofileengine.so.0.0.0
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# openldap 2.4 includes (CentOS 5)
-if [ -d "/usr/include/openldap24" ]; then
-  RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
-fi
-
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
-  \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  \
-  -DWITH_BUILDTOOL_ALL=ON \
-  -DWITH_LANGUAGE_ALL=ON \
-  -DWITH_VCS_ALL=OFF \
-  -DBUILD_ALL=ON \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-# Links duplicate files
-%fdupes "%{?buildroot}%{tde_datadir}"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/main/tdewebdev/tdewebdev.spec b/redhat/main/tdewebdev/tdewebdev.spec
deleted file mode 100644
index e3b6654d7..000000000
--- a/redhat/main/tdewebdev/tdewebdev.spec
+++ /dev/null
@@ -1,531 +0,0 @@
-#
-# spec file for package tdewebdev (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/
-#
-
-# BUILD WARNING:
-#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
-#  Having KDE libraries may cause FTBFS here !
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.10
-%endif
-%define tde_pkg tdewebdev
-%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_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Summary:	Web development applications
-Group:		Applications/Editors
-Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	http://download.sourceforge.net/quanta/css.tar.bz2
-Source2:	http://download.sourceforge.net/quanta/html.tar.bz2
-Source3:	http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
-Source4:	http://download.sourceforge.net/quanta/javascript.tar.bz2
-
-Source10:		%{name}-rpmlintrc
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	desktop-file-utils
-BuildRequires:	gcc-c++
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-BuildRequires:	libxslt-devel
-%if 0%{?rhel} == 4
-# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
-BuildRequires:	libgcrypt-devel
-%endif
-
-# PERL support
-BuildRequires:	perl
-
-# KXSLDBG requires libxml2
-#if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || ( 0%{?fedora} > 0 && %{?fedora} <= 17 ) || 0%{?suse_version}
-%define build_kxsldbg 1
-BuildRequires:	libxml2-devel
-#endif
-
-%if "%{?tde_version}" != "14.1.0"
-%define build_tdefilereplace 1
-%endif
-
-Obsoletes:	trinity-kdewebdev-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdewebdev-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes:	trinity-kdewebdev < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdewebdev = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires: trinity-quanta = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?build_kxsldbg:Requires: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release}}
-
-%description
-Web development applications, including:
-* kimagemapeditor: HTML image map editor
-* klinkstatus: link checker
-* kommander: visual dialog building tool
-* quanta+: web development
-%{?build_kxsldbg:* kxsldbg: xslt Debugger}
-
-%files
-%defattr(-,root,root,-)
-
-##########
-
-%package -n trinity-quanta
-Summary:	web development environment for TDE [Trinity]
-Group:		Applications/Development
-Requires:	trinity-tdefilereplace
-Requires:	trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release}
-#Requires:	trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release}
-#Requires:	trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	tidy
-
-%description -n trinity-quanta
-Quanta Plus is a web development environment for working with HTML
-and associated languages. It strives to be neutral and transparent
-to all markup languages, while supporting popular web-based scripting
-languages, CSS and other emerging W3C recommendations.
-
-Quanta Plus supports many external components, debuggers and other tools
-for web development, several of which are shipped with the TDE web
-development module.
-
-Quanta Plus is not in any way affiliated with any commercial versions
-of Quanta. The primary coders from the original team left the GPL'd
-version to produce a commercial product.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-quanta
-%defattr(-,root,root,-)
-%{tde_bindir}/quanta
-%{tde_tdelibdir}/quantadebuggerdbgp.la
-%{tde_tdelibdir}/quantadebuggerdbgp.so
-%{tde_tdelibdir}/quantadebuggergubed.la
-%{tde_tdelibdir}/quantadebuggergubed.so
-%{tde_tdeappdir}/quanta.desktop
-%{tde_datadir}/apps/kafkapart
-%{tde_datadir}/icons/hicolor/*/apps/quanta.png
-%{tde_datadir}/mimelnk/application/x-webprj.desktop
-%{tde_datadir}/services/quantadebuggerdbgp.desktop
-%{tde_datadir}/services/quantadebuggergubed.desktop
-%{tde_datadir}/services/quanta_preview_config.desktop
-%{tde_datadir}/servicetypes/quantadebugger.desktop
-%{tde_tdedocdir}/HTML/en/quanta/
-
-##########
-
-%package -n trinity-quanta-data
-Summary:	data files for Quanta Plus web development environment [Trinity]
-Group:		Applications/Development
-
-%description -n trinity-quanta-data
-This package contains architecture-independent data files for Quanta
-Plus, a web development environment for working with HTML and associated
-languages.
-
-See the quanta package for further information.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-quanta-data
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/quanta/
-
-##########
-
-%package -n trinity-kimagemapeditor
-Summary:	HTML image map editor for TDE
-Group:		Applications/Development
-
-%description -n trinity-kimagemapeditor
-KImageMapEditor is a tool that allows you to edit image maps in HTML
-files. As well as providing a standalone application, KImageMapEditor
-makes itself available as a KPart for embedding into larger applications.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-kimagemapeditor
-%defattr(-,root,root,-)
-%{tde_bindir}/kimagemapeditor
-%{tde_tdelibdir}/libkimagemapeditor.la
-%{tde_tdelibdir}/libkimagemapeditor.so
-%{tde_tdeappdir}/kimagemapeditor.desktop
-%{tde_datadir}/apps/kimagemapeditor/
-%{tde_datadir}/icons/hicolor/*/apps/kimagemapeditor.png
-%{tde_datadir}/icons/locolor/*/apps/kimagemapeditor.png
-%{tde_datadir}/services/kimagemapeditorpart.desktop
-%{tde_tdedocdir}/HTML/en/kimagemapeditor/
-
-##########
-
-%package -n trinity-klinkstatus
-Summary:	web link validity checker for TDE
-Group:		Applications/Development
-
-%description -n trinity-klinkstatus
-KLinkStatus is TDE's web link validity checker. It allows you to
-search internal and external links throughout your web site. Simply
-point it to a single page and choose the depth to search.
-
-You can also check local files, or files over ftp:, fish: or any other
-KIO protocols. For performance, links can be checked simultaneously.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-klinkstatus
-%defattr(-,root,root,-)
-%{tde_bindir}/klinkstatus
-%{tde_tdelibdir}/libklinkstatuspart.la
-%{tde_tdelibdir}/libklinkstatuspart.so
-%{tde_tdeappdir}/klinkstatus.desktop
-%{tde_datadir}/apps/klinkstatus/
-%{tde_datadir}/apps/klinkstatuspart/
-%{tde_datadir}/config.kcfg/klinkstatus.kcfg
-%{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png
-%{tde_datadir}/services/klinkstatus_part.desktop
-%{tde_tdedocdir}/HTML/en/klinkstatus/
-
-##########
-
-%package -n trinity-kommander
-Summary:	visual dialog builder and executor tool [Trinity]
-Group:		Applications/Development
-Requires:	gettext
-
-%description -n trinity-kommander
-Kommander is a visual dialog building tool whose primary objective is
-to create as much functionality as possible without using any scripting
-language.
-
-More specifically, Kommander is a set of tools that allow you to create
-dynamic GUI dialogs that generate, based on their state, a piece of
-text. The piece of text can be a command line to a program, any piece
-of code, business documents that contain a lot of repetitious or
-templated text and so on.
-
-The resulting generated text can then be executed as a command line
-program (hence the name "Kommander"), written to a file, passed to a
-script for extended processing, and literally anything else you can
-think of. And you aren't required to write a single line of code!
-
-As well as building dialogs, Kommander may be expanded to create full
-mainwindow applications.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-kommander
-%defattr(-,root,root,-)
-%{tde_bindir}/kmdr-editor
-%{tde_bindir}/kmdr-executor
-%{tde_bindir}/kmdr-plugins
-%{tde_libdir}/libkommanderplugin.so.*
-%{tde_libdir}/libkommanderwidgets.la
-%{tde_libdir}/libkommanderwidget.so.*
-%{tde_libdir}/libkommanderwidgets.so.*
-%{tde_tdeappdir}/kmdr-editor.desktop
-%{tde_datadir}/applnk/.hidden/kmdr-executor.desktop
-%{tde_datadir}/apps/katepart/syntax/kommander.xml
-%{tde_tdedocdir}/HTML/en/kommander/
-%{tde_datadir}/icons/crystalsvg/*/apps/kommander.png
-%{tde_datadir}/icons/hicolor/*/apps/kommander.png
-%{tde_datadir}/mimelnk/application/x-kommander.desktop
-%{tde_tdelibdir}/libkommander_part.so
-%{tde_tdelibdir}/libkommander_part.la
-%{tde_datadir}/apps/kommander/
-%{tde_datadir}/apps/kmdr-editor/
-%{tde_datadir}/apps/katepart/syntax/kommander-new.xml
-%{tde_datadir}/apps/tdevappwizard/
-%{tde_datadir}/services/kommander_part.desktop
-
-##########
-
-%package -n trinity-kommander-devel
-Summary:	development files for Kommander [Trinity]
-Group:		Development/Libraries
-Requires:	trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-kommander-devel
-This package contains the headers and other development files for
-building plugins or otherwise extending Kommander.
-
-Kommander is a visual dialog building tool whose primary objective is
-to create as much functionality as possible without using any scripting
-language.
-
-See the kommander package for further information.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-kommander-devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkommanderplugin.la
-%{tde_libdir}/libkommanderplugin.so
-%{tde_libdir}/libkommanderwidget.la
-%{tde_libdir}/libkommanderwidget.so
-%{tde_libdir}/libkommanderwidgets.so
-%{tde_tdeincludedir}/kommander*
-%{tde_tdeincludedir}/specials.h
-
-##########
-
-%if 0%{?build_kxsldbg}
-
-%package -n trinity-kxsldbg
-Summary:	graphical XSLT debugger for TDE [Trinity]
-Group:		Applications/Development
-
-%description -n trinity-kxsldbg
-KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
-interface as well as a text-based debugger. KXSLDbg can be run as a
-standalone application or as an embedded TDE part.
-
-XSLT is an XML language for defining transformations of XML files from
-XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
-using standard XSLT stylesheets.
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-kxsldbg
-%defattr(-,root,root,-)
-%{tde_bindir}/kxsldbg
-%{tde_bindir}/xsldbg
-%{tde_tdelibdir}/libkxsldbgpart.la
-%{tde_tdelibdir}/libkxsldbgpart.so
-%{tde_tdeappdir}/kxsldbg.desktop
-%{tde_datadir}/applnk/.hidden/xsldbg.desktop
-%{tde_datadir}/apps/kxsldbg/
-%{tde_datadir}/apps/kxsldbgpart/
-%{tde_tdedocdir}/HTML/en/kxsldbg/
-%{tde_tdedocdir}/HTML/en/xsldbg/
-%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png
-%{tde_datadir}/icons/hicolor/*/actions/configure.png
-%{tde_datadir}/icons/hicolor/*/actions/system-log-out.png
-%{tde_datadir}/icons/hicolor/*/actions/system-run.png
-%{tde_datadir}/icons/hicolor/*/actions/hash.png
-%{tde_datadir}/icons/hicolor/*/actions/mark.png
-%{tde_datadir}/icons/hicolor/*/actions/next.png
-%{tde_datadir}/icons/hicolor/*/actions/step.png
-%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png
-%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png
-%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png
-%{tde_datadir}/services/kxsldbg_part.desktop
-
-%endif
-
-##########
-
-%if 0%{?build_tdefilereplace}
-
-%package -n trinity-tdefilereplace
-Summary:	Batch search-and-replace component for TDE
-Group:		Applications/Utilities
-
-Obsoletes:	trinity-kfilereplace < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kfilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n trinity-tdefilereplace
-TDEFileReplace is an embedded component for TDE that acts as a batch
-search-and-replace tool. It allows you to replace one expression with
-another in many files at once.
-
-Note that at the moment TDEFileReplace does not come as a standalone
-application.
-
-This package is part of Trinity, as a component of the TDE utilities module.
-
-%files -n trinity-tdefilereplace
-%defattr(-,root,root,-)
-%{tde_bindir}/tdefilereplace
-%{tde_tdelibdir}/libtdefilereplacepart.la
-%{tde_tdelibdir}/libtdefilereplacepart.so
-%{tde_tdeappdir}/tdefilereplace.desktop
-%{tde_datadir}/apps/tdefilereplace/
-%{tde_datadir}/apps/tdefilereplacepart/
-%{tde_tdedocdir}/HTML/en/tdefilereplace/
-%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
-%{tde_datadir}/services/tdefilereplacepart.desktop
-
-%endif
-
-##########
-
-%package devel
-Group: Development/Libraries
-Summary:	Header files and documentation for %{name} 
-
-Obsoletes:	trinity-kdewebdev-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:	trinity-kdewebdev-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Requires:	trinity-tdelibs-devel >= %{tde_version}
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:	trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-%{summary}.
-
-%files devel
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4
-
-%if 0%{?build_kxsldbg} == 0
-%__rm -rf kxsldbg/ doc/kxsldbg/ doc/xsldbg/
-%endif
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-# Warning: GCC visibility causes FTBFS [Bug #1285]
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-  --enable-editors \
-  --with-extra-includes=%{_includedir}/tqt
-
-
-# WTF hack for RHEL4
-%if 0%{?rhel} == 4
-mkdir  kommander/plugin/.libs/
-ln -s . kommander/plugin/.libs/.libs
-%endif
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-
-## package separately?  Why doesn't upstream include this? -- Rex
-# install docs
-for i in css html javascript ; do
-   pushd $i
-   ./install.sh <<EOF
-%{buildroot}%{tde_datadir}/apps/quanta/doc
-EOF
-   popd
-   rm -rf $i
-done
-cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r klinkstatus      Office WebDevelopment
-%if 0%{?build_kxsldbg}
-%suse_update_desktop_file -r kxsldbg          Office WebDevelopment
-%endif
-%suse_update_desktop_file -r kimagemapeditor  Office WebDevelopment
-%suse_update_desktop_file    kmdr-editor      Development GUIDesigner
-%suse_update_desktop_file    kmdr-executor    Development GUIDesigner
-%suse_update_desktop_file -r quanta           Office WebDevelopment
-%if 0%{?build_tdefilereplace}
-%suse_update_desktop_file -r tdefilereplace   System      FileManager
-%endif
-%endif
-
-# Adds missing icons in 'hicolor' theme
-%__mkdir_p %{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
-pushd %{buildroot}%{tde_datadir}/icons
-for i in {16,22,32,64,128}; do %__cp crystalsvg/"$i"x"$i"/apps/kommander.png  hicolor/"$i"x"$i"/apps/kommander.png  ;done
-popd
-
-# Unwanted icon
-%__rm -f "%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png"
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/ubuntu/_base/applications/development/kdbg/debian/docs b/ubuntu/_base/applications/development/kdbg/debian/docs
index d5aaf5213..8f287764a 100644
--- a/ubuntu/_base/applications/development/kdbg/debian/docs
+++ b/ubuntu/_base/applications/development/kdbg/debian/docs
@@ -1,3 +1,3 @@
 BUGS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/development/kdiff3/debian/docs b/ubuntu/_base/applications/development/kdiff3/debian/docs
index e845566c0..b43bf86b5 100644
--- a/ubuntu/_base/applications/development/kdiff3/debian/docs
+++ b/ubuntu/_base/applications/development/kdiff3/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/ubuntu/_base/applications/development/kpicosim/debian/docs b/ubuntu/_base/applications/development/kpicosim/debian/docs
index e845566c0..b43bf86b5 100644
--- a/ubuntu/_base/applications/development/kpicosim/debian/docs
+++ b/ubuntu/_base/applications/development/kpicosim/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/ubuntu/_base/applications/development/kscope/debian/docs b/ubuntu/_base/applications/development/kscope/debian/docs
index 1333ed77b..76c3076c9 100644
--- a/ubuntu/_base/applications/development/kscope/debian/docs
+++ b/ubuntu/_base/applications/development/kscope/debian/docs
@@ -1 +1,3 @@
+AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/ubuntu/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
- 
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
- 
- dnl generate the config header
diff --git a/ubuntu/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/ubuntu/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
-        KDE_USE_CLOSURE_TRUE="#"
-        KDE_USE_CLOSURE_FALSE=""
-        KDE_NO_UNDEFINED=""
--       case $host in 
--         *-*-linux-gnu)
--           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
--                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
--		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
--		[KDE_NO_UNDEFINED=""])],
--	    [KDE_NO_UNDEFINED=""])
--           ;;
--       esac
-   fi
-   AC_SUBST(KDE_USE_CLOSURE_TRUE)
-   AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/_base/applications/development/kscope/debian/patches/series b/ubuntu/_base/applications/development/kscope/debian/patches/series
index b8743ddd9..e69de29bb 100644
--- a/ubuntu/_base/applications/development/kscope/debian/patches/series
+++ b/ubuntu/_base/applications/development/kscope/debian/patches/series
@@ -1,2 +0,0 @@
-04_am_maintainer_mode.diff
-06_disable_no_undefined.diff
diff --git a/ubuntu/_base/applications/development/ktechlab/debian/docs b/ubuntu/_base/applications/development/ktechlab/debian/docs
index 724e08449..76c3076c9 100644
--- a/ubuntu/_base/applications/development/ktechlab/debian/docs
+++ b/ubuntu/_base/applications/development/ktechlab/debian/docs
@@ -1,2 +1,3 @@
-README
+AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/docs b/ubuntu/_base/applications/development/kxmleditor/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/development/kxmleditor/debian/docs
+++ b/ubuntu/_base/applications/development/kxmleditor/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/games/knights/debian/docs b/ubuntu/_base/applications/games/knights/debian/docs
index 724e08449..76c3076c9 100644
--- a/ubuntu/_base/applications/games/knights/debian/docs
+++ b/ubuntu/_base/applications/games/knights/debian/docs
@@ -1,2 +1,3 @@
-README
+AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/games/tdepacman/debian/docs b/ubuntu/_base/applications/games/tdepacman/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/games/tdepacman/debian/docs
+++ b/ubuntu/_base/applications/games/tdepacman/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/docs b/ubuntu/_base/applications/graphics/potracegui/debian/docs
index ba8894c15..648393dc3 100644
--- a/ubuntu/_base/applications/graphics/potracegui/debian/docs
+++ b/ubuntu/_base/applications/graphics/potracegui/debian/docs
@@ -1,2 +1,2 @@
-README
+README.md
 
diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/docs b/ubuntu/_base/applications/internet/kasablanca/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/internet/kasablanca/debian/docs
+++ b/ubuntu/_base/applications/internet/kasablanca/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/internet/kbiff/debian/docs b/ubuntu/_base/applications/internet/kbiff/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/internet/kbiff/debian/docs
+++ b/ubuntu/_base/applications/internet/kbiff/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/control b/ubuntu/_base/applications/internet/kftpgrabber/debian/control
index 8413b0e9b..832139e15 100644
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/control
+++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libssl-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kftp.org
 
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/docs b/ubuntu/_base/applications/internet/kftpgrabber/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/docs
+++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml b/ubuntu/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml
deleted file mode 100644
index ae9a1cc32..000000000
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/kftpgrabber.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY dhfirstname "<firstname>Fathi</firstname>">
-  <!ENTITY dhsurname   "<surname>Boudra</surname>">
-  <!ENTITY dhdate      "<date>mars 17, 2006</date>">
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>fboudra@free.fr</email>">
-  <!ENTITY dhusername  "Fathi Boudra">
-  <!ENTITY dhucpackage "<refentrytitle>kftpgrabber</refentrytitle>">
-  <!ENTITY dhpackage   "kftpgrabber">
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>ftp client for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable>options</replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&dhpackage;</command> is a graphical ftp client for TDE.
-    It supports technologies like ZeroConf, TLS/SSL and FXP</para>
-
-    <para>Some features:
-      <simplelist>
-        <member>- Multiple FTP sessions (tabs)</member>
-        <member>- Transfer queue</member>
-        <member>- TLS/SSL support for encrypted connections (implicit and explicit)</member>
-        <member>- Partial X509 certificate support for authentication</member>
-        <member>- File eXchange Protocol (FXP) transfer support</member>
-        <member>- One Time Password (OTP) support - S/Key, MD5, RMD160, SHA1</member>
-        <member>- Drag and Drop support</member>
-        <member>- Site bookmarking</member>
-        <member>- Encrypted bookmark support (password can be saved to TDEWallet)</member>
-        <member>- Distributed FTP support (PRET)</member>
-        <member>- SSCN and CPSV support</member>
-        <member>- Skiplist</member>
-        <member>- ZeroConf (aka. Rendezvous) support for local site discovery</member>
-        <member>- Bookmark sharing with Kopete contacts</member>
-        <member>- Bookmark import plugins</member>
-        <member>- Support for SFTP protocol</member>
-        <member>- Traffic graph</member>
-        <member>- Speed limiting</member>
-        <member>- Priority and skip lists</member>
-        <member>- Fast directory listings via control channel on servers that support STAT</member>
-        <member>- Integrated SFV checksum verifier</member>
-        <member>- Ability to view/edit remote files</member>
-        <member>- Exporting of directory listings into text files</member>
-        <member>- "On file exists" action matrix for Download, Upload and FXP transfers</member>
-      </simplelist>
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>All TDE and Qt programs accept some common command-line options.
-    <command>&dhpackage;</command> has no application-specific options.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show help about options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-qt</option>
-        </term>
-        <listitem>
-          <para>Show Qt specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-tde</option>
-        </term>
-        <listitem>
-          <para>Show TDE specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-all</option>
-        </term>
-        <listitem>
-          <para>Show all options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--author</option>
-        </term>
-        <listitem>
-          <para>Show author information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--license</option>
-        </term>
-        <listitem>
-          <para>Show license information</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/manpages b/ubuntu/_base/applications/internet/kftpgrabber/debian/manpages
deleted file mode 100644
index ac7779c7e..000000000
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-kftpgrabber.1
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/rules b/ubuntu/_base/applications/internet/kftpgrabber/debian/rules
index 8292bc38c..a6797f19a 100755
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/rules
+++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/rules
@@ -1,23 +1,17 @@
 #!/usr/bin/make -f
 
-# Currently is not possible to build with --enable-final
-DEB_BUILD_OPTIONS += noopt
-
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-build/kftpgrabber-trinity::
-	/usr/bin/docbook2x-man debian/kftpgrabber.xml
-
-binary-install/kftpgrabber-trinity::
-	install -D -p -m644 debian/kftpgrabber-trinity.lintian-overrides \
-	  debian/kftpgrabber-trinity/usr/share/lintian/overrides/kftpgrabber-trinity
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
-	rm -f kftpgrabber.1
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/watch b/ubuntu/_base/applications/internet/kftpgrabber/debian/watch
deleted file mode 100644
index a0f049d56..000000000
--- a/ubuntu/_base/applications/internet/kftpgrabber/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://www.kftp.org/misc/downloads/ /uploads/files/kftpgrabber-(.*)\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/internet/knmap/debian/docs b/ubuntu/_base/applications/internet/knmap/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/internet/knmap/debian/docs
+++ b/ubuntu/_base/applications/internet/knmap/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/docs b/ubuntu/_base/applications/internet/kopete-otr/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/internet/kopete-otr/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/docs b/ubuntu/_base/applications/internet/kshowmail/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/internet/kshowmail/debian/docs
+++ b/ubuntu/_base/applications/internet/kshowmail/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/docs b/ubuntu/_base/applications/internet/kstreamripper/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/internet/kstreamripper/debian/docs
+++ b/ubuntu/_base/applications/internet/kstreamripper/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/control b/ubuntu/_base/applications/internet/ktorrent/debian/control
index 65092ce74..160789e78 100644
--- a/ubuntu/_base/applications/internet/ktorrent/debian/control
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/control
@@ -2,7 +2,7 @@ Source: ktorrent-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktorrent-trinity
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook b/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
deleted file mode 100644
index 63a5fa185..000000000
--- a/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Mercatante</firstname>
-      <surname>Anthony</surname>
-      <email>tonio@ubuntu.com</email>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Anthony Mercatante</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2006-12-205</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>ktorrent</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>ktorrent</refname>
-    <refpurpose>BitTorrent client for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>ktorrent</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      BitTorrent client for TDE.
-    </para>
-    <para>
-      KTorrent is a BitTorrent program for TDE. Its features include speed capping (both down and up), integrated searching, UDP tracker support, preview of certain file types (video and audio) and integration into the TDE Panel enabling background downloading.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options. ktorrent has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to ktorrent it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Anthony Mercatante
-      <email>tonio@ubuntu.com</email> for the
-      <productname>Debian</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
-
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/rules b/ubuntu/_base/applications/internet/ktorrent/debian/rules
index a90794996..4ad6f5c28 100755
--- a/ubuntu/_base/applications/internet/ktorrent/debian/rules
+++ b/ubuntu/_base/applications/internet/ktorrent/debian/rules
@@ -13,9 +13,3 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-build/ktorrent-trinity::
-	docbook2x-man debian/ktorrent.1.docbook
-
-clean::
-	rm -f ktorrent.1
diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/watch b/ubuntu/_base/applications/internet/ktorrent/debian/watch
deleted file mode 100644
index 0262eb3c5..000000000
--- a/ubuntu/_base/applications/internet/ktorrent/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://ktorrent.org/downloads/(^2\.[\d\.]+)/ktorrent-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/docs b/ubuntu/_base/applications/internet/kvpnc/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/internet/kvpnc/debian/docs
+++ b/ubuntu/_base/applications/internet/kvpnc/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/internet/tork/debian/docs b/ubuntu/_base/applications/internet/tork/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/internet/tork/debian/docs
+++ b/ubuntu/_base/applications/internet/tork/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
index 9737d93a4..38f031651 100644
--- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
+++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
@@ -1,2 +1,2 @@
 INSTALL
-README
+README.md
diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/docs b/ubuntu/_base/applications/misc/kcmldap/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/ubuntu/_base/applications/misc/kcmldap/debian/docs
+++ b/ubuntu/_base/applications/misc/kcmldap/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 INSTALL
-README
+README.md
diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/docs b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/docs
+++ b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 INSTALL
-README
+README.md
diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/docs b/ubuntu/_base/applications/misc/kcmldapmanager/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/docs
+++ b/ubuntu/_base/applications/misc/kcmldapmanager/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 INSTALL
-README
+README.md
diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/docs b/ubuntu/_base/applications/misc/kerberostray/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/misc/kerberostray/debian/docs
+++ b/ubuntu/_base/applications/misc/kerberostray/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
index 8c3677c1a..28bc4ff13 100644
--- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
+++ b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
@@ -1,6 +1,7 @@
 debian/tmp/opt/trinity/share/apps
 debian/tmp/opt/trinity/share/icons
 debian/tmp/opt/trinity/share/locale
+debian/tmp/opt/trinity/share/man/man1/krecipes.1
 debian/tmp/opt/trinity/share/mimelnk
 
 debian/krecipes.xpm	opt/trinity/share/pixmaps/
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
deleted file mode 100644
index 196cdc430..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/krecipes.1
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1 b/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1
deleted file mode 100644
index aaf56f777..000000000
--- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1
+++ /dev/null
@@ -1,187 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KRECIPES 1 "May 2009"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-Krecipes \- The TDE Cookbook
-.SH SYNOPSIS
-.B krecipes
-[Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-.B Krecipes
-is a program that lets you to manage your recipes, create shopping
-lists, choose a recipe based on available ingredients and plan your
-menu/diet in advance.
-.PP
-This manual page briefly describes its command line options.
-.SH OPTIONS
-This program follows the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-.TP
-.B \-\-convert-sqlite3
-Convert the current SQLite 2.x database to SQLite 3 and exit
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS Qt options
-.TP
-.B \-\-display <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color map on an 8-bit
-display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color cube on an 8-bit
-display, if the application is using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb
-running under a debugger can cause an implicit \-nograb, use \-dograb
-to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an application palette (light
-and dark shades are calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on an 8\-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible values are onthespot,
-overthespot, offthespot and root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS TDE options
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget \- see man X for the
-argument format
-.TP
-.B \-\-nofork
-Don't run in the background.
-
-.SH FILES
-.TP
-.I ~/.trinity/share/config/krecipesrc
-.B Krecipes
-configuration file
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You
-can also enter the URL
-.BR help:/krecipes/
-directly into konqueror or you can run
-.BR "khelpcenter help:/krecipes/"
-from the command\-line.
-
-.SH AUTHORS
-.nf
-Jason Kivlighn <jkivlighn@gmail.com>
-.br
-Unai Garro <ugarro@users.sourceforge.net>
-.br
-Cyril Bosselut <bosselut@b1project.com>
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors
-directly.
-.PP
-This manual page was written by Matthias Julius <mdeb@julius-net.net>,
-for the Debian project (and may be used by others).  Permission is
-granted to copy, distribute and/or modify this document under the
-terms of the GNU General Public License, Version 2 or any later
-version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License
-version 2 can be found in /usr/share/common\-licenses/GPL\-2.
diff --git a/ubuntu/_base/applications/misc/krecipes/debian/rules b/ubuntu/_base/applications/misc/krecipes/debian/rules
index e3708987f..523611ff9 100755
--- a/ubuntu/_base/applications/misc/krecipes/debian/rules
+++ b/ubuntu/_base/applications/misc/krecipes/debian/rules
@@ -33,10 +33,6 @@ binary-install/krecipes-trinity::
 	install -p -D -m644 debian/$(cdbs_curpkg).lintian \
 		debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
 
-binary-install/krecipes-data-trinity::
-	dh_testdir
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
 clean::
 	dh_testdir
 	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
index 2be358a21..0dbd9f84e 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install
@@ -1,28 +1,32 @@
-debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
-debian/tmp/opt/trinity/share/services/amarokitpc.protocol
-debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
-debian/tmp/opt/trinity/share/services/amarokpcast.protocol
-debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
-debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop 
-debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la
-debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la
+debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so
+debian/tmp/opt/trinity/share/applications/tde/amarok.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop 
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop
+debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
+debian/tmp/opt/trinity/share/man/man1/amarokapp.1
+debian/tmp/opt/trinity/share/man/man1/amarokcollectionscanner.1
+debian/tmp/opt/trinity/share/man/man1/amarok_libvisual.1
+debian/tmp/opt/trinity/share/man/man1/amarok.1
+debian/tmp/opt/trinity/share/services/amarokitpc.protocol
+debian/tmp/opt/trinity/share/services/amaroklastfm.protocol
+debian/tmp/opt/trinity/share/services/amarokpcast.protocol
+debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop
+debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop
 
 #libkarma is not in MAIN yet
 #debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la
@@ -31,8 +35,6 @@ debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so
 debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.la
 debian/tmp/opt/trinity/lib/trinity/libamarok_mtp-mediadevice.so
 debian/tmp/opt/trinity/lib/ruby_lib/*           /opt/trinity/lib/ruby_lib/
-debian/tmp/opt/trinity/lib/libamarok.so.0
-debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
 debian/tmp/opt/trinity/bin/amarok
 debian/tmp/opt/trinity/bin/amarokapp
 debian/tmp/opt/trinity/bin/amarok_libvisual
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
deleted file mode 100644
index 8094eebb9..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/amarokapp-trinity.1
-debian/man/amarok-trinity.1
-debian/man/amarokcollectionscanner-trinity.1
-debian/man/amarok_libvisual-trinity.1
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control
index 8cd20b0ee..413da25f7 100644
--- a/ubuntu/_base/applications/multimedia/amarok/debian/control
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bzip2,
  tdelibs14-trinity-dev, tdebase-trinity-dev,
- libakode-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev,
+ libakode-dev, libxine2-dev | libxine-dev,
  libtag1-dev, libsqlite3-dev,
  default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
@@ -17,7 +17,7 @@ Homepage: http://amarok.kde.org
 
 Package: amarok-trinity
 Architecture: any
-Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
+Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engines-trinity, unzip, ${shlibs:Depends}
 Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser,
@@ -45,6 +45,16 @@ Description: versatile and easy to use audio player for Trinity
  Support for libvisual visualization plugins is also compiled in (you need 
  to have libvisual-0.4-plugins installed to be able to use it).
 
+Package: libamarok-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Breaks: amarok-trinity (<< 4:14.0.11~)
+Replaces: amarok-trinity (<< 4:14.0.11~)
+Description: base library for Amarok [Trinity]
+ This package contains base library needed for Amarok to run properly.
+ Therefore, unless you have 'amarok' package installed, you will hardly
+ find this package useful.
+
 Package: amarok-common-trinity
 Architecture: all
 Depends: ruby
@@ -72,7 +82,7 @@ Description: Amarok sidebar for konqueror [Trinity]
 Package: amarok-engines-trinity
 Architecture: all
 Depends: amarok-engine-xine-trinity (>= ${source:Version}) | amarok-engine-akode-trinity (>= ${source:Version})
-Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version}), amarok-engine-yauap-trinity (>= ${source:Version})
+Recommends: amarok-engine-xine-trinity (>= ${source:Version}), amarok-engine-akode-trinity (>= ${source:Version})
 Replaces: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
 Breaks: amarok-engines-kde3 (<< 4:14.0.0~), amarok-engines-trinity (<< 4:14.0.0~)
 Description: output engines for the Amarok music player [Trinity]
@@ -100,18 +110,6 @@ Description: xine engine for the Amarok audio player [Trinity]
  for some reason over the other engines (e.g., it is the lightest engine
  Dependency-wise).
 
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Replaces: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Breaks: amarok-engine-yauap-kde3 (<< 4:14.0.0~), amarok-engine-yauap-trinity (<< 4:14.0.0~)
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features 
- (like visualizations) might not be available while using this engine.
-
 Package: amarok-trinity-dbg
 Priority: extra
 Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/docs b/ubuntu/_base/applications/multimedia/amarok/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
new file mode 100644
index 000000000..69d47ff8d
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/libamarok-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libamarok.so.0
+debian/tmp/opt/trinity/lib/libamarok.so.0.0.0
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
deleted file mode 100644
index 821ec48c7..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Mar 2004" "Trinity Desktop Environment" "An audio player for TDE"
-.SH NAME
-amarok
-\- An audio player for TDE
-.SH SYNOPSIS
-amarok [Qt-options] [TDE-options] [URL(s)] 
-.SH DESCRIPTION
-amaroK is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'.
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'.
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-\-nograb, use \-\-dograb to override.
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging.
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font.
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color.
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color.
-.TP
-.B  \-\-name  <name>
-sets the application name.
-.TP
-.B  \-\-title  <title>
-sets the application title (caption).
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root.
-.TP
-.B  \-\-im  <XIM server>
-set XIM server.
-.TP
-.B  \-\-noxim  
-disable XIM.
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets.
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar.
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon.
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar.
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file.
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'.
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps.
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager.
-.TP
-.B  \-\-style  <style>
-sets the application GUI style.
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget.
-.SS 
-.SS Arguments:
-URL(s)                    Files/URLs to Open
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-previous  
-Skip backwards in playlist
-.TP
-.B \-p,  \-\-play  
-Start playing current playlist
-.TP
-.B \-s,  \-\-stop  
-Stop playback
-.TP
-.B  \-\-pause  
-Pause playback
-.TP
-.B \-f,  \-\-next  
-Skip forwards in playlist
-.SS 
-.SS Additional options:
-.TP
-.B \-e,  \-\-enqueue  
-Enqueue Files/URLs
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/amarok/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/amarok/'"
-from the command-line.
-.BR
-.SH AUTHORS
-.nf
-Christian Muehlhaeuser <chris@chris.de>
-.BR
-Mark Kretschmann <markey@web.de>
-.BR
-Max Howell <max.howell@methylblue.com>
-.BR
-Stanislav Karchebny <berk@upnet.ru>
-.BR
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.BR
-.SH OTHER
-This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian
-system (but may be used by others).
-.BR
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
deleted file mode 100644
index c932b9b0c..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1
+++ /dev/null
@@ -1,14 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok"
-.SH NAME
-amarok_libvisual \- LibVisual support utility for Amarok
-.SH SYNOPSIS
-amarok_libvisual
-.SH DESCRIPTION
-This is LibVisual support helper utility for Amarok. It's used internally by Amarok 
-itself when needed and is not supposed to be invoked manually by user.
-.SS 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
deleted file mode 100644
index 91ff8b6aa..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.\" Generated by kdemangen.pl and edited by hand
-.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for TDE"
-.SH NAME
-amarokapp
-\- A direct executable for Amarok.
-.SH SYNOPSIS
-amarokapp [Qt-options] [TDE-options] [URL(s)] 
-.SH DESCRIPTION
-Amarok is a multimedia player based on the soundserver-independent framework.
-There are many media players around these days, true. What's missing from most
-players is a user interface, that doesn't get in the way of the user.
-.P
-This is direct Amarok executable. The recommend way to run Amarok is using
-\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're
-debugging Amarok with gdb, valgrind or similar program, you will probably want to
-run it against this binary directly.
-.P
-\fBamarokapp(1)\fP takes the same command line options and arguments as
-\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP.
-.SH SEE ALSO
-amarok(1)
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
deleted file mode 100644
index c67cd917f..000000000
--- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius
-.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok"
-.SH NAME
-amarokcollectionscanner \- Collection Scanner for Amarok
-.SH SYNOPSIS
-amarokcollectionscanner [Qt\-options] [TDE\-options] Folder(s) 
-.SH DESCRIPTION
-This Amarok helper utility scans folder(s) given on the command line or
-restarts previous scan if \fB\-\-restart\fP option was given and writes a
-specially structured XML file to standard output with extensive information
-(including tags) about audio files it was able to find. XML file schema used
-by this utility is Amarok specific.
-.P
-You may find his utility useful if you need to retreive and/or display extended
-information about collection of audio files.
-.SH OPTIONS
-.SS
-.SS Arguments:
-Folder(s)                 Folders to scan
-.SS 
-.SS Options:
-.TP
-.B \-r,  \-\-recursive  
-Scan folders recursively
-.TP
-.B \-i,  \-\-incremental  
-Incremental Scan (modified folders only)
-.TP
-.B \-p,  \-\-importplaylists  
-Import playlist
-.TP
-.B \-s,  \-\-restart  
-Restart the scanner at last position, after a crash []
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SH AUTHORS
-Amarok Developers
-.SH OTHER
-This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian.
diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules
index fce2f7d4a..55c147b76 100755
--- a/ubuntu/_base/applications/multimedia/amarok/debian/rules
+++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules
@@ -15,4 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
  -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_YAUAP="OFF" \
  -DWITH_IFP="OFF"
diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/docs b/ubuntu/_base/applications/multimedia/codeine/debian/docs
new file mode 100644
index 000000000..6f7727790
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/codeine/debian/docs
@@ -0,0 +1,2 @@
+README.md
+TODO
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/multimedia/k3b-i18n/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/multimedia/k3b-i18n/debian/docs b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
index 440fce6c1..6a65ab1bb 100755
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
+++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/rules
@@ -2,16 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-
-# 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
+include debian/cdbs/debian-tde.mk
 
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/watch b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/watch
deleted file mode 100644
index cdaaf355a..000000000
--- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/k3b/k3b-i18n-([\d.]*).tar.bz2
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/control b/ubuntu/_base/applications/multimedia/k3b/debian/control
index d5bd13a60..8925b8328 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/control
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/control
@@ -5,8 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org>
 Build-Depends:
- cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build,
- tdelibs14-trinity-dev, libdbus-tqt-1-dev,
+ cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
  libdvdread-dev, libasound2-dev, lame, libmp3lame-dev,
  libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev,
  libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1 b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1
deleted file mode 100644
index 08ca27b5f..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1
+++ /dev/null
@@ -1,207 +0,0 @@
-.TH K3B "1" "December 2002" TDE "TDE Application"
-.SH NAME
-k3b \- TDE CD burning program
-.SH SYNOPSIS
-.B k3b
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B k3b
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-K3b is a CD burning program that has two aims:
-usability and as many features as possible.
-.P
-This program is part of the official TDE extra gear #1 module.
-.SH OPTIONS
-.SS "Arguments:"
-.TP
-File(s)
-file(s) to open
-.SS "General Options"
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Options:"
-.B \-\-datacd
-Create a new data CD project and add all given files
-.TP
-.B \-\-audiocd
-Create a new audio CD project and add all given files
-.TP
-.B \-\-videocd
-Create a new video CD project and add all given files
-.TP
-.B \-\-mixedcd
-Create a new mixed mode CD project and add all given files
-.TP
-.B \-\-emovixcd
-Create a new eMovix CD project and add all given files
-.TP
-.B \-\-datadvd
-Create a new data DVD project and add all given files
-.TP
-.B \-\-emovixdvd
-Create a new eMovix DVD project and add all given files
-.TP
-.B \-\-copycd
-Open the CD copy dialog
-.TP
-.B \-\-clonecd
-Open the CD cloning dialog
-.TP
-.B \-\-cdimage
-Write an ISO image or Bin/Cue image to cd
-.TP
-.B \-\-erasecd
-Erase a CDRW
-.TP
-.B \-\-formatdvd
-Format a DVD-RW or DVD+RW
-.TP
-.BI \-\-lang \ language
-Set the GUI language
-.SS "Qt options:"
-.TP
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-title \ title
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options:"
-.TP
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-K3b was written by
-.nh
-.ad l
-Sebastian Trueg <trueg@informatik.uni-freiburg.de>
-and Thomas Froescher <tfroescher@gmx.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/k3b
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/k3b
-
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
index a72c0b374..8c6643cf2 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install
@@ -1,5 +1,7 @@
 debian/tmp/opt/trinity/bin/*
-debian/tmp/opt/trinity/share/applications/*
-debian/k3b.xpm /opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.so
 debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.la
+debian/tmp/opt/trinity/share/applications/*
+debian/tmp/opt/trinity/share/man/man1/k3b.1
+
+debian/k3b.xpm /opt/trinity/share/pixmaps/
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
deleted file mode 100644
index 328f16efe..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/k3b-trinity.1
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files
deleted file mode 100644
index d6388a5b6..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/applications/*
-usr/share/mimelnk/*
-usr/share/pixmaps/*
-usr/share/services/*
-usr/bin/*
-etc/*
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install
deleted file mode 100644
index 134bb0bf2..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/bin/*
-debian/tmp/usr/share/applications/*
-debian/k3b.xpm usr/share/pixmaps/
-debian/tmp/usr/lib/trinity/tdefile_k3b.so
-debian/tmp/usr/lib/trinity/tdefile_k3b.la
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages
deleted file mode 100644
index 60dde70bc..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/k3b.1
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu
deleted file mode 100644
index e3ec0ef1f..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(k3b-trinity):\
-	needs="X11"\
-	section="Applications/File Management"\
-	title="K3b"\
-	command="/opt/trinity/bin/k3b"\
-	icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst
deleted file mode 100644
index 3807d55e6..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-	configure)
-
-	# Remove bad files 
-	if dpkg --compare-versions "$2" eq "0.10.3-1"; then
-		rm -rf /usr/share/applnk/.hidden
-		rm -rf /usr/share/applnk/System/k3b.desktop
-	fi
-	
-	if dpkg --compare-versions "$2" lt "0.10.3-1"; then
-		rm -rf /usr/share/applnk/System/k3b.desktop
-		rm -rf /usr/share/applnk/System/k3bsetup.desktop
-	fi
-
-	;;	
-abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-
-*)
-	echo "postinst called with unknown argument \`$1'" >&2
-	exit 1
-	;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/watch b/ubuntu/_base/applications/multimedia/k3b/debian/watch
deleted file mode 100644
index 7e3c554ae..000000000
--- a/ubuntu/_base/applications/multimedia/k3b/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/k3b/k3b-([\d.]*).tar.bz2
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook b/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
deleted file mode 100644
index 96001a6ad..000000000
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Mercatante</firstname>
-      <surname>Anthony</surname>
-      <email>anthony.mercatante@laposte.net</email>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Anthony Mercatante</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2005-07-28</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>k9copy</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>k9copy</refname>
-    <refpurpose>DVD copy tool for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>k9copy</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      DVD copy tool for TDE.
-    </para>
-    <para>
-      k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options. k9copy has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to keep it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Anthony Mercatante
-      <email>anthony.mercatante@laposte.net</email> for the
-      <productname>Debian</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
-
diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/rules b/ubuntu/_base/applications/multimedia/k9copy/debian/rules
index aca7b475b..6219a645e 100755
--- a/ubuntu/_base/applications/multimedia/k9copy/debian/rules
+++ b/ubuntu/_base/applications/multimedia/k9copy/debian/rules
@@ -10,8 +10,6 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1
-
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --enable-k3bdevices
 
 post-patches:: debian/stamp-bootstrap
@@ -30,14 +28,3 @@ endif
 	
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
-
-install/k9copy-trinity::
-	dh_installman k9copy.1
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-	dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
-
-build/k9copy-trinity::
-	docbook2x-man debian/k9copy.1.docbook
-
-clean::
-	rm -f k9copy.1
diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs
index e845566c0..0b6e0f321 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs
+++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/docs b/ubuntu/_base/applications/multimedia/kaffeine/debian/docs
index b7c0e782e..0ca805e45 100644
--- a/ubuntu/_base/applications/multimedia/kaffeine/debian/docs
+++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/docs
@@ -1,5 +1,5 @@
-README
-TODO
+README.md
 README.atsc
 README.dvb
 README.gstreamer
+TODO
diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/docs b/ubuntu/_base/applications/multimedia/kmplayer/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
+++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
deleted file mode 100644
index b420ba197..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" This is free documentation; 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.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual 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 manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
-.\"
-.TH ROSEGARDEN-AUDIOFILE-IMPORTER 1 "19 March 2006"
-
-.SH NAME
-
-rosegarden-audiofile-importer - Helper application to convert and
-import audio files for Rosegarden.
-
-.SH SYNOPSIS
-
-rosegarden-audiofile-importer -t [<version>]
-rosegarden-audiofile-importer --conftest [<version>]
-rosegarden-audiofile-importer -l [<version>]
-rosegarden-audiofile-importer [-r <rate>] -w <inputfile>
-rosegarden-audiofile-importer [-r <rate>] -c <inputfile> <outputfile>
-
-
-.SH OPTIONS
-
-.BR -t " " [<version>], 
-.BR --conftest " " [<version>]
-
-Exit successfully if the importer is available and working [and is
-of at least version <version>].  If some of the required helper
-applications are missing, also print to stdout a line saying
-"Required: application1, application2", listing the missing
-programs.
-
-.BR \-l " " [<version>]
-
-List known file extensions (e.g. ogg wav flac).  Return code is same
-as for -t (so can combine two calls into one)
-
-.BR \-r " " <rate>
-
-Test whether any work is needed to convert the input, either because
-it isn't in a Rosegarden-compatible format or because its samplerate
-differs from <rate>.  Exit successfully if no work is required; return
-error code 2 if conversion required, 3 if resampling required, 4 if
-both required, 1 for other error.
-
-.SH DESCRIPTION
-
-Helper application to convert and import audio files for Rosegarden.
-
-Can take audio files of various kinds as input, always produces WAV
-files that are compatible with Rosegarden as output.
-
-Not actually specific to Rosegarden in any way, except that
-Rosegarden needs to know it can rely on its presence and calling
-interface.
-
-.SH SEE ALSO
-     rosegarden(1), rosegarden-lilypondview(1), rosegarden-project-page(1)
-
-
-
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
deleted file mode 100644
index e2aa9f951..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\" This is free documentation; 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.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual 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 manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
-.\"
-.TH ROSEGARDEN-LILIPONDVIEW 1 "10 February 2006"
-i
-.SH NAME
-
-rosegardern-lilypondview - display a lilypond file in a postscript
-viewer.
-
-.SH SYNOPSIS
-
-rosegarden-lilypondview [-g] [FILE].ly
-
-.SH DESCRIPTION
-
-This script takes a Lilypond file as input.  It creates a temporary
-sandbox, runs Lilypond against the input file, then opens a PostScript
-viewer against the results in order to provide a graphical, printable
-preview.
-
-This script is used internally by Rosegarden, as the backend for the File -> 
-Export -> Preview Lilypond file feature.
-
-.SH OPTIONS
-.BR \-g " " Use graphical mode
-
-.SH REQUIREMENTS
-
-Working installation of Lilypond 2.0 or later KGhostView or KPDF or
-XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for
-graphical mode only]
-
-.SH AUTHOR
-Chris Cannam
-
-.SH COPYRIGHT
-2005-2006 Fervent Software.
-
-
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
deleted file mode 100644
index 0da30c2a5..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" This is free documentation; 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.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual 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 manual; if not, write to the Free
-.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-.\" USA.
-.\"
-.TH ROSEGARDEN-PROJECT-PACKAGE 1 "10 February 2006"
-
-.SH NAME
-
-rosegarden-project-package - converts between Rosegarden (.rg) files
-and Rosegarden Project (.rgp) files.
-
-.SH SYNOPSIS
-
-orosegarden-project-package [--quiet] [--pack] [--unpack] [--conftest] [FILE] [.rg|.rgp]
-
-.SH OPTIONS
-.BR \-\-quiet " " Be silent
-.BR \-\-unpack " " Unpack .rgp file
-.BR \-\-pack " " Pack .rg file plus associated external data files into .rgp file
-.BR \-\-conftest " " Test environment for necessary installed components
-
-.SH DESCRIPTION
-
-This program converts between Rosegarden (.rg) files and Rosegarden
-Project (.rgp) files.  It is primarily intended to be used internally and 
-transparently by the Rosegarden application.
-
-A Rosegarden file (.rg) is a single file (in gzipped XML format)
-that defines a Rosegarden composition in terms of events, segments,
-programs, plugin data, references to audio files, and so on.  Some
-of these types of information depend on the presence of external
-files such as the audio files or plugin preset data, without which
-the file cannot be used.
-
-A Rosegarden Project (.rgp) file is a bundle of files, including the
-Rosegarden file itself, as well as any audio file or other external
-data it requires, in compressed form.  A Rosegarden Project file is
-intended to be portable and self-contained, but the Rosegarden
-program itself does not (at the time of writing) understand these
-files directly.
-
-This program can take a Rosegarden file, examine it to find out
-which other data files it uses, and pack it to create the
-corresponding Rosegarden Project file.  Conversely, it can also take
-a Rosegarden Project file and unpack it as a project directory for
-use with Rosegarden.
-
-.SH REQUIREMENTS
-
-Working installation of Lilypond 2.0 or later KGhostView or KPDF or
-XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for
-graphical mode only]
-
-.SH AUTHOR
-Chris Cannam
-
-.SH COPYRIGHT
-2005-2006 Fervent Software.
-
-
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
index 50a0bcdaa..ac05f6185 100644
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install
@@ -1,4 +1,8 @@
 debian/tmp/opt/trinity/bin/rosegarden*
 debian/tmp/opt/trinity/bin/rosegardensequencer*
-debian/tmp/opt/trinity/share/mimelnk
 debian/tmp/opt/trinity/share/applications
+debian/tmp/opt/trinity/share/mimelnk
+debian/tmp/opt/trinity/share/man/man1/rosegarden.1
+debian/tmp/opt/trinity/share/man/man1/rosegarden-lilypondview.1
+debian/tmp/opt/trinity/share/man/man1/rosegarden-project-package.1
+debian/tmp/opt/trinity/share/man/man1/rosegarden-audiofile-importer.1
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
deleted file mode 100644
index 6e3b96ee0..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/rosegarden.1
-debian/rosegarden-lilypondview.1
-debian/rosegarden-project-package.1
-debian/rosegarden-audiofile-importer.1
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1
deleted file mode 100644
index fe750e0b2..000000000
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1
+++ /dev/null
@@ -1,155 +0,0 @@
-.TH ROSEGARDEN 1 "23 July 2006"
-
-.SH NAME
-
-rosegarden, rosegarden-sequencer - MIDI and audio sequencer and
-musical notation editor.
-
-.SH SYNOPSIS
-
-rosegarden [Qt-options] [TDE-options] [options] [File]
-
-rosegardensequencer [Qt-options] [TDE-options] [playback_1 playback_2 capture_1 capture_2]
-
-.SH DESCRIPTION
-
-This manual page documents briefly the rosegarden and rosegardensequencer commands.
-
-rosegarden is a MIDI and audio sequencer, notation editor, and general-purpose music composition and editing application for Unix and Linux. It is a TDE application, which means to build it you need the TDE libraries. However, once installed it can be run within the TDE environment or any other desktop or window manager environment.
-
-rosegardensequencer is part of the rosegarden application, the part which knows about and audio MIDI devices, and about real time. rosegardensequencer is executed automatically when rosegarden starts, so you will probably never need to execute it directly. You may want to specify command line options, though, to change the JACK ports used for audio capture and playback. In order to do that, you can invoque rosegardensequencer directly before running rosegarden, or you can specify the sequencer command line arguments using the rosegarden configuration dialog, and restarting the application. This program follows the usual GNU command line syntax, with long options starting with two dashes ('-'). A summary of options is included below.
-
-.SH OPTIONS
-.BR \-\-author " "
-     Show author information.
-
-.BR \-\-help " "
-     Show help about options.
-
-.BR \-\-help-all
-     Show all options.
-
-.BR \-\-help-tde
-     Show TDE specific options.
-
-.BR \-\-help-qt
-     Show Qt specific options.
-
-.BR \-\-license 
-     Show license information.
-
-.BR \-v, \-\-version
-     Show version information.
-
-
-.SH OPTIONS for rosegarden
-
-.BR \-\-nosplash
-     Don\'t show splash screen.
-	
-
-.BR \-\-nosequencer
-     Don\'t use an external sequencer.
-
-.BR \-\-nofork
-     Don\'t automatically run in the background.
-
-.BR \ \--existingsequencer
-     Attach to a running sequencer process, if found.
-
-.BR File
-     File to load at startup. Typically a rosegarden (.rg) file, but it can also be a rosegarden2.1 file or a MIDI file.
-
-.SH OPTIONS
-.BR \-g " " Use graphical mode>
-     
-.SH QT OPTIONS
-.BR \-\-bg, --background color
-     Sets the default background color and an application palette (light and dark shades are calculated).
-
-.BR \-\-btn, --button color
-     Sets the default button color.
-
-.BR \-\-cmap
-     Causes the application to install a private color map on an 8-bit display.
-
-.BR \-\-display displayname
-     Use the X-server display 'displayname'.
-
-.BR \-\-dograb
-     Running under a debugger can cause an implicit --nograb, use --dograb to override.
-
-.BR \-\-fg, \-\-foreground color
-     Sets the default foreground color.
-
-.BR \-\-fn, \-\-font fontname
-     Defines the application font.
-
-.BR \-\-im XIMserver
-     Set XIM server.
-
-.BR \-\-inputstyle inputstyle
-     Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root.
-
-.BR \-\-name name
-     Sets the application name.
-
-.BR \-\-ncols count
-     Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification.
-
-.BR \-\-nograb
-     Tells Qt to never grab the mouse or the keyboard.
-
-.BR \-\-noxim
-     Disable XIM.
-
-.BR \-\-reverse
-     Mirrors the whole layout of widgets.
-
-.BR \-\-session sessionId
-     Restore the application for the given 'sessionId'.
-
-.BR \-\-sync
-     Switches to synchronous mode for debugging.
-
-.BR \-\-title title
-     Sets the application title (caption).
-
-.BR \-\-visual TrueColor
-     Forces the application to use a TrueColor visual on an 8-bit display.
-
-
-.SH TDE OPTIONS
-.BR \-\-caption caption
-     Use 'caption' as name in the titlebar.
-
-.BR \-\-config filename
-     Use alternative configuration file.
-
-.BR \-\-dcopserver server
-     Use the DCOP Server specified by 'server'.
-
-.BR \-\-geometry geometry
-     Sets the client geometry of the main widget.
-
-.BR \-\-icon icon
-     Use 'icon' as the application icon.
-
-.BR \-\-miniicon icon
-     Use 'icon' as the icon in the titlebar.
-
-.BR \-\-nocrashhandler
-     Disable crash handler, to get core dumps.
-
-.BR \-\-style style
-     Sets the application GUI style.
-
-.BR \-\-waitforwm
-     Waits for a WM_NET compatible windowmanager.
-
-.SH SEE ALSO
-     jackd(1), rosegarden-lilypondview(1), rosegarden-project-package(1), rosegarden-audiofile-importer(1)
-
-
-.SH AUTHOR
-This manual page was written by Enrique Robledo Arnuncio <era@debian.org> and later ammended by Mike O'Connor <stew@vireo.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front Cover Texts and no Back Cover Texts.
diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rules b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
index 94fe8c0a8..1372a08f8 100755
--- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
+++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules
@@ -26,8 +26,6 @@ DEB_COMPRESS_EXCLUDE += .rg .wav .docbook
 binary-install/rosegarden-trinity::
 	dh_testdir
 	find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \;
-	cp -Rp debian/rosegarden-trinity/usr/share/man/* debian/rosegarden-trinity/opt/trinity/share/man/
-	rm -rf debian/rosegarden-trinity/usr/share/man
 
 clean::
 	dh_testdir
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/multimedia/tderadio/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/multimedia/tderadio/debian/control b/ubuntu/_base/applications/multimedia/tderadio/debian/control
index dc6584c46..ad9aa35a9 100644
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/control
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/control
@@ -2,9 +2,9 @@ Source: tderadio-trinity
 Section: sound
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), tdelibs14-trinity-dev, liblircclient-dev, libsndfile1-dev, imagemagick, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
+               liblircclient-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev
 Standards-Version: 3.8.4
-Homepage: http://tderadio.sourceforge.net/
 
 Package: tderadio-trinity
 Architecture: any
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1 b/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1
deleted file mode 100644
index 0a96aa40e..000000000
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH CONVERT\-PRESETS 1 "Dec 2005" "Trinity Desktop Environment" "convert-presets"
-.SH NAME
-convert\-presets
-\- convert-presets
-.SH SYNOPSIS
-convert\-presets [Qt\-options] [TDE\-options] [options] [preset files] 
-.SH DESCRIPTION
-convert-presets
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B preset
-files              preset file to convert
-.SS Options:
--q                        be quiet
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/convert\-presets/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/convert\-presets/'"
-from the command-line.
-.br
-.SH AUTHORS
-Ernst Martin Witte, Klas Kalass
-.nf
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/docs b/ubuntu/_base/applications/multimedia/tderadio/debian/docs
index 0ecc1e4f1..76c3076c9 100644
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/docs
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/docs
@@ -1,2 +1,3 @@
-tderadio3/README
-tderadio3/TODO
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/manpages b/ubuntu/_base/applications/multimedia/tderadio/debian/manpages
deleted file mode 100644
index 4760e939e..000000000
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tderadio.1
-debian/convert-presets.1
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/patches/series b/ubuntu/_base/applications/multimedia/tderadio/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/patches/series
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/rules b/ubuntu/_base/applications/multimedia/tderadio/debian/rules
index 4bef8d0a0..a6797f19a 100755
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/rules
+++ b/ubuntu/_base/applications/multimedia/tderadio/debian/rules
@@ -1,142 +1,17 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-# 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
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png
-	convert $< $@
-
-configure:
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cat /usr/share/aclocal/libtool.m4 > admin/libtool.m4.in
-	cp -f /usr/share/misc/config.sub admin/config.sub
-	cp -f /usr/share/misc/config.guess admin/config.guess
-
-	make -f admin/Makefile.common
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/opt/trinity --with-qt-dir=/usr/share/qt3 \
-		--with-qt-includes=/usr/include/qt3 \
-		--with-qt-libraries=/usr/share/qt3/lib \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--disable-rpath --disable-debug \
-		kde_htmldir=\$${prefix}/share/doc/tde/HTML
-															
-
-
-build: build-stamp debian/tderadio.xpm
-
-build-stamp:  config.status
-	dh_testdir
-	# Add here commands to compile the package.
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	rm -f debian/debiandirs 
-	rm -f debian/tderadio.xpm 
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-#	[ ! -tderadio3/src && $(MAKE) clean
-	for i in `find | grep .gmo` ; do rm -f $$i ; done
-	find -name Makefile.in -delete
-	rm -f config.sub config.guess configure
-	rm -f acinclude.m4
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	# Add here commands to install the package into debian/tderadio.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tderadio-trinity
-	install -D -m 644 debian/tderadio.xpm debian/tderadio-trinity/opt/trinity/share/pixmaps/tderadio.xpm
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libalsa-sound.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimeshifter.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstandard-display.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liblirc.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstreaming.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libradio.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libquickbar.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/librecording.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libv4lradio.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimecontrol.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libdocking-menu.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liboss-sound.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liberror-log.so
-#	chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libsoundserver.so
-#	chrpath -d debian/tderadio/usr/bin/convert-presets
-#	chrpath -d debian/tderadio/usr/bin/tderadio
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs tderadio3/ChangeLog
-	dh_installdocs 
-	dh_installmenu
-	dh_installman
-	mv debian/tderadio-trinity/usr/share/man debian/tderadio-trinity/opt/trinity/share/
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1 b/ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1
deleted file mode 100644
index 2648970c2..000000000
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1
+++ /dev/null
@@ -1,147 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KRADIO 1 "Dec 2005" "Trinity Desktop Environment" "TDERadio"
-.SH NAME
-tderadio
-\- TDERadio
-.SH SYNOPSIS
-tderadio [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-TDERadio
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tderadio/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/tderadio/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Martin Witte <witte@kawo1.rwth-aachen.de>
-.br
-Marcus Camen <mcamen@mcamen.de>
-.br
-Klas Kalass <klas.kalass@gmx.de>
-.br
-
diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/watch b/ubuntu/_base/applications/multimedia/tderadio/debian/watch
deleted file mode 100644
index 033fb78b0..000000000
--- a/ubuntu/_base/applications/multimedia/tderadio/debian/watch
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
-version=2
-tderadio.sourceforge.net /download	tderadio-(.*)\.tar\.gz	debian	uupdate
diff --git a/ubuntu/_base/applications/office/basket/debian/docs b/ubuntu/_base/applications/office/basket/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/office/basket/debian/docs
+++ b/ubuntu/_base/applications/office/basket/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/office/kbibtex/debian/docs b/ubuntu/_base/applications/office/kbibtex/debian/docs
index c17f03764..960f99591 100644
--- a/ubuntu/_base/applications/office/kbibtex/debian/docs
+++ b/ubuntu/_base/applications/office/kbibtex/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 NEWS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/office/kbookreader/debian/docs b/ubuntu/_base/applications/office/kbookreader/debian/docs
index 7d96d4e7e..76c3076c9 100644
--- a/ubuntu/_base/applications/office/kbookreader/debian/docs
+++ b/ubuntu/_base/applications/office/kbookreader/debian/docs
@@ -1,2 +1,3 @@
 AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/office/kile/debian/README.Debian b/ubuntu/_base/applications/office/kile/debian/README.Debian
deleted file mode 100644
index 5339affff..000000000
--- a/ubuntu/_base/applications/office/kile/debian/README.Debian
+++ /dev/null
@@ -1,10 +0,0 @@
-kile for Debian
----------------
-
-Kile no longer comes with a Gnuplot front end. The Gnuplot front end that used
-to be part of Kile is now a separate application named Qgfe maintained by
-Pascal Brachet at http://www.xm1math.net/qgfe/ .
-
-Syntax files bibtex.xml and latex.xml are provided by tdelibs-data package.
-
- -- Ben Burton <bab@debian.org>, Sat, 23 Oct 2004 12:56:57 +1000
diff --git a/ubuntu/_base/applications/office/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control
index 7b699f3b0..cb01d0882 100644
--- a/ubuntu/_base/applications/office/kile/debian/control
+++ b/ubuntu/_base/applications/office/kile/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kile.sourceforge.net
 
diff --git a/ubuntu/_base/applications/office/kile/debian/docs b/ubuntu/_base/applications/office/kile/debian/docs
index 724e08449..76c3076c9 100644
--- a/ubuntu/_base/applications/office/kile/debian/docs
+++ b/ubuntu/_base/applications/office/kile/debian/docs
@@ -1,2 +1,3 @@
-README
+AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/office/kile/debian/kile-trinity.install b/ubuntu/_base/applications/office/kile/debian/kile-trinity.install
index eb1b59da1..fdbee1056 100644
--- a/ubuntu/_base/applications/office/kile/debian/kile-trinity.install
+++ b/ubuntu/_base/applications/office/kile/debian/kile-trinity.install
@@ -6,3 +6,4 @@ opt/trinity/bin/kile
 /opt/trinity/share/doc/tde/HTML/en/kile
 /opt/trinity/share/icons
 /opt/trinity/share/mimelnk/text/x-kilepr.desktop
+/opt/trinity/share/man/man1/kile.1
diff --git a/ubuntu/_base/applications/office/kile/debian/kile.1 b/ubuntu/_base/applications/office/kile/debian/kile.1
deleted file mode 100644
index d7609722c..000000000
--- a/ubuntu/_base/applications/office/kile/debian/kile.1
+++ /dev/null
@@ -1,64 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KILE 1 "June 22, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kile \- the TDE Integrated LaTeX Environment
-.SH SYNOPSIS
-.B kile [ \fIgeneric-options\fP ]
-[ \fB\-\-line\fP \fIline\fP ] [ \fB\-\-new\fP ]
-[ \fIfile\fP ]
-.SH DESCRIPTION
-\fBKile\fP (the TDE Integrated LaTeX Environment) is a user-friendly
-LaTeX source editor and TeX shell for TDE.
-.PP
-The source editor is a multi-document editor designed for .tex and .bib
-files.  Menus, wizards and auto-completion are provided to assist with
-tag insertion and code generation.  A structural view of the document
-assists with navigation within source files.
-.PP
-The TeX shell integrates the various tools required for TeX processing.
-It assists with LaTeX compilation, DVI and postscript document viewing,
-generation of bibliographies and indices and other common tasks.
-.PP
-Kile can support large projects consisting of several smaller files.
-.SH OPTIONS
-Below are the kile-specific options.
-For a full summary of options, run \fIkile \-\-help\fP.
-.TP
-\fB\-\-line\fP \fIline\fP
-Jump to the given line in the file that is opened.
-.TP
-\fB\-\-new\fP
-Start a new Kile main window.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kile/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kile/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can
-read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kile/\fP.
-.SH AUTHOR
-Kile was written by Pascal Brachet <pascal.brachet_at_club-internet.fr> and
-Jeroen Wijnhout <Jeroen.Wijnhout_at_kdemail.net> with contributions from
-many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/kile/debian/patches/series b/ubuntu/_base/applications/office/kile/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/office/kile/debian/patches/series
diff --git a/ubuntu/_base/applications/office/kile/debian/rules b/ubuntu/_base/applications/office/kile/debian/rules
index bd5478578..59bca7cd4 100755
--- a/ubuntu/_base/applications/office/kile/debian/rules
+++ b/ubuntu/_base/applications/office/kile/debian/rules
@@ -1,60 +1,39 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kile := debian/kile.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-install/kile-trinity-i18n-br::
-	-for language in `cd translations; ls -1d */`; do \
-		cd $(CURDIR)/$(DEB_BUILDDIR)/translations/$$language; \
-		$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-$$language; \
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
+
+common-install-indep::
+	# Install translations into individual packages
+	-for language in `cd debian/tmp/opt/trinity/share/locale; ls -1d */`; do \
+		pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+		install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale; \
+		cp -a $(CURDIR)/debian/tmp/opt/trinity/share/locale/$$language \
+		    $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale/$$language; \
+	done
+	-for language in `cd debian/tmp/opt/trinity/share/doc/tde/HTML; ls -1d */ | grep -v '^en/'`; do \
+		pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \
+		install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML; \
+		cp -a $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/$$language \
+		    $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML/$$language; \
 	done
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/en_GB/; \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-engb
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/pt_BR/; \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-ptbr
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/sr@Latn/;\
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-srlatin
-
-	cd $(CURDIR)/$(DEB_BUILDDIR)/translations/zh_CN/; \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-zhcn
 
 install/kile-trinity::
 	# Install pixmap
 	install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm
 
-	chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh
-
 clean::
 	rm -rf debian/kile-trinity-i18n-*
diff --git a/ubuntu/_base/applications/office/kile/debian/watch b/ubuntu/_base/applications/office/kile/debian/watch
deleted file mode 100644
index e372a7062..000000000
--- a/ubuntu/_base/applications/office/kile/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/control b/ubuntu/_base/applications/office/kmymoney/debian/control
index 8693580ef..e44a64d57 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/control
+++ b/ubuntu/_base/applications/office/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3, recode, html2ps
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3
 Standards-Version: 3.8.4
 
 Package: kmymoney2-trinity
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
index f8c5dc4e3..9c50137ba 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
@@ -1,3 +1,3 @@
-opt/trinity/include/tde/kmymoney/*
+opt/trinity/include/kmymoney/*
 opt/trinity/lib/lib*.la
 opt/trinity/lib/lib*.so
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/rules b/ubuntu/_base/applications/office/kmymoney/debian/rules
index 0f794b445..ba37f1c35 100755
--- a/ubuntu/_base/applications/office/kmymoney/debian/rules
+++ b/ubuntu/_base/applications/office/kmymoney/debian/rules
@@ -1,35 +1,18 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include --disable-pdf-docs
-
-LDFLAGS += -Wl,--as-needed
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-clean::
-	rm -f po/*.gmo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DBUILD_DEVELOPER_DOCS="OFF"
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/watch b/ubuntu/_base/applications/office/kmymoney/debian/watch
deleted file mode 100644
index b80efc65c..000000000
--- a/ubuntu/_base/applications/office/kmymoney/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kmymoney2/kmymoney2-([\d].[\d].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/office/knowit/debian/docs b/ubuntu/_base/applications/office/knowit/debian/docs
index 5502ed8f4..960f99591 100644
--- a/ubuntu/_base/applications/office/knowit/debian/docs
+++ b/ubuntu/_base/applications/office/knowit/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
 NEWS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control b/ubuntu/_base/applications/office/koffice-i18n/debian/control
index 8f7bb1a23..e30b5aae7 100644
--- a/ubuntu/_base/applications/office/koffice-i18n/debian/control
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control
@@ -2,397 +2,15 @@ Source: koffice-i18n-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org>
-Build-Depends-Indep: tdelibs14-trinity-dev
-Build-Depends: debhelper (>= 9~), cdbs, quilt, automake, autoconf, libtool, libltdl-dev
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
 
-Package: koffice-i18n-bg-trinity
+Package: koffice-i18n-trinity
 Architecture: all
 Section: tde
-Recommends: tde-i18n-bg-trinity
+Recommends: tde-i18n-trinity
 Suggests: koffice-trinity
 Provides: koffice-i18n-trinity
-Description: Bulgarian (bg) translations for KOffice
- This package contains the Bulgarian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ca-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ca-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Catalan (ca) translations for KOffice
- This package contains the Catalan translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-cs-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-cs-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Czech (cs) translations for KOffice
- This package contains the Czech translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-cy-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-cy-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Welsh (cy) translations for KOffice
- This package contains the Welsh translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-da-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-da-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Danish (da) translations for KOffice
- This package contains the Danish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-de-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-de-trinity
-Suggests: koffice-trinity, openthesaurus-de-kword
-Provides: koffice-i18n-trinity
-Description: German (de) translations for KOffice
- This package contains the German translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-el-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-el-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Greek (el) translations for KOffice
- This package contains the greek translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-engb-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-engb-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: British English (en_GB) translations for KOffice
- This package contains the British English (en_GB) translations
- for all applications in the Trinity Office Suite.
- 
-Package: koffice-i18n-es-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-es-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Spanish (es) translations for KOffice
- This package contains the Spanish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-et-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-et-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Estonian (et) translations for KOffice
- This package contains the Estonian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-eu-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-eu-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Basque (eu) translations for KOffice
- This package contains the Basque translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fa-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fa-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Farsi (fa) translations for KOffice
- This package contains the Farsi translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fi-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fi-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Finnish (fi) translations for KOffice
- This package contains the Finnish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-fr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-fr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: French (fr) translations for KOffice
- This package contains the French translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ga-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ga-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Irish Gaelic (ga) translations for KOffice
- This package contains the Irish Gaelic translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-gl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-gl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Galician (gl) translations for KOffice
- This package contains the Galician translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-hu-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-hu-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Hungarian (hu) translations for KOffice
- This package contains the Hungarian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-it-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-it-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Italian (it) translations for KOffice
- This package contains the Italian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ja-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ja-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Japanese (ja) translations for KOffice
- This package contains the Japanese translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-km-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-km-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Khmer (km) translations for KOffice
- This package contains the Khmer translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-lv-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-lv-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Latvian (lv) translations for KOffice
- This package contains the Latvian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ms-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ms-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Malay (ms) translations for KOffice
- This package contains the Malay translations for all applications
- in the Trinity Office Suite.
- 
-Package: koffice-i18n-nb-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nb-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Norwegian Bookmal (nb) translations for KOffice
- This package contains the Norwegian Bookmal translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-nds-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nds-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Low Saxon (nds) translations for KOffice
- This package contains the Low Saxon translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ne-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ne-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Nepali (ne) translations for KOffice
- This package contains the Nepali translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-nl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-nl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Dutch (nl) translations for KOffice
- This package contains the Dutch translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-pl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-pl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Polish (pl) translations for KOffice
- This package contains the Polish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-pt-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-pt-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Portuguese (pt) translations for KOffice
- This package contains the Portuguese translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-ptbr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ptbr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Brazilian Portuguese (pt_BR) translations for KOffice
- This package contains the Brazilian Portuguese translations for all
- applications in the Trinity Office Suite.
- 
-Package: koffice-i18n-ru-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-ru-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Russian (ru) translations for KOffice
- This package contains the Russian translations for all applications
- in the Trinity Office Suite.
- 
-Package: koffice-i18n-sk-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sk-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Slovak (sk) translations for KOffice
- This package contains the Slovak translations for all applications
- in the Trinity Office Suite.
- 
-Package: koffice-i18n-sl-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sl-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Slovenian (sl) translations for KOffice
- This package contains the Slovenian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Serbian (sr) translations for KOffice
- This package contains the Serbian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-srlatin-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-srlatin-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Latin Serbian (sr@Latn) translations for KOffice
- This package contains the Latin Serbian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-sv-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-sv-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Swedish (sv) translations for KOffice
- This package contains the Swedish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-tr-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-tr-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Turkish (tr) translations for KOffice
- This package contains the Turkish translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-uk-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-uk-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Ukrainian (uk) translations for KOffice
- This package contains the Ukrainian translations for all applications
- in the Trinity Office Suite.
-
-Package: koffice-i18n-zhcn-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-zhcn-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Chinese Simplified (zh_CN) translations for KOffice
- This package contains the Chinese Simplified translations for all
- applications in the Trinity Office Suite.
-
-Package: koffice-i18n-zhtw-trinity
-Architecture: all
-Section: tde
-Recommends: tde-i18n-zhtw-trinity
-Suggests: koffice-trinity
-Provides: koffice-i18n-trinity
-Description: Chinese Traditional (zh_TW) translations for KOffice
- This package contains the Chinese Traditional translations for all
- applications in the Trinity Office Suite.
+Description: All languages (all) internationalized (i18n) files for KOffice
+ This package contains the All languages (all) internationalized (i18n)
+ files for all applications in Trinity Office Suite.
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control-lang b/ubuntu/_base/applications/office/koffice-i18n/debian/control-lang
new file mode 100644
index 000000000..f75b7d747
--- /dev/null
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control-lang
@@ -0,0 +1,10 @@
+
+Package: koffice-i18n-@pkg_lang@-trinity
+Architecture: all
+Section: tde
+Recommends: tde-i18n-@pkg_lang@-trinity
+Suggests: koffice-trinity
+Provides: koffice-i18n-trinity
+Description: @lang_desc@ (@lang@) internationalized (i18n) files for KOffice
+ This package contains the @lang_desc@ (@lang@) internationalized (i18n)
+ files for all applications in Trinity Office Suite.
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control-source b/ubuntu/_base/applications/office/koffice-i18n/debian/control-source
new file mode 100644
index 000000000..c1a3a089b
--- /dev/null
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control-source
@@ -0,0 +1,6 @@
+Source: koffice-i18n-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs b/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs
deleted file mode 100644
index 90247b9a0..000000000
--- a/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs
+++ /dev/null
@@ -1,10 +0,0 @@
-export kde_prefix=/opt/trinity
-export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/tde
-export infodir=/opt/trinity/share/info
-export mandir=/opt/trinity/share/man
-export qtdir=/opt/trinity/share/qt3
-export kde_cgidir=/opt/trinity/lib/cgi-bin
-export kde_confdir=/etc/trinity
-export kde_htmldir=/opt/trinity/share/doc/tde/HTML
-configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/rules b/ubuntu/_base/applications/office/koffice-i18n/debian/rules
index 8fb58ece9..2a292557e 100755
--- a/ubuntu/_base/applications/office/koffice-i18n/debian/rules
+++ b/ubuntu/_base/applications/office/koffice-i18n/debian/rules
@@ -3,11 +3,36 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+I18N_DIR_PREFIX := koffice-i18n
+I18N_DEST_PREFIX := $(I18N_DIR_PREFIX)
+I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%
+I18N_DIRS := $(wildcard $(I18N_DIR_PREFIX)-*)
+
+# Stamps and support variables
+cur_lang = $(word 2,$(subst __, ,$@))
+cur_lang_target = $(subst @,_,$(cur_lang))
+cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%,$(cur_lang))
+cur_pkg_lang = $(subst _,,$(subst @,,$(subst @latn,latin,$(shell echo $(cur_lang) | tr '[:upper:]' '[:lower:]'))))
+cur_pkg = $(I18N_DEST_PREFIX)-$(cur_pkg_lang)-trinity
+
+STAMP_BUILD := $(patsubst $(I18N_DIR_PAT),debian/stamp__%__build,$(I18N_DIRS))
+I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
+I18N_CLEAN := $(patsubst $(I18N_DIR_PAT),clean__%,$(I18N_DIRS))
+
+DEB_BUILD_PARALLEL ?= true
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS))
 
+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
+
 # 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| .*||" | \
@@ -18,91 +43,124 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
-languages = `ls -1d *i18n*`
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON"
+
 
-build-stamp:
+build::
 	dh_testdir
+	dh_prep
+
+ifneq "$(wildcard /usr/bin/ninja)" ""
+
+build:: debian/stamp__build
+
+debian/stamp__build:
+	[ -d build ] || \
+	mkdir build
+	cd build && \
+	cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \
+	$(MAKE) $(DEB_MAKE_PARALLEL)
+	touch $@
+
+else
+
+build:: $(STAMP_BUILD)
+
+$(STAMP_BUILD):
+	# Building the '$(cur_lang)' language ...
+	[ -d $(cur_lang_dir)/build ] || \
+	mkdir $(cur_lang_dir)/build
+	[ -e $(cur_lang_dir)/CMakeLists.txt ] || \
+	ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt
+	cd $(cur_lang_dir)/build && \
+	cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \
+	$(MAKE) $(DEB_MAKE_PARALLEL)
+	touch $@
 
-	# Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
 endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+
+install::
+	dh_testdir
+	dh_testroot
+
+install:: $(I18N_INSTALL)
+	dh_testdir
+	cat debian/control-source > debian/control
+	find debian -name "control-lang-*" | LANG=C sort | xargs -r cat >> debian/control
+
+$(I18N_INSTALL): build
+ifneq "$(wildcard /usr/bin/ninja)" ""
+	[ ! -e $(cur_lang_dir)/CMakeLists.txt ] || \
+	DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) -C build install-$(cur_lang_target)
+else
+	cd $(cur_lang_dir)/build && \
+	DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) install $(DEB_MAKE_PARALLEL)
 endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	#Configure languages.
-	-for i in $(languages); do \
-	  cd  $$i && \
-	  autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && \
-	  ./configure $(configkde); \
-	  $(MAKE) $(DEB_MAKE_PARALLEL); \
-	  cd ..; \
-	done
-
-	touch build-stamp
-
-build: build-stamp
--include debian/debiandirs
-
-clean: 
-	dh_clean
+	sed -e "s|@lang@|$(cur_lang)|g" \
+	    -e "s|@pkg_lang@|$(cur_pkg_lang)|g" \
+	    -e "s|@lang_desc@|$$(sed -n '/^\[$(cur_lang)\]/,/^\[/s#^Name=##p' /opt/trinity/share/locale/all_languages)|" \
+	    < debian/control-lang > debian/control-lang-$(cur_pkg_lang); \
+
+ifneq "$(wildcard /usr/bin/ninja)" ""
+
+clean: debian-clean
+
+else
+
+clean: $(I18N_CLEAN) debian-clean
+
+$(I18N_CLEAN):
 	dh_testdir
-	
-	# Remove all language directories.
-	rm -rf build-stamp 
-	rm -rf debian/*18n*
+	rm -rf $(cur_lang_dir)/build
+
+endif
 
-binary-indep: build
+debian-clean:
 	dh_testdir
+	rm -rf build
+	rm -rf debian/$(I18N_DEST_PREFIX)-*
+	rm -f debian/stamp__*
+	rm -f debian/control-lang-*
+	cat debian/control-source > debian/control
+	sed -e "s|@lang@|all|g" \
+	    -e "s|-@pkg_lang@||g" \
+	    -e "s|@lang_desc@|All languages|" \
+	    < debian/control-lang >> debian/control
+	dh_clean
+
+
+binary-arch: build
 	dh_testroot
-	dh_clean -k
-	
-	-for i in $(languages); do \
-	  ( \
-	   cd $$i && \
-	   echo $$(install_dir) && \
-	   $(MAKE) install DESTDIR=`pwd`/../debian/$$i-trinity $(DEB_MAKE_PARALLEL); \
-	   cd .. \
-	  ) \
-	done
-	
-
-	mkdir debian/koffice-i18n-engb-trinity
-	cp -aR debian/koffice-i18n-en_GB-trinity/* debian/koffice-i18n-engb-trinity/
-	
-	mkdir debian/koffice-i18n-ptbr-trinity
-	cp -aR debian/koffice-i18n-pt_BR-trinity/* debian/koffice-i18n-ptbr-trinity/
-	
-	mkdir debian/koffice-i18n-srlatin-trinity
-	cp -aR debian/koffice-i18n-sr@Latn-trinity/* debian/koffice-i18n-srlatin-trinity/
-	
-	mkdir debian/koffice-i18n-zhcn-trinity
-	cp -aR debian/koffice-i18n-zh_CN-trinity/* debian/koffice-i18n-zhcn-trinity/
-
-	mkdir debian/koffice-i18n-zhtw-trinity
-	cp -aR debian/koffice-i18n-zh_TW-trinity/* debian/koffice-i18n-zhtw-trinity/
-	
-
-	#Removing duplicate kdgantt.mo files.
-	-rm -f `find . -name "kdgantt.mo"`
+	dh_testdir
 
+
+binary-indep: build install
+	dh_testroot
+	dh_testdir
 	dh_installdocs
 	dh_installmenu
 	dh_installchangelogs
-	dh_strip
 	dh_link
+	dh_strip
+	$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
+	dh_strip_nondeterminism)
 	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
 	dh_fixperms
 	dh_installdeb
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
 
-binary:	binary-indep 
 
-.PHONY: binary binary-indep clean
+# Below here is fairly generic really
+binary: binary-indep binary-arch
+
+.PHONY: binary binary-arch binary-indep clean build install $(I18N_INSTALL)
diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
index a03e53a02..8b0b8b25c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
@@ -57,6 +57,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/karbon.svgz
+debian/tmp/opt/trinity/share/man/man1/karbon.1
 debian/tmp/opt/trinity/share/services/karbon_ai_import.desktop
 debian/tmp/opt/trinity/share/services/karbondefaulttools.desktop
 debian/tmp/opt/trinity/share/services/karbon_eps_export.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
deleted file mode 100644
index 8a212a2b2..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/karbon.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon.1 b/ubuntu/_base/applications/office/koffice/debian/karbon.1
deleted file mode 100644
index 6a4cbb8ef..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/karbon.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KARBON 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-karbon \- a vector graphics application for the Trinity Office Suite
-.SH SYNOPSIS
-.B karbon
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKarbon\fP is a vector graphics application.
-.PP
-Note that the Trinity Office Suite comes with two graphics applications \-
-Kontour (which is vector-based) and Chalk (which is raster-based).
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the karbon-specific options.
-For a full summary of options, run \fIkarbon \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH AUTHOR
-Karbon was written by Rob Buis <buis@kde.org>, Lennart Kudling
-<kudling@kde.org>, Tomislav Lukman <tomislav.lukman@ck.hinet.hr> and
-Benoit Vautrin <benoit.vautrin@free.fr>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
index c5d3596c2..a6a595a2b 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
@@ -32,6 +32,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kchart.png
+debian/tmp/opt/trinity/share/man/man1/kchart.1
 debian/tmp/opt/trinity/share/services/kchart_bmp_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_jpeg_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_mng_export.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
deleted file mode 100644
index 38c864763..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kchart.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart.1 b/ubuntu/_base/applications/office/koffice/debian/kchart.1
deleted file mode 100644
index 367f2e7ab..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kchart.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KCHART 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kchart \- a chart drawing program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kchart
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKChart\fP is a chart drawing application.  It can be used to embed charts
-into KOffice documents.  KChart is easy to use and highly configurable.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kchart-specific options.
-For a full summary of options, run \fIkchart \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kchart/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kchart/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kchart/\fP.
-.SH AUTHOR
-KChart was written by Kalle Dalheimer <kalle@kde.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Karl-Heinz Zimmer <khz@kde.org> and
-Reginald Stadlbauer <reggie@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
index c97a73fa5..c73fd674a 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
@@ -18,5 +18,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kformula.png
+debian/tmp/opt/trinity/share/man/man1/kformula.1
 debian/tmp/opt/trinity/share/services/kformulapart.desktop
 debian/tmp/opt/trinity/share/services/kformula_svg_export.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
deleted file mode 100644
index 35c78eaa9..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kformula.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula.1 b/ubuntu/_base/applications/office/koffice/debian/kformula.1
deleted file mode 100644
index ebbd55afb..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kformula.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFORMULA 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kformula \- a formula editor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kformula
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKFormula\fP is an easy to use formula editor. It provides the basic
-input facilities and the support functionality you come to expect of a
-KOffice application. But there is more. Some of its most exciting
-features are:
-.PP
-.RS
-Easy Greek letter insertion
-.PP
-Intelligent cursor movement
-.PP
-Advanced syntax highlighting
-.PP
-Multi-level undo support
-.PP
-LaTeX export (copy and paste into a text editor)
-.RE
-.PP
-KFormula uses the KOffice formula drawing library. If you have to deal
-with many formulae you may wish to use a KFormula object embedded in
-KWord or KSpread.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kformula-specific options.
-For a full summary of options, run \fIkformula \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kword (1),
-.BR kspread (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kformula/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kformula/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kformula/\fP.
-.SH AUTHOR
-KFormula was written by Andrea Rizzi <rizzi@kde.org>,
-Stephan Kulow <coolo@kde.org>, Ulrich Kuettler <ulrich.kuettler@gmx.de>,
-Heinrich Kuettler <heinrich.kuettler@gmx.de> and
-Claus O. Wilke <wilke@caltech.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
index 289580d09..b1fa9d81d 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
@@ -19,3 +19,4 @@ debian/tmp/opt/trinity/lib/trinity/straight_connector.la
 debian/tmp/opt/trinity/lib/trinity/straight_connector.so
 debian/tmp/opt/trinity/lib/libtdeinit_kivio.so
 debian/tmp/opt/trinity/lib/libkiviocommon.so.*
+debian/tmp/opt/trinity/share/man/man1/kivio.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
deleted file mode 100644
index 1f348c0ca..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kivio.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio.1 b/ubuntu/_base/applications/office/koffice/debian/kivio.1
deleted file mode 100644
index b6557f54f..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kivio.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KIVIO 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kivio \- a flowcharting program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kivio
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKivio\fP is a flowcharting program that offers basic flowcharting
-abilities, but with a twist.  Objects are scriptable, and a backend plugin
-system offers the ability to make objects do just about anything.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kivio-specific options.
-For a full summary of options, run \fIkivio \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Some documentation from the program author
-is available in \fI/usr/share/doc/kivio/\fP.
-.SH AUTHOR
-Kivio was written by Dave Marotti <lndshark@speakeasy.net>,
-Max Judin <max@thekompany.com>, Dmitry Poplavsky <dima@kde.org>,
-Peter Simonsson <psn@linux.se>, Ian Reinhart Geiser <geiseri@kde.org>,
-Laurent Montel <montel@kde.org> and theKompany.com <info@thekompany.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/koconverter.1 b/ubuntu/_base/applications/office/koffice/debian/koconverter.1
deleted file mode 100644
index 07529ada9..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koconverter.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOCONVERTER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koconverter \- convert between office suite file formats
-.SH SYNOPSIS
-.B koconverter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-mimetype\fP \fImime\fP ]
-\fIinput\fP \fIoutput\fP
-.SH DESCRIPTION
-\fBKOConverter\fP is the KOffice file format converter.  It uses the
-KOffice import and export filters to convert from any file format
-that is understood by KOffice to any other.
-.PP
-This tool is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koconverter-specific options.  For a full summary of options,
-run \fIkoconverter \-\-help\fP.
-.TP
-\fB\-\-mimetype\fP \fImime\fP
-Use \fImime\fP as the mime type for the output file.  This option should be
-used when the desired type of output file cannot be determined from its
-name alone.
-.SH EXAMPLES
-The following line will convert an Excel spreadsheet to a native KSpread
-file.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.ksp
-.RE
-.PP
-The following line will convert an Excel spreadsheet to a plain text
-file.  Note that this conversion is done internally by first importing
-to a KSpread spreadsheet and then exporting as plain text.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.txt
-.RE
-.SH AUTHOR
-KOConverter was written by David Faure <faure@kde.org>.
-.br
-This manual page was written by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
index 4be4f26eb..317098e2f 100644
--- a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
@@ -51,3 +51,5 @@ debian/tmp/opt/trinity/lib/libkstore.so.*
 debian/tmp/opt/trinity/lib/libkwmailmerge_interface.so.*
 debian/tmp/opt/trinity/lib/libkwmf.so.*
 debian/tmp/opt/trinity/lib/libkwordexportfilters.so.*
+debian/tmp/opt/trinity/share/man/man1/koconverter.1
+debian/tmp/opt/trinity/share/man/man1/koscript.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
deleted file mode 100644
index 52c63b5d7..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/koconverter.1
-debian/koscript.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koscript.1 b/ubuntu/_base/applications/office/koffice/debian/koscript.1
deleted file mode 100644
index 419c52df0..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koscript.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOSCRIPT 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koscript \- a script interpreter for the Trinity Office Suite
-.SH SYNOPSIS
-.B koscript
-[ \fIgeneric-options\fP ]
-\fIscript\fP [ \fB\-\-\fP \fIscript-options\fP ]
-.SH DESCRIPTION
-\fBKOScript\fP is the KOffice script interpreter.  It is used to run the
-given KOffice script.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koscript-specific options.  For a full summary of options,
-run \fIkoscript \-\-help\fP.
-.TP
-\fB\-\-\fP \fIscript-options\fP
-Pass \fIscript-options\fP as options to the script.
-.SH AUTHOR
-KOScript was written by Torben Weis <weis@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
index 4b63bd352..dd3561570 100644
--- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
@@ -17,3 +17,4 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/koshell.svgz
+debian/tmp/opt/trinity/share/man/man1/koshell.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
deleted file mode 100644
index fc332a5cc..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/koshell.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell.1 b/ubuntu/_base/applications/office/koffice/debian/koshell.1
deleted file mode 100644
index d1dc76870..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koshell.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOSHELL 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koshell \- the Trinity Office Suite workspace
-.SH SYNOPSIS
-.B koshell
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBKOShell\fP (the KOffice workspace) is a desktop with easy one-click
-launchers for KOffice applications.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkoshell \-\-help\fP.
-.SH AUTHOR
-KOShell was written by Torben Weis <weis@kde.org>, Simon Hausmann
-<hausmann@kde.org>, David Faure <faure@kde.org> and Sven Lüppken
-<sven@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1 b/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
deleted file mode 100644
index 635cc9556..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPRCONVERTER.PL 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kprconverter.pl \- converts a KPresenter document from old to new format
-.SH SYNOPSIS
-.B kprconverter.pl
-.I old-XML new-XML
-.SH DESCRIPTION
-This Perl script converts the XML data within a KPresenter document from the
-old format (v1) to the new format (v2), which is necessary due to the new
-text object.  It reads the old XML data from \fIold-XML\fP and writes new
-converted XML data to \fInew-XML\fP.
-.PP
-The XML data stored in a KPresenter document can be accessed by passing
-the \fB.kpr\fP document through gunzip.
-.PP
-This utility is part of the Trinity Office Suite.
-.SH NOTES
-Be aware that \fIold-XML\fP should not be the
-original \fB.kpr\fP document, but should
-instead be just the extracted XML data.
-.PP
-This script is automatically called by KPresenter when an old format
-document is opened.  Ordinary users should not need to run this script
-themselves.
-.SH SEE ALSO
-.BR kpresenter (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
index 5aada1cab..44d61cc4c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
@@ -27,3 +27,5 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so
 debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
 debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kpresenter.1
+debian/tmp/opt/trinity/share/man/man1/kprconverter.pl.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
deleted file mode 100644
index 3357e6954..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kpresenter.1
-debian/kprconverter.pl.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter.1 b/ubuntu/_base/applications/office/koffice/debian/kpresenter.1
deleted file mode 100644
index 08eddd41e..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kpresenter.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPRESENTER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpresenter \- a presentation program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kpresenter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKPresenter\fP is a fully-featured presentation program.  Presentations can
-be edited directly within KPresenter, and many advanced features for
-screen presentations are available.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kpresenter-specific options.
-For a full summary of options, run \fIkpresenter \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kpresenter/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kpresenter/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kpresenter/\fP.
-.SH AUTHOR
-KPresenter was written by Reginald Stadlbauer <reggie@kde.org>,
-Werner Trobin <trobin@kde.org>, David Faure <dfaure@kde.org>,
-Toshitaka Fujioka <fujioka@kde.org>, Lukas Tinkl <lukas@kde.org>,
-Laurent Montel <montel@kde.org>, Thorsten Zachmann <t.zachmann@zagge.de> and
-Ariya Hidayat <ariya@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
index ee708351b..915f71c19 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
@@ -49,6 +49,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kspread.png
+debian/tmp/opt/trinity/share/man/man1/kspread.1
 debian/tmp/opt/trinity/share/services/kspread_applixspread_import.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_export.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_import.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
deleted file mode 100644
index 833228aec..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kspread.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread.1 b/ubuntu/_base/applications/office/koffice/debian/kspread.1
deleted file mode 100644
index 0cf7e8861..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kspread.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSPREAD 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kspread \- a spreadsheet for the Trinity Office Suite
-.SH SYNOPSIS
-.B kspread
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKSpread\fP is a powerful spreadsheet application.  It is scriptable and
-provides both table-oriented sheets and support for complex mathematical
-formulae and statistics.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kspread-specific options.
-For a full summary of options, run \fIkspread \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kspread/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kspread/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kspread/\fP.
-.SH AUTHOR
-KSpread was written by Torben Weis <weis@kde.org>, Laurent Montel
-<montell@club-internet.fr>, David Faure <faure@kde.org> and many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
index 1ce19b21c..4fb9550bd 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
@@ -8,5 +8,6 @@ debian/tmp/opt/trinity/share/apps/thesaurus
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.docbook
+debian/tmp/opt/trinity/share/man/man1/kthesaurus.1
 debian/tmp/opt/trinity/share/services/thesaurustool.desktop
 debian/kthesaurus.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
deleted file mode 100644
index 4fb6feb79..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kthesaurus.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1 b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1
deleted file mode 100644
index 32f929bb8..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KTHESAURUS 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kthesaurus \- a thesaurus for the Trinity Office Suite
-.SH SYNOPSIS
-.B kthesaurus
-[ \fIgeneric-options\fP ] [ \fIterm\fP ]
-.SH DESCRIPTION
-\fBKThesaurus\fP is a thesaurus tool.  It lists words related to a search
-term and offers a user interface to WordNet, an online lexical reference
-system.
-.PP
-Only the English language is supported.
-.PP
-A term to search for may be optionally specified on the command-line.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkthesaurus \-\-help\fP.
-.SH SEE ALSO
-.BR kword (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/thesaurus/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/thesaurus/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/thesaurus/\fP.
-.SH AUTHOR
-KThesaurus was written by Daniel Naber <daniel.naber@t-online.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kudesigner.1 b/ubuntu/_base/applications/office/koffice/debian/kudesigner.1
deleted file mode 100644
index bb08bb355..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kudesigner.1
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUDESIGNER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kudesigner \- a report template designer for Kugar
-.SH SYNOPSIS
-.B kudesigner
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKuDesigner\fP is a tool for creating report templates to use with
-Kugar, the business report maker for KOffice.  Templates (which describe
-the layout of the data within a report) can be created in a visual
-drag-and-drop manner and then saved to file.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kudesigner-specific options.
-For a full summary of options, run \fIkudesigner \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kugar (1).
-.PP
-Full user documentation for Kugar is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-KuDesigner was written by Alexander Dymo <cloudtemple@mksat.net> and
-Joseph Wenninger <jowenn@jowenn.at>.
-.br
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
index 0cda2bece..b1b014203 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
@@ -32,5 +32,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kudesigner.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kudesigner.png
+debian/tmp/opt/trinity/share/man/man1/kugar.1
+debian/tmp/opt/trinity/share/man/man1/kudesigner.1
 debian/tmp/opt/trinity/share/services/kugar_kugar_import.desktop
 debian/tmp/opt/trinity/share/services/kugarpart.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
deleted file mode 100644
index 2a72a7d1b..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kugar.1
-debian/kudesigner.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar.1 b/ubuntu/_base/applications/office/koffice/debian/kugar.1
deleted file mode 100644
index 134747aa2..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kugar.1
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUGAR 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kugar \- a business report maker for the Trinity Office Suite
-.SH SYNOPSIS
-.B kugar
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIxml-data-file\fP ... ]
-.SH DESCRIPTION
-\fBKugar\fP is a tool for generating business quality reports that can
-be viewed and printed.  It includes a standalone report viewer and a
-KPart report viewer.  The latter means that any TDE application can
-embed the report viewing functionality and that reports can be viewed
-using the Konqueror browser.
-.PP
-Kugar will create a report for the data stored in the data file
-\fIxml-data-file\fP.  Data files typically end in \fB.kud\fP.
-Note that simply clicking on a data file in Konqueror will cause Kugar
-to create a report.
-.PP
-The data will be displayed according to the layout described in a template
-file.  This template file is generally named in the data file.
-Template files typically end in \fB.kut\fP.  See
-.BR kudesigner (1)
-for a tool for creating template files.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kugar-specific options.
-For a full summary of options, run \fIkugar \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kudesigner (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
index dfeb77b97..29ea06866 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
@@ -69,3 +69,4 @@ debian/tmp/opt/trinity/lib/trinity/libwpimport.la
 debian/tmp/opt/trinity/lib/trinity/libwpimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kword.so
 debian/tmp/opt/trinity/lib/libkwordprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kword.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
deleted file mode 100644
index a9bf36729..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kword.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kword.1 b/ubuntu/_base/applications/office/koffice/debian/kword.1
deleted file mode 100644
index e55e7f5f3..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kword.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KWORD 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kword \- a word processor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kword
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKWord\fP is a FrameMaker-like word processing and desktop publishing
-application.  KWord is capable of creating demanding and professional
-looking documents.  It can be used for desktop publishing, but also for
-"normal" word processing, like writing letters, reports and so on.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kword-specific options.
-For a full summary of options, run \fIkword \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1),
-.BR kthesaurus (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kword/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kword/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kword/\fP.
-.SH AUTHOR
-KWord was written by Reginald Stadlbauer <reggie@kde.org>, Torben Weis
-<weis@kde.org>, David Faure <dfaure@kde.org>, Thomas Zander
-<zander@kde.org>, Shaheed Haque <srhaque@iee.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Sven Lüppken <sven@kde.org>
-and many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/tellico/debian/docs b/ubuntu/_base/applications/office/tellico/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/office/tellico/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/office/tellico/debian/rules b/ubuntu/_base/applications/office/tellico/debian/rules
index 0c4cf46b6..e0960f0b5 100755
--- a/ubuntu/_base/applications/office/tellico/debian/rules
+++ b/ubuntu/_base/applications/office/tellico/debian/rules
@@ -26,6 +26,3 @@ binary-install/tellico-data-trinity::
 	[ ! -d debian/tmp/opt/trinity/share/mime ] || \
 	mv debian/tmp/opt/trinity/share/mime debian/$(cdbs_curpkg)/usr/share/
 	mv debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico.xml debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico-trinity.xml
-
-binary-install/tellico-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
index a45d88c99..c20347b59 100644
--- a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
+++ b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install
@@ -1,3 +1,5 @@
 debian/tmp/opt/trinity/bin/*
-debian/tellico.xpm /opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/share/applications/*
+debian/tmp/opt/trinity/share/man/man1/tellico.1
+
+debian/tellico.xpm /opt/trinity/share/pixmaps/
diff --git a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages
deleted file mode 100644
index 68831ac30..000000000
--- a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tellico.1x
diff --git a/ubuntu/_base/applications/office/tellico/debian/tellico.1x b/ubuntu/_base/applications/office/tellico/debian/tellico.1x
deleted file mode 100644
index 29a569a0b..000000000
--- a/ubuntu/_base/applications/office/tellico/debian/tellico.1x
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH TELLICO: "1x" "March 2008"
-.SH NAME
-Tellico \- a collection manager for TDE
-.SH SYNOPSIS
-.B tellico
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfilename\fR]
-.SH DESCRIPTION
-Tellico \- a collection manager for TDE
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-nofile\fR
-Do not reopen the last open file
-.TP
-\fB\-\-bibtex\fR
-Import <filename> as a bibtex file
-.TP
-\fB\-\-mods\fR
-Import <filename> as a MODS file
-.TP
-\fB\-\-ris\fR
-Import <filename> as a RIS file
-.SS "Arguments:"
-.TP
-filename
-File to open
-.SH "SEE ALSO"
-The full documentation for
-.B Qt:
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B Qt:
-programs are properly installed at your site, the command
-.IP
-.B info Qt:
-.PP
-should give you access to the complete manual.
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/docs b/ubuntu/_base/applications/settings/kdpkg/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/settings/kdpkg/debian/docs
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/settings/kima/debian/docs b/ubuntu/_base/applications/settings/kima/debian/docs
index 1a4f0317f..1a960e71b 100644
--- a/ubuntu/_base/applications/settings/kima/debian/docs
+++ b/ubuntu/_base/applications/settings/kima/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 FAQ
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/docs b/ubuntu/_base/applications/settings/kiosktool/debian/docs
index 724e08449..6f7727790 100644
--- a/ubuntu/_base/applications/settings/kiosktool/debian/docs
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/docs
@@ -1,2 +1,2 @@
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/docs b/ubuntu/_base/applications/settings/klcddimmer/debian/docs
index 6f83607c1..46a4ca718 100644
--- a/ubuntu/_base/applications/settings/klcddimmer/debian/docs
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 NEWS
-README
+README.md
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
index 0eb1e7d11..76c3076c9 100644
--- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
@@ -1,4 +1,3 @@
-AUTHOR
-
-
-
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/docs b/ubuntu/_base/applications/settings/tdesudo/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/settings/tdesudo/debian/docs
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
index 8fa4b0c87..960f99591 100644
--- a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
@@ -1,4 +1,4 @@
-doc/AUTHORS
-doc/NEWS
-doc/README
-doc/TODO
+AUTHORS
+NEWS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/dolphin/debian/docs b/ubuntu/_base/applications/system/dolphin/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/system/dolphin/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/katapult/debian/docs b/ubuntu/_base/applications/system/katapult/debian/docs
index 777273e59..a2b373b4d 100644
--- a/ubuntu/_base/applications/system/katapult/debian/docs
+++ b/ubuntu/_base/applications/system/katapult/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 
diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/docs b/ubuntu/_base/applications/system/kcmautostart/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/kcmautostart/debian/docs
+++ b/ubuntu/_base/applications/system/kcmautostart/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/docs b/ubuntu/_base/applications/system/kdbusnotification/debian/docs
index e845566c0..b43bf86b5 100644
--- a/ubuntu/_base/applications/system/kdbusnotification/debian/docs
+++ b/ubuntu/_base/applications/system/kdbusnotification/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/ubuntu/_base/applications/system/klamav/debian/docs b/ubuntu/_base/applications/system/klamav/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/klamav/debian/docs
+++ b/ubuntu/_base/applications/system/klamav/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/system/knemo/debian/docs b/ubuntu/_base/applications/system/knemo/debian/docs
index c17f03764..960f99591 100644
--- a/ubuntu/_base/applications/system/knemo/debian/docs
+++ b/ubuntu/_base/applications/system/knemo/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 NEWS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/system/knetload/debian/docs b/ubuntu/_base/applications/system/knetload/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/system/knetload/debian/docs
+++ b/ubuntu/_base/applications/system/knetload/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/system/knetstats/debian/docs b/ubuntu/_base/applications/system/knetstats/debian/docs
index e845566c0..b43bf86b5 100644
--- a/ubuntu/_base/applications/system/knetstats/debian/docs
+++ b/ubuntu/_base/applications/system/knetstats/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/ubuntu/_base/applications/system/kshutdown/debian/docs b/ubuntu/_base/applications/system/kshutdown/debian/docs
index 9341bcf45..d70cd6976 100644
--- a/ubuntu/_base/applications/system/kshutdown/debian/docs
+++ b/ubuntu/_base/applications/system/kshutdown/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
-README
+README.md
 TODO
 VERSION
diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/docs b/ubuntu/_base/applications/system/ksystemlog/debian/docs
index 5502ed8f4..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/ksystemlog/debian/docs
+++ b/ubuntu/_base/applications/system/ksystemlog/debian/docs
@@ -1,3 +1,2 @@
-NEWS
-README
-TODO
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/system/kvkbd/debian/docs b/ubuntu/_base/applications/system/kvkbd/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/applications/system/kvkbd/debian/docs
+++ b/ubuntu/_base/applications/system/kvkbd/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/system/polkit-agent-tde/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/system/polkit-agent-tde/debian/changelog b/ubuntu/_base/applications/system/polkit-agent-tde/debian/changelog
new file mode 100644
index 000000000..434ce69fc
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/changelog
@@ -0,0 +1,67 @@
+polkit-agent-tde (0.99.1-2) unstable; urgency=low
+
+  * Port to TDE and package renaming
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sun, 19 Dec 2021 18:12:00 +0900
+
+polkit-kde-1 (0.99.1-1) unstable; urgency=low
+
+  * Team upload.
+
+  [ Felix Geyer ]
+  * New upstream release.
+    - Drop fix_dialog_focus.diff, applied upstream.
+    - Remove non-functional checkbox "Remember password". (Closes: #691104)
+  * Remove obsolete /etc/xdg/autostart/polkit-kde-authentication-agent-1.desktop
+    on upgrade. (Closes: #645440)
+  * Bump Standards-Version to 3.9.4, no changes needed.
+
+  [ Pino Toscano ]
+  * The rebuild changes the tdebase-runtime dependency to kde-runtime.
+    (Closes: #716849)
+  * Update Vcs-* headers
+
+ -- Felix Geyer <fgeyer@debian.org>  Mon, 12 Aug 2013 11:58:57 +0200
+
+polkit-kde-1 (0.99.0-3) unstable; urgency=low
+
+  [ Scott Kitterman ]
+  * Add debian/patches/fix_dialog_focus.diff from Kubuntu
+    - Prevents the auth dialog from popping up in the background where it can't
+      be seen
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 23 Jun 2011 11:38:30 +0300
+
+polkit-kde-1 (0.99.0-2) unstable; urgency=low
+
+  [ Modestas Vainius ]
+  * Bump Standards-Version to 3.9.2: no changes needed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 May 2011 00:28:45 +0300
+
+polkit-kde-1 (0.99.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+  [ Modestas Vainius ]
+  * Add Vcs fields to debian/control.
+  * Switch to dhmk based debian-qt-kde.mk.
+
+  [ José Manuel Santamaría Lema ]
+  * Bump Standards-Version to 3.9.1, no changes needed.
+  * Bump libpolkit-qt-1-dev build depend to 0.99.0.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 23 Mar 2011 01:30:52 +0200
+
+polkit-kde-1 (0.95.1-2) unstable; urgency=low
+
+  * Update debian/control: add policykit-1 dependency.
+
+ -- Fathi Boudra <fabo@debian.org>  Mon, 22 Mar 2010 09:08:17 +0100
+
+polkit-kde-1 (0.95.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #571531)
+
+ -- Fathi Boudra <fabo@debian.org>  Thu, 25 Feb 2010 20:43:18 +0100
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat b/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/control b/ubuntu/_base/applications/system/polkit-agent-tde/debian/control
new file mode 100644
index 000000000..645e7ec1e
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/control
@@ -0,0 +1,25 @@
+Source: polkit-agent-tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Fathi Boudra <fabo@debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libpolkit-tqt-dev
+Standards-Version: 3.9.4
+Section: libs
+
+Package: polkit-agent-tde
+Architecture: any
+Provides: polkit-1-auth-agent
+Replaces: tde-ubuntu-integration
+Breaks: tde-ubuntu-integration
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1
+Conflicts: tde-ubuntu-integration
+Description: TDE dialogs for PolicyKit
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ PolicyKit-agent-tde provides a D-Bus session bus service that is used to
+ bring up authentication dialogs used for obtaining privileges.
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright b/ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright
new file mode 100644
index 000000000..a9cebd94f
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright
@@ -0,0 +1,52 @@
+This code was ported to TDE and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+    https://snapshot.debian.org/package/polkit-kde-1/0.99.1-1/
+
+Original polkit-kde-1 code was packaged for Debian by:
+
+    Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+    Jaroslav Reznik <jreznik@redhat.com>
+    Gökçen Eraslan <gokcen@pardus.org.tr>
+    Dario Freddi <drf@kde.org>
+    Daniel Nicoletti <dantti85-pk@yahoo.com.br>
+    Dirk Mueller <mueller@kde.org>
+
+Copyright:
+
+    Copyright (C) 2009 Jaroslav Reznik
+    Copyright (C) 2007-2008 Gökçen Eraslan
+    Copyright (C) 2008-2009 Dario Freddi
+    Copyright (C) 2008 Daniel Nicoletti
+    Copyright (C) 2008 Dirk Mueller
+
+License:
+
+    This package 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 package 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, 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' and
+`/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/docs b/ubuntu/_base/applications/system/polkit-agent-tde/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/patches/series b/ubuntu/_base/applications/system/polkit-agent-tde/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/patches/series
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules b/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules
@@ -0,0 +1,17 @@
+#!/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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/format b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/options b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/control b/ubuntu/_base/applications/system/smartcardauth/debian/control
index d370c6f02..f1db4e038 100644
--- a/ubuntu/_base/applications/system/smartcardauth/debian/control
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.4
 
 Package: smartcardauth
 Architecture: any
-Depends: ${shlibs:Depends}, pcsc-tools, pcscd-nodbus | pcscd (>= 1.7~), initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu
+Depends: ${shlibs:Depends}, pcsc-tools, pcscd-nodbus | pcscd (>= 1.7~), initramfs-tools, libpcsc-perl, libpcsclite1, libccid, opensc, zenity, gksu, psmisc, xxd
 Replaces: smartcardauth (<< 4:14.0.0~)
 Breaks: smartcardauth (<< 4:14.0.0~)
 Conflicts: openct
diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/docs b/ubuntu/_base/applications/system/smartcardauth/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/system/smartcardauth/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/system/tastymenu/debian/docs b/ubuntu/_base/applications/system/tastymenu/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/system/tastymenu/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/docs b/ubuntu/_base/applications/system/tdepowersave/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/rules b/ubuntu/_base/applications/system/tdepowersave/debian/rules
index 01e5357b6..58af3504b 100755
--- a/ubuntu/_base/applications/system/tdepowersave/debian/rules
+++ b/ubuntu/_base/applications/system/tdepowersave/debian/rules
@@ -4,8 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
-
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
@@ -20,4 +18,3 @@ DEB_CMAKE_EXTRA_FLAGS := \
 
 install/tdepowersave-trinity::
 	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
-	install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..5b4e8bfd7
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk
@@ -0,0 +1,237 @@
+# -*- 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
+
+# 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),+$(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 .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/system/tdesshaskpass/debian/changelog b/ubuntu/_base/applications/system/tdesshaskpass/debian/changelog
new file mode 100644
index 000000000..6d6634085
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/changelog
@@ -0,0 +1,11 @@
+tdesshaskpass-trinity (4:14.0.11~pre0+0debian8.0.0+0) unstable; urgency=low
+
+  * Initial TDE release
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Thu, 26 Aug 2021 03:00:00 +0200
+
+ksshaskpass (0.4.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #413109)
+
+ -- Armin Berres <trigger+debian@space-based.de>  Tue, 10 Jun 2008 23:40:01 +0200
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/compat b/ubuntu/_base/applications/system/tdesshaskpass/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/control b/ubuntu/_base/applications/system/tdesshaskpass/debian/control
new file mode 100644
index 000000000..dd6674b51
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/control
@@ -0,0 +1,14 @@
+Source: tdesshaskpass-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+X-Original-Maintainer: Armin Berres <trigger+debian@space-based.de>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev
+Standards-Version: 3.8.0
+
+Package: tdesshaskpass-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, openssh-client
+Provides: ssh-askpass
+Description: interactively prompt users for a passphrase for ssh-add
+ A TDE version of ssh-askpass with TDEWallet support.
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/copyright b/ubuntu/_base/applications/system/tdesshaskpass/debian/copyright
new file mode 100644
index 000000000..b5f032375
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/copyright
@@ -0,0 +1,35 @@
+This package was debianized by Armin Berres <trigger+debian@space-based.de> on
+Mon, 28 May 2007 15:33:02 +0200.
+
+It was downloaded from http://www.kde-apps.org/content/show.php/show.php?content=50971
+
+Upstream Author:
+
+    Armin Berres <trigger@space-based.de>
+
+Copyright: 
+
+    Copyright (C) 2006 Hans van Leeuwen
+    Copyright (C) 2008 Armin Berres
+
+License:
+
+    This package 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 package 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, 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'.
+
+The Debian packaging is (C) 2008, Armin Berres <trigger+debian@space-based.de> and
+is licensed under the GPL, see above.
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/docs b/ubuntu/_base/applications/system/tdesshaskpass/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/patches/series b/ubuntu/_base/applications/system/tdesshaskpass/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/patches/series
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/postinst b/ubuntu/_base/applications/system/tdesshaskpass/debian/postinst
new file mode 100644
index 000000000..7b881b29b
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/postinst
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postinst script for tdesshaskpass
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+        update-alternatives --quiet \
+            --install /usr/bin/ssh-askpass ssh-askpass \
+            /opt/trinity/bin/tdesshaskpass 35
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/prerm b/ubuntu/_base/applications/system/tdesshaskpass/debian/prerm
new file mode 100644
index 000000000..48eb7bfd7
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/prerm
@@ -0,0 +1,43 @@
+#!/bin/sh
+# prerm script for tdesshaskpass
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|deconfigure)
+      update-alternatives --quiet \
+          --remove ssh-askpass /opt/trinity/bin/tdesshaskpass
+    ;;
+
+    upgrade)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/rules b/ubuntu/_base/applications/system/tdesshaskpass/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/rules
@@ -0,0 +1,17 @@
+#!/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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/tdeio/tdeio-appinfo/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/changelog
new file mode 100644
index 000000000..39785e5c7
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/changelog
@@ -0,0 +1,6 @@
+tdeio-appinfo-trinity (0.1.5-0) testing; urgency=low
+
+  * First TDE release
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sat, 25 Aug 2018 21:56:00 +0900
+
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control
new file mode 100644
index 000000000..b5c61299d
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control
@@ -0,0 +1,16 @@
+Source: tdeio-appinfo-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Robert Hogan <robert@roberthogan.net>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+
+Package: tdeio-appinfo-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: TDEIO slave for the appinfo protocol
+ Adds support for the "appinfo:" protocol
+ to Konqueror and other TDE applications.
+ .
+ This enables you to perform appinfo: searches in TDE.
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright
new file mode 100644
index 000000000..f64b4fdd9
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright
@@ -0,0 +1,11 @@
+This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on
+Sat, 08 May 2022 20:11:00 +0900
+
+Copyright:
+    This program was initially written by Robert Hogan <robert@roberthogan.net>
+
+License:
+    You are free to distribute this software under the terms of
+    the GNU General Public License 2 or higher.
+    On Debian systems, the complete text of the GNU General Public
+    License can be found in the file `/usr/share/common-licenses/GPL'.
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/patches/series b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/patches/series
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules
new file mode 100755
index 000000000..16f2fa011
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
+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="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 INSTALL
-README
+README.md
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/tdeio/tdeio-gopher/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/changelog
new file mode 100644
index 000000000..42dfe20d9
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/changelog
@@ -0,0 +1,6 @@
+tdeio-gopher-trinity (0.1.4-1debian0) buster; urgency=low
+
+  * Buster rebuild
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Sat, 25 Aug 2018 21:56:00 +0900
+
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
new file mode 100644
index 000000000..2752551e6
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
@@ -0,0 +1,19 @@
+Source: tdeio-gopher-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Albert Astals Cid <aacid@kde.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Standards-Version: 3.8.4
+
+Package: tdeio-gopher-trinity
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kio-gopher-trinity (<< 4:14.0.0~)
+Breaks: kio-gopher-trinity (<< 4:14.0.0~)
+Conflicts: kdebase-kio-plugins-trinity (<< 4:14.0.11~), tdebase-tdeio-plugins-trinity (<< 4:14.0.11~)
+Description: tdeio-slave for the gopher protocol [Trinity]
+ Adds support for the "gopher:" protocol
+ to Konqueror and other TDE applications.
+ .
+ This enables you to perform gopher searches in Konqueror.
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/copyright
new file mode 100644
index 000000000..31f347396
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/copyright
@@ -0,0 +1,16 @@
+This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on
+Sat, 25 Aug 2018 21:56:00 +0900
+
+Copyright:
+    This program was initially written by Albert Astals Cid.
+    Copyright (C) 2003-2008 by Albert Astals Cid
+    aacid@kde.org
+
+Upstream Authors:
+    Albert Astals Cid <aacid@kde.org>
+
+License:
+    You are free to distribute this software under the terms of
+    the GNU General Public License.
+    On Debian systems, the complete text of the GNU General Public
+    License can be found in the file `/usr/share/common-licenses/GPL'.
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/patches/series b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/patches/series
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules
new file mode 100755
index 000000000..5a24d4563
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/rules
@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_KDE_APIDOX := yes
+
+CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DLIB_SUFFIX="" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+DEB_INSTALL_DOCS_tdeio-gopher-trinity := -XREADME -XNEWS -XTODO -XAUTHORS
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
index c9e6b78b0..b9e54f6a9 100755
--- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
+++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules
@@ -31,5 +31,3 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS
diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
+++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
deleted file mode 100644
index 6bc424f8e..000000000
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file was written by TDE
-# You can edit it in the Trinity control center, under "GTK Styles and Fonts"
-
-include "/usr/share/themes/Qt/gtk-2.0/gtkrc"
-
-style "user-font"
-{
-	font_name="Sans Serif 9"
-}
-widget_class "*" style "user-font"
-
-gtk-theme-name="Qt"
-gtk-font-name="Sans Serif 9"
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
deleted file mode 100644
index e25e89fd4..000000000
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file was written by TDE
-# You can edit it in the Trinity control center, under "GTK Styles and Fonts"
-
-include "/usr/share/themes/Qt/gtk-2.0/gtkrc"
-
-style "user-font"
-{
-	font_name="Tahoma 10"
-}
-widget_class "*" style "user-font"
-
-gtk-theme-name="Qt"
-gtk-font-name="Tahoma 10"
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
index 5502ed8f4..76c3076c9 100644
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
@@ -1,3 +1,3 @@
-NEWS
-README
+AUTHORS
+README.md
 TODO
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
deleted file mode 100644
index b477f5ce2..000000000
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Make sure our customised gtkrc file is loaded.
-export GTK2_RC_FILES=$HOME/.gtkrc-2.0-kde4
diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
index 8f250b682..a6797f19a 100755
--- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
+++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules
@@ -1,34 +1,17 @@
 #!/usr/bin/make -f
 
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
 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" \
- -DLIB_SUFFIX="" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
  -DSYSCONF_INSTALL_DIR="/etc/trinity" \
- -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
- -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" \
- -DAUTODETECT_QT_DIRS="ON" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DBUILD_ALL="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-binary-install/gtk-qt-engine-trinity::
-	mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
-	cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
-	cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
-	cp -Rp $(CURDIR)/debian/gtk-qt-engine.rc.sh $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/themes/gtk3-tqt-engine/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/themes/gtk3-tqt-engine/debian/control b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
index 8b7033112..f8fb914e5 100644
--- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev
 Standards-Version: 3.8.4
 
 Package: gtk3-tqt-engine-trinity
diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/docs b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules
index 1a185d594..a6797f19a 100755
--- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules
+++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules
@@ -1,39 +1,17 @@
 #!/usr/bin/make -f
 
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-# 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
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
index c17f03764..0b6e0f321 100644
--- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
+++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.docs
@@ -1,4 +1,2 @@
 AUTHORS
-NEWS
-README
-TODO
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/docs b/ubuntu/_base/applications/themes/tde-style-domino/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
index 0948b8ef4..4c9a51eb2 100644
--- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
+++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/docs
@@ -1,4 +1,4 @@
+AUTHORS
 BUGS
-README
+README.md
 TODO
-AUTHORS
diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs b/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs
index e845566c0..0b6e0f321 100644
--- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs
+++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/themes/twin-style-dekorator/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/themes/twin-style-dekorator/debian/changelog b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/changelog
new file mode 100644
index 000000000..1383a9a15
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/changelog
@@ -0,0 +1,12 @@
+twin-style-dekorator-trinity (0.3-2) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Mavridis Philippe <mavridisf@gmail.com>  Fri, 30 Jul 2021 12:35:19 +0900
+
+kwin-style-dekorator (0.3-1) unstable; urgency=low
+
+  * Initial release (Closes: #374869)
+
+ -- Sune Vuorela <debian@pusling.com>  Wed, 21 Jun 2006 20:04:02 +0200
+
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control
new file mode 100644
index 000000000..4625fc1f0
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control
@@ -0,0 +1,17 @@
+Source: twin-style-dekorator-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev
+Standards-Version: 3.7.2
+
+Package: twin-style-dekorator-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Window decorations for TDE using user-supplied PNG files
+ Make your own window decorations easy with deKorator.
+ Dekorator uses your own made images for buttons, borders
+ and so on, so go ahead and be creative.
+ .
+ This is a window decoration, not a style
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/copyright b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/copyright
new file mode 100644
index 000000000..832fc1bd9
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/copyright
@@ -0,0 +1,30 @@
+This package was debianized by Sune Vuorela <debian@pusling.com> on
+Wed, 21 Jun 2006 20:04:02 +0200.
+
+It was downloaded from http://www.kde-look.org/content/show.php?content=31447
+
+Copyright 2005-2006: moty rahamim <moty.rahamim (at) gmail.com>
+
+
+
+License:
+
+   This package 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 package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, 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'.
+
+The Debian packaging is (C) 2006, Sune Vuorela <debian@pusling.com> and
+is licensed under the GPL, see above.
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/docs b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/patches/series b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/patches/series
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/rules
@@ -0,0 +1,17 @@
+#!/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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/source/format b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/source/options b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/themes/twin-style-machbunt/debian/changelog b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/changelog
new file mode 100644
index 000000000..b58d7112d
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/changelog
@@ -0,0 +1,6 @@
+twin-style-machbunt-trinity (0.1-1) unstable; urgency=low
+
+  * Initial release for TDE
+
+ -- Mavridis Philippe <mavridisf@gmail.com>  Sun, 16 Oct 2022 11:07:15 +0900
+
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control
new file mode 100644
index 000000000..0960aefca
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control
@@ -0,0 +1,15 @@
+Source: twin-style-machbunt-trinity
+Section: tde
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Adrian Schroeter <adrian@suse.de>, Gerd Fleischer <gerdfleischer@web.de>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev
+Standards-Version: 3.6.2
+
+Package: twin-style-machbunt-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TDE window decoration from SUSE 9.1/9.2
+ This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2.
+ .
+ An example color scheme is provided too.
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/copyright b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/copyright
new file mode 100644
index 000000000..dfd1f265b
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/copyright
@@ -0,0 +1,31 @@
+This code was ported to TDE by:
+    Mavridis Philippe <mavridisf@gmail.com>
+and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+
+Original authors and copyright:
+  Adrian Schroeter <adrian@suse.de>
+  Gerd Fleischer   <gerdfleischer@web.de>
+
+On Debian systems, the complete text of the GNU Library General Public
+License can be found in `/usr/share/common-licenses/LGPL'.
+
+For the rest of the package this license applies:
+
+   This package 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; version 2 dated June, 1991.
+
+   This package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02111-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/patches/series b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/patches/series
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules
@@ -0,0 +1,17 @@
+#!/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="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/format b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/options b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages b/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
deleted file mode 100644
index 0737a321e..000000000
--- a/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/abakus.1
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/abakus.1 b/ubuntu/_base/applications/utilities/abakus/debian/abakus.1
deleted file mode 100644
index 1411beebd..000000000
--- a/ubuntu/_base/applications/utilities/abakus/debian/abakus.1
+++ /dev/null
@@ -1,143 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH ABAKUS 1 "Oct 2005" "Trinity Desktop Environment" "A simple keyboard-driven calculator"
-.SH NAME
-abakus
-\- A simple keyboard-driven calculator
-.SH SYNOPSIS
-abakus [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-A simple keyboard-driven calculator
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/abakus/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/abakus/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Michael Pyne <michael.pyne@kdemail.net>
-.br
-
diff --git a/ubuntu/_base/applications/utilities/abakus/debian/rules b/ubuntu/_base/applications/utilities/abakus/debian/rules
index 3c72c1e14..aaf4d4db4 100755
--- a/ubuntu/_base/applications/utilities/abakus/debian/rules
+++ b/ubuntu/_base/applications/utilities/abakus/debian/rules
@@ -41,8 +41,5 @@ common-install-arch::
 	install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm
 	dh_icons -pabakus-trinity
 
-binary-install/abakus-trinity::
-	mv debian/abakus-trinity/usr/share/man debian/abakus-trinity/opt/trinity/share/
-
 clean::
 	rm -f debian/abakus.xpm
diff --git a/ubuntu/_base/applications/utilities/filelight/debian/docs b/ubuntu/_base/applications/utilities/filelight/debian/docs
new file mode 100644
index 000000000..76c3076c9
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/filelight/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README.md
+TODO
diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/docs b/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
index 1ed9b5bd5..b72409e5a 100644
--- a/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
+++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 FAQ
-README
+README.md
diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/docs b/ubuntu/_base/applications/utilities/kdirstat/debian/docs
index 7f03542b1..871711684 100644
--- a/ubuntu/_base/applications/utilities/kdirstat/debian/docs
+++ b/ubuntu/_base/applications/utilities/kdirstat/debian/docs
@@ -1,4 +1,4 @@
 AUTHORS
 CREDITS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/utilities/keep/debian/docs b/ubuntu/_base/applications/utilities/keep/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/utilities/keep/debian/docs
+++ b/ubuntu/_base/applications/utilities/keep/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/docs b/ubuntu/_base/applications/utilities/knutclient/debian/docs
index e845566c0..0b6e0f321 100644
--- a/ubuntu/_base/applications/utilities/knutclient/debian/docs
+++ b/ubuntu/_base/applications/utilities/knutclient/debian/docs
@@ -1 +1,2 @@
-README
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/utilities/krename/debian/docs b/ubuntu/_base/applications/utilities/krename/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/utilities/krename/debian/docs
+++ b/ubuntu/_base/applications/utilities/krename/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/docs b/ubuntu/_base/applications/utilities/ksensors/debian/docs
index ca0272abf..76c3076c9 100644
--- a/ubuntu/_base/applications/utilities/ksensors/debian/docs
+++ b/ubuntu/_base/applications/utilities/ksensors/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
-README
+README.md
 TODO
diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/docs b/ubuntu/_base/applications/utilities/mathemagics/debian/docs
index 6f12db508..0b6e0f321 100644
--- a/ubuntu/_base/applications/utilities/mathemagics/debian/docs
+++ b/ubuntu/_base/applications/utilities/mathemagics/debian/docs
@@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control
index 56889bd5c..dc6bfaba3 100644
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 X-Original-Maintainer: Vincent Legout <vincent@legout.info>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, libqalculate-dev (>= 0.9.6), libcln-dev, libgmp3-dev, libxml2-dev, tdelibs-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6)
 Standards-Version: 3.8.4
 Homepage: http://qalculate.sourceforge.net/
 
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/docs b/ubuntu/_base/applications/utilities/qalculate-tde/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1 b/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1
deleted file mode 100644
index 90682e55b..000000000
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH QALC 1 "28 December 2008"
-.SH NAME
-qalculate-tde \- Powerful and easy to use desktop calculator
-.SH SYNOPSIS
-.B qalculate-tde
-.SH DESCRIPTION
-Qalculate! is a small and simple to use calculator but with much power and
-versatility underneath. Features include customizable functions, units,
-arbitrary precision using a one-line fault-tolerant expression entry.
-.PP
-\fBqalculate-tde\fP is the TDE version of Qalculate!.
-.SH AUTHORS
-Original qalculate-kde was written by Niklas Knutsson <nq@altern.org>.
-.PP
-This manual page was originally written by Vincent Legout <vincent@legout.info>,
-for the Debian system (but may be used by others).
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages b/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages
deleted file mode 100644
index f3d6ef522..000000000
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/qalculate-tde.1
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules b/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules
index d03dd383d..a6797f19a 100755
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules
+++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules
@@ -1,15 +1,17 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-install/qalculate-trinity::
-	rm debian/qalculate-trinity/opt/trinity/bin/qalculate
-
-clean::
-	rm -f po/*.gmo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/watch b/ubuntu/_base/applications/utilities/qalculate-tde/debian/watch
deleted file mode 100644
index c98cd4d96..000000000
--- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/qalculate/ qalculate-kde-(.*).tar.gz
diff --git a/ubuntu/_base/common/cmake/debian/control b/ubuntu/_base/common/cmake/debian/control
index 1363e01ee..50ea830ef 100644
--- a/ubuntu/_base/common/cmake/debian/control
+++ b/ubuntu/_base/common/cmake/debian/control
@@ -2,7 +2,7 @@ Source: cmake-trinity
 Section: tde
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~)
 Standards-Version: 3.8.4
 
 Package: cmake-trinity
diff --git a/ubuntu/_base/core/tde-i18n/debian/rules b/ubuntu/_base/core/tde-i18n/debian/rules
index 0daf98a6d..900b2d86e 100755
--- a/ubuntu/_base/core/tde-i18n/debian/rules
+++ b/ubuntu/_base/core/tde-i18n/debian/rules
@@ -150,6 +150,7 @@ binary-indep: build install
 	dh_installdocs
 	dh_installmenu
 	dh_installchangelogs
+	dh_link
 	dh_strip
 	$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
 	dh_strip_nondeterminism)
diff --git a/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install b/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install
index aff5ed18a..e01f62f5d 100644
--- a/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.install
@@ -5,3 +5,4 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/atlantikdesigner
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/atlantikdesigner.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/atlantikdesigner.png
 debian/icons/atlantikdesigner.xpm /opt/trinity/share/pixmaps
+debian/tmp/opt/trinity/share/man/man1/atlantikdesigner.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.manpages
deleted file mode 100644
index f0b5385f4..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/atlantikdesigner-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/atlantikdesigner-trinity.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.install b/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.install
index 22bc62c71..de806109c 100644
--- a/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.install
@@ -164,6 +164,10 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/metabar.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/metabar.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/metabar.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
+debian/tmp/opt/trinity/share/man/man1/exif.py.1
+debian/tmp/opt/trinity/share/man/man1/fsview.1
+debian/tmp/opt/trinity/share/man/man1/jpegorient.1
+debian/tmp/opt/trinity/share/man/man1/orient.py.1
 debian/tmp/opt/trinity/share/services/akregator_konqplugin.desktop
 debian/tmp/opt/trinity/share/services/ark_plugin.desktop
 debian/tmp/opt/trinity/share/services/fsview_part.desktop
diff --git a/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.manpages
deleted file mode 100644
index b33b9ee5a..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/konq-plugins-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/exif-trinity.py.1
-debian/man/fsview-trinity.1
-debian/man/jpegorient-trinity.1
-debian/man/orient-trinity.py.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.install b/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.install
index 10959a93a..94b1c6d7f 100644
--- a/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.install
@@ -8,3 +8,4 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksig/screenshot.png
+debian/tmp/opt/trinity/share/man/man1/ksig.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.manpages
deleted file mode 100644
index 2b3ef735d..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/ksig-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ksig-trinity.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/atlantikdesigner-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/atlantikdesigner-trinity.1
deleted file mode 100644
index 41a1aeb2b..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/atlantikdesigner-trinity.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ATLANTIKDESIGNER 1 "October 14, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-atlantikdesigner \- game board designer for Atlantik
-.SH SYNOPSIS
-.B atlantikdesigner
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBAtlantik Designer\fP is a game board designer for Atlantik.
-.PP
-Atlantik is a TDE client for playing Monopoly-like board games on the
-monopd network.  It can play any board supported by the network
-server, including the classic Monopoly game as well as the Atlantik
-game in which the properties include several major cities in North
-America and Europe.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-For a full summary of options, run \fIatlantikdesigner \-\-help\fP.
-.SH SEE ALSO
-.BR atlantik (6).
-.SH AUTHOR
-Atlantik Designer was written by Jason Katz-Brown <jason@katzbrown.com>
-and Rob Kaper <cap@capsi.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/exif-trinity.py.1 b/ubuntu/_base/core/tdeaddons/debian/man/exif-trinity.py.1
deleted file mode 100644
index 73179046f..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/exif-trinity.py.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXIF.PY 1 "February 4, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-exif.py \- extract EXIF information from digital camera image files
-.SH SYNOPSIS
-.B exif.py
-\fIimage-file\fP ...
-.SH DESCRIPTION
-This is a Python library for extracting EXIF tags from digital camera
-image files.  It contains a command-line testing and debugging interface,
-which reads EXIF tags from the given files and dumps them to the
-console.
-.PP
-This library is provided with the image conversion and transformation
-plugins for Konqueror.  The JPEG rotation/reflection tool \fBjpegorient\fP,
-part of the same set of plugins, makes use of this library.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH SEE ALSO
-.BR jpegorient (1),
-.BR konqueror (1),
-.BR orient.py (1).
-.SH AUTHOR
-The EXIF extraction library was written by Thierry Bousch
-<bousch@topo.math.u-psud.fr>, Gene Cash <gcash@cfl.rr.com> and
-Leif Jensen <jensen@math.columbia.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/fsview-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/fsview-trinity.1
deleted file mode 100644
index a1dd43b20..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/fsview-trinity.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FSVIEW 1 "February 4, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fsview \- a filesystem viewer that graphically shows disk usage
-.SH SYNOPSIS
-.B fsview
-.RI "[ " generic-options " ]"
-[ \fIfolder\fP ]
-.SH DESCRIPTION
-\fBFSView\fP is a tool for showing disc utilization in a graphical form, much
-like the UNIX command 'du'.  The visualisation type chosen is a
-treemap.  Each directory is represented by a rectangle whose area is
-proportional to its size.  Each directory rectangle contains smaller
-rectangles for its contents, and so on down.
-.PP
-FSView is provided both as a Konqueror plugin for viewing directories,
-and as a standalone executable.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the fsview-specific options.
-For a full summary of options, run \fIfsview \-\-help\fP.
-.TP
-\fIfolder\fP
-View the filesystem starting from this folder.
-.SH SEE ALSO
-.BR du (1),
-.BR kdirstat (1),
-.BR konqueror (1).
-.PP
-For a full featured graphical 'du', see KDirStat.  It's quite similar
-to FSView, but allows for lot of cleanup actions.
-.SH AUTHOR
-FSView was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/jpegorient-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/jpegorient-trinity.1
deleted file mode 100644
index 3317c868c..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/jpegorient-trinity.1
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH JPEGORIENT 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-jpegorient \- change the orientations of JPEG images
-.SH SYNOPSIS
-.B jpegorient
-{ \fB\-90\fP | \fB\-180\fP | \fB\-270\fP | \fB\-v\fP | \fB\-h\fP }
-\fIimage-file\fP ...
-.SH DESCRIPTION
-This is a simple utility for changing the orientations of one or more
-JPEG images.
-It is provided as part of the image conversion and transformation
-plugins for Konqueror.
-.PP
-A single option must be passed before any filenames to specify how the
-orientations of the images are to be changed.  Each new image will be
-saved over the old one.
-.PP
-This utility makes use of
-.BR orient.py (1),
-which is designed to work with certain types of digital camera image
-files.  Instead of modifying the image data, it alters the EXIF
-tags stored with the image to reflect the new orientation.  For this
-reason only images with the correct types of EXIF tags can be changed
-using this tool.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH OPTIONS
-.TP
-\fB\-90\fP
-Rotate each image by 90 degrees clockwise.
-.TP
-\fB\-180\fP
-Rotate each image by a half turn (i.e., 180 degrees).
-.TP
-\fB\-270\fP
-Rotate each image by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
-.TP
-\fB\-v\fP
-Flip each image vertically.
-.TP
-\fB\-h\fP
-Flip each image horizontally.
-.SH SEE ALSO
-.BR exif.py (1),
-.BR konqueror (1),
-.BR orient.py (1).
-.SH AUTHOR
-The image transformation plugins were written by
-Leif Jensen <jensen@math.columbia.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/ksig-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/ksig-trinity.1
deleted file mode 100644
index 5c0ec94b5..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/ksig-trinity.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSIG 1 "February 4, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ksig \- a graphical tool for managing multiple email signatures
-.SH SYNOPSIS
-.B ksig
-.RI "[ " generic-options " ]"
-[ \fB\-\-random\fP | \fB\-\-daily\fP ]
-.SH DESCRIPTION
-\fBKSig\fP is a graphical tool for keeping track of many different email
-signatures.  The signatures themselves can be edited through KSig's
-graphical user interface.  This is done by starting KSig in the usual way
-through the menus, or by running KSig without either of the special
-options \-\-random or \-\-daily.
-.PP
-A direct command-line interface is then available for generating random
-or daily signatures from this list.  This is achieved by running KSig
-with one of the options \-\-random or \-\-daily, both of which are
-described below.
-.PP
-The command-line interface makes a suitable plugin for generating
-signatures in external mail clients such as KMail.  See
-\fI/opt/trinity/share/doc/ksig/README.Debian\fP for details on how this can be
-done.
-.PP
-This application is part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the ksig-specific options.
-For a full summary of options, run \fIksig \-\-help\fP.
-.TP
-\fB\-\-random\fP
-Write a random signature from the list to the console.
-.TP
-\fB\-\-daily\fP
-Write a signature for the day to the console.  The signature will change
-from day to day, but multiple calls on the same day will always return
-the same signature.
-.SH SEE ALSO
-.BR kmail (1).
-.SH AUTHOR
-KSig was written by Scott Wheeler <wheeler@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/lnkforward-trinity.1 b/ubuntu/_base/core/tdeaddons/debian/man/lnkforward-trinity.1
deleted file mode 100644
index 692d6182a..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/lnkforward-trinity.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH LNKFORWARD 1 "October 23, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-lnkforward \- open an URL in a Windows .lnk file under TDE
-.SH SYNOPSIS
-.B lnkforward
-[ \fIgeneric-options\fP ]
-[ \fB\-\-map\fP \fIdrive\fP=\fIpath\fP ... ]
-\fIURL\fP
-.SH DESCRIPTION
-\fBlnkforward\fP examines a Windows .lnk file, determines its target and
-then opens this target file.  In deciding how to open the target file,
-the usual TDE file associations will be used.
-.PP
-The given URL must include a protocol.  Specifically, if it is simply a
-file on the local filesystem, it must be given in the form
-\fIfile:/path/to/file.lnk\fP.
-.PP
-Drive mappings must be supplied (via \-\-map) for any Windows drive
-referred to in the .lnk file.  See the OPTIONS section below for details.
-.PP
-This utility is used by the .lnk tdefile plugin, and is
-part of the official TDE add-ons module.
-.SH OPTIONS
-Below are the lnkforward-specific options.
-For a full summary of options, run \fIlnkforward \-\-help\fP.
-.TP
-\fB\-\-map\fP \fIdrive\fP=\fIpath\fP
-Map the given Windows drive to the given path on the local filesystem
-(generally its mount point).
-This option may be passed multiple times.
-.SH EXAMPLE
-Suppose that the Windows file \fIc:\\readme.txt.lnk\fP is a link to
-\fId:\\foo\\bar.txt\fP.  Then the following command will open the file
-\fI/mnt/data/foo/bar.txt\fP in the usual TDE text editor:
-.PP
-.RS
-\fIprompt$\fP
-lnkforward \-\-map c=/mnt/windows \-\-map d=/mnt/data /mnt/windows/readme.lnk
-.RE
-.SH AUTHOR
-This utility was written by Martin Koller <m.koller@surfeu.at>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1 b/ubuntu/_base/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
deleted file mode 100644
index fe860f1f8..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NOATUNSYNAESCOPE.BIN 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-noatunsynaescope.bin \- start the Synaescope visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatunsynaescope.bin
-.SH DESCRIPTION
-This program starts the Synaescope visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Synaescope plugin was written by Charles Samuels <charles@kde.org>,
-Paul Francis Harrison <pfh@yoyo.cc.monash.edu.au> et al.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1 b/ubuntu/_base/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
deleted file mode 100644
index b33eb3b16..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NOATUNTIPPECANOE.BIN 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-noatuntippecanoe.bin \- start the Tippecanoe visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatuntippecanoe.bin
-.SH DESCRIPTION
-This program starts the Tippecanoe visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Tippecanoe plugin was written by Neil Stevens <multivac@fcmail.com>,
-Charles Samuels <charles@kde.org> and
-Paul Francis Harrison <pfh@yoyo.cc.monash.edu.au>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1 b/ubuntu/_base/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1
deleted file mode 100644
index 5a4001047..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/noatuntyler-trinity.bin.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NOATUNTYLER.BIN 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-noatuntyler.bin \- start the Tyler visualisation plugin for Noatun
-.SH SYNOPSIS
-.B noatuntyler.bin
-.SH DESCRIPTION
-This program starts the Tyler visualisation plugin for Noatun, the audio
-and video media player for TDE.
-.PP
-This program is for Noatun's internal use and should \fBnot\fP be run
-directly.  To start the plugin, run Noatun and select Plugins from the
-configuration dialog.
-.PP
-This plugin is part of the TDE addons module.
-.SH SEE ALSO
-.BR noatun (1).
-.SH AUTHOR
-The Tyler plugin was written by Neil Stevens <multivac@fcmail.com>,
-Julien Carme <julien.carme@acm.org>, Charles Samuels <charles@kde.org>
-and Mitja Horvat <Mitja.Horvat@hermes.si>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/man/orient-trinity.py.1 b/ubuntu/_base/core/tdeaddons/debian/man/orient-trinity.py.1
deleted file mode 100644
index 024ec11d7..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/man/orient-trinity.py.1
+++ /dev/null
@@ -1,88 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ORIENT.PY 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-orient.py \- change the orientation of a digital camera image file
-.SH SYNOPSIS
-.B orient.py
-.I image-file
-.br
-.B orient.py
-[1-8]
-.I image-file
-.SH DESCRIPTION
-This is a small script for changing the orientation of certain types
-of digital camera image files.  The image data is not modified, but
-rather the EXIF tags stored with the image are altered to reflect the
-new orientation.  For this reason only images with the correct types of
-EXIF tags can be changed using this script.
-.PP
-When called with with a numeric argument from 1 to 8, the orientation
-will be changed as described in the options section below.  When called
-with only a filename, the current orientation will be written to the
-console (also as a number from 1 to 8).
-.PP
-If the image contains no EXIF information or if the EXIF information is not
-of the correct type, an error will be displayed and this script will
-exit immediately.
-.PP
-This script is provided with the image conversion and transformation
-plugins for Konqueror.  For a more general-purpose JPEG rotation/reflection
-tool, see
-.BR jpegorient (1)
-which is also a part of this same set of plugins.
-.PP
-This utility is part of the official TDE add-ons module.
-.SH OPTIONS
-The possible orientations are represented by the numbers 1 to 8 as
-follows.
-.TP
-.B 1
-No change of orientation.
-.TP
-.B 2
-Flip horizontally.
-.TP
-.B 3
-Rotate by a half turn (i.e., 180 degrees).
-.TP
-.B 4
-Flip vertically.
-.TP
-.B 5
-Transpose image (i.e., reflect across the upper-left to lower-right
-diagonal axis).
-.TP
-.B 6
-Rotate by 90 degrees clockwise.
-.TP
-.B 7
-Transverse transpose image (i.e., reflect across the upper-right to
-lower-left diagonal axis).
-.TP
-.B 8
-Rotate by 270 degrees clockwise (i.e., 90 degrees counter-clockwise).
-.SH SEE ALSO
-.BR exif.py (1),
-.BR jpegorient (1),
-.BR konqueror (1).
-.SH AUTHOR
-The image transformation plugins were written by
-Leif Jensen <jensen@math.columbia.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.install b/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.install
index 843bdf15c..7ae7d70de 100644
--- a/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.install
@@ -51,6 +51,9 @@ debian/tmp/opt/trinity/share/apps/noatun/tylerstates
 debian/tmp/opt/trinity/share/apps/noatun/wakeup.plugin
 debian/tmp/opt/trinity/share/apps/noatun/wavecapture.plugin
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/synaescope.png
+debian/tmp/opt/trinity/share/man/man1/noatunsynaescope.bin.1
+debian/tmp/opt/trinity/share/man/man1/noatuntippecanoe.bin.1
+debian/tmp/opt/trinity/share/man/man1/noatuntyler.bin.1
 noatun-plugins/dub/AUTHORS /opt/trinity/share/doc/noatun-plugins/dub
 noatun-plugins/dub/BUGS /opt/trinity/share/doc/noatun-plugins/dub
 noatun-plugins/dub/ChangeLog /opt/trinity/share/doc/noatun-plugins/dub
diff --git a/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.manpages
deleted file mode 100644
index 76a3fc35b..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/noatun-plugins-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/noatunsynaescope-trinity.bin.1
-debian/man/noatuntippecanoe-trinity.bin.1
-debian/man/noatuntyler-trinity.bin.1
diff --git a/ubuntu/_base/core/tdeaddons/debian/rules b/ubuntu/_base/core/tdeaddons/debian/rules
index 907151e92..26ed99e85 100755
--- a/ubuntu/_base/core/tdeaddons/debian/rules
+++ b/ubuntu/_base/core/tdeaddons/debian/rules
@@ -20,16 +20,6 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdeaddons-trinity-dbg
 
 DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter
 
-binary-install/konq-plugins-trinity::
-	mkdir -p debian/konq-plugins-trinity/opt/trinity/share/
-#	mv -f debian/konq-plugins-trinity/opt/trinity/share/man debian/konq-plugins-trinity/opt/trinity/share/
-#	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man
-#	mv -f debian/konq-plugins-trinity/opt/trinity/share/man/py/man1/exif.1 \
-#		debian/konq-plugins-trinity/opt/trinity/share/man/man1/exif.py.1; \
-#	mv -f debian/konq-plugins-trinity/opt/trinity/share/man/py/man1/orient.1 \
-#		debian/konq-plugins-trinity/opt/trinity/share/man/man1/orient.py.1; \
-#	rm -rf debian/konq-plugins-trinity/opt/trinity/share/man/py;
-
 binary-install/tdeaddons-tdefile-plugins-trinity::
 	install -p -D -m644 renamedlgplugins/README \
 		debian/tdeaddons-tdefile-plugins-trinity/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins
diff --git a/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install b/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
index 70f735948..a666d9166 100644
--- a/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/lib/trinity/librenaudioplugin.so
 debian/tmp/opt/trinity/lib/trinity/librenimageplugin.la
 debian/tmp/opt/trinity/lib/trinity/librenimageplugin.so
 debian/tmp/opt/trinity/share/applnk/.hidden/lnkforward.desktop
+debian/tmp/opt/trinity/share/man/man1/lnkforward.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-win-lnk.desktop
 debian/tmp/opt/trinity/share/services/tdefile_cert.desktop
 debian/tmp/opt/trinity/share/services/tdefile_desktop.desktop
diff --git a/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages b/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
deleted file mode 100644
index eda9949fb..000000000
--- a/ubuntu/_base/core/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/lnkforward-trinity.1
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kbanner-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kbanner-trinity.kss.1
deleted file mode 100644
index d8cc7f4f6..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kbanner-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBANNER.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbanner.kss \- Banner screen saver for TDE
-.SH SYNOPSIS
-.B kbanner.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBanner\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkbanner.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Martin R. Jones <mjones@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kblob-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kblob-trinity.kss.1
deleted file mode 100644
index d3d2b9394..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kblob-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBLOB.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kblob.kss \- Blob screen saver for TDE
-.SH SYNOPSIS
-.B kblob.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBlob\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkblob.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Tiaan Wessels <tiaan@netsys.co.za>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kclock-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kclock-trinity.kss.1
deleted file mode 100644
index 03c795709..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kclock-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KCLOCK.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kclock.kss \- Clock screen saver for TDE
-.SH SYNOPSIS
-.B kclock.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBClock\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkclock.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Melchior Franz <mfranz@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/keuphoria-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/keuphoria-trinity.kss.1
deleted file mode 100644
index c8fb549b8..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/keuphoria-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KEUPHORIA.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-keuphoria.kss \- Euphoria screen saver for TDE
-.SH SYNOPSIS
-.B keuphoria.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBEuphoria\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkeuphoria.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1
deleted file mode 100644
index 58f427ba4..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kfiresaver-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFIRESAVER.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kfiresaver.kss \- Fireworks 3D screen saver for TDE
-.SH SYNOPSIS
-.B kfiresaver.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBFireworks 3D\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkfiresaver.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Enrico Ros <asy@libero.it> and
-David Sansome.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kflux-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kflux-trinity.kss.1
deleted file mode 100644
index 3556a7bc3..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kflux-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFLUX.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kflux.kss \- Flux screen saver for TDE
-.SH SYNOPSIS
-.B kflux.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBFlux\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkflux.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kfountain-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kfountain-trinity.kss.1
deleted file mode 100644
index 9aa452ded..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kfountain-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFOUNTAIN.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kfountain.kss \- Particle Fountain screen saver for TDE
-.SH SYNOPSIS
-.B kfountain.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBParticle Fountain\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkfountain.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>,
-Jeff Molofee <nehe@connect.ab.ca> and Nick Betcher <nbetcher@usinternet.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kgravity-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kgravity-trinity.kss.1
deleted file mode 100644
index f7789052b..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kgravity-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KGRAVITY.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kgravity.kss \- Particle Gravity screen saver for TDE
-.SH SYNOPSIS
-.B kgravity.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBParticle Gravity\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkgravity.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>,
-Jeff Molofee <nehe@connect.ab.ca> and Nick Betcher <nbetcher@usinternet.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/klines-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/klines-trinity.kss.1
deleted file mode 100644
index 6121f8e2d..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/klines-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KLINES.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-klines.kss \- Lines screen saver for TDE
-.SH SYNOPSIS
-.B klines.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBLines\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIklines.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by
-Dirk Staneker <dirk.stanerker@student.uni-tuebingen.de>,
-Martin R. Jones <mjones@kde.org> and Mario Weilguni <mweilguni@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/klorenz-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/klorenz-trinity.kss.1
deleted file mode 100644
index 3df447a64..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/klorenz-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KLORENZ.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-klorenz.kss \- Lorenz Attractor screen saver for TDE
-.SH SYNOPSIS
-.B klorenz.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBLorenz Attractor\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIklorenz.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Nicolas Brodu <brodu@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kpendulum-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kpendulum-trinity.kss.1
deleted file mode 100644
index d253f4189..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kpendulum-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPENDULUM.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpendulum.kss \- Pendulum screen saver for TDE
-.SH SYNOPSIS
-.B kpendulum.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBPendulum\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It simulates a two-part pendulum.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkpendulum.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Georg Drenkhahn
-<georg-d@users.sourceforge.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kpolygon-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kpolygon-trinity.kss.1
deleted file mode 100644
index bc7e56868..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kpolygon-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPOLYGON.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpolygon.kss \- Polygons screen saver for TDE
-.SH SYNOPSIS
-.B kpolygon.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBPolygons\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkpolygon.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Martin R. Jones <mjones@kde.org> and
-Mario Weilguni <mweilguni@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/krotation-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/krotation-trinity.kss.1
deleted file mode 100644
index 6bc0c172b..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/krotation-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KROTATION.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-krotation.kss \- Rotation screen saver for TDE
-.SH SYNOPSIS
-.B krotation.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBRotation\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It simulates a force free rotating asymmetric body.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkrotation.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Georg Drenkhahn
-<georg-d@users.sourceforge.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kscience-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kscience-trinity.kss.1
deleted file mode 100644
index 061374a15..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kscience-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSCIENCE.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kscience.kss \- Science screen saver for TDE
-.SH SYNOPSIS
-.B kscience.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBScience\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkscience.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Rene Beutler <rbeutler@g26.ethz.ch>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kslideshow-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kslideshow-trinity.kss.1
deleted file mode 100644
index c8b208e0d..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kslideshow-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSLIDESHOW.KSS 1 "January 30, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kslideshow.kss \- Slide Show screen saver for TDE
-.SH SYNOPSIS
-.B kslideshow.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSlide Show\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkslideshow.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Stefan Taferner <taferner@kde.org>,
-Martin R. Jones <mjones@kde.org>, Chris Howells <howells@kde.org>
-and Sven Leiber <s.leiber@web.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
deleted file mode 100644
index 8555d6209..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSOLARWINDS.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ksolarwinds.kss \- Solar Winds screen saver for TDE
-.SH SYNOPSIS
-.B ksolarwinds.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSolar Winds\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIksolarwinds.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Terence Welsh and Karl Robillard.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kspace-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kspace-trinity.kss.1
deleted file mode 100644
index 1e39ff18e..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kspace-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSPACE.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kspace.kss \- Space screen saver for TDE
-.SH SYNOPSIS
-.B kspace.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSpace\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkspace.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Bernd Johannes Wuebben
-<wuebben@math.cornell.edu> and Silicon Graphics, Inc.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kswarm-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kswarm-trinity.kss.1
deleted file mode 100644
index ea1e0d653..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kswarm-trinity.kss.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSWARM.KSS 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kswarm.kss \- Swarm screen saver for TDE
-.SH SYNOPSIS
-.B kswarm.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBSwarm\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkswarm.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Patrick J. Naughton,
-Emanuel Pirker <epirker@edu.uni-klu.ac.at>,
-Jeff Butterworth <butterwo@ncsc.org> and Mario Weilguni <mweilguni@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kvm-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kvm-trinity.kss.1
deleted file mode 100644
index a7e037cbe..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kvm-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KVM.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kvm.kss \- Virtual Machine screen saver for TDE
-.SH SYNOPSIS
-.B kvm.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBVirtual Machine\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkvm.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Artur Rataj <art@zeus.polsl.gliwice.pl>,
-Eric Plante and Jamie Zawinski <jwz@jwz.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kwave-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/kwave-trinity.kss.1
deleted file mode 100644
index 8ad59b9c1..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kwave-trinity.kss.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KWAVE.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kwave.kss \- Bitmap Wave screen saver for TDE
-.SH SYNOPSIS
-.B kwave.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBBitmap Wave\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fIkwave.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Ian Reinhart Geiser <geiseri@msoe.edu>
-and Jeff Molofee <nehe@connect.ab.ca>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kxsconfig-trinity.1 b/ubuntu/_base/core/tdeartwork/debian/man/kxsconfig-trinity.1
deleted file mode 100644
index f4cd67694..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kxsconfig-trinity.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KXSCONFIG 1 "October 13, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kxsconfig \- TDE X screen saver configuration tool
-.SH SYNOPSIS
-.B kxsconfig
-.RI "[ " generic-options " ]"
-\fIscreensaver\fP
-[ \fIsavername\fP ]
-.SH DESCRIPTION
-\fBkxsconfig\fP is a screen saver configuration tool
-for the Trinity Desktop Environment (TDE).  It is used to configure generic
-X screen savers, i.e., screen savers that have not been written explicitly
-for TDE.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the kxsconfig-specific options.
-For a full summary of options, run \fIkxsconfig \-\-help\fP.
-.TP
-\fIscreensaver\fP
-The filename of the screen saver to configure.
-.TP
-\fIsavername\fP
-An optional human-readable screen saver name to use in messages.
-.SH EXAMPLES
-\fIexample$\fP kxsconfig /usr/lib/xscreensaver/bouboule Bouboule
-.SH SEE ALSO
-.BR kxsrun (1).
-.SH AUTHOR
-This tool was written by Martin R. Jones <mjones@kde.org>.  It also
-makes use of xscreensaver code written by Jamie Zawinski <jwz@jwz.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/kxsrun-trinity.1 b/ubuntu/_base/core/tdeartwork/debian/man/kxsrun-trinity.1
deleted file mode 100644
index 9e45a775c..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/kxsrun-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KXSRUN 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kxsrun \- TDE X screen saver launcher
-.SH SYNOPSIS
-.B kxsrun
-.RI "[ " generic-options " ]"
-\fIscreensaver\fP
-[ \fB\-\-\fP \fIoptions\fP ]
-.SH DESCRIPTION
-\fBkxsrun\fP is a screen saver launcher
-for the Trinity Desktop Environment (TDE).  It is used to launch generic
-X screen savers, i.e., screen savers that have not been written explicitly
-for TDE.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the kxsrun-specific options.
-For a full summary of options, run \fIkxsrun \-\-help\fP.
-.TP
-\fIscreensaver\fP
-The filename of the screen saver to launch.
-.TP
-\fB\-\-\fP \fIoptions\fP
-Additional options to pass to the screen saver.
-.SH EXAMPLES
-\fIexample$\fP kxsrun /usr/lib/xscreensaver/bouboule
-.SH SEE ALSO
-.BR kxsconfig (1).
-.SH AUTHOR
-This tool was written by Martin R. Jones <mjones@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1
deleted file mode 100644
index 2eb943ee2..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/tdeasciiquarium-trinity.kss.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDEASCIIQUARIUM.KSS 1 "May 21, 2021"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdeasciiquarium.kss \- TDE screensaver to draw an ASCII art aquarium
-.SH SYNOPSIS
-.B tdeasciiquarium.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBTDEAsciiquarium\fP is a screen saver for the Trinity Desktop Environment (TDE).
-It draws an ASCII art aquarium.
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fItdeasciiquarium.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-Native TDE Screensaver based on the Asciiquarium program
-from Kirk Baucom <kbaucom@schizoid.com>, available at
-http://www.robobunny.com/projects/asciiquarium.
-.br
-Ported to TDE by Maksim Orlovich <maksim@kde.org> and
-Michael Pyne <michael.pyne@kdemail.net>.
-.br
-This manual page was prepared by Michele Calgaro <michele.calgaro@yahoo.it>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 b/ubuntu/_base/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
deleted file mode 100644
index 00b4d4c58..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPARTSAVER.KSS 1 "May 12, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdepartsaver.kss \- Media screen saver for TDE
-.SH SYNOPSIS
-.B tdepartsaver.kss
-.RI "[ " generic-options " ]"
-[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
-\fB\-\-demo\fP ]
-.SH DESCRIPTION
-\fBMedia\fP is a screen saver for the Trinity Desktop Environment (TDE).
-.PP
-This program is part of the official TDE artwork module.
-.SH OPTIONS
-Below are the screen saver-specific options.
-For a full summary of options, run \fItdepartsaver.kss \-\-help\fP.
-.TP
-\fB\-\-setup\fP
-Set up the screen saver.
-.TP
-\fB\-\-window-id\fP \fIwid\fP
-Run in the specified XWindow.
-.TP
-\fB\-\-root\fP
-Run in the root XWindow.
-.TP
-\fB\-\-demo\fP
-Start the screen saver in demo mode (default).
-.SH SEE ALSO
-.BR kxsconfig (1),
-.BR kxsrun (1).
-.SH AUTHOR
-This screen saver was written by Stefan Schimanski <1Stein@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.install b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.install
index 1ae8e4bf3..b5a29f45c 100644
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.install
+++ b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.install
@@ -44,3 +44,25 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdeasciiquarium.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/tdepartsaver.desktop
 debian/tmp/opt/trinity/share/apps/kfiresaver
 debian/tmp/opt/trinity/share/apps/tdescreensaver
+debian/tmp/opt/trinity/share/man/man1/kbanner.kss.1
+debian/tmp/opt/trinity/share/man/man1/kblob.kss.1
+debian/tmp/opt/trinity/share/man/man1/kclock.kss.1
+debian/tmp/opt/trinity/share/man/man1/keuphoria.kss.1
+debian/tmp/opt/trinity/share/man/man1/kfiresaver.kss.1
+debian/tmp/opt/trinity/share/man/man1/kflux.kss.1
+debian/tmp/opt/trinity/share/man/man1/kfountain.kss.1
+debian/tmp/opt/trinity/share/man/man1/kgravity.kss.1
+debian/tmp/opt/trinity/share/man/man1/klines.kss.1
+debian/tmp/opt/trinity/share/man/man1/klorenz.kss.1
+debian/tmp/opt/trinity/share/man/man1/tdepartsaver.kss.1
+debian/tmp/opt/trinity/share/man/man1/kpendulum.kss.1
+debian/tmp/opt/trinity/share/man/man1/kpolygon.kss.1
+debian/tmp/opt/trinity/share/man/man1/krotation.kss.1
+debian/tmp/opt/trinity/share/man/man1/kscience.kss.1
+debian/tmp/opt/trinity/share/man/man1/kslideshow.kss.1
+debian/tmp/opt/trinity/share/man/man1/ksolarwinds.kss.1
+debian/tmp/opt/trinity/share/man/man1/kspace.kss.1
+debian/tmp/opt/trinity/share/man/man1/kswarm.kss.1
+debian/tmp/opt/trinity/share/man/man1/kvm.kss.1
+debian/tmp/opt/trinity/share/man/man1/kwave.kss.1
+debian/tmp/opt/trinity/share/man/man1/tdeasciiquarium.kss.1
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.manpages b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.manpages
deleted file mode 100644
index dad73c192..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-trinity.manpages
+++ /dev/null
@@ -1,22 +0,0 @@
-debian/man/kbanner-trinity.kss.1
-debian/man/kblob-trinity.kss.1
-debian/man/kclock-trinity.kss.1
-debian/man/keuphoria-trinity.kss.1
-debian/man/kfiresaver-trinity.kss.1
-debian/man/kflux-trinity.kss.1
-debian/man/kfountain-trinity.kss.1
-debian/man/kgravity-trinity.kss.1
-debian/man/klines-trinity.kss.1
-debian/man/klorenz-trinity.kss.1
-debian/man/tdepartsaver-trinity.kss.1
-debian/man/kpendulum-trinity.kss.1
-debian/man/kpolygon-trinity.kss.1
-debian/man/krotation-trinity.kss.1
-debian/man/kscience-trinity.kss.1
-debian/man/kslideshow-trinity.kss.1
-debian/man/ksolarwinds-trinity.kss.1
-debian/man/kspace-trinity.kss.1
-debian/man/kswarm-trinity.kss.1
-debian/man/kvm-trinity.kss.1
-debian/man/kwave-trinity.kss.1
-debian/man/tdeasciiquarium-trinity.kss.1
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
index 2657a6d03..f6ba5762d 100644
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
+++ b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
@@ -64,9 +64,10 @@ debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/lockward.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/cwaves.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/topblock.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/voronoi.desktop
-
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/cubicgrid.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/hypnowheel.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/lcdscrub.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/photopile.desktop
 debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/skytentacles.desktop
+debian/tmp/opt/trinity/share/man/man1/kxsconfig.1
+debian/tmp/opt/trinity/share/man/man1/kxsrun.1
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
deleted file mode 100644
index 356af4f32..000000000
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kxsconfig-trinity.1
-debian/man/kxsrun-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control
index 946636b3e..c9cb55970 100644
--- a/ubuntu/_base/core/tdebase/debian/control
+++ b/ubuntu/_base/core/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharutils, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~)
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssh-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
@@ -14,7 +14,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-kde3 (<< 4:14.0.0~), kdebase-trinity (<< 4:14.0.0~)
 Breaks: kdebase-kde3 (<< 4:14.0.0~), kdebase-trinity (<< 4:14.0.0~)
-Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib
+Depends: kappfinder-trinity (>= ${source:Version}), kate-trinity (>= ${source:Version}), kcontrol-trinity (>= ${source:Version}), tdebase-trinity-bin (>= ${source:Version}), tdebase-data-trinity (>= ${source:Version}), tdebase-tdeio-plugins-trinity (>= ${source:Version}), tdepasswd-trinity (>= ${source:Version}), tdeprint-trinity (>= ${source:Version}), kdesktop-trinity (>= ${source:Version}), kfind-trinity (>= ${source:Version}), khelpcenter-trinity (>= ${source:Version}), kicker-trinity (>= ${source:Version}), klipper-trinity (>= ${source:Version}), kmenuedit-trinity (>= ${source:Version}), konqueror-nsplugins-trinity (>= ${source:Version}), konqueror-trinity (>= ${source:Version}), konsole-trinity (>= ${source:Version}), kpager-trinity (>= ${source:Version}), kpersonalizer-trinity (>= ${source:Version}), ksmserver-trinity (>= ${source:Version}), ksplash-trinity (>= ${source:Version}), ksysguard-trinity (>= ${source:Version}), ktip-trinity (>= ${source:Version}), twin-trinity (>= ${source:Version}), libkonq4-trinity (>= ${source:Version}), xcalib | argyll
 Recommends: tdm-trinity (>= ${source:Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity
 Suggests: tdebase-trinity-doc-html (>= ${source:Version})
 Description: base components from the official TDE release
@@ -474,7 +474,7 @@ Replaces: ksmserver-kde3 (<< 4:14.0.0~), ksmserver-trinity (<< 4:14.0.0~)
 Breaks: ksmserver-kde3 (<< 4:14.0.0~), ksmserver-trinity (<< 4:14.0.0~)
 Provides: x-session-manager
 Depends: ${shlibs:Depends}, tdebase-runtime-data-common-trinity, twin-trinity (= ${source:Version}) | x-window-manager
-Recommends: kpersonalizer-trinity (= ${source:Version}), tde-ubuntu-integration
+Recommends: kpersonalizer-trinity (= ${source:Version}), polkit-agent-tde
 Description: session manager for TDE
  This package contains the TDE session manager. It is responsible for
  restoring your TDE session on login. It is also needed to properly
diff --git a/ubuntu/_base/core/tdebase/debian/img/cr128-app-energy_star.png.uu b/ubuntu/_base/core/tdebase/debian/img/cr128-app-energy_star.png.uu
deleted file mode 100644
index 0d74bb8ef..000000000
--- a/ubuntu/_base/core/tdebase/debian/img/cr128-app-energy_star.png.uu
+++ /dev/null
@@ -1,299 +0,0 @@
-begin 644 cr128-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```(````"`"`8```##/F'+````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CL!!M^7Q```(`!)1$%4>)SMO7FT'=5]Y_O9
-M56>\Y\Z#KJZD*Y"$L"20$`*$31@LBT$!@V/2V-@$&T*,$XAC>Z7?RWK]5EZ_
-M7MV=[L3N7MTO3MSNV&UBM_-B;#\SV`8S3P)+0@BPL)!`\WCG\9Q[IJK]_JC:
-M5;N&<^ZY5]AQ._>W5MU3M6NX>^_O]S?MO4\=6)`%69`%69`%69`%69`%69`%
-M69`%69`%69`%69`%69`%69#?9!&-7'3;;;>9N5QN'=!O&,8B(/7+K=:"S%/*
-MMFT/`L?S^?POOO>][UFSW5"7`/?<<\_5MFW_/G`CT/,>57)!?C4R!#PFI?SF
-M`P\\\%RMBV()<-===ZT'OBR$N#Z7R[%BQ0K./?=<VMK::&IJPC1-[UHIY7M=
-M\5^Y_#JV83YULFV;?#[/Y.0DQXX=X]"A0Q0*!8`GI91_^L`##_P\?$^$`'??
-M??<G@*\W-34U;=Z\F?7KUY-*I6AN;J:EI854*D4BD<`PC/FTZS=>%'#AS]G.
-MU[MOMGTI);9M8UD6E4J%F9D9BL4BE4J%M]YZBYT[=U(H%&:`>[_YS6_^3[T^
-M`0+<???=_SOPE\N7+^>FFVXBE\O1W=U-=W?W`N#SD+EJ\5RN#U]KVS:V;5.M
-M5JE4*EB6Q>3D)%-34Q0*!1Y[[#&.'S\.\&??_.8W_TK=Y]GRN^ZZZW>$$'^W
-M9LT:<<LMM]#2TL**%2MH;6U%B(9BQ04)B1!BUFVNU]?:#,/`-$V2R23I=-H[
-MSF:SV+;-^>>?S_CX.",C(]=NVK1IWYX]>]X"EP!WW7778B'$LTN6+$GKX"<2
-MB7^";OO-E5]%K*'^1R*1()5*(:4DF\U2J53H[^_GU*E38G)R\K<W;][\P.[=
-MNZ>57?]WIFDV;]NVC::F)I8O7[Y@\M\CD5)ZVR_CF>%-%\,P:&YN)IE,TM[>
-M3B:3X=IKK\4TS>9*I?+O`<Q[[[VWS[;M;VW:M,E8MVX=_?W]I-/I]ZRR_YSE
-M;$%_+T@CA""93%*I5#R+/C,SPYDS9R[:L&'#-XQJM7HK8*Y?OYZ6EA9RN=Q9
-M_]-_KE)/&^?SG/>J+D((FIJ:O/A@PX8-`(9IFA\UI)0WMK>WT]/30UM;VUG]
-MTW_.\EX"-M_[ZCTCE4IY06%75Q<='1T`'S:`53T]/9Z_6)"YRWS`GX^U:`3H
-M>M>GTVD2B01""+J[NQ%"K$@`2YJ;FQ<&=^8H\P7]EWG/;-<J\`W#H*6E!2GE
-MT@30HIBQ((W)>PG*V=PSUWH8AH&4$M,T%=XY#_6Y:/^__JMOD$L4&[Y^07ZY
-M<L?MMY)*9^EH:ZY+BKA!J(1^HE$QA472E!P:KCTK;&,P+KJ]Y^K_0PCG&/=3
-M>.<!!,)PQZA599UB;5^XSW"?@WNO`.'MJ^=ZK??'O06@]9,$D-+]U(XE2+=`
-MNL?@EDO_'BG=:[QSZAY5)KWG2ML?OP\^3[M7.R^1=!NC&-@U^UJ8:6_09S8)
-M7S,ONR^$(%].\)7GVV//&T*P]L*E=/4TNSY'WPR$VA<"PU2?1N!:H=\C0O>I
-M\\*_3C]6SQ'>L5.G.)*K#K%5A]O2G5R12%LZY5J95Z[*+-N[QM+.>>=MVSL.
-MWF]KUZC-#MWK;*^/=?/N@0%L.Q[@>^\VR62C4#9""&.NV@_,>OWY:Q?3WMGD
-M5B!^-LS3"._3N=;3#'?SSKL'7E1K^QKK7:<!&+C.[4@K!@Q;`SL`?CCBMI4F
-MA\K=.MA2:Q/1MNA82*U/O'IK_:)]`)+6MBPK5BV:=?5.O0PA/"Y@&*["S6>B
-MIQYI^L_IHJ.K.=@8SZQYM8ET0K"39-!T:IO^'-4@.]!PYWP$:$VCO<VV`QJK
-M:Y\#.#6W8+VE5V>T.ONMT?I!<P=A462/]!O0UIYER;+..JC$/:\V&<#!<5XQ
-M@+HG+&T=32Q9ZKH%"5(XC1*A3PD(Y4-5.8Z/5GTDO/NEPWQU;`.&V\$V2,,]
-M9X-M@(%3CL`]4(U6\4"TZP.^V/:)I(@5)%C,IIX1(4C0:O@60K]6LQ2J/AJ#
-M].?V]+8P-37#Y,1,35QJF7T]MM"Q\US`7`A@&$8D:S!-@Q4K>]1_BS%SBHE:
-M1P0ZS3\OPQUF.R:VGD8J/VQK'1KUQU'P(GY8LQ"1>P+WJ[J'R1!C_E4_J#]Z
-M7X1!"ED(W15(*5G:WXEIQF=L]<R^+KH+2+Q7<_U]2]M)),V:&J[6GBBP/0T/
-M:7[`4NB=X?=-P,0J2X`AL)$8KB5PDP*G'L+Y7Z'@']2QE-ISHQ8@WAW4T'X[
-M9`4T()1B^"Y!:Z>N&'H;0Q8BD3!8M+B5TR?'8W&8S0+HXKD`=="H&(:!T!Z8
-M2B7H6=3BH@=(X8+KFG*OPT3$#:C&":%UH@:N<)_E/4=UE.L*;!L,@P`)A`V&
-M`ETH$KA4"S=3?Z;;43[@&AGB`L.ZVB\#[B30MHC5"Y);MQ`Z;.K>CHX<(T/3
-ME,O5NB#'@1XN2^CF8+[2O:@%(80?U2L-ER"%KN&:S[=!FD(CB(.A6<\*V&`;
-M`L,[EE$2N*IONY\>$5R+4ROZDN!E%GXP&4,&+4BT0QH?K_VZM9":1DO]W]>T
-M$''!,0(ZNG(,G)X(-6-VP"'D`F:'-RI.^N#X(0%T=.9<;74[&5_#=3?@U$5H
-MQS)@);QK0E8@$#5K9#$0`1)X@T/*!4BPA/0'D)`1HNNIG&<)=`*$P%?C!0[X
-M=:R!=B[BQK2V1>*=6`L1M"1(:&MK8O#,9,.@USJ7F'<&X#ZGJ3E-(F'XVJW`
-M5&Y`:Y`0CBDUC-K7V.!HN$X`&VQ#.D&]]#4^3`)/;`=,80B/E%X8$M<Y'D":
-M)7`14T#8>G:@@3MKAA"S!=Q$P%KX%D(W_P'7X9XQ#,AFDQ0*Y9K@QI6K+$!M
-M\R:`TJE<+NV!ZS=$<P.Z_Y9^K!$Q[ZX)52E>(-T#L(63\H7,OF?U=0O@;@X1
-M7,OBFO^8$,`CLP](#0N@@Q_(#C0WH(@LHV71S873&V3R+9TWL*1?IT7"4D*V
-M*1T@0!S@<67Z\/R\@D"=`)EL4NNPH%9[K`V00'K@*>WV<GFT1FO[2IS[HF;?
-M\$)^O/Q?)Z5P4P'-<(4Z!Z\-JK.DRV2=`+;:5ZFC!WZ\Z=?]>D"S-4(%V@K$
-MC3AZ==3)`Z0RN@</QA6J'7&BER?F,PZ@$R"1-)$V"#.HU:C!GQJ`2JG'`GX'
-MA%V!<AE*`B10`9\A$$B?`Y:O]>%!J%H2B,8]+=.#PB#88?#CLX0&M#]TCU<'
-M]+Y"JX_/A*09C6?4IVW;2"FQ+`O+LKPOCMBV'1T'.)N10%,(QSAIP`KIN^4X
-M*^`%@+J&ZP0(I'C"TU"=!,+0W+[M@^U%_1#P_T[T7*.-,B801*^CC.['@:\R
-M`[7531U#5E+]?\V21`CB7>/VHZ894L+DY*0'/OC/"A-$QW#>68"R`);M^R0=
-MV+E8`0=$&70%6@S@:;UNP&V!;6A:[_X_VWV&,]LL_6E@-P`4H2C`"[6\^BFM
-M#UF"&F2(@A]T`W;XN.;(HO9<#[`Z!(DQ^4KKG7OCP5=!H)*S#@*KEJ5UE'-.
-M@1ZQ`EXC_$KY=13>=38Q$;_R]Z%H7S'`T_J0^?<47VJ6("1ZAZ,%@!$W$/#W
-M06W5P0]D!I%1Q!H6H08QP`<[0!`)5C6X1J`1\!5^@7&`LR%`I6PYRJXUT.M,
-MSY3Z^^%HWQO$4=>Y(WJ.%9#!8,\0V+:,1/O"S?4](K@L=\8D@B.`X:9Z_10R
-M_[XET*U`B`!>,!@#?@#XQN*"V,S!UOHO]"S+CBX2F0W\L-5(Z"E!HZ*/`\P4
-MRK1W-,5H-UZ$K^_'60)=RPWWFD".[T;VMJU%_#$S?8H(*MY0N,N`!8B*U![D
-MU4V1(0"\UI%Q$T\AD.TYF'[5(;6"P[@XH%P*OO^A4?`#::#^Y<)&11\)S$^7
-M')9JT[)Z_JZ8'><*]`@_G!JBY?C>%&^=O%_]+W4LT?-_QPI(J#$0X`.NGA,T
-MI^X52NNUS@X#'9U'J#\;J:Z/T_ZPLH3O+94JP:8T`+Z*`2)#P?.="ZA4+$JE
-M,IEL*AAURVB*%VB4,O6JA8"4PB>%A[X[P4,4=&4-I%:F_B](C>DNP#77U*C_
-M'^X\YUS8`D1<04"KZVA^31=01^-K:+^44"I6(VT(UK^^^0?F9P$,PW`ML//`
-MT9$"?4M2-:R`C+@";^&&=ZT#C&W;&(;A^?GP!$]XL,=VGV'4($&`A&Y]=:+'
-M=8@..O@:C_1]O5<>(H-MQQV'SL6M2:CA%NIMY5*%:C7Z"J#9P-?;/.\T,"R3
-M$P6Z>UI(I<R(V5):I[L"/>6S`<,E#`AMH*+&!(_:M'.*"-ZU$!@$\AM<#W2U
-M+[4V2,]R!8"GE@6(!S^LZ1'`PYE":(8QSCWDITLQ[9@;^##/D4#?`EA>!XX,
-M3[&XKRU`@$B$+_W@SK$&TM-DGP2.Z/>B!X.A+:KYCJG7QP'<)_A&4C55!][O
-M1=]=Q5@"+]"JXP["X$?F#P+9PQS<@!9+3.>C!(#&21"9##K;-8'C8P5:6K/.
-MY)"!QP*O`UWSC^&<BHSKHTC@0Q4D@?\<?;I7S_G#FB]4,((?"S@/B3Y3G8BU
-M!E+WO[X_CELX$@W^B("GK&'8[#>TZ$3"]'0Q,@;@U;>!S\ADT+S&`6)N.7-Z
-MG'-7]B"$X0=YWK"N']RI&"".!,JTZ]E!W"Q?8/!'@E3S_A)O38+P_DAO@*J6
-M>.8Q9/XC*2%$OMP1!"]$B)@XP*X+>FW3[_2'S<1X8=9VS&;^`RY`?^U;(R)$
-MP*!Z4BE;G#XQQM+^3B^?EQ"-^&N1P`OPP@,^TB-=N$P2-^_OIGV!_%\2RUJG
-M=T!OD0ZZ>UX!JSK3!SILOHD$B+[/#Z\SU,T[H7NCIE]*R?A8(5;[5;WJ?>K[
-MG@L`YKPD3!\)#,OT=(F!,^,L[FO7?#Y:3."B$B*!"O0"R[HC`SXJA_5-O!`@
-M+6U?$%C^Y5'5<P=X=9<Q08`"W-_W@58NHI;OK[D?,V(8<!'V;%;!V8K%:MTE
-MX:J/XC[#^TK.>BX@3L;'9C!-TUDH:NA6()X$#LZ.%;#K1/NJFFH$5">"\^GX
-M>WT<P`=?C_V"'2%#.W[GN5=KY3K`@;*X["`P*13O#FK-`7A?57,WRY(,#TW5
-MQ:41\)42O6<K@FK)R/`TEB59W-?F+^>J00(O"%37Q.7]@8C?:81E!5U#D`RJ
-MT7Z\4B<$0(98(&/($`N\[AYBM#\<&P2.]84E86+HYVW)T,`DU<JLK_Z=%?R:
-M+F"NT@AIQL?R6)9%WY(.2!`A07BPQPX%>Y'<W\$S-O731_WT_#\\%E!/@IT6
-MIU$0=@/H1$`W\4$R1,RZK<4'[CU^T!>T!B-#DQ2+E4A]:]5_-O!UF?=D4*.7
-M3TT6*16'6-K?02:;#'UU*V9VSW,)!*R!GNIY`5]L_N\SW.V"AMH6[IR:;D`;
-M&91NL!AG`8+^GL;`#\T9*,V/6_?72#OBP(]U`7.U`',A`$"Y7.7(X6%Z>UOI
-MZ,I%)G@"4LL:A(F@6P.(6?[EF_\XYL>)[@;T6P+@.J<]X`,6H('`,#Q<7`M\
-MR[(9')BB.%-&".C,V4@)8P6CID5K!'PE`1>@"AJ5N1(`G`:>.3W!Y,0,BY>V
-MD\DD`T&>X0X%J\X/6P.O3">"Q$GY:N3_<S'_7CT]5:?V>``A4NB`0JP+:"0X
-M5."7BA4&!R>I5FRN.;_$K9LJM+0X[UHH%HL\OC?)HWL$MHP'83;P=9G_]P+J
-MAE2UI5`H<_C=(3J[<O0L:L5,.`,&X0$?P+,&EEL6)H*>\CF@A_-_&<C]:[72
-M5WP9.@Z"C@:PNCSL^R&&%#56$NG60($_,3'#V,@T4L+O;"SPT<MS?.QW;R.3
-MR0!0*I4X]_GM;#IG@'_[B$EX/F@V\,-6X*Q7!,U5U+\:&\TS-5FDLRM'1V?.
-M^<:KJ^XZR+K6*R((+?"3U,G_!2#]=8#U*.NEAOJ'3@@]\-,#0:@!?`T+$"*#
-M&B0J%2N,#$]1=*=X;UX_Q2V7YKCC]EL#`W6)1((/??!*DJD=W#-^@J\]&_WM
-MAMG`CXP$SE7T!2%SO<\!U/?-HR-Y)B8*M'<VT]Z6Q4P8#ERQ*WX(F7\W*(S+
-M_W4B*%1G&0ET[L8G@=>)3J&L:0FT0%`=U]+Z$#&J%<M1AHD9CZ`WKAOGEDMS
-M?.J.VSSPP\N[+]FXGL.'C_'=)GUB?G;P:P:!O\P8(`R\7P%`.$/$XR-Y)L<+
-MY)HSM+9FR&23@9S?KWB\YN-9AE``&*C)7()!S<R[._4L@7.)"SPUM![?WU<K
-M%N-C>28FB@&@MJT9Y>9+LOS^IS_A!>=22N\W`!0!+,MBZ9)>+E@RH-5[=O!]
-M/$)!X%RD40*$P0X#'R8%0"%?8J90(I5.T)Q+TY1+DTB:_F".YM:]6`#_TUO_
-MJ5D`O3YQHL='M4R_7ZREA#H1-.")T7I55BR6F9PHD9\N>NOWE5RW>H@/;\IR
-M[SUW!C(SI0"52B5`@*9,DN:T'P0T`GXX&$SHVM6H-$*`".A&'!F"_LAP$WTA
-M!%;59G*RR.1DD70Z03:;(I--DDR9'@GT>D>__A4:"G:*:HM.@D`'.B=5D;"J
-M+!I^AXZQX[1.G2%5+H*`DIEFO+F7B9;%#':NH&0V>02H5&T*^1+YZ1*5<M4A
-MK`$&_I=J/[3B##=N3/&'G_ET)"V74E(JE2($.'EFE-/CT6O#^W73P/ED`>H!
-M\>5!$S,;\`[F\59!`5JMVDQ-%YF>+F(F#-+I)*ET@E0J@6D:7KJGIWVZ*]#K
-M%B=!I9"!,BDE0MJL//PR5^[^GW2-'*)="!972[172Z@7ZY>`<3/-2"+-*%`T
-M4QSI6L/S?1]D;_MZ2D8:\-_6*<%;)G?5LI-LNRC)?9^].W9,9FIJBE*I%'`!
-MP\/#'#D^R%NG_5?U-0)^V`W,ZR51M2R`*O?>T3>;%5`K=PRAW>\_6QCJ6SW^
-M]5)"J5BA5*HZ28,A2*1,DDF39,+YF10SH0^6^%9"UK$`8=.H#L\YL8N;G_SW
-M+"]-LZF<K__;>5;)V8`J,%AXB0^>WLU)87*P_7Q^O.(CO-VQ`5N9*0F_U7>,
-MZ]<;_/$?W4,RF8S496)B@IF9&4_K+<MB9&2$IY_?R5\_UX%E1X&8#7Q=/!<P
-M%PF/`S2F]?Z^(7S@]:'H@/8+X4;X0O/K;IDB!CCI8<7&JMH4\?7=3)@8AL`T
-MG9=0&H!P7S;I_!_#)5H\\,*VN>&%_\SF_4]P77F:N;Y(/P$L`994G>G;,T.O
-ML7E\/Z>,%#]:^2]XOO\Z-O8>9^M:^-Q]]Y),)B,XC(^/4R@4`F9_>'B8)Y[]
-M&7_[4@\#4[5?#EGO,Q($ZM%C(Q+0TA#XAE%;ZPT=W-@`40-<A+3?.W8L09@4
-M"+]NJDV6);$L$*+V+)H>5'IEMLW=S_PY5PV\P0>K,Y'1:@20<BO0:D!.0-J`
-MLH2BA"G;,0$`1><E!8N!FRIYBN19>^!;7-IU`./\Z_C\'W^>=#H=Z?^QL3$*
-MA4(@_1L>'N;QI[?SM5?Z&)Q.QK1E=O##<E9I8*S)#Q$@0H@ZP(?!]UU`B!!:
-MF5OD(5/+-<6)HPWA,OC(JU_EMP;?Y$/5T.(+`20%K#+APA1TF'XJXI@T?]\6
-M,%B%(V4X4(2*A*)-1L+PYDUD/W0-]W[^<V0RF8CO#H-O619#0T,\_O1VOKYS
-M&4/YVN]HGK,%.)LLP`-7(X!10^O]:^+)0(0,H>#0!2`<(.IU\O?#.WHHJ'66
-M7NIVT-HC+W+M^"X^9(=6W2:`=@.N34.+&04\3(*$@*5I6):!J]I@S()7IWBX
-M8R/O?G`K?_#%+WK@ZP08'1TEG\\'S/[@X""//?42#[QV+D/YVK_GU*@%B'4!
-M<Q,-9`/O1<QA"V#4`KTN&30+$"*&#GI`^\-NP-_1:ASJK'"9%&1+D]RV^V_8
-M]A?_%\;]]_OG3*#7A!LR8`IGYBJB]7%DT+9NDX>OO8IWNB[G[C_Z$[+9;&3@
-M1H&O1_L#`P/\^(D7^,[/SV.X4.?'O+2LI=YG6,[.!>C@!][278,`C0"OF?_`
-M_ZH!>#@><(O1#L.U]WM+]9W+AH^^]&4^_'_^2Y)#0\%;F@1<GW6T6AB02$)[
-M%^1:()N#9-)9SFY+J%:A4H)B`?+34"V#$#Q<6<N!KLNYZ[-_3%-34UWP%0$&
-M!@9X]/'G>/#MM8R5LJBU#K7`;`1\]7\C+F`NXIAV8E_/'C7Y,7%"@!!1X'5M
-M;R@KT-3?N5:K:ZSQ#Y9))(N&W^&2Y`B=7_P"W'JK?S(MX)J,X_N3:5BR'+I[
-MP=#\OYI[]C;\LG*1AP]G.="ZED_?>[\'OOX6CY&1D8C/'Q@8X$<_>9H?'MG(
-M>*4)X2ZK<UX97QLS'73+LCAUZI3WYI#FYF9:6UOI[^_W<)R7"]!]OQ'Q_S4`
-M#Q.B#AE4Y;QCS2W@DL]S!T(#66C0AJQ!/9$(/OK\7['USS[C%.S?[Y]L$K`D
-M`2UML'(M)%/U37V(#`\/+&)_=CF?NN>SGMG7W^0Q,C(2,?MGSISAV8<>HO.1
-MQ^CODXSU7NE\_<U;11U/`AW\2J7"WKU[6;-F#==<<PV93(;!P4'>>.,-=NW:
-MY=TS+Q?@7&\'P8]Q`2)L%4)`*\(X>(6NT<IT[0^`'K($83*XI^J#+V'9Z9^S
-M?.H,33??#)4*G#CAG#0%O"_I@+_Z0C!-W]='M#Y*A(>/Y=@O^[GCKC_P?L-7
-M`11G]I7F/_O00]SX]),TE2=I>ON_T9L_SI,K/Q%#@NC@E@+_]==?YXHKKF#M
-MVK7>N;Z^/GI[>]F]>S='CQ[U+8`"8&XR._C!^"`<+\3$`3'`&[H5B,L*%!'"
-M;D"O:9VV22FY[I6O<LWR7NCL=`A0<+]YDP)69!W--Q,UP#8"H'N:?[2)MZU^
-M/OGI>VAJ:@IHO6W;L='^P,``S__T1]RX^TDZ1X<@E65KLR1YXB=DJM,\>OYG
-M'!((_X4:>CPCI:1<+K-[]VZNO/+*`/@ZR=:M6\?)DR?)9#)GL1[`]$$/F_O@
-MS[6$`L-Z!`CL^V5!%Z`1)"8K"!(@GA!^AT'WZ!&6C1ZA<_,6)X";T7)_"9RW
-M'%+I*-AUMH>/-K'/6L8G[KR;;#:+Y;Y'21&@5K3_XI,_X4;Q&IU7M4"V#'O'
-M,;,YKFE-DQA\B4QUAN^O^QR6(<".MJM<+K-CQPZV;-G"NG7K/%*$)Y$LRV+E
-MRI4,#@Z>C0N0$?##XP+>;_I$7$#M0-"(`UYIOQ$%/4R$`!GTLC@"`!_8_6TN
-M+TY`;Z^C_4EMA$T(6+8T"+PQN^;OJRSE8W=\.@`^.)H?-\(W.#C(2\_\E!LS
-M^^BT2L[S+N^!SC2\,(#1U,R5;6G,L=U4]_TW?KCVCP+?J@*8*138OGT[6[=N
-M]<#7^T*M)U!;+I=S?CZN8=1#XIOJ*/A&H"SD]VNDAC6!USYK@1Z7&2C\:E-`
-MDJB6.._PRRR7$G(YAP``K:TP.0EITTGY:IG\4/G#1[+\HKR$VSYY)YE,AFK5
-M&0]6@=_8V%AD8F=H:(CMSS_%3?UC=*87PU@")D:=9Y[?`4D3GCZ%:&[A_>U9
-MRB,_(W^HC9^N_*3'NU*QP`\>_1X?VK*%"RZX(()5M5J-$&!Z>MKY0>GYN``E
-M$=]?`_SH_$`X$Q`-K1>(9`8:X'&6P"-''`>D8/4[S[*J6G:*;=LGP*)%#@$2
-M<0,^\<=/G,BPM]3';9_X/=+I=,#LJ^'=F9F9@"D>&AKBE1>?X:9E8W1F`0PG
-MQ<QF8?B,8Z)6M3GU>.($1FL[5W4U43WY&%.I=EY>=B.Y1(6G'OT.VVZXEO7K
-MUT<L>;E<CL0:EF6Q?_]^IJ:FSN[W`GQ`8L"/"PQ#%J#1:6,%;,VL@!`I\!A1
-M.PT4<.FK_\B&<MXYGIIR8@"`_GXX=`@R)HQ,0D]'//"N.YBJ&#QU,LNG[ODX
-MJ53*`U\%?N$I7=NV&1H:8L=+SW'3\G$7?.5*@.8V2*1A^!14+5C1#EN`%TZ3
-M:&OGYL7MM!U^D/&.Y6S>7.6Z:V]1OP@>2`W+Y3+CX^.1I61OOOFFM\#DK%X2
-MY8%8%_P:@:$6*]0.!+68(D"XD#M09M]S_4+;CY=T<9+.B5.TJ()3IWP+L'8M
-MO/0BY%)P9`P6=:K&QA+AP)C!LOYS2"025-QG*`),3DY2+!8#VC<\/,RNEU_@
-MIG,F-/"]7G4^LEGH.P<&3B*L"JT;>V@'VE\9(M'30_LY&8ZL/<9'/O8';-RX
-M$2'\<0$A!*52B;&QL<ABTM=??QTI)4N6+.'X\>/SS0*<>@8U>!;P`V,"HNX<
-M0CSP(?.O@:X`#\0`NN6/:>/*=YYC=47[^=L3)QP""`$77^SF60*.3<#EAA;\
-MA<V_054*$LD4Q6+1F]J54GK@A^?S=__L)6XZ=Y+.C-)6K_+^H1"TMC?3T;>.
-M]K'3F%89;FB&O,7TP1F^?MV-W/+I3W/999<@A/]N)2DEQ6*1T='1P/^U;9O7
-M7GN-?#[/K;?>RIX]>Q#B+%\2Y?GX&N#'906!(#`N@ZAK$713']5^WS)X-0P=
-M^[+AM1_ROHJ6\AT^!&5GW)X+UD$R`=,6O#L>'_EK^TM:!3_>?YQBL4BI5,(P
-M#(K%(N5R.:!]HZ.C&O@JC_/!-X2@-9>FHR5-6R[M_SI8:PY.'H)*A>E;UO*?
-MWNQEZ^_=R:6;-WO@`P'PPYJ_>_=N"H4"%UUT46#9V9S7!/H^)JR]4<U7(-?*
-M"L(6)$B6.IH?`EW$!(!ZF\+M,ZPJ[:/':/4*A)/_O_VV`WXZ`^>MAH/O@EV%
-M8@6:,D'P-5+TMPF,RC1'CQZEM[<W$G"I(-`!?XK.K`0<`AE"T-:<IJ,E0VLN
-MC6GHI'`;F4K!LI5,'SG*EX_VL?53MW/9^]\?`!]@9F8F`+XBP*Y=N\CG\UQZ
-MZ:4A]SG'7PX-@`^!WP`.1OMU8@,C;`E"ORTL!*;A!*;Z[P2+4)EA^L?^,PQ,
-MT]F<Y6#^OK[UG-I+CQI!,PQ_>^-UJ%0=5[!YLP-R=PYV'ZD)OBK_S$:+G=N?
-M9V!@@$JE0J52H5JM!L%?X8!O&"8=K1E6+FGGHM6+6+FDG8YY[=-!```3E$E$
-M0536K/OM*/5\;=\03)/FRX?ZV7++Q[ET\^4>^&K+Y_,,#0UY_UMM.W;L8')R
-MT@,_=DG87,!W/E6P$;<%W4$D-HBS`&&M#X\5Q+D!@N?4L:I7/?._<O]SG%\8
-M=X$7/@&V;X=;?]>YZ>JKX7O?A8J`UP;AFG4UP4<8+&T5W'=)E:^^]`S=BY?0
-MW;L4PS`8&QWFY)&#_,YY><[IRM#1DJ8UE_;-<,@-A&,!$$R7)%]^=H9KMGV4
-MRS3P%28S,S.,C(Q$HOT=.W90*!2XXHHK//#U?H(&78`.OK_46@:#N)@M$AO4
-M`%^?&6QDVAC4&T;B78!R%UI7:IT-RP^\2)\00?`-`P[LAX$SL'@QK%CII(.G
-M3T,Z!6<F8&EG%'PM,UC5;?(7U\/.$V?8>VJ0B@WK.B1_N"U-+I7U[PD`+@)U
-M"W].ER1??J;(U==_A$LOB_?YP\/#$9__RBNO4"@4N/KJJP/@1Y:%ST:`*/AZ
-M?X;-OP]XF!RS@1^WO"S.`JA[=?#]P!`_*%3]&TH$!9*FZ1$R8?`-U]=6J\XF
-M!-SPV_#M!Z`Y!=N/P<>[:H#OEZ42@BM7.%O`-"I0/0+,3@('_!FNO.[#7'+I
-M90@AL"SU<DX9T'R=`-NW;V=F9H8M6[;$@J\3H.XW/./`]QZBP-(!JY$6QH&O
-M_'W$SPN]W/??RI_'Q0U^7&'XQ^[]P@A>VSIZC!81`[YAP/4W0%N;3X*M6R&3
-M@1,S<+($T\6ZX-?=#,._-LZ-A)XW788O/U7@B@_=R"677.9IO@(ZG\\S.#A(
-MN5P.^/SGGWJ*\=.GZX*O2\T@L![X84)'VAIUD1'P8P-#(0*DTDD0`-X,@1\A
-M@G"^"Z`'C.[6<>H7+*O,:,"[G9]M@FW;P+)\`J33L&6+T]A<`IXZ$@*N#OA&
-MC7)A$`^\>\Y0X.?YP);?]L`/C^,/#@YZH"L2O/SLLTSMV<WB'SU:$WP=SYI!
-M8%W-QS,`?/'6E:B4+)BFA<PSFJ_6K@\?^Y91>Y:R-C4'>_1]14Z!5H3N!<2.
-M_?1:14@D@E;@_9?[+D`'[,.WP(O/P^$)2&1A>!H6M<VB\?JB$4U3"%WG5=B_
-M;KHD^=(3TWS@@]NX>-,E`(%YA;A4S[(L=K[X`C-OOL&'CQS@Q5,GR1\^3-.Y
-MY]8$7XGW\_&-@A_P(U[GQX"O]?S9@2^"9?J]ZO^Y<P?!969NOX;<DGGH;5H,
-M,PB^:<!55X%5A6K%(<'DA'/<W@Y;MCI?Y*N4X;F3,2:NAG8'RHR0MFOGW.=-
-MER5?^ND4EU]S`QLOWN1I?K5:]31_:&@H8O9_]O*+S!Q]BQM>?@YA"%9UM7'B
-M&U^O"W[L.,!<P/?P]8!3F\]LW0*H,W,!7P<S%O@(*?3C\'7.)D\?H]G4?+$A
-MX)QSH:W=-?\6'#L"?_D7SLJ@:A5^^R9HRL*)*6=X^/63M;6^EK;'D42+!:;+
-MDB\]/L7FJZYCX\:+`6<:5VW3T],,#P]'\_R?;:<T=)`;SIU`3.?!MNGKZ>3,
-MSEU4IZ;JXAD;!,X&?M`"!`$GU&[_'\6`2*B?"(,6U7I!//#Q@(>)X#*^6,!4
-M6J\LP/KUKO97H5R"[WP;QL;@QX\ZI&ANAEL^XEQ[:`3VS00#PKEL@0#0(<),
-M!;[T^`277KF5]1LN0DK9$/B[=KQ">>P8-UQ@(A(FO/\<F)S&,`UZVW(,//%$
-M73<.(1?0,/B^4D<U5KL@'`\$B.-ILZ_Y==V`3@C"P,>!CN<:O$U*A%6-!FBK
-M5SO@6U5X^248&G*N>>D%.'G"(<'56V#)4IBI0F4&GCU%X&6%NN;7U/XX0AA\
-M9\<T[]NPF0LOW.`MX5+;]/0T(R,C$?!?W?DSRN/'N&&=@4@D(-<*%R^#J4DP
-M3/HZ6QG]Z>.U8SBW3P*S@8V`KY^;+%11OC>BK6K?(`28!KRZ!OS!GI"_#Q+,
-MH8]Z?9QBE2(?ZJO@&MD"7P";&J/#<%?V*NWO7>2D>M4J%(OPPG-^9B`E_,.W
-MX?-_"MD,W'X'_.U_A8/CT-$*+Q^%JU;XH-<U^Z!5W#MG(_CY\2*?_?`E'OA*
-M$4NE$A,3$]$IW==>I3IYPM%\U;A<,W05W"EM24=[*V_L>1MK9@;#?<-8&+]`
-M%C`7\"_;L)I,*L'241F,P'50O%X/:;]V0[!<A*Y1'17"4Y$D4A8GP1/%HX.<
-M21K.Z\:4_U_6[X!O&+!KA].!^OC`P!EX[$=PRT=A^7*X]GIXYBG8>QHNZH<#
-M@[!F<1TMKY$JNG4K522I9))*I8)IFMXZ@E*IQ-345&20YXT]N[&F3G'#!8E`
-M_V$F'"*?UPW3!41'*QWM+8SMW$G7U5<'\-,E,!+8"/A22B0F&`DZFO4'!H$.
-M`NF"$2D+`A^Z-`2JJ%$>O<^K3^BT+$Z35N`J8+J['=,_4W4F@_0`35W[LY?A
-M_/-AW86P]7IX]QTX=0+>'7+(U#8.2[L:!]\C@""3$A1+)0J%`M5J%<,PJ%0J
-ML<NX]O[\=:SI4]QP82+2CP!D<K"JFZ;71^G(94EWM7'\G0-P]=6UAX+C^K$>
-M^`"M329@TY&-3S,:)1(0>-5:H\^R9WMFC6<5IX9P?NK<!=@TH+/#B?S?.>!J
-MOP@&B(9+O.\_"'_8`[V+X1._!U_[&R=+&)F`%R1<FX+>V<8'H@000K!^>8X#
-M^]]FY:KS(AJOQ@#V_OQU1_,O3,:"G\NF:%_40L?&Y:1?'X)<EF1W!X???#,6
-M?"6&$&*R7"Y'K$"CGV<%_C_!LZJ6Y6MW(@%-.2?(>W>_7^X%:)H5J)3A'[[E
-M!%FM;4X\D$S`R`SD9^")8S`UO\S@ULO;>/VU79%(7TTGUP(_ETVQK+>=]:O[
-M6+-B$8M[VDBO7@*3>3!-.KK:*!X[%NF?I.MRA!#3AA#B5#Z?_[4%;+9[3_SW
-M_\[)?_B'QI^%!G)3#FP+QD=A>#@X+Z!;`46&B7'XP8-.JGC.N7#CS<[YP8+C
-M1G[P-HSG&P->(UIW:Y(_NJ&'%YY]DK?W[:-0*'A!X)[=NZ@J\`UHSJ7I[^M@
-M_?E+6+.RE][N%E(I[5M+;2U0+(-A8"23X))(]8-IFJ33:?+Y/$*(4PG@X/#P
-M\!H`PS`"LTV_[N"//?\\DW_S-U0OO92^VV^?]5EF<[/SK1H%:%.38_Y/G-"`
-MCAFQT\EPXBC\X+MPVR=@TV50G(&7GH.!&5B4A7_\!?R+M=#;7C\P!#\@$H+S
-MES3Q?]^^C(=W'N?E%]ZF6+9()0TN6I[@`Y>TTM&2I;TE0S)I4C,*DH`T_#J[
-M@,MRV?O"2T='!T((AH>'`=Y-""$>G9J:NFEH:(BNKJ[_9<"O3DPP^A_^`U<,
-M#_.,TYA9GY7LZ2%?J3KO\Q'"F>RQ+#ASRL\*=)`B92Y!CAR$'SX(MWX<KKS&
-MB2MVO`PC9>?;/-_>`Q]=`ZN7NF#5`E\%MLYG6U."3VU9Y)[W_L1%SM0484(J
-MZ7R154J2V0S6Q`1F=S=22A8O7LS(R`B3DY,8AO%CPS3-AX40U7W[]J%_/^#7
-M&7R`@U_X`IOV[2,-5-T7.LSV+)%,8AL:N`G#&?L?'X_Z??4FD/"<@3I_^!`\
-M\GTHE>#JK;#Y`\[Y*<MY:<2#>^'E_<&@+P"H#KZ^Z>?K!)!QFQ!P9`!:F[WZ
-M5LL5C%P.*24='1UT=G;RUEMO(82PJM7J#XW[[[__C!#B&WOW[F5L;(Q$(A'I
-MN%\W\(>?>X[FG3O)5:N8@)R>;OA9(IW!%K@IFNGX=?4+E8'(/QP,:AHL7((<
-M.00/?L<)##]X+;S_2C=@!-HZX-E#\/5GHC.,*"YHH"-J`Z](T\BV]QATMGEN
-MRZI4(),AF4RR>O5JQL?'V;MW+\#_^.(7OWC:`+!M^\^EE)-//_TTEF4%WEGW
-MZP:^E!)9+F.H;_$`AFUC:]_#J_>L[*I5C%74<#`.`>+F[B,KAG1+H)T;/`/_
-M^/<P-`!7?A"VW>SX6TM`2P],6O!G#\*1,PKU$-`Z^(0^0UK?"`&>^06L[`?3
-M0`H#:9J8ILD%%UQ`,IGDJ:>>0DHY:5G6GP/.9-"?_,F?#$DI[QP8&+">?/))
-M`-+IX`N)?EW`!T@O6<)TRG]56J>43+[V6D//:KKR2@8M=RS`LB"?#P$>\OMZ
-MT.B=TZR#:4`A#]__?^'@`5A[(?SN)YVAV80)Z4Y8N1S^S</PC2?<GUM6ICX&
-M_+`[B"5!W+4"]AV'JNVL:C)-AH=&R*X^CXLOOIB6EA:>>>89!@8&+"GEG5_X
-MPA<&/`(`?.YSGWL$^-SAPX?E(X\\0K%8))O-1EY?^D\-OI22W/O>QZCT?@6`
-ME1,3G/G;OVWH62V;-S.@7O."A%(QF.J%5^MX+B'&.IC:M58%'G\$GG\*>GKA
-M]D_#TG[WNF;8?"D<&H<[_Q_8_@L"?EL'7^W/94))W?<?'X+++W("0,/@U.DA
-MSKO]DQB&P2.//,*[[[XK@7_I8@TX+T#SY"<_^<FK-]]\\]ZIJ:D;]^_?GS(,
-M@T6+%I%.^\N8PZ\QG^W36<9E>`&F.@Z7U_L,7V<F$DSMVD7VX$%:@%;#X)W1
-M4=)KU]*T:E7D7M,TO<]45Q>'O_I5UF33B'3:&>#Q8@`13/G,L.D/EXGH=<.#
-M<.B`,TYPV6\YX_.#IQQ`.WJ@?S$\\2H\]AHL[X3%G37`1R.(IO6UB/&7/P"1
-M@/X5'DEW[]A+\HX[>6;'#L;'QZ>%$'?>?__]_T/'7!`C7_G*5\XW#.-+P"V9
-M3(;ERY>S?/ER6EM;:6IJ(I6J_:;*7Y6,O?$&;V[;QO43XY!(D#=-GLIDN>@;
-MWZ#OQAOKWKO[SCLYYY476-K7Z[@!J^II380`LQ$B'"NH:Q(FK-\$FW_+&2MX
-MX4D8/.U;FYD)V/.6$T_<?@5LW>AD)1&P(1@[$-RW;/BWWX5#@[#E&N=:*3EY
-M\!@OO3O`Z+V?!7@4^-_NN^\^[>U7[F/J==37OO:URZ64OR^EO`E8VA`ROT)I
-M_>N_YO)WWV%5PG1(8`B>L213O8LI7'45=G>W,]P;$N/$"<YY[,=<MZP7IPMD
-M$.SPIV&X!!&USP>.75=B&LY@TV57P`4;X<01>/5EF!CSB5":@@/OPL%3L/D\
-MV+81+EGMOI`*8@-$<`:PGM@#7_TI7+@2UJUWRJ7S&T0/_?W#]M#O?NPA:^W:
-M+]UWWWT_J]6'=0F@1$HI_N[O_FZU95E+@*52REQ#"/V219PYD^OXR__XKZ]+
-MF&V=Z90#=L+D5+7*T7*U-&E;54N"-Q>OS2CF\X6F#Z\^1V23B:CV!SY-1TM-
-M?1VA?BRB1`A;!R&@JPLV7`:KU\+1@_#SW2X1%,`21@?@T#$X.@`=.5C=!_W=
-MT-WLU*-8@>%)>.LX[#L)%YP+&RZ`K/J2NP1;LO/Q%XM'?G'P^Q_/S]PY:Q_^
-M<J#YU<G?PX:,$$]=W=;<O;@I*S!-Y[4JINF8X43"WS==338-#@V-,C`TQ@?Z
-M^X(`1TA@1D&/Q`(QY_4!)W6M$,[\PYH+X<)-,%.`=]Z"PP<<-Z0"3P&4BS`]
-M"5/3SMQ#J>RL6F[*.E/8N78?/15,2\D[N_967WOJE0,3Q=)EGX7";/WWOSP!
-M`+X#*TTAGN[/9;HO[FQOSJ93SDQ=0B.":7K@8YI(P^#QG6_R_J6]=#0WU08^
-MCARU]F-)H1VKM%&XS^SIA>4K8>FY3D.&3L.9$S`VY("N`FYE^@WA@ZV+!&S)
-MGB>W%PZ\^M;^Z<+,M7\`HXWTW6\$`0">A<1IP_B\`7_6DDXE>EN:LLVI5,9(
-M:.!YJ9WS.5DH,C@XPK8U*YQU=35)4`/HP'4U@D&]7+<$@7/">0-I9S>T=T)[
-MMU-6FG&&F@O3SO[TI#-TK8N4Y">F>/$[/YZ8&AE[@OS,[WT,&OZQX=\8`BB1
-M(+X%EPFXR#2,<X6!&Z\8L=<;L'5E5]N:RU8L2_@6(L;W-^H:PO%!+?##A/3,
-MOR`X[@"!`2"]K;;-_NU[2F\^^<IDM53^S!V6]?!<^^LWC@!SE0<A92<2VS<N
-M[]OPOB4]*8\$NF;'^7[3B)*CIDNH81UTEQ#>5T0(I(7NIX1C/]\O7WWHF;%J
-MJ?1@H5#\/^Z&\?FT_Y\]`0`>A#:93+Q\8?_B5>N6]Z6C)*@!?$3[:P2(<?&"
-M`CSL$B(6P-^D;7-DSS[KC<=>&*\42R\5I@I_>A<</)NV+Q#`E6]!+IU,_*2O
-MH^WB#ZP[KR612@1),)OVUPP075<2FR;J+D%`^!M#;D8P,S'-@>U[\N^\\OJ,
-M7;4>K>8+_^8../I>M'N!`)I($-]-)/Z5F1!_>NG[5K2>NW2Q&0MXG&O0M3_.
-M0M0=,]!21I<4E4J%$WO?M0]LWSTR.3`Z7BV6_TNB4OG.QV#BO6SS`@%BY-O0
-METFGOI).);=L6K>JHZ^W&T.-+31"@D8R"!U\%_3\Q!2G#ARM'MJU=W1R8*0H
-MI?U@*3_S]Y^"O;^LMBX0H(Y\&R[*9%+_RK;E=>?T]R97K>AO[NKN<+Z'%VL9
-MZ@2/(=,OA6!B9)S1DX/VJ7>.C`X>.FY+R;'R3.G_JY;+#WT*]OTJVKA`@`;D
-M0<B63//6IG3R3LN6&[+9=')QWZ)T>V=K2U-SCEQK,YF6)H1A8"03)-(IJK:D
-M7*E0+E<H5ZKDI_),C(Q-3PR-%2:&QB@72V5AB+?+,^5GJN7RBQG8.9?\_;V2
-M!0+,0[X)BTVX+)$P5B=3J;6&(59*1`^`M&462`K#F,%@`F=$;J12K.RKELN_
-CL.%0%@Y]#*;_21OARO\/`@Q9S<[?68P`````245.1*Y"8((`
-`
-end
diff --git a/ubuntu/_base/core/tdebase/debian/img/cr16-app-energy_star.png.uu b/ubuntu/_base/core/tdebase/debian/img/cr16-app-energy_star.png.uu
deleted file mode 100644
index 174f00947..000000000
--- a/ubuntu/_base/core/tdebase/debian/img/cr16-app-energy_star.png.uu
+++ /dev/null
@@ -1,21 +0,0 @@
-begin 644 cr16-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CL,>&[K>0```KM)1$%4.(VEDSUHG64`A9_W
-MY_N[W[TW]]+$$A.31K&-UJ:5"`Z"(!V=Q"Y.P460$L'%01$W=SN(.KDX%!<1
-MJRY"Q4$:+7H+QE+2>IN6VG)S\_?U^__>]W4(U-&"!\YX#N?`.?`_(5975Z>6
-MEY??ZO?[O8<16&L!&(_'NX/!X!P;&QO7W4/"6NNLM<X8X^JZ=NOKZW^)-$V+
-MBY=O!9]=V,1$'<+0(P@]PL##\Q7&.JJRIBP:BJ*B*&ITE?+!RA(+A[U*`VSO
-MEUS;BYAN=U!12-`)47&`\A7".)J\PJB2PA8D><[=44-6@3'&:2$$4DJ$%)1E
-MC9<KI!188U%:X9RC*AORK*+(*\JJ06E!FF:DJ3`:0$K)O;O[A*&'$`)K'55E
-M4$K@'-2UH2SJ!R;;XPQK#<8(M!#"22D9CQ)PCIG9/DUC\`J%E!+G'*:QE%5S
-MD""YS\NG6EAK<4[R;P4AR+**V[>VB>.0,/+0GF(BW^6-7S]AVF[QS:$7./OY
-M.UP?WJ$Q!I!(*:532M+IA'2[$9UN1-CR\#R%%/#^[G>\_N*?O/1FG_<^/D.Z
-M?HEW/_P)3SJ44IX60J"5(FX'Q.V`J.43A`<&O73,Z7H()Y_AZORKC&X,F=CX
-MBB^.5,P]N\+-FT-Y4$$)CBU,$+=\HCAXL('G?OZ!X)%)2'9X-/^=6>7PEY?8
-M?^4,5[[]FOZ)4Z6VUKK);LC*Z1E\3Z-]A=82I27S@QVX,X;M&::.YG!HDK7R
-M.*-?+O+8']]CCSV-3I+D]HG'NT>?FFMHF@.6E]=HQF/\*0]^^QO*^]!:A),I
-M"_VK'']"$3?S#+:V[JG%Q<7S4LHJS_,K29*L95FVEF?9P#OW49QNWMCOE7E/
-MM2-!Y2!M$;L:?Z]@="T=_B@[SXO_>M_FTI.O]6:GW]:')X_8B?:."8-+>SN[
-<%^8^_?(\P#\DY761`2R&E`````!)14Y$KD)@@@``
-`
-end
diff --git a/ubuntu/_base/core/tdebase/debian/img/cr32-app-energy_star.png.uu b/ubuntu/_base/core/tdebase/debian/img/cr32-app-energy_star.png.uu
deleted file mode 100644
index 77c6322f4..000000000
--- a/ubuntu/_base/core/tdebase/debian/img/cr32-app-energy_star.png.uu
+++ /dev/null
@@ -1,48 +0,0 @@
-begin 644 cr32-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CL;^[UNO@``!W9)1$%46(7MEUMH'-<=QG_G
-M,KLCK;2R;BM'DNW*L7R1&LM)(6EJNTG;AY)`Z4.@.(&Z-DTI%!L$@4*A#VEH
-M"Z6!4DJ<EX9":*&%/ABGD-(\)*5N3>WZ(ODB2W+DM:V+94FVM*O5[FCFG-.'
-MF5U);EY*3?O2`\.<96?F^\[W??__X<#_Q_]X"(!CQXZ]U-?7]_WN[NY6(<0C
-M^;"UMC9WSM7NSCEF9F86KEZ]^J,3)T[\7@\.#KYZ_/CQG_?T]-0_*O#UH)]$
-M(@S#+?E\_EW/\YK5X.#@R0,'#K3]-\`!A!!(*6EL;/26EY?WZ6W;MF6JX+\^
-M=8[9N26,A<`IA!`(07+?.(\_!LZ!BU&PSL:_$ZF=`V?C>UH9E("!W5OXXF=W
-MH+6FJZNK42NE:NS.#$_S]@<!?4]TD^O(XOL>:=\CG=:DTYI4.IY[*87G*804
-M6..((D.X:@B"D""(""H1JT%()8@(*B%!$#)_;YGQT1E^^=W'L=;BG$,I);24
-M<H,\;;DLV:R/M0YK'<98C+%$QJ(B0RCCU5OK$$+@DF?"T!!%%A-9K+48Z[#&
-MUKZ3:4C3W-J`<ZY&0`C!!@)22II;ZC$F?KD*;B)+)"U"F!JXBF(KG'.8J@JA
-M(8K6B!AC8Q(F!FUJJ@/`&%/#^Q<"6BJ,358=&:042"$0R<J=<VACD5+6,F!M
-MK%`4QB2J1*K*51<BI<`8P^+B(L:83U:@7%DEY6LB:9$R?J@&;AW62HR2""D0
-MQ`&LVA!%,8DJD2@TF&B-3!`8K'5$482U-B:@E*K5GQ""A?DBF4P:*==27P-W
-M#F4D2LG:?\ZYF(!UL571F@KQE5@869:+Y<1"NT;@804*2Q4>W%^FI:UQ0QW'
-MX7$H)1-R@JH$<0YLLCJST8KD'E1"BDL5P&TDL+X,JV2FIY8PQM'>D4T(Q,$S
-MD44F!*1<:US5I%>#&ZM0S41$$(3<FUG").VY2@!`K^^`50+..>[.++%<J+"Y
-MLXF&;!W&2I24*!5G0HAU&:C:8%R-@(GBTBP4RNQJJ?#;-P<X>V6F5H;6QD'6
-MK!OKR6BMB(QE9F:)S&*93&,=F08/+^4A50Q>+0/GP"L7&9CX"YE*B3N9#LYE
-M^WFPM,J^KI!3/WD13PNT"SCWL<%:U@@\G`$I!=J+.YW6"JTE2$&YLLIJ&**D
-M0'D*I135&#Q]\R.^=^8M^OQY:%&X`,:*39PZ^`I'?_P#M(+K8Q.\_JMKO/A<
-M_T8+I)2UG4)I12JUUFJU5FA/H91,+E&K?Q*U<H5)?ECZD&V=]^&KW9#=A'`6
-MGVT<.?H:2CF&AR[S^KLW^.,5S0N?CRVH5"JD4JF-%GA:D4IKO$0!STL(:(E6
-M:HV`7+-KL'"!;8T*#NZ!W=M!:?*B&[G_.X1*,S9\B;E?_)2NR_7HKD-)5@Q[
-M]^[EVK5K]1LLJ"G@J5B%E,;3$JUC$DK)N`J2G=$/BAP,IZ"U$7;4@Y<B[SHH
-M[3U,R@C&K@Q3'#[%UNT/^/;'EXAF?79NWL'`P`"%0H$P#.5#&1!X7J)"2I'R
-M--J+<^`E5LA:'X`#E_]$;G8,GML/=X=A9Y:IU1SIT'+S^C56QS^@M[%`<U<_
-MFSZ5XS4SP*YG^IB?GV=\?!RE5+EF@7,.*43-_S4E=)*'1(EUC:A_;A3&Q^!;
-MK\+P:>COX0DUS9E+?Z!9EMBW4Y"I?PPG)%?:#M+S[$O,SLXR.C*"U)K.SDZC
-MJ^W46DLZK7FVKZ56!5X20NTIM))(+9%2HF0<PKYB'OK[84LWG,U!8,AN4GRY
-M:1&4!I7!"<FEE1UT/?4"4U-33)P]37A^B-RA5^*-;7UGJDLI#GRZ&:WENN17
-MO1<H&6]"U2[8LEJ`)[\$;[\%^_?#Y;_"%UIB<*U!:?YQOX/6_N>9G)PD/SK$
-MIML?XE^^B?W:H9C`^L[TY*X<*Z$$(39L1G'J01`7OA`.&U3(K*Y`>05NC$)#
-M'6S9`5=GX*D>T!YHS<(*E"<GF<Y?I\.,T-770>9\GAMW[F"S6:<7%A9*[>WM
-M+=9:^K8V8(S9T"ZM-;7YZL6+E(:'R;S\,DX[HN8FN',;TBG(3T![&\RVP/!M
-M>'H7*,WGMA2Y,/DW/I,+Z-G<B582MK8Q,3-->?OVHAP:&GHCBJ)2O*,]#+[Q
-M,N^]AS\Z6GO&='3`TH.80,J#L1$(#"QTP/O#L+A"ML'C^;X4O5N;T.D4+`=$
-MD22W9T]E9&3D#77RY,D+O;V]UX(@V!F&850L%@O%8K&PO+Q<*)5*A5*I5"B7
-MRX5RN5P(C`F:WGG'7R@L%BNW;ZV8?%ZTK10UZ134I<%/0Z4$2D)N-XQ/P^P<
-M+)=C#_/S<'&2B?M>Z4RV]?"1HT=_\V\?!LYE_,.;FS=]PVMJ>*PLA-^JQ=;&
-MYDV*.A_JZZ#>ASH?_!2TYR";!1M!N0C.,3UVZ_S$T/@W#UZ\.@3)T>P_&1>Z
-M<E]_?&OGF]E<2X[Z.LC4Q6K4^^#[X*<Q`C<W>??*O5O3O[M]_J.??66:E>K[
-MC^0X].?V]M[-6UJ/-+0T/Z,R?H>LJ_>-IY:,5%.E<OGJW*VIT_O_?OE]D9QA
-8UH]_`NO&3=99UCY]`````$E%3D2N0F""
-`
-end
diff --git a/ubuntu/_base/core/tdebase/debian/img/cr48-app-energy_star.png.uu b/ubuntu/_base/core/tdebase/debian/img/cr48-app-energy_star.png.uu
deleted file mode 100644
index 0be925842..000000000
--- a/ubuntu/_base/core/tdebase/debian/img/cr48-app-energy_star.png.uu
+++ /dev/null
@@ -1,81 +0,0 @@
-begin 644 cr48-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CLFH]4BKP``#3M)1$%4:('MF7N,7-5]QS_G
-M<>_,[,R^7_8^[%T;L`UU@(``EU@0`I22A$I])(@*E`8JE**@0A0E?U1J6A)5
-MZ1]5%;7_1)2V4+>-*B(@)+9I"R&$IX!B'L$8O+;7Z_'N>G=G=G9F]C'WG-,_
-M[F,>NQ@BT?!'<Z2K>^^Y>^_Y?G^_[^]Q=N#7X]?C__<0C3>WWGKK@._[.YUS
-M_L<%Z&Q#"+&VMK9V^*&''IJ-YS3`'7?<,9C+Y?YA]^[=-^[:M:O6UM9F/NK%
-MG7,?.!]?O]]<M5I51XX<\?KZ^O8O+2U]^?[[[Y\1M]UV6^_6K5M?N_WVVS>-
-MCHYJ*>5'C?T#QX<A!V"MI5JMDL_GS;Y]^TY/3DY>I/;LV?/7=]YYY]7;MV_7
-M0H@-/_1QC58\0@A\WZ>MK4T.#0VU'3ITJ%V/C8W=/#(RHC\.@!_6\JWWZ72:
-M@8$!O67+EB_J;#;;FTZGDX>UP/#,2T<^>K2-@#@[P(U&KBW%I;O'DOMT.DTV
-MF^W5M&2BQ?(*CQU\AI<G4P"(;!\JUX%6$J4D2D=G)=%:(I4,GVF)DA*I)5(*
-MI!0Q6HRU&&.QQF*,PP3AO3&6(+!8:PD"D\P'QF("BUTNHU86`/C&E_9L%.1B
-MPZ"=6?)X]FB&WKX<.T>&$)Y">AKM*;2G\#R%]B2>I_!T.*=U.!>3BPDX1P0P
-M!%4+#$'-$`266BV\KM4,1(>M&:@%N)HA4#D.YR7%0H79LH=S+@%OK44(P8:!
-M*Z5$:\76\=[D)><<-CY;B[,":QQ&.H0)/X8(+>ZL2^Y==!];UAH;OF="RUOK
-ML-;AK&M8B^08'NVFO+2<@&Z4G922#3T@I:2W/XN4$A<M8*T+%Y<"*P7&.(2T
-M"",0HIXQG'5(*1!2A'P<T?N1;`*+L74B-B;B7/)WC6M*(>CJSH4?BH#'1CPK
-M@8Z.3!UX]&%K!<:&%I<B(B)LHO70*@(A0@+QO(VL&^L^U'ITWV"<T"LN(11[
-M/9OS$_#6VH3$AA(2(@2@/=5$P$0RD5)@A2`0MA[^+@(:$9`-!)R+%XZ]$`>Q
-M20A98UN,5?>,LPZE%0"52H5:K1:]:\[N@:!F\;P0N(QD$P(0B;YC[K%%I`V!
-MAP%<-XQS+I%%XH7$$W$V,I&L&KT2D@YJ`0Y865G!&%-?3TJT4FI=Q9-24BFO
-MD$KK)MF$WFD(6.K!9B/MU_4?>0"'LQMXH8%$F$KCN8:XL`YC'6NK09.AFB3D
-M>=XZ#P@A*!2J='5G,1%@*<`(T50TDLQA'5()I)1)0(<V"=-2G(GB0*W7A"B]
-MMG@C)A+_7;F\NHY`$L1:K^\BI)0L5]<H%*KT]+2%P!N0N\CR6LO0^BJ4CY2N
-MA4"#EQH(Q)IO]H()"UA#7!AKJ:U9*BT$XD`^:PR`8?IT$4]+VCLS38!BW3CG
-M4`EXV42@,<!=2QRT>J&Q^K96X[DSI:8*W)B%-B009Z%8(B=/+C#B>NCHRK3B
-M1T86#;5OFR04?BM)WPTQX!)]6[,^'DP#D<)"A6IU+5FW$?P'5N($K'6<G)RG
-M:RG+YN$N/(\D/RLKD:HQ==H6_=?!AP!<74IQMC%V76:JU0SS9Y;XK0L<_5T=
-M[/MIZ?TE]$$$XE$L5%A>7J.W-T=W3QO:4[A$/B*I$4F*;<A"<9%+JK)S#;F_
-MGGD"8ZDLK;(PM\1=UVF^??<->)[FD]N?#;/9AY'01@2D%"@5SA4*%9:65NCL
-MS)#-I4AG="2=*'U&&:MQN!8"SCGDVC*!]+'&$1A#N;Q*J;A,I;S"O3?Z?/=K
-MGT,(*)5*7'9^/R\>7<5:O5Y"&_7B=0V+J+L4R+B=EN'U\O(:*ZLUM)+X:4TJ
-MY:&UQ/-U**?6+.0<>U_[#SXU\3.V+9P@Y2PEE6(JT\_+N7%^O/EJ%MJV\-7K
-MX*_N_2Q2"DJE$J52B4=_^@Z;QG;C7/#A)22E:.K]&]MDJ>H]OY0"9QRKRS76
-MI(#*&E*"0(*,*X'@*T]_ASN//46[-K!)0H\"48:E.6Y>>).OGGR"_5_Y4VZ[
-M]\^04C(_/T^A4.!??_PJW_V1XWOWB(TEU)AU8JM+&?9"C1L7I<+-BXKD%!.I
-M:[\A@S6E7/CBB4?XD]7#M&4-[$W#6!K2&9`:3(!#,M%^$[=\[1LH)9F9F0G!
-M/_X*?W/08R50D2<WJ,3KS`\HK=!:HI4*O1#MML)S@P?B\[H`KH_,2I&[/G<N
-M;4_FX=(47+D3^H=`:Y`*)^#)ZDXN^H-[$$)P^O1I"H4"S_[@A_SS2UL(:`-L
-M4G>JU2J^[]<K\48$M(YV6+&$M$JVC7%`Q]Z(>Y^$0$,,`?SN<P^RZ0_O!&7A
-MFIVP:12D`J5P4O'?U5V<?],?`X)\/D^Q6.2M)Q[FDH?_B:\O=O*]<^YB,CT"
-MA`$]/#S,R,@(JZNKE$HEY+I"!B@9R28BXFF)]L(Y+]I2>M'V,MQBZNA0^+[&
-M]Q6^KTAKQU5S;T!W-^0TC(^`TJ`U3FH.EG>P_=I;<<Z1S^>9G9WEC6?WLRMX
-M%?_:?C[57>#KQ_Z.OMH\K!48'1UE='0T`2^$"+O1UB&D2*P>QT+=&^L#6LEZ
-M"A4-->#"-PYPZ:EW0"GH[8"Y,HP.@%*\6>YB^#=_#V,L^7R>Q<5%)E[[&;O5
-M$?R^7LAE\-)I;CQX"L\]RMX+KV=H:(C5U57FYN:8GIZF6"QN("$1:EI'H'44
-M`W$\:"V1&\5#0J">0B\Y_@*^L_#>NS!\/DP587PS*(V0,#<WAU2:<KG,R5^\
-MP"?T>^0RFJ[V--WM`^1V#C,YN(VK/GTO8V.C5"H5SIPY0SZ?IU0JD4JEUJ?1
-MN$"H2$(Q^(2(5G5/-!&03=D(8-O<!'@:GGD&+KL<CCP22DAI?J.OQH'#3S`K
-M!K#5!:X=F&&PNY=<FP]"@A"<6.JD>L.7&-]Y$4M+2\S,S)#/YZE4*@P,#(0>
-M:(R!.,>**%!#\`U>\.K!W%P;9+@?:/!`;F&*'<63X'L0!'#--?#B8U!:@;Y.
-M4)H;QLH@ET%*D!WA64B0DA,EG^+0]8QO.Y]2J<3,S`R31]YA%<'PR$B]#K2"
-M=\[1W9'F]_?VH)2H@U3K):.40`A9WX4)D"+<3G;O?YQ-&.CJ@BNN`*U@VV7P
-MRC&XL3>,BR@;(55$(CR.+VKF>JYF;&P'BXN+H>6/O\?:0P_2?L&%N.'AI$'4
-M0H@F\,XZ4IYBZV`F_$^;$DT2:9)+D_:;6_&.M2+"UW#AA5!:A`?_$6Z_`Q[Z
-M6S@Q#^=L;B$A02I.EA13F<L9VW(NA4*!V=E9ID]-(DX]Q_C"!*<.&=SG;ZKW
-M0E+*I@8)YQ@?[N+X@DJVB5(*E)2AM&+@0B"40`H9>ETT=Z*9Y5)8K,:VPG\>
-M@&-'X;F?PZ77P9LOAC+J[UI'XHVY+.=<OIU"H<#<W!RSTU/H^?]A:[^#H0[T
-MR3G6BD54>WO22CCGG(B]T);1#/6W,S0@HW(=2BQV6=.]LR`L.!MM7**^WSD,
-MRZ%L,ADX_'88"S]_&O[H#C@]#"_/P/4Y\/P&$I*L7F%R\@3&6.9G\Z26WF);
-MGZ4CEZ5[SWE<L#3)\Z^_CK=W+T((IZO5ZKQSKB]ID`1L[4^OV_W46V*W[MG:
-M\>/,[]O'P#>_F3PKMWG0EH&IDR$QK4$*^.$/X`NWP'-/PW\=A4^?!UWMB0?V
-M[A`\^?8+%*H>@ZDE+M[=06='*&>P\/0T\LPTV6R68K$X+_/Y_+\%01"T[O@W
-MNGZ_9\%]]Y$]<:+IF4FG(96"V9DPE6H-G@?6P$\>A:L^`Z5../@V')])`EA*
-MQ;6[T]Q\A<=G/ME+3T\[2NOP^8DYZ.K`2<7@X&`P-37U[[)<+G_KP($#TU+*
-MH#4;?1CPSCE6EY;01X]B@R"98VR<&@[*42QX.I24UA#40A*?N!@Z=L%3Q^"Q
-ME\"8IE1:/R*)'9NGXFDV77*)>?[YYZ<KE<J?JX,'#RY?>>65_S(Q,;$+.-?S
-MO,!::X(@,$$0&&.,L=8:8XQQSAEKK7'.&>><`8P0PE0G)QD[<$!.S4S;S-Z]
-M-9U.&V_+%E-Y_#'9:0.!5B$!3X>QX'DAF5.3,#@(YUT,IQ;AE5_`Z7D8Z85,
-MJIY>'?#P"[":X>ABX%[=LGW_0K'XV;OOOGNNJ0P_\,`#_;5:;8<0(LTO,ZI5
-MM?O;]WWG8BTNF=;>PHJG5_$4U<IRU\6#O1E\#](^^'Y((.75KWT/,FG8<4$X
-MMS`#T^]!FP)?@@6J`:3[F)M9J+[\\MOW_/:K;WP_Z7Q^*:!G&4^!5NUM?]G3
-MGKU"^7X:SZ.&3>4L%XQO[DN1B@"G4W7@*;_NE=@S?7V0:P\_NKH,*Q6PCHE7
-MWGKOV*$CW[KVG8E]C>O^G_\L^617U^_L&!WX^Z'-?<.D4G7KMYY]KRXS3X?[
-M!2$X=7AB:NJM=W]T[-"[?W%+I3+3^OU?R>^J^]O;]PQMZKYO^_CPWFQ7IT_*
-M)SEB3Z1"#Q@IF3\]6YR?FGUE_N3IITX?/O[]+Y3+9][OV[_2'X9_TM-Y?7]?
-MS^=S7>UC*N5WR;2?12GEE)RO&5-<7EDY59PNO'[B\-%'O@SO"[IQ_"\KGJJI
-04E_IW0````!)14Y$KD)@@@``
-`
-end
diff --git a/ubuntu/_base/core/tdebase/debian/img/cr64-app-energy_star.png.uu b/ubuntu/_base/core/tdebase/debian/img/cr64-app-energy_star.png.uu
deleted file mode 100644
index 0691c9b78..000000000
--- a/ubuntu/_base/core/tdebase/debian/img/cr64-app-energy_star.png.uu
+++ /dev/null
@@ -1,117 +0,0 @@
-begin 644 cr64-app-energy_star.png
-MB5!.1PT*&@H````-24A$4@```$````!`"`8```"J:7'>````!F)+1T0`_P#_
-M`/^@O:>3````!W1)344'UPD;!CLT4&Q3YP``$ZE)1$%4>)SMFGN,7-5]QS_G
-MG'MG9G=V]FWC]=K>M1V\`=N8APTQ)0T$8I,$"N)1$DB":5,2H@8I;:/^4:4B
-ME:I655,I2/FCJ"IITL0(DI`0'FF:$($;.8`Q:VSC]]I>K_<U.[.[L[/SON?T
-MC_N8.[.SWJ20!*D<Z?C<>^?ZGOO]_KZ_QSEWX;WV7GNOO=?>:_]_FPB?//C@
-M@VWE<OEN8#NP`HC\7M[JG6\E8!S8:]OV4X\]]MBL_T-`P`,//'!_=W?WUZ^\
-M\LJVC1LW.FUM;5)**1H][7?1C#&+7@O_UNA:_77'<<S<W)P^=NR8&AP<S$Q-
-M33W\^../_P=X!.S:M>LOMFS9\K7;;KO-]/;VBDCDW6OX1L0L=8\QAG*YS/S\
-M/,EDTKSPP@OBX,&#7W[\\<?_6>W:M6OSVK5K?W#OO?>*OKX^H93Z;;W[.]*$
-M6%J40HB@^^=**9J:FHC%8J*GIX?SY\_?U-?7][040OSE33?=9%:N7/G;?O>W
-MU8PQ0?]U[FETKS&&YN9F.CL[N?[ZZXT0XJ^LUM;6'>O6K5/O9LLO!GHI=UCL
-M]^;F9GIZ>E1[>_L.*Y%(7!2+Q=[V2_XVVF\*_$*!,]QLV\:R+.+Q^')+""$;
-M6?^Q)UYB>O0PQ4K5YPHZ0EE$:GQ+"'!/_6,!WB@(G>-?]X[]%_3^-08P!F]P
-MCPT8#!A?WN'SVDCOGT<I$5/EX/E;K]A(3V\?FRZN=7$/@[06"RH51_/<H3A[
-M3C8!$(O97'Y5'[$F&\M2*$MB28FR%)8EL2R)4M5SI<+7O%%)I))(CS@\L%IK
-MM#8X%8WC:"J..SH5MU<<QQW]WRN.>[S@W*&0+_/6X5&*!9>$AZPXGU_;VE`)
-M4DJDE+)A9`U'4:4DEVQ>B67)*O,A*U0MX)UK]YK6H>Z8*BC'!>-V)[CNWVMT
-MZ!G&8#3N&#R;D"I,S3LH6W'QP$4H)6OP-`J.0@AD/?!&!*Q:W4DT8H<`USTP
-M!-1H]Z7#X!U'XVC/JDX(=-C2NMK#I&E=):%F/N\]=`-"+$NQHJ>M"I[%LX,E
-M96,.?`*B48ONY8D%#]#:(*7W,A)DZ+IP#$(8!-H7&QB-D0(C31`7O+=;H!;'
-MT6A'>ZX1[AZY]9;7(15ZQQV=<9+)N<#-&J5$I91+P(5<H*,K7@O88UU*#ZPT
-M"*W1#D%`%`)P/.`>"<8(C!%H+1H3$%:2HW&TP0F[1.CWL(L$!JEQ1?>XM:VI
-M!G#]L1""18.@WYJ;HS6`I3886:L`(PQ:5BWOQO:J]0TZ`.\O+_QYZU_:E;U+
-M@':T%SN\&**K+E$37VK<HAHSFILBH3D6(2#\,N'F14AL2]4H0!N#T"Y0[8U"
-MN.#!@!.2/=JUL!(8+1#25T#M7&'I.IYU':T#,O1BL4'K6C74!4YIN1,YCD,^
-MGT=K3:52P7&<8.Y%%>"[@`X%$->_=2!SQ_'O,R"T]_^JL@?A65>@I4!H@72+
-M@[`'@#%HCX2J*VC7\O[HD^$TB`DA=PD'8HP[2Z52(9]WT-IW1Q,8V5)*77"!
-M42I6B$:LP-(ULA=NP'*Q2@0&*AJCO*"GA!<S7.D+`3I<&+&PT-%!"M55V7M9
-MI&KYA;U1G*A4JI8.@S?&#<122M<%+J2`[%R!>$LTD+WCC7A=".W>ZQ%A`MNZ
-M0<\H]UG&^-+WQIH@6%M/^-*N6E57ZPA?`8ZN<X?:M*F-H9`O>Z!KP=>D09^)
-MQ0B8G<G3O2P12%TX!L>3N(O#E[QT)_*M[\E>&I`"UP5$'0EX92^A0-@HR'E@
-M??".$[X>ZJ8V2^1RQ0!/?1H/%+!4'5"I.*12698M3X32G/2L7_5]%X3T)O,L
-M;H17)[C^'ZP=W`D"!OSZO[[0"?RY'KQ?0&D3(L/4D%$J5\CG2@')BU6"2]8!
-M8$@EL[2T1&F.1Q'XJ4Z[J=XO<CP%N`6&=`G0`E,'/@B`81?PB6A0$[A;6GJ!
-M$IRP`AR?I*IJ9E+SA&N?10GX=?8!C#&,#*?I6]M-+&;7%#D&4$9X(#R_-R"E
-M&_BJ`;"Z2JS#7U6!KJL)PC&@KDCR5>`&RMK,,)\MDLT6PP`:$A!D@48MO!8`
-MJ%0T9\],L7IU%\UQ?\_0S_6^G#W9^ZE/5TGPE\K51U8I\"U5$P1]-3A5WZ[*
-MW-2"=ZJILI`O,S4Y5VO`!@KPX\"B=8!?"'GF=DDH:\Z<F6+%16UT=L>K18YQ
-MJSWERUX1*GS">W2-BZ[JNK[!@F=!RJM&_S!XQ]'D\T4FQC-82E.JB`5S-'2!
-M7V>3L>9!VC`V-D,FDZ=G50>QF!58W'BR-\:@157Z->"]Z<*E<*,XX+O`@F5U
-M*"WZ0=%Q-+,S.:S*'/_RZ00;+U[!B;-IOO[C&1_]A6/`4OL!C5H^7^+,J21M
-M'4UT=2>(1BW""Y[%_+^!!RP:!WP%+"2A*O]"OD(JF2&N"OS]ISKYTWMWHK7F
-M@U>7B5A[V#]J%ET.2RF7+H4;79=2()5`"D$N6R*?FR;>$B&1B!&/1Y!*+O!_
-MA%<&XR^&`N,0U`$A%?C6#Y3@IT;/\OE\B9ETCKEL@:[F"O_@@7>-DZ=4*G'%
-MP'*.3&0NG`;#<KP0`4+X<<$C0$I$<"PHERI,I^>9F<X1:XK0U&01:XI@63)P
-M`;V$N[GN8.@_^RI;C_Z4SF(6NU*@K&Q2T7:&6OOYQ<H;F"K;E$H5M-8LBU?X
-MZCT)_N03.P!WX9/+Y2@6BQP^,49)=P3/7I2`I100!BV5J".B*G,IW<#G.`[S
-M\YI<KH22$F5++*50ML)2`B%!XM[KUP7&0%?J#)]^\1_Y</(H:RI%ZNDJ`*_%
-M=K,_T<]/>ZYCL/\#_/4M$?[LOH\BA*!<+C,U-46Q6&3?FR?YUY],<=FF[H8Q
-M(,@"BQ5"?I-2N)N94K@;FE*@`B)"2A`B4(00>!N?7M`SKF4<1U-NL!06PM"6
-MG>)+/_TRMV9&W!\Z)'1+6*9`2BA!+&/XX$R&#T[MYV9GF%<_LY9[[G\((03%
-M8I%D,DFA4&#?@9,\^LPDOSK3Q&6;&J?!)1=#4DHLRW)W=$.65R$B_!W>0`4A
-M(L*1?T$&"*\$`:DU7YG^'K?,G7=OZ%=P?0QB%DB/`"F#X]1XC*-;/\==GW_0
-M54:AP,3$!,5BD5<'C_&-9].\=JZECNA%7,!GHZ'E96@[.U!"K?55&'S8%7PB
-M"!=`"S=#`&YY<S>W/K`3\?.GX"()'XG#\A70N0R:XMYJRD`A1VK.8<_`'=SX
-MR<]AC"&?SS,Q,4&A4&!P_R&^\;,\;XRU(41HU1<"/COK?AF/1J-+U`'"]56E
-MJ@H(]O7#;B&K,:'&%;S_']0!+OZ:CR(`JE+@DYMBV%FO>ML8@_=OAM:.6NL+
-M22K6S4OM'^"&VS\5@!\?'Z=8+'+BE5^1_>9W6#W3SX$U=P)NC>`KS7$<)B8F
-MN.JJJT@D$AP\>!#+LA:/`5)(I%(+%:`DJCX0^F2(:GH4#5S!X[6F[7CUVUSV
-MJ2M@?!R:!7SH_=#662-YI"15CO"BWLJ';KT'K36%0H')R4D*A0(G#[Y.Y+4G
-MN6;D$*L*QVDK3?.=]WT6CW.TUHR,C+!CQPXLRZ)<+C,P,,#HZ.CBWP5\P$'W
-MO_:$KKE?A!16<.Q%>__+D56]QS]WOQSY77+U\"NH[FY0RO7YWE[W6%G>J)BJ
-M1/AYY4JV[[P3QW'(9K.</W^>N;DYCA]Z@\BYEUG7/@,WKZ`W4>$3N=?XQ*E_
-M1RJ)D)`\=X2=.W<2B4306I/+Y<CE<DMLB^-&<M?J7CRP9$U&4'X<4`OK`M_Z
-MLBX(AF=:<_8UKDD-P?0T)!+0'L7=S8P$UG>$Y+F9#?SA']WN[>WE@U1W^O@A
-MXLE]K.O2T+X.HJ/P\1A=SX]P=V&0[/D?T1_]&+?=<CN69:&U)I/)D,OEF)F9
-M(95*+1T#&H$/NX):I#:H"8;U>P%>VW[P67K+!9B8@,V;H2SAS#1<LBIP@61>
-MTKUV,Z52B7*Y3#J=IE@L,GSJ"(GT&ZQOS0,2["C6ZK6TSZ?HN*^9RYX>)GU3
-M)W=]YE9LV\9Q'%*I%/E\GG0ZS>CH*,:8"R^&I)`UF:!&#2H4&$.*$**:'H4,
-MI\)J!O#GO#AYW+UP]`C<>@L4(W`R!1O[`@*Z6R13YX[3UME-L5BD6"PR>N8$
-MK3.#K&\M8-LV[2TQ.A(Q6IHB"-E#9?@,/[[W6F[_\[\E$HU0J51()I/D<CG2
-MZ31#0T-LV[:-O7OW-B;`38T$"@C27E@-=9E!-<H(=4KPA`4(6J?.LF%F%"P%
-MK[\.Q2)<>RVDWW3!*P5284G)QN@(@X._HJ5[%=/CPUQ4.L&V/DE[HI.6IEA0
-M42*@HN&9\I5<_]!#1&,Q2J52`'YJ:HK3IT\S,#`0&&(!`4&QX,>`L`(:@`]G
-MB2`;A(GP8X`,I4/@DJ,_H[^2!\N"R0E(I^'&F^!;;\!P"M;W!$1L[:FPH72:
-M$]/GZ.^'KGB+EQI]X.YQQ8%GAA+\P6V?)1J-!=7A_/P\J:DIADZ?9M.F32$O
-M%\@P`36E(NY+NPKP?;X!>*O61=SLX/V-@)\%[&K4MVR%92O63)[$LBQ7`5NW
-MNH`V;H1R&[R9K%$!4M+:K+AJE:"K1872HPIZQ4A^>+*%:SZVBV@TZKK*Z"BS
-ML[.,CXRP;_=W`_`-=X06U,K`I?T=;-K04HWNHK&TERJ!&U6!O4]D7/"6!3MV
-MNBX`<-==\-+WX&P*WM=36P8+_UA4CX6@H@5/'XNQ;>=]1"(1"H5"5?;)2<Y]
-M?S>7[!\DNVT;\<NVU*X'W(\6#59+F%IP-0`;@P^O"\)N4+^,EE(2R<VY!*SL
-M@67+X,0Q^/8W8=LU8#KAR(R[&U=7$-5:7J*%XOMO1=ERP]W8=H1\/A]8?G)B
-MC.$W7V1K[A@],8OTCWZT8"T@%U6`$&AC*)8UQ8JAY'>G.I;KNW;'BL;KICH:
-MJ&CAC@:LW)PK\0T;(#<//W@*]N^#HV_!G7?#H12\<BYD:5E+@G*)>/F49L,U
-M'\>R;'*Y'&-C8V0R&28GQQDYO(=MJTN([>NA4L"9FL`XSD(7:*2`E<M;V?+^
-M5G)%:O^XJ:ZHJ4;W4*'C2]X[#C;"/1<HIU,H7705T-L+1PZ[0=!2\.1N^-*7
-M8?N'X?CKT#D&5ZQ9L"+T29DN:-J%))O-DLEDR.?SS$RGF1IZE6UK2@@AH;T#
-MU6+15S;,'SM&+)P%C/OA3-83<&E?NRN5%G^;VC142L.N&U\'[UGI<931K@+B
-M<?CEGJ#L93X+3_PG[/HL/'$>CDQ#2Q0NZ:US`Y>`;6LCO+C_%5:N64^I5&(N
-MDR%]9A_;UE2P+$5;2XR.1!>MO1TXE59>.G``LV$#2BF,,5KF\_F)Q8`%+_R;
-M@`_U\O0TIQY^>,&S5',S%2F@J<F5?W+2"X@>"2/#\-P/X<X_AFD+#B3AP+F%
-M!$C)JBZ+C>UC#!W>R^EC;Y`;?9V;MT2YN'\96P9Z6;NJF_:V%F1+#+LYAIQ-
-M8XS[%Z/Y?'["RF0R/YF9F;D_'H_+=Q*\,8;L(X_0.CR\X%DR'B??U.Q^81X=
-MK0(/DW#D$$2C<-_]\-1WX$`*YHIPXV8O[_M=<-6Z9JY:[_OIBH5+3G#OM2U$
-M1:*40BFEY^;F_DLJI;ZV9\\>8]NV>2?!YTZ?IOVYYXA,3N*42K7/`LJ)A/NB
-MZ2E/_K*.!`N.'H*7?@9WWPNJ$TYFX5LO0ZY8+8*D:.`:#:YEBQ"QT5(R,#!@
-M]N[=BS'F:^KYYY]/7G?==<GY^?E;UJU;9[36XNV"-\8@+(O\DT_2/3%!:LL6
-MHOW]-;_/__*7K)Q)`P:TX]8#?K?]8P79#$R.P4<^#OD23,W#OL-0*+K5HEA8
-M$099P[_^ZC%(5TC-E;$_>KLYE<N)H:&AA[_XQ2\^JP">?_[Y?=NW;Q\:&AJZ
-M(1J--B42"<>V;:241BD5=,NR@M&V[6"T;=M$(I&@1Z-1TY1(F.2++[+NU"DQ
-M,3QLVF^]U;0L6V9BL9AI:FHR^9%SM!T<%):2;G;P+>\#MY1+A&U!J0A#QV#3
-M%MAP":2S,)F!_WD32F58<Y%7-8JJ:_A*>&L8_OLMZ%S)\;%9#FVX='9D;.S!
-M+WSA"_\6)"R_/?KHHZVV;=\!7"N$:%_H2+]9BQXXT/6!W=_=/B!I&FQJSDZV
-MM<]IR])(@7&T7)V>6K9Y>8?E@K6K@.TZ%=@A970O@RNOALP,'#\,^5G(34-K
-M!#H3\+X5+AECTW!J`K0%';UDTK/Z%P?//CM\USV??OCAAS-!:'B[()=J+RBU
-M:U4\]M5+N]K7R*881"-NC]B\-3+.AM86K%BT%J1M0<0F(*:&!$\E'9VP?L"U
-M<F'>=9-"%O+S[L21*,3B`,R,IXJO_^3E9VX\.7R/\#Y`_<X(`-@-_5TML;^)
-M1Z)KA+*B6`*DPL%8D8J^_.KUJ^.UUK<A4A</`E5X9"A_E-#4#!U=8$>@5(#\
-M')0K&&,X\<J;8T/[#S_VT3.CCS1ZM]\)`1=JSS0W;^OK;GOJLO5K^FJL7^\*
-M857XYS59PZ\2!2`X,W@T>6;PR,O3Y\]_Y8Y4]LAB\__>"0!X.AZ_?'E;\^-7
-M#*S=TI2(BT`%844TB@]U)&2G,\[0OD/'I\]/[$L/3_[3'=/3AY::^UU!`,"3
-M$&GO:ON[SL[VG6O[5U[:N:PK4@,X4D>(I2@[FO&SYZ?38\FS<ZG,R9FQB1^/
-MGI_<_3DH+SVCV]XU!/CM$9"7MS;?G&AIN26>B/?:L4B'%8TT(Q5&4:EH,ULJ
-JE6=+I<I,/C-W-'EV['N?@>'_ZWS_"^RYW^\E9("T`````$E%3D2N0F""
-`
-end
diff --git a/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.install b/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.install
index d99c8f055..eac5c8e50 100644
--- a/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.install
@@ -211,6 +211,7 @@ debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.
 debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
 debian/tmp/opt/trinity/share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kappfinder.png
+debian/tmp/opt/trinity/share/man/man1/kappfinder.1
 
 debian/icons/kappfinder.xpm		/opt/trinity/share/pixmaps
 debian/icons/kappfinder-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.manpages
deleted file mode 100644
index b83ec9565..000000000
--- a/ubuntu/_base/core/tdebase/debian/kappfinder-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kappfinder-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/kate-trinity.install b/ubuntu/_base/core/tdebase/debian/kate-trinity.install
index 93c4a1b87..4ab5fb474 100644
--- a/ubuntu/_base/core/tdebase/debian/kate-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kate-trinity.install
@@ -60,6 +60,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kate.png
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kwrite.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kate2.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kwrite2.svgz
+debian/tmp/opt/trinity/share/man/man1/kate.1
+debian/tmp/opt/trinity/share/man/man1/kwrite.1
 debian/tmp/opt/trinity/share/servicetypes/kateplugin.desktop
 
 debian/icons/kate-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kate-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kate-trinity.manpages
deleted file mode 100644
index 56b772103..000000000
--- a/ubuntu/_base/core/tdebase/debian/kate-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kate-trinity.1
-debian/man/kwrite-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/kfind-trinity.install b/ubuntu/_base/core/tdebase/debian/kfind-trinity.install
index 3c02d8aae..b17c5eebb 100644
--- a/ubuntu/_base/core/tdebase/debian/kfind-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kfind-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kfind/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kfind.png
+debian/tmp/opt/trinity/share/man/man1/kfind.1
 debian/tmp/opt/trinity/share/services/kfindpart.desktop
 debian/tmp/opt/trinity/share/servicetypes/findpart.desktop
 
diff --git a/ubuntu/_base/core/tdebase/debian/kfind-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kfind-trinity.manpages
deleted file mode 100644
index f0e6d9c78..000000000
--- a/ubuntu/_base/core/tdebase/debian/kfind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfind-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/kicker-trinity.install b/ubuntu/_base/core/tdebase/debian/kicker-trinity.install
index 839bdc565..c9cd96420 100644
--- a/ubuntu/_base/core/tdebase/debian/kicker-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kicker-trinity.install
@@ -259,6 +259,10 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/systemtray.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/taskbar.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/kbinaryclock.svgz
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/systemtray.svgz
+debian/tmp/opt/trinity/share/man/man1/appletproxy.1
+debian/tmp/opt/trinity/share/man/man1/extensionproxy.1
+debian/tmp/opt/trinity/share/man/man1/kasbar.1
+debian/tmp/opt/trinity/share/man/man1/kicker.1
 
 debian/tmp/opt/trinity/share/apps/kicker/icons/crystalsvg/16x16/actions/modified.png
 debian/tmp/opt/trinity/share/apps/kicker/icons/crystalsvg/16x16/actions/suspend2disk.png
diff --git a/ubuntu/_base/core/tdebase/debian/kicker-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kicker-trinity.manpages
deleted file mode 100644
index 399a3843c..000000000
--- a/ubuntu/_base/core/tdebase/debian/kicker-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/appletproxy-trinity.1
-debian/man/extensionproxy-trinity.1
-debian/man/kasbar-trinity.1
-debian/man/kicker-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.install b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.install
index ec5672f01..039265b1b 100644
--- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.install
@@ -30,6 +30,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/kmenueditmain.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/new.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selecticon.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmenuedit/selectinternet.png
+debian/tmp/opt/trinity/share/man/man1/kmenuedit.1
 
 debian/icons/kmenuedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/kmenuedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.manpages
deleted file mode 100644
index e657bdffb..000000000
--- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kmenuedit-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs
index c023d564b..e00f630aa 100644
--- a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs
+++ b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.install b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.install
index 6b8800fe4..0d6a2b0eb 100644
--- a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.install
@@ -207,6 +207,9 @@ debian/tmp/opt/trinity/share/services/konq_sidebartng.desktop
 debian/tmp/opt/trinity/share/services/konq_textview.desktop
 debian/tmp/opt/trinity/share/services/konq_treeview.desktop
 debian/tmp/opt/trinity/share/servicetypes/konqaboutpage.desktop
+debian/tmp/opt/trinity/share/man/man1/keditbookmarks.1
+debian/tmp/opt/trinity/share/man/man1/kfmclient.1
+debian/tmp/opt/trinity/share/man/man1/konqueror.1
 
 debian/icons/keditbookmarks.xpm		/opt/trinity/share/pixmaps
 debian/icons/keditbookmarks-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.manpages b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.manpages
deleted file mode 100644
index 8097ed067..000000000
--- a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/konqueror-trinity.1
-debian/man/kfmclient-trinity.1
-debian/man/keditbookmarks-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.postinst b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.postinst
index 4c62f6bf2..a68978a50 100644
--- a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.postinst
+++ b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.postinst
@@ -26,7 +26,7 @@ case "$1" in
         divert_remove /usr/share/icons/hicolor/scalable/apps/konqueror.svgz
 
         update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/trinity/bin/konqueror 100 \
-          --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/konqueror-trinity.1.gz
+          --slave /usr/share/man/man1/x-www-browser.1 x-www-browser.1 /opt/trinity/share/man/man1/konqueror.1
     ;;
 
     install)
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.install b/ubuntu/_base/core/tdebase/debian/konsole-trinity.install
index ee966a5c1..b7fd05d0c 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.install
@@ -82,6 +82,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/konsole.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/konsole/tabbar.png
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/konsole.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/konsole.svgz
+debian/tmp/opt/trinity/share/man/man1/konsole.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-konsole.desktop
 debian/tmp/opt/trinity/share/services/kded/kwrited.desktop
 debian/tmp/opt/trinity/share/services/konsolepart.desktop
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.manpages b/ubuntu/_base/core/tdebase/debian/konsole-trinity.manpages
deleted file mode 100644
index 8c33f637e..000000000
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/konsole-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
index d8be0590f..532e028bd 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
+++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst
@@ -20,7 +20,7 @@ set -e
 case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \
-          --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/share/man/man1/konsole-trinity.1.gz
+          --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /opt/trinity/share/man/man1/konsole.1
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/ubuntu/_base/core/tdebase/debian/kpager-trinity.install b/ubuntu/_base/core/tdebase/debian/kpager-trinity.install
index 8e7ee184a..17d32c189 100644
--- a/ubuntu/_base/core/tdebase/debian/kpager-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kpager-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpager/settings.png
 debian/tmp/opt/trinity/share/icons/hicolor/*/apps/kpager.png
+debian/tmp/opt/trinity/share/man/man1/kpager.1
 
 debian/icons/kpager.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpager-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kpager-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kpager-trinity.manpages
deleted file mode 100644
index b34d67959..000000000
--- a/ubuntu/_base/core/tdebase/debian/kpager-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpager-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.install b/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.install
index 1b0039191..749090dab 100644
--- a/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.install
@@ -7,6 +7,7 @@ debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step3.png
 debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step4.png
 debian/tmp/opt/trinity/share/apps/kpersonalizer/pics/step5.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/kpersonalizer.png
+debian/tmp/opt/trinity/share/man/man1/kpersonalizer.1
 
 debian/icons/kpersonalizer.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpersonalizer-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.manpages b/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.manpages
deleted file mode 100644
index bcd309b73..000000000
--- a/ubuntu/_base/core/tdebase/debian/kpersonalizer-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpersonalizer-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.install b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.install
index fbbd61ab4..de0b2623f 100644
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.install
@@ -7,3 +7,4 @@ debian/tmp/opt/trinity/share/apps/tdeconf_update/ksmserver.upd
 debian/tmp/opt/trinity/share/apps/tdeconf_update/move_session_config.sh
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdown.png
 debian/tmp/opt/trinity/share/apps/ksmserver/pics/shutdownkonq.png
+debian/tmp/opt/trinity/share/man/man1/starttde.1
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.manpages b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.manpages
deleted file mode 100644
index 354e23800..000000000
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/starttde-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
index 7983daa09..14e203a41 100644
--- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
+++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst
@@ -21,8 +21,8 @@ case "$1" in
     configure)
         update-alternatives --install /usr/bin/x-session-manager \
 	x-session-manager /opt/trinity/bin/starttde 40 \
-	--slave /usr/share/man/man1/x-session-manager.1.gz \
-	x-session-manager.1.gz "/usr/share/man/man1/starttde-trinity.1.gz"
+	--slave /usr/share/man/man1/x-session-manager.1 \
+	x-session-manager.1 "/opt/trinity/share/man/man1/starttde.1"
 
         # force ldconfig due to tdeinit library
         ldconfig
diff --git a/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs b/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs
index c023d564b..e00f630aa 100644
--- a/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs
+++ b/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs
@@ -1 +1 @@
-libkonq/SERVICEMENUS
+libkonq/SERVICEMENUS.md
diff --git a/ubuntu/_base/core/tdebase/debian/libtqt3-integration-trinity.install b/ubuntu/_base/core/tdebase/debian/libtqt3-integration-trinity.install
index b1bb45962..9fe1dee4f 100644
--- a/ubuntu/_base/core/tdebase/debian/libtqt3-integration-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/libtqt3-integration-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/kded/kdeintegration.desktop
 debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.la
 debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.so
-debian/tmp/usr/lib/tqt3/plugins/integration/libqtkde.*
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/integration/libqtkde.*
diff --git a/ubuntu/_base/core/tdebase/debian/man/appletproxy-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/appletproxy-trinity.1
deleted file mode 100644
index 3ab13208f..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/appletproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH APPLETPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel applet proxy"
-.SH NAME
-appletproxy
-\- TDE kicker panel applet proxy
-.SH SYNOPSIS
-\fBappletproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The applet's desktop file
-.SS 
-.SS Options:
-.TP
-.B  \-\-configfile  <file>
-The config file to be used
-.TP
-.B  \-\-callbackid  <id>
-DCOP callback id of the applet container
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-.SH FILES
-\fI/usr/share/apps/kicker/applets\fP
-kicker applets directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBextensionproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/drkonqi-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/drkonqi-trinity.1
deleted file mode 100644
index 987164834..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/drkonqi-trinity.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH DRKONQI 1 "June 2006" "Trinity Desktop Environment" "TDE crash handler"
-.SH NAME
-drkonqi
-\- TDE crash handler gives the user feedback if a program crashed
-.SH SYNOPSIS
-\fBdrkonqi\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-The TDE crash handler gives the user feedback if a program crashed.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-signal  <number>
-The signal number that was caught
-.TP
-.B  \-\-appname  <name>
-Name of the program
-.TP
-.B  \-\-apppath  <path>
-Path to the executable
-.TP
-.B  \-\-appversion  <version>
-The version of the program
-.TP
-.B  \-\-bugaddress  <address>
-The bug address to use
-.TP
-.B  \-\-programname  <name>
-Translated name of the program
-.TP
-.B  \-\-pid  <pid>
-The PID of the program
-.TP
-.B  \-\-startupid  <id>
-Startup ID of the program
-.TP
-.B  \-\-tdeinit  
-The program was started by tdeinit
-.TP
-.B  \-\-safer  
-Disable arbitrary disk access
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Hans Petter Bieker <bieker@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/extensionproxy-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/extensionproxy-trinity.1
deleted file mode 100644
index 4ea041189..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/extensionproxy-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH EXTENSIONPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel extension proxy"
-.SH NAME
-extensionproxy
-\- TDE kicker panel extension proxy
-.SH SYNOPSIS
-\fBextensionproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
-.SH DESCRIPTION
-\fBextensionproxy\fP is a small application that allows you to run a kicker extension outside of \fBkicker\fP itself.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B desktopfile
-The extension's desktop file
-.SS 
-.SS Options:
-.TP
-.B  \-\-configfile  <file>
-The config file to be used
-.TP
-.B  \-\-callbackid  <id>
-DCOP callback id of the extension container
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-.SH FILES
-\fI/usr/share/apps/kicker/extensions\fP
-kicker extensions directory
-.SH SEE ALSO
-\fBkicker\fP(1), \fBappletproxy\fP(1)
-.SH AUTHORS
-.nf
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/gentdmconf-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/gentdmconf-trinity.1
deleted file mode 100644
index d98e166c2..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/gentdmconf-trinity.1
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH GENTDMCONF 1 "June 2006" "Trinity Desktop Environment" "generate configuration files for tdm"
-.SH NAME
-gentdmconf
-\- generate configuration files for tdm
-.SH SYNOPSIS
-\fBgentdmconf\fP
-.RB [ \-\-in
-.IR /path/to/new/tdm\-config\-dir ]
-.RS 11
-.RB [ \-\-old\-xdm
-.IR /path/to/old/xdm\-dir ]
-.br
-.RB [ \-\-old\-kde
-.IR /path/to/old/kde\-config\-dir ]
-.br
-.RB [ \-\-no\-old ]
-.RB [ \-\-no\-old\-xdm ]
-.RB [ \-\-no\-old\-kde ]
-.RB [ \-\-old\-scripts ]
-.br
-.RB [ \-\-no\-old\-scripts ]
-.RB [ \-\-old\-confs ]
-.RB [ \-\-no\-backup ]
-.br
-.RB [ \-\-no\-in\-notice ]
-.RE
-
-.SH DESCRIPTION
-\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP.
-.br
-If an older xdm/tdm configuration is found, its config files are "absorbed";
-if it lives in the new target directory, its scripts are reused (and possibly
-modified) as well, otherwise the scripts are ignored and default scripts are
-installed.
-.SH OPTIONS
-.TP
-.BI \-\-in \ /path/to/new/tdm\-config\-dir
-In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected.
-.br
-Default is \fI/etc/trinity/tdm\fP.
-.TP
-.BI \-\-old\-xdm \ /path/to/old/xdm\-dir
-Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan
-.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ;
-there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP.
-.br
-Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect.
-.TP
-.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir
-Where to look for the \fItdmrc\fP of an older \fBtdm\fP.
-.br
-.RI Default\ is\ to\ scan\  /etc/trinity \ and\ { /usr,/usr/local ,
-.RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config .
-.TP
-.B \-\-no\-old
-Don't look at older xdm/tdm configurations, just create default config.
-.TP
-.B \-\-no\-old\-xdm
-Don't look at older xdm configurations.
-.TP
-.B \-\-no\-old\-kde
-Don't look at older tdm configurations.
-.TP
-.B \-\-old\-scripts
-Directly use all scripts from the older xdm/tdm configuration.
-.TP
-.B \-\-no\-old\-scripts
-Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory.
-.TP
-.B \-\-old\-confs
-Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea.
-.TP
-.B \-\-no\-backup
-Overwrite/delete old config files instead of backing them up.
-.TP
-.B \-\-no\-in\-notice
-Don't put the notice about \fB\-\-in\fP being used into the generated README.
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kappfinder-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kappfinder-trinity.1
deleted file mode 100644
index ec8eae964..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kappfinder-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KAPPFINDER 1 "August, 24 2003"
-.SH NAME
-kappfinder \- searches for program to add to the Kde menu
-.SH SYNOPSIS
-.B kappfinder
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kappfinder
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the TDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-dir directory
-Use this option to set where the .desktop files will be installed (default is $(HOME)/.trinity/share/applnk
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kappfinder was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kasbar-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kasbar-trinity.1
deleted file mode 100644
index 7d57958d2..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kasbar-trinity.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KASBAR 1 "June 2006" "Trinity Desktop Environment" "An alternative task manager"
-.SH NAME
-kasbar
-\- An alternative task manager
-.SH SYNOPSIS
-\fBkasbar\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-The \fBKasBar\fP is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the left mouse button. The active window is highlighted, minimized windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-test  
-Test the basic kasbar code
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-\fBkicker\fP(1)
-.SH AUTHORS
-.nf
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kate-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kate-trinity.1
deleted file mode 100644
index e48268d6f..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kate-trinity.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.TH KATE 1 "May 2006"
-.SH NAME
-kate \- TDE Advanced Text Editor
-.SH SYNOPSIS
-.B kate
-.RI [ options ] [file(s)]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kate
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkate\fP is a powerful text editor for TDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ...
-
-It is able to expand or collapse parts of code (C functions, ...), can handle complete projects, and includes a terminal emulator.
-
-Kate is primarily intended for developers but can be used by anyone. It will for example be very useful to edit configuration files for example.
-
-It can handle plugins to expand its capabilities (more languages support, vim/Emacs compatibility, ...)
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-s, \-\-start <name>
-Start Kate with a given session
-.TP
-.B \-u, \-\-use
-Use a already running kate instance (if possible)
-.TP
-.B \-p, \-\-pid <pid>
-Only try to reuse kate instance with this pid
-.TP
-.B \-e, \-\-encoding <name>
-Set encoding for the file to open
-.TP
-.B \-l, \-\-line <line>
-Navigate to this line
-.TP
-.B \-c, \-\-column <column>
-Navigate to this column
-.TP
-.B \-i, \-\-stdin
-Read the contents of stdin
-.TP
-.B file(s)
-is the file or the files to open
-
-.SH SEE ALSO
-.BR kwrite (1)
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, for Debian GNU/Linux, but may be used by others.
-.PP
-kate was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1
deleted file mode 100644
index 46b2d4e1a..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kblankscrn.kss-trinity.1
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KBLANKSCRN.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
-.SH NAME
-kblankscrn.kss
-\- TDE screensaver which shows a blank screen
-.SH SYNOPSIS
-\fBkblankscrn.kss\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBKBlankScreen\fP is a screensaver which shows a blank screen.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-setup  
-Setup screen saver
-.TP
-.B  \-\-window\-id  wid
-Run in the specified XWindow
-.TP
-.B  \-\-root  
-Run in the root XWindow
-.TP
-.B  \-\-demo  
-Start screen saver in demo mode [default]
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-The KDE Project <www.kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kcheckpass-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kcheckpass-trinity.1
deleted file mode 100644
index fa5a4c817..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kcheckpass-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  KCHECKPASS 1 "June 2006" "Trinity Desktop Environment" "authentication software"
-.SH NAME
-kcheckpass
-\- The KCheckPass authentication software
-.SH SYNOPSIS
-\fBkcheckpass\fP
-.SH DESCRIPTION
-\fBKCheckPass\fP is TDE's authentication program. It is meant to be
-used by any software in need of user authentication, most
-notably screensavers.
-.sp 1
-It enhances security be the following means:
-.br
-.IP "     \-"
-It's only a small program, which is hopefully simple enough to
-allow it to be SUID root. Setting it to SUID root is necessary
-on Shadow Password systems.
-.IP "     \-"
-No other program in need of user authentication, must be
-SUID root.
-.IP "     \-"
-It provides a single implementation to check passwords. So one only must take a closer look at \fBKCheckPass\fP to ensure password security. It's much easier for programs using \fBKCheckPass\fP to preserve security.
-.PP
-.br
-\fBTechnique:\fP
-.sp 1
-\fBKCheckPass\fP is a simple password checker. Just invoke and send it the password on stdin.
-.sp 1
-If the password was accepted, the program exits with 0;
-.br
-if it was rejected, it exits with 1. Any other exit code signals an error.
-
-.SH AUTHORS
-.nf
-Olaf Kirch <okir@caldera.de>
-.br
-Christian Esken <esken@kde.org>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kcminit-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kcminit-trinity.1
deleted file mode 100644
index 4c557456e..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kcminit-trinity.1
+++ /dev/null
@@ -1,153 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCMINIT 1 "June 2006" "Trinity Desktop Environment" "Trinity Control Modules initialization"
-.SH NAME
-kcminit
-\- runs startups initialization for Control Modules.
-.SH SYNOPSIS
-\fBkcminit\fP [Qt\-options] [TDE\-options] [options] module 
-.SH DESCRIPTION
-\fBkcminit\fP runs startups initialization for Control Modules.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B module
-Configuration module to run
-.SS Options:
-.TP
-.B  \-\-list  
-List modules that are run at startup
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kdcop-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kdcop-trinity.1
deleted file mode 100644
index 1c01dcc47..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kdcop-trinity.1
+++ /dev/null
@@ -1,159 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDCOP 1 "June 2006" "Trinity Desktop Environment" "A graphical DCOP browser/client"
-.SH NAME
-kdcop
-\- A graphical DCOP browser/client
-.SH SYNOPSIS
-\fBkdcop\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBkdcop\fP is a browser/executor for DCOP. It queries the DCOP clients in a system,
-their interfaces, and the interfaces' arguments. You can even execute DCOP
-calls by double\-clicking on a call. If the method has parameters, \fBkdcop\fP will
-open a dialog and prompt you for them. If the method returns a return value,
-you will see it in a message box after the call.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdcop/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdcop/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Matthias Kalle Dalheimer <kalle@kde.org>
-.br
-Rik Hemsley <rik@kde.org>
-.br
-Ian Reinhart Geiser <geiseri@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kdialog-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kdialog-trinity.1
deleted file mode 100644
index 243709ed1..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kdialog-trinity.1
+++ /dev/null
@@ -1,209 +0,0 @@
-.TH KDIALOG "1" "December 2002" "TDE" "TDE Application"
-.SH NAME
-kdialog \- Show TDE dialog boxes from shell scripts
-.SH SYNOPSIS
-.B kdialog
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIarg\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kdialog
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B kdialog
-allows to display dialog boxes from shell scripts.
-The syntax is very much inspired from the 
-.B dialog
-command
-(which shows text mode dialogs).
-.SH OPTIONS
-.TP
-.BI \-\-yesno " text"
-Question message box with yes/no buttons
-.TP
-.BI \-\-yesnocancel " text"
-Question message box with yes/no/cancel buttons
-.TP
-.BI \-\-warningyesno " text"
-Warning message box with yes/no buttons
-.TP
-.BI \-\-warningcontinuecancel " text"
-Warning message box with continue/cancel buttons
-.TP
-.BI \-\-warningyesnocancel " text"
-Warning message box with yes/no/cancel buttons
-.TP
-.BI \-\-sorry " text"
-\&'Sorry' message box
-.TP
-.BI \-\-error " text"
-\&'Error' message box
-.TP
-.BI \-\-msgbox " text"
-Message Box dialog
-.TP
-.BI \-\-inputbox " text init"
-Input Box dialog
-.TP
-.BI \-\-password " text"
-Password dialog
-.TP
-.RI \fB\-\-textbox\fP \ file " [" width "] [" height ]
-Text Box dialog
-.TP
-.RI \fB\-\-menu\fP \ text " [" "tag item" "] [" "tag item" "] ..."
-Menu dialog
-.TP
-.RI \fB\-\-checklist\fP \ text " [" "tag item status" "] ..."
-Check List dialog
-.TP
-.RI \fB\-\-radiolist\fP " text" " [" "tag item status" "] ..."
-Radio List dialog
-.TP
-.BI \-\-title " text"
-Dialog title
-.TP
-.B \-\-separate\-output
-Return list items on separate lines (for checklist option)
-.SS "Arguments:"
-.TP
-arg
-Arguments - depending on main option
-.SS "Generic options:"
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options:"
-.TP
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-title \ title
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options:"
-.TP
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-KDialog was written by
-.nh
-.ad l
-David Faure <faure@kde.org>,
-Nick Thompson,
-Nick Thompson,
-Matthias Hoelzer <hoelzer@kde.org> and
-David Gumbel <david.guembel@gmx.net>.
-.br
-.hy
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdebase/debian/man/keditbookmarks-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/keditbookmarks-trinity.1
deleted file mode 100644
index 23606dccb..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/keditbookmarks-trinity.1
+++ /dev/null
@@ -1,181 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KEDITBOOKMARKS 1 "Jan 2005" "Trinity Desktop Environment" "Konqueror Bookmarks Editor"
-.SH NAME
-keditbookmarks
-- Konqueror Bookmark Editor
-.SH SYNOPSIS
-keditbookmarks [Qt-options] [TDE-options] [options] [file] 
-.SH DESCRIPTION
-Bookmark editor for TDE.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File to edit
-.SS Options:
-.TP
-.B  --importmoz  <filename>
-Import bookmarks from a file in Mozilla format
-.TP
-.B  --importns  <filename>
-Import bookmarks from a file in Netscape (4.x and earlier) format
-.TP
-.B  --importie  <filename>
-Import bookmarks from a file in Internet Explorer's Favorites format
-.TP
-.B  --importopera  <filename>
-Import bookmarks from a file in Opera format
-.TP
-.B  --exportmoz  <filename>
-Export bookmarks to a file in Mozilla format
-.TP
-.B  --exportns  <filename>
-Export bookmarks to a file in Netscape (4.x and earlier) format
-.TP
-.B  --exporthtml  <filename>
-Export bookmarks to a file in a printable HTML format
-.TP
-.B  --exportie  <filename>
-Export bookmarks to a file in Internet Explorer's Favorites format
-.TP
-.B  --exportopera  <filename>
-Export bookmarks to a file in Opera format
-.TP
-.B  --address  <address>
-Open at the given position in the bookmarks file
-.TP
-.B  --customcaption  <caption>
-Set the user readable caption for example "Konsole"
-.TP
-.B  --nobrowser  
-Hide all browser related functions
-.SS 
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
-.SS 
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-Alexander Kellett <lypanov@kde.org>
-.br
-
diff --git a/ubuntu/_base/core/tdebase/debian/man/kfind-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kfind-trinity.1
deleted file mode 100644
index 55542fd66..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kfind-trinity.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH KFIND 1 "August, 25 2003"
-.SH NAME
-kfind \- TDE find tool
-.SH SYNOPSIS
-.B kfind
-.RI [ options ]  [searchpath]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kfind
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkfind\fP is a find tool for TDE. It allows fine tuning of the search options (name, path, type, plain text search, meta search, modification date, size, user, group, ...)
-
-It also permits to save the results of the search in a file, which is a plain-text list of file URIs. (file:/path_to_file)
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.TP
-.B searchpath
-is the path in which the search must be done
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kfind was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kfmclient-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kfmclient-trinity.1
deleted file mode 100644
index 67cbed380..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kfmclient-trinity.1
+++ /dev/null
@@ -1,222 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added.
-.TH KFMCLIENT 1 "Jan 2005" "Trinity Desktop Environment" "TDE tool for opening URLs from the command line"
-.SH NAME
-kfmclient
-- TDE tool for opening URLs from the command line
-.SH SYNOPSIS
-kfmclient [Qt-options] [TDE-options] [options] command [URL(s)] 
-.SH DESCRIPTION
-kfmclient is a tool for opening local and remote URLs in Konqueror from
-the command line.
-.SH COMMANDS
-.SS
-.SS openURL
-.TP
-kfmclient openURL \fIurl\fR [ \fImimetype\fR ]
-Opens a window showing \fIurl\fR. \fIurl\fR may be a relative path or file name,
-such as . or subdir/. If \fIurl\fR is omitted, $HOME is used instead.
-
-If \fImimetype\fR is specified, it will be used to determine the component
-that Konqueror should use. For instance, set it to text/html for a web
-page, to make it appear faster.
-.SS newTab
-.TP
-kfmclient newTab \fIurl\fR [ \fImimetype\fR ]
-Same as above but opens a new tab with \fIurl\fR in an existing Konqueror
-window on the current active desktop if possible.
-.SS openProfile
-.TP
-kfmclient openProfile \fIprofile\fR [ \fIurl\fR ]
-Opens a window using the given profile. \fIprofile\fR is a file under
-~/.trinity/share/apps/konqueror/profiles. \fIurl\fR is an optional URL to open.
-.SS openProperties
-.TP
-kfmclient openProperties \fIurl\fR
-Opens a properties menu.
-.SS exec
-.TP
-kfmclient exec [ \fIurl\fR [ \fIbinding\fR ] ]
-Tries to execute \fIurl\fR. \fIurl\fR may be a usual URL, this URL will
-be opened. You may omit \fIbinding\fR. In this case the default binding
-is tried. Of course URL may be the URL of a document, or it may be a
-*.desktop file.
-This way you could for example mount a device by passing 'Mount default'
-as binding to 'cdrom.desktop'.
-.SS move
-.TP
-kfmclient move \fIsrc\fR \fIdest\fR
-Moves the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
-.SS copy
-.TP
-kfmclient copy \fIsrc\fR \fIdest\fR
-Copies the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
-.SS download
-.TP
-kfmclient download [ \fIsrc\fR ]
-Copies the URL \fIsrc\fR to a user specified location. \fIsrc\fR may be
-a list of URLs, if not present then a URL will be requested.
-.SS sortDesktop
-.TP
-kfmclient sortDesktop
-Rearranges all icons on the desktop.
-.SS configure
-.TP
-kfmclient configure
-Re-read Konqueror's configuration.
-.SS configureDesktop
-.TP
-kfmclient configureDesktop
-Re-read kdesktop's configuration.
-.SH OPTIONS
-.SS
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
-.SH EXAMPLES
-.TP
-kfmclient exec file:/root/Desktop/cdrom.desktop "Mount default"
-Mounts the CD-ROM.
-.TP
-kfmclient exec file:/home/weis/data/test.html
-Opens the file with default binding.
-.TP
-kfmclient exec file:/home/weis/data/test.html Netscape
-Opens the file with netscape.
-.TP
-kfmclient exec ftp://localhost/
-Opens new window with URL.
-.TP
-kfmclient exec file:/root/Desktop/emacs.desktop
-Starts emacs.
-.TP
-kfmclient exec file:/root/Desktop/cdrom.desktop
-Opens the CD-ROM's mount directory.
-.TP
-kfmclient exec .
-Opens the current directory. Very convenient.
-.SH OTHER
-This manual page was written by Adeodato Simo <asp16@alu.ua.es> for the
-Debian system (but may be used by others).
-
-This manual page can be redistribute and/or modified it under the terms
-of the GNU General Public License as published by the Free Software
-Foundation; version 2 dated June, 1991.
-.nf
diff --git a/ubuntu/_base/core/tdebase/debian/man/khotkeys-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/khotkeys-trinity.1
deleted file mode 100644
index 34d754b05..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/khotkeys-trinity.1
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHOTKEYS 1 "June 2006" "Trinity Desktop Environment" "KHotKeys daemon"
-.SH NAME
-khotkeys
-\- daemon to bind actions to triggers and conditions
-.SH SYNOPSIS
-\fBkhotkeys\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKHotKeys\fP is a utility that allows you to bind actions to triggers and conditions. The most common case is where action means launching some  command/application/URL, the trigger is some key combination pressed and condition is some window being (not) active/existing.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS
-
-.SH FILES
-.I ~/.trinity/share/config/khotkeysrc
-\fBkhotkeys\fP configuration file
-
-.SH AUTHORS
-.nf
-Lubos Lunak <l.lunak@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kicker-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kicker-trinity.1
deleted file mode 100644
index 1d17fa199..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kicker-trinity.1
+++ /dev/null
@@ -1,171 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KICKER 1 "June 2006" "Trinity Desktop Environment" "The TDE panel"
-.SH NAME
-kicker
-\- The TDE panel
-.SH SYNOPSIS
-\fBkicker\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKicker\fP is the TDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-
-.SH SEE ALSO
-\fBkasbar\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kicker/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kicker/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Aaron J. Seigo <aseigo@kde.org>
-.br
-Matthias Elter <elter@kde.org>
-.br
-Matthias Ettrich <ettrich@kde.org>
-.br
-Wilco Greven <greven@kde.org>
-.br
-Rik Hemsley <rik@kde.org>
-.br
-Daniel M. Duley <mosfet@kde.org>
-.br
-Preston Brown <pbrown@kde.org>
-.br
-John Firebaugh <jfirebaugh@kde.org>
-.br
-Waldo Bastian <bastian@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kjobviewer-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kjobviewer-trinity.1
deleted file mode 100644
index 6dae2692e..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kjobviewer-trinity.1
+++ /dev/null
@@ -1,202 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KJOBVIEWER 1 "June 2006" "Trinity Desktop Environment" "A print job viewer"
-.SH NAME
-kjobviewer
-\- a print job viewer
-.SH SYNOPSIS
-\fBkjobviewer\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBKJobViewer\fP is a powerful queue and spool manager. You can view jobs in the different queues waiting for print as well as manipulate jobs in many ways.
-.sp 1
-The details are, again, as with all other modules of \fBTDEPrint\fP, dependent on the print subsystem in use. \fBCUPS\fP, as is usual now, in this field is the most feature\-complete system for "doing something with jobs that are sent away already and wait for print, possibly on a remote print server".
-.sp 1
-With kjobviewer you can...
-.IP "     \-"
-see an overview for a certain queue or see all jobs on all queues;
-.IP "     \-"
-filter the list to see your "own" jobs only;
-.IP "     \-"
-sort the pending jobs according to different criteria (size, ownership, job\-ide, job\-name; billing\-tags);
-.IP "     \-"
-stop a job from printing, putting it into a "held" state;
-.IP "     \-"
-re\-start a held job;
-.IP "     \-"
-manually release a job that was sent to "hold" from the client already;
-.IP "     \-"
-reschedule a job for printing at a specified time;
-.IP "     \-"
-increase or decrease the job\-priorities (allowed values are 1\-100) to re-arrange the order of automatic printing;
-.IP "     \-"
-move a job to a different print\-queue;
-.IP "     \-"
-stop jobs from leaving the queue (while still accepting incoming ones);
-.IP "     \-"
-reject new incoming jobs (while still printing all the pending ones until the queue is empty);
-.IP "     \-"
-check and re\-set all job options \-\- even adapt them to another target printet which might have a complete different set of commands;
-.IP "     \-"
-view the existing and re\-assign a new job\-billing tag to a job;
-.IP "     \-"
-pop up on screen a nicely formatted report of IPP attributes for any job and also print it;
-.IP "     \-"
-increase or decrease the number of required copies;
-.IP "     \-"
-cancel and delete a no-longer\-required job.
-.PP
-Note, that some of these manipulations require job ownership or root access.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-d  
-<printer\-name>         The printer for which jobs are requested
-.TP
-.B  \-\-noshow  
-Show job viewer at startup
-.TP
-.B  \-\-all  
-Show jobs for all printers
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kjobviewer/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kjobviewer/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kmenuedit-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kmenuedit-trinity.1
deleted file mode 100644
index fd5c7daf5..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kmenuedit-trinity.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH KMENUEDIT 1 "August, 24 2003"
-.SH NAME
-kmenuedit \- editor for the TDE menu
-.SH SYNOPSIS
-.B kmenuedit
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmenuedit
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkmenuedit\fP is a powerful editor for the TDE menu. It allows you to add, remove, or move items in the menu, add sub-menus, ...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmenuedit was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/knetattach-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/knetattach-trinity.1
deleted file mode 100644
index 84bc38fcf..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/knetattach-trinity.1
+++ /dev/null
@@ -1,164 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KNETATTACH 1 "June 2006" "Trinity Desktop Environment" "TDE Network Wizard"
-.SH NAME
-knetattach
-\- TDE Network Wizard
-.SH SYNOPSIS
-\fBknetattach\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-The \fBTDE Network Wizard\fP is an application which makes it easier to integrate your network resources with your Trinity Desktop.
-.sp 1
-The program, also known as the \fBNetwork Folder Wizard\fP, allows easy addition and integration of various network folders with your Trinity desktop.
-.sp 1
-The \fBNetwork Folder Wizard\fP currently allows you to add four types of network folders:
-.br
-.RS 3
-\- WebDav
-.br
-\- FTP
-.br
-\- Microsoft(R) Windows(R) (Samba) network drives
-.br
-\- SSH
-.RE
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/knetattach/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/knetattach/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-George Staikos <staikos@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/konqueror-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/konqueror-trinity.1
deleted file mode 100644
index 0515c4f87..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/konqueror-trinity.1
+++ /dev/null
@@ -1,245 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KONQUEROR 1 "Jan 2005" "Trinity Desktop Environment" "Web browser, file manager, ..."
-.SH NAME
-konqueror
-- Web browser, file manager, ...
-.SH SYNOPSIS
-konqueror [Qt-options] [TDE-options] [options] [URL] 
-.SH DESCRIPTION
-Konqueror is the file manager for the Trinity Desktop Environment.
-It supports basic file management on local UNIX filesystems,
-from simple cut/copy and paste operations to advanced remote
-and local network file browsing.
-
-It is also the canvas for all the latest TDE technology,
-from KIO slaves (which provide mechanisms for file access) to
-component embedding via the KParts object interface, and it
-is one of the most customizable applications available.
-
-Konqueror is an Open Source web browser with HTML4.0 compliance,
-supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
-as well as Netscape plugins (for example, Flash or RealVideo plugins).
-
-It is a universal viewing application, capable of embedding
-read-only viewing components in itself to view
-documents without ever launching another application.
-
-This package is part of the official TDE base module.
-
-
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Location to open
-.SS Options:
-.TP
-.B  --silent  
-Start without a default window
-.TP
-.B  --preload  
-Preload for later use
-.TP
-.B  --profile  <profile>
-Profile to open
-.TP
-.B  --profiles  
-List available profiles
-.TP
-.B  --mimetype  <mimetype>
-Mimetype to use for this URL (e.g. text/html or inode/directory)
-.TP
-.B  --select  
-For URLs that point to files, opens the directory and selects the file, instead of opening the actual file
-.SS 
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/konqueror/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/konqueror/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-Simon Hausmann <hausmann@kde.org>
-.br
-Michael Reiher <michael.reiher@gmx.de>
-.br
-Matthias Welk <welk@fokus.gmd.de>
-.br
-Alexander Neundorf <neundorf@kde.org>
-.br
-Michael Brade <brade@kde.org>
-.br
-Lars Knoll <knoll@kde.org>
-.br
-Dirk Mueller <mueller@kde.org>
-.br
-Peter Kelly <pmk@post.com>
-.br
-Waldo Bastian <bastian@kde.org>
-.br
-Germain Garand <germain@ebooksfrance.org>
-.br
-Leo Savernik <l.savernik@aon.at>
-.br
-Stephan Kulow <coolo@kde.org>
-.br
-Antti Koivisto <koivisto@kde.org>
-.br
-Apple Safari Developers
-.br
-Harri Porten <porten@kde.org>
-.br
-Koos Vriezen <koos.vriezen@xs4all.nl>
-.br
-Matt Koss <koss@miesto.sk>
-.br
-Alex Zepeda <zipzippy@sonic.net>
-.br
-Richard Moore <rich@kde.org>
-.br
-Dima Rogozin <dima@mercury.co.il>
-.br
-Wynn Wilkes <wynnw@calderasystems.com>
-.br
-Stefan Schimanski <schimmi@kde.org>
-.br
-George Staikos <staikos@kde.org>
-.br
-Dawit Alemayehu <adawit@kde.org>
-.br
-Carsten Pfeiffer <pfeiffer@kde.org>
-.br
-Torsten Rahn <torsten@kde.org>
-.br
-Torben Weis <weis@kde.org>
-.br
-Joseph Wenninger <jowenn@kde.org>
-.br
-
diff --git a/ubuntu/_base/core/tdebase/debian/man/konsole-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/konsole-trinity.1
deleted file mode 100644
index 5de5500b4..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/konsole-trinity.1
+++ /dev/null
@@ -1,179 +0,0 @@
-.\" The draft of this file was generated by kdemangen.pl and edited after.
-.TH Konsole 1 "Nov 2005" "Trinity Desktop Environment" ""
-.SH NAME
-.BR Konsole
-\- X terminal emulator for TDE.
-.SH SYNOPSIS
-.BR Konsole 
-[Qt\-options] [TDE\-options] [options] [args] 
-.SH DESCRIPTION
-Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
-better organize user's desktop by containing multiple sessions in a single
-window (a less cluttered desktop).
-.PP
-Konsole advanced features include simple configuration and the ability to use
-multiple terminal shells in a single window, making for a less
-cluttered desktop.
-.PP
-Using Konsole, a user can open:
-.PP
-.RS
-Linux console sessions
-.PP
-Shell sessions
-.PP
-Screen sessions
-.PP
-Midnight Commander file manager sessions
-.PP
-Root console sessions
-.PP
-Root Midnight Commander sessions
-.PP
-User created sessions
-.RE
-
-These sessions can be renamed to help you keep track of all your shells,
-or signaled (STOP, CONT, HUP, INT, TERM, KILL).
-.PP
-For more control over konsole, a user can:
-hide/show the menubar and/or frame;
-select the size of a konsole window, fonts, color
-schemes, and key mapping;
-change location of the scrollbar or hide the scrollbar;
-change location of the tabbar or hide the tabbar.
-.PP
-All chosen settings can be made the default for forthcoming sessions by
-saving them.
-.SH OPTIONS
-.SS
-.SS Konsole specific options:
-.TP
-.B  \-\-name  <name>
-Set window class
-.TP
-.B  \-\-ls  
-Start login shell
-.B \-T <title>                
-Set the window title
-.TP
-.B  \-\-tn  <terminal>
-Specify terminal type as set in the TERM [xterm]
-environment variable
-.TP
-.B  \-\-noclose  
-Do not close Konsole when command exits
-.TP
-.B  \-\-nohist  
-Do not save lines in history
-.TP
-.B  \-\-nomenubar  
-Do not display menubar
-.TP
-.B \-\-notabbar,  \-\-notoolbar  
-Do not display tab bar
-.TP
-.B  \-\-noframe  
-Do not display frame
-.TP
-.B  \-\-noscrollbar  
-Do not display scrollbar
-.TP
-.B  \-\-noxft  
-Do not use Xft (anti-aliasing)
-.TP
-.B  \-\-vt_sz CCxLL             
-Terminal size in columns x lines
-.TP
-.B  \-\-noresize  
-Terminal size is fixed
-.TP
-.B  \-\-type  <type>
-Start with given session type
-.TP
-.B  \-\-types  
-List available session types
-.TP
-.B  \-\-keytab  <name>
-Set keytab to 'name'
-.TP
-.B  \-\-keytabs  
-List available keytabs
-.TP
-.B  \-\-profile  <name>
-Start with given session profile
-.TP
-.B  \-\-profiles  
-List available session profiles
-.TP
-.B  \-\-schema  <name>
-| <file>  Set schema to 'name' or use 'file'
-.TP
-.B \-\-schemas,  \-\-schemata  
-List available schemata
-.TP
-.B  \-\-script  
-Enable extended DCOP Qt functions
-.TP
-.B  \-\-workdir  <dir>
-Change working directory to 'dir'
-.TP
-.B \-e <command> [ arguments ]
-Execute 'command' instead of shell. It also sets the window title and 
-icon name to be the basename of the program being executed if neither 
--T nor -n are given on the command line. 
-This must be the last option on the command line.
-.SS 
-.SS Arguments:
-.TP
-.B args
-Arguments for 'command'
-.SS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/konsole/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/konsole/'"
-from the command-line.
-.BR
-
-Konsole homepage: 
-.BR http://konsole.kde.org/
-.SH AUTHORS
-Kurt V. Hindenburg <kurt.hindenburg@kdemail.net>
-
-Lars Doelle <lars.doelle@on-line.de>
-.BR
-.SH OTHER
-This manual page was written by Ana Beatriz Guerrero Lopez <ana@ekaia.org> for the Debian
-system (but may be used by others).
-.BR
-
diff --git a/ubuntu/_base/core/tdebase/debian/man/kpager-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kpager-trinity.1
deleted file mode 100644
index 63a24f267..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kpager-trinity.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.TH KPAGER 1 "August, 24 2003"
-.SH NAME
-kpager \- Trinity desktop pager
-.SH SYNOPSIS
-.B kpager
-.RI [ options ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kpager
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkpager\fP is a desktop pager for the Trinity desktop. It creates mini-views of the different Trinity desktops. These views show the real content of the desktop, or only icons. 
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-hidden
-Create the preview of the desktops, but hide the window
-.SH SEE ALSO
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kpager was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kpersonalizer-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kpersonalizer-trinity.1
deleted file mode 100644
index 01dc0b3cc..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kpersonalizer-trinity.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.TH KPERSONALIZER 1
-.SH NAME
-kpersonalizer - TDE basic settings wizard
-
-.SH SYNOPSIS
-
-.B kpersonalizer [OPTION...]
-
-.SH DESCRIPTION
-
-The TDE Personalizer (KPersonalizer) is a wizard to configure TDE, and should automatically be run the first time a user runs TDE, to allow the user to configure basic TDE settings.
-.PP
-KPersonalizer allows the user to set locales, desktop behavior, enable accessibility features, and so forth. The options can be changed later by the Trinity Control Center application.
-
-.SH OPTIONS
-
-KPersonalizer accepts the following options:
-.PP
-.B Help options
-.TP
-.B \-\-help
-Show help about options.
-.TP
-.B \-\-help-qt
-Show Qt specific options.
-.TP
-.B \-\-help-tde 
-Show TDE specific options.
-.TP
-.B \-\-help-all 
-Show all options.
-.TP
-.B \-\-author
-Show author information.
-.TP
-.B \-v, \-\-version
-Show version information.
-.TP
-.B \-\-license 
-Show license information. 
-
-.PP
-.B Options
-.TP
-.B \-r 
-KPersonalizer is restarted by itself. 
-.TP
-.B \-\-before-session 
-KPersonalizer is started before the TDE session.
-
-.SH EXAMPLES
-.TP
-.B kpersonalizer
-Run kpersonalizer to set (or reset) TDE preferences.
-.TP
-.B kpersonalizer --before-session
-Run kpersonalizer before the first TDE session. 
-
-.SH AUTHORS
-
-Kpersonalizer was written by Ralf Nolden <nolden@kde.org>, Carsten Wolff <wolff@kde.org>, qwertz <kraftw@gmx.de>, and Bernhard Rosenkraenzer <bero@redhat.com>.
-.PP
-This  manual page was written by Joe Brockmeier <jzb@zonker.net>, for the Debian GNU/Linux project, but may be used by others.
-.SH "SEE ALSO"
-.TP
-.BR khelpcenter (1)
diff --git a/ubuntu/_base/core/tdebase/debian/man/kprinter-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kprinter-trinity.1
deleted file mode 100644
index a3ecdc88b..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kprinter-trinity.1
+++ /dev/null
@@ -1,209 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPRINTER 1 "June 2006" "Trinity Desktop Environment" "A printer tool for TDE"
-.SH NAME
-kprinter
-\- a printer tool for TDE
-.SH SYNOPSIS
-\fBkprinter\fP [Qt\-options] [TDE\-options] [options] file(s) 
-.SH DESCRIPTION
-\fBKPrinter\fP opens automatically when you click on the "Print" icon of any TDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
-.sp 1
-\fBkprinter\fP is a very versatile tool. Depending on the actual features and power of the print subsystem of your computer, \fBkprinter\fP translates the former's abilities into a nice and easy\-to\-understand GUI. If your print subsystem does not support duplexing, \fBkprinter\fP will not show the option. If your print subsystem is CUPS, kprinter is at its peak shape.
-.sp 1
-With \fBKPrinter\fP you can...
-.IP "     \-"
-switch "on the fly" the print subsystem\-to\-use,
-.IP "     \-"
-start the Add Printer Wizard,
-.IP "     \-"
-choose the target printer,
-.IP "     \-"
-possibly select one or more files to print,
-.IP "     \-"
-drag'n'drop files for print,
-.IP "     \-"
-check for or set the print options,
-.IP "     \-"
-schedule the job for later printing,
-.IP "     \-"
-tag the print job with accounting information for billing purposes,
-.IP "     \-"
-set the job priority for a higher or lower level to influence the order of the job queue,
-.IP "     \-"
-access the TDEPrint configurator,
-.IP "     \-"
-and activate (or disable) a viewing filter that shows all or just the selected few printers relevant to the user.
-.SP
-.SH OPTIONS
-.SS
-.SS Arguments:
-file(s)                   Files to load
-.SS Options:
-.TP
-.B  \-c  
-Make an internal copy of the files to print
-.TP
-.B \-P,  \-d  <printer>
-Printer/destination to print on
-.TP
-.B \-J,  \-t  <title>
-Title/Name for the print job
-.TP
-.B \-#, \-n <number>
-Number of copies
-.TP
-.B  \-o  
-<option=value>         Printer option
-.TP
-.B  \-j  <mode>
-Job output mode (gui, console, none) [gui]
-.TP
-.B  \-\-system  <printsys>
-Print system to use (lpd, cups)
-.TP
-.B  \-\-stdin  
-Allow printing from STDIN
-.TP
-.B  \-\-nodialog  
-Do not show the print dialog (print directly)
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\fB\-\-nograb\fP, use \fB\-\-dograb\fP to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kprinter/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kprinter/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/krandom.kss-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/krandom.kss-trinity.1
deleted file mode 100644
index 4a13d95ec..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/krandom.kss-trinity.1
+++ /dev/null
@@ -1,152 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KRANDOM.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
-.SH NAME
-krandom.kss
-\- Start a random TDE screen saver
-.SH SYNOPSIS
-\fBkrandom.kss\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBkrandom.kss\fP starts a random TDE screen saver.
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-setup  
-Setup screen saver
-.TP
-.B  \-\-window\-id  wid
-Run in the specified XWindow
-.TP
-.B  \-\-root  
-Run in the root XWindow
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kreadconfig-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kreadconfig-trinity.1
deleted file mode 100644
index 3bb6c4d0b..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kreadconfig-trinity.1
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KREADCONFIG 1 "June 2006" "Trinity Desktop Environment" "Read TDEConfig entries"
-.SH NAME
-kreadconfig
-\- Read TDEConfig entries (for use in shell scripts)
-.SH SYNOPSIS
-\fBkreadconfig\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBkreadconfig\fP is a command line tool to retrieve values from TDE configuration files.
-.sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
-.SS Example:
-.TP
-\fBkreadconfig \-\-group\fP Directories \fB--key\fP dir_tmp
-read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from TDE's main configuration file
-
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-file  <file>
-Use <file> instead of global config
-.TP
-.B  \-\-group  <group>
-Group to look in [TDE]
-.TP
-.B  \-\-key  <key>
-Key to look for
-.TP
-.B  \-\-default  <default>
-Default value
-.TP
-.B  \-\-type  <type>
-Type of variable
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS
-
-.SH FILES
-.I /etc/trinity/system.kdeglobals
-global TDE configuration file
-.I ~/.trinity/share/config
-standard configuration directory
-
-.SH AUTHORS
-.nf
-Bernhard Rosenkraenzer <bero@redhat.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/krootimage-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/krootimage-trinity.1
deleted file mode 100644
index e9b19a604..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/krootimage-trinity.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KROOTIMAGE 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-krootimage
-\- set desktop background for tdm
-.SH SYNOPSIS
-\fBkrootimage\fP [Qt\-options] [TDE\-options] config 
-.SH DESCRIPTION
-\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B config
-Name of the configuration file
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kstart-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kstart-trinity.1
deleted file mode 100644
index 9d3a77ddc..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kstart-trinity.1
+++ /dev/null
@@ -1,215 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSTART 1 "June 2006" "Trinity Desktop Environment" "application launch utility"
-.SH NAME
-kstart
-\- Utility to launch applications with special window properties 
-.SH SYNOPSIS
-\fBkstart\fP [Qt\-options] [TDE\-options] [options] command 
-.SH DESCRIPTION
-Utility to launch applications with special window properties.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B command
-Command to execute
-.SS 
-.SS Options:
-.TP
-.B  \-\-window  <regexp>
-A regular expression matching the window title
-.TP
-.B  \-\-windowclass  <class>
-A string matching the window class (WM_CLASS property)
-The window class can be found out by running
-'xprop | grep WM_CLASS' and clicking on a window
-(use either both parts separated by a space or only the right part).
-NOTE: If you specify neither window title nor window class,
-then the very first window to appear will be taken;
-omitting both options is NOT recommended.
-.TP
-.B  \-\-desktop  <number>
-Desktop on which to make the window appear
-.TP
-.B  \-\-currentdesktop  
-Make the window appear on the desktop that was active
-when starting the application
-.TP
-.B  \-\-alldesktops  
-Make the window appear on all desktops
-.TP
-.B  \-\-iconify  
-Iconify the window
-.TP
-.B  \-\-maximize  
-Maximize the window
-.TP
-.B  \-\-maximize\-vertically  
-Maximize the window vertically
-.TP
-.B  \-\-maximize\-horizontally  
-Maximize the window horizontally
-.TP
-.B  \-\-fullscreen  
-Show window fullscreen
-.TP
-.B  \-\-type  <type>
-The window type: Normal, Desktop, Dock, Tool, 
-Menu, Dialog, TopMenu or Override
-.TP
-.B  \-\-activate  
-Jump to the window even if it is started on a 
-different virtual desktop
-.TP
-.B \-\-ontop,  \-\-keepabove  
-Try to keep the window above other windows
-.TP
-.B \-\-onbottom,  \-\-keepbelow  
-Try to keep the window below other windows
-.TP
-.B  \-\-skiptaskbar  
-The window does not get an entry in the taskbar
-.TP
-.B  \-\-skippager  
-The window does not get an entry on the pager
-.TP
-.B  \-\-tosystray  
-The window is sent to the system tray in Kicker
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Matthias Ettrich <ettrich@kde.org>
-.br
-David Faure <faure@kde.org>
-.br
-Richard J. Moore <rich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/ksystraycmd-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/ksystraycmd-trinity.1
deleted file mode 100644
index 4807276c0..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/ksystraycmd-trinity.1
+++ /dev/null
@@ -1,189 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KSYSTRAYCMD 1 "June 2006" "Trinity Desktop Environment" "system tray utility"
-.SH NAME
-ksystraycmd
-\- Allows any application to be kept in the system tray
-.SH SYNOPSIS
-\fBksystraycmd\fP [Qt\-options] [TDE\-options] [options] command 
-.SH DESCRIPTION
-The system tray is an area in which an application can display a small window.
-It may be used to display status information or provide quick access to commands.
-Normally tray icons are developed as part of an application.
-\fBksystraycmd\fP allows any application to be kept in the system tray.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B command
-Command to execute
-.SS 
-.SS Options:
-.TP
-.B  \-\-window  <regexp>
-A regular expression matching the window title
-If you do not specify one, then the very first window
-to appear will be taken \- not recommended.
-.TP
-.B  \-\-wid  <int>
-The window id of the target window
-Specifies the id of the window to use. If the id starts with 0x
-it is assumed to be in hex.
-.TP
-.B  \-\-hidden  
-Hide the window to the tray on startup
-.TP
-.B  \-\-startonshow  
-Wait until we are told to show the window before
-executing the command
-.TP
-.B  \-\-tooltip  <text>
-Sets the initial tooltip for the tray icon
-.TP
-.B  \-\-keeprunning  
-Keep the tray icon even if the client exits. This option
-has no effect unless startonshow is specified.
-.TP
-.B  \-\-ownicon  
-Use ksystraycmd's icon instead of window's icon in systray
-(should be used with \-\-icon to specify ksystraycmd icon)
-.TP
-.B  \-\-ontop  
-Try to keep the window above other windows
-.TP
-.B  \-\-quitonhide  
-Quit the client when we are told to hide the window.
-This has no effect unless startonshow is specified and implies keeprunning.
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Richard Moore <rich@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/ktrash-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/ktrash-trinity.1
deleted file mode 100644
index 0094c84fa..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/ktrash-trinity.1
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KTRASH 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-ktrash
-\- Helper program to handle the TDE trash can
-.SH SYNOPSIS
-\fBktrash\fP [Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-\fBktrash\fP is a helper program to handle the TDE trash can.
-.sp 1
-Note: to move files to the trash, do not use \fBktrash\fP, but "\fBkfmclient\fP move 'url' trash:/"
-.SH OPTIONS
-.SS
-.SS Options:
-.TP
-.B  \-\-empty  
-Empty the contents of the trash
-.TP
-.B  \-\-restore  <file>
-Restore a trashed file to its original location
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-.SH SEE ALSO
-\fBkfmclient\fP(1)
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kwrite-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kwrite-trinity.1
deleted file mode 100644
index f7d39f61d..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kwrite-trinity.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.TH KWRITE 1 "August, 25 2003"
-.SH NAME
-kwrite \- TDE text editor
-.SH SYNOPSIS
-.B kwrite
-.RI [ options ]  [file]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kwrite
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBkwrite\fP is a text editor for TDE, that is a light version of \fIkate\fP.
-It allows syntax coloration for many langages.
-
-It is able to expand or collapse parts of code (C functions, ...).
-
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-v, \-\-version
-Show version of program.
-
-.B file
-is the file to open
-
-.SH SEE ALSO
-.BR kate (1)
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kwrite was written by the KDE project
diff --git a/ubuntu/_base/core/tdebase/debian/man/kwriteconfig-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kwriteconfig-trinity.1
deleted file mode 100644
index b347b9849..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kwriteconfig-trinity.1
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWRITECONFIG 1 "June 2006" "Trinity Desktop Environment" "Write TDEConfig entries"
-.SH NAME
-kwriteconfig
-\- Write TDEConfig entries (for use in shell scripts)
-.SH SYNOPSIS
-\fBkwriteconfig\fP [Qt\-options] [TDE\-options] [options] value 
-.SH DESCRIPTION
-\fBkwriteconfig\fP is a command line tool to write values in TDE configuration files.
-Nonexisting files/groups/keys will be created.
-.sp 1
-If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
-.SS Example:
-.TP
-\fBkwriteconfig \-\-file\fP \fImyrc\fP \fB\-\-group\fP Directories \fB\-\-key\fP dir_tmp /tmp
-writes the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories in configuration \fBfile\fP \fImyrc\fP
-
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B value
-The value to write. Mandatory, on a shell use '' for empty
-.SS Options:
-.TP
-.B  \-\-file  <file>
-Use <file> instead of global config
-.TP
-.B  \-\-group  <group>
-Group to look in [TDE]
-.TP
-.B  \-\-key  <key>
-Key to look for
-.TP
-.B  \-\-type  <type>
-Type of variable. Use "bool" for a boolean, otherwise it is treated as a string
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Luis Pedro Coelho <luis_pedro@netcabo.pt>
-.br
-Bernhard Rosenkraenzer <bero@redhat.com>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/kxkb-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/kxkb-trinity.1
deleted file mode 100644
index 9a6a6bcf6..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/kxkb-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KXKB 1 "June 2006" "Trinity Desktop Environment" "A utility to switch keyboard maps"
-.SH NAME
-kxkb
-\- A utility to switch keyboard maps
-.SH SYNOPSIS
-\fBkxkb\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKxkb\fP is a keyboard layout switching utility based on X11 xkb extension. It allows to use different keyboard layouts for inputing text. \fBKxkb\fP features keyboard layout indicator.
-.sp 1
-\fBKxkb\fP starts automatically and stays in system tray as a flag with 2 or 3 letter abbreviation of layout name on top of it if more than one layout is defined or Show indicator for single layout option is turned on.
-.sp 1
-When \fBKxkb\fP is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can right mouse button click the \fBKxkb\fP icon and select layout from the list.
-.sp 1
-Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBtdecmshell keyboard_layout\fP in a terminal.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kxkb/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kxkb/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Andriy Rysin <rysin@kde.org>
-.br
-Shaheed Haque <srhaque@iee.org>
-.br
-Ilya Konstantinov <kde\-devel@future.galanet.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/starttde-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/starttde-trinity.1
deleted file mode 100644
index 73ab27b9c..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/starttde-trinity.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH starttde 1 "Jan 17, 2005"
-.SH NAME
-starttde \- Starts up the Trinity Desktop Environment 
-.SH SYNOPSIS
-.B starttde
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B starttde
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-The \fBstarttde\fP script starts up the Trinity Desktop Environment and
-is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from
-your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
-will load your last session, or a default session that includes the standard
-TDE programs if no saved session is available.
-
-\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
-any X11R6 SM compliant program.
-
-\fBstarttde\fP and ksmserver use the contents of the ~/.trinity directory
-for starting previously saved sessions. Source scripts found in ~/.trinity/env/*.sh
-can be used to define environment variables that will be available to all TDE 
-programs.
-
-For anything else (that doesn't set env vars, or that needs a window manager),
-better use the ~/.trinity/Autostart folder.
-
-At the end of a session, the scripts found in ~/.trinity/shutdown will be executed.
-
-
-.SH OPTIONS
-\fBstarttde\fP takes no command line options.
-
-.SH AUTHOR
-\fBstarttde\fP is written by the KDE Project.
-
-This manual page was written by Philipp Grau.
-
-.SH "REPORTING BUGS"
-Report bugs of this modified Debian version of starttde to the Bug
-Tracking System at: http://bugs.debian.org
-.SH COPYRIGHT
-Copyright \(co 2005 Philipp Grau.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1
deleted file mode 100644
index af48f59e6..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdedebugdialog-trinity.1
+++ /dev/null
@@ -1,200 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEDEBUGDIALOG 1 "June 2006" "Trinity Desktop Environment" "control debug output"
-.SH NAME
-tdedebugdialog
-\- A dialog box for setting preferences for debug output
-.SH SYNOPSIS
-\fBtdedebugdialog\fP [Qt\-options] [TDE\-options] [options] 
-.SH DESCRIPTION
-\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
-.sp 1
-If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
-.sp 1
-If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
-.sp 1
-In full mode, first you should select the debug area you are interested in from the drop down list at the top.
-.sp 1
-You may independently set the output for various types of messages:
-.sp 1
-.RS 3
-\- Information
-.br
-\- Warning
-.br
-\- Error
-.br
-\- Fatal Error
-.RE
-.PP
-For each of these types, you can set the following:
-.sp 1
-\fBOutput to\fP:
-.br
-In this Combobox, you can choose where the messages should be output. The choices are: \fBFile\fP?, \fBMessage Box\fP, \fBShell\fP (meaning stderr), \fBSyslog\fP an \fBNone\fP. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is ?Message Box?.
-.sp 1
-\fBFilename:\fP
-.br
-This is only enabled when you have chosen \fBFile\fP as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is \fIkdebug.dbg\fP.
-Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level TDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message.
-.sp 1
-When you close the dialog by pressing OK, your entries apply immediately and are saved in \fIkdebugrc\fP. When you press Cancel, your entries are discarded and the old ones are restored.
-
-.SH OPTIONS
-.SS Options:
-.TP
-.B  \-\-fullmode  
-Show the fully\-fledged dialog instead of the default list dialog
-.TP
-.B  \-\-on  <area>
-Turn area on
-.TP
-.B  \-\-off  <area>
-Turn area off
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS
-
-.SH FILES
-.I ~/.trinity/share/config/kdebugrc
-\fBtdedebugdialog\fP configuration file
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdedebugdialog/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdedebugdialog/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
deleted file mode 100644
index 1e7b055f6..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-tdeio_media_mounthelper
-\- tdeio_media_mounthelper
-.SH SYNOPSIS
-\fBtdeio_media_mounthelper\fP [Qt\-options] [TDE\-options] [options] URL 
-.SH DESCRIPTION
-\fBtdeio_media_mounthelper\fP is a helper program to handle the mounting of media in TDE. It is part of the KIO subsystem.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-media:/ URL to mount/unmount/eject/remove
-.SS Options:
-.TP
-.B  \-u  
-Unmount given URL
-.TP
-.B  \-m  
-Mount given URL (default)
-.TP
-.B  \-e  
-Eject given URL via tdeeject
-.TP
-.B  \-s  
-Unmount and Eject given URL (necessary for some USB devices)
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-.SH AUTHORS
-.nf
-Waldo Bastian <bastian@kde.org>
-.br
-Kevin Ottens <ervin@ipsquad.net>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
deleted file mode 100644
index 270dd86e6..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  tdeio_system_documenthelper 1 "June 2006" "Trinity Desktop Environment" "helper script"
-.SH NAME
-tdeio_system_documenthelper
-\- TDE helper script used by document.desktop
-.SH SYNOPSIS
-\fBtdeio_system_documenthelper\fP
-
-.SH DESCRIPTION
-The script is used by document.desktop entry to determine if it must be shown or not.
-
-.SH AUTHORS
-.nf
-Kevin Ottens <ervin@ipsquad.net>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdepasswd-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdepasswd-trinity.1
deleted file mode 100644
index e09aff0e2..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdepasswd-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.TH TDEPASSWD 1
-
-.SH NAME
-tdepasswd \- graphical frontend to change the user's password
-
-.SH SYNOPSIS
-.B tdepasswd [ \fIQt-options\fR ] [ \fITDE-options\fR ] \fIoptions\fR
-
-.SH DESCRIPTION
-Changes a UNIX password.
-
-.SH OPTIONS
-.B Generic options:
-.TP
-.HP
-.B \-\-help
-Show help about options
-.TP
-.HP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.HP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.HP
-.B \-\-help\-all
-Show all options
-.TP
-.HP
-.B \-\-author
-Show author information
-.TP
-.HP
-.B \-v\fR, \fB \-\-version
-Show version information
-.TP
-.HP
-.B \-\-license
-Show license information
-.TP
-.B Qt options:
-.TP
-.HP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'.
-.TP
-.HP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'.
-.TP
-.HP
-.B \-\-cmap
-Causes the application to install a private 
-color map on an 8-bit display.
-.TP
-.HP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.HP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.HP
-.B \-\-dograb
-Running under a debugger can cause an implicit
--nograb, use -dograb to override.
-.TP
-.HP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.HP
-.B \-\-fn, \-\-font <fontname>
-Defines the application font.
-.TP
-.HP
-.B \-\-bg, \-\-background <color> 
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.HP
-.B \-\-fg, \-\-foreground <color> 
-Sets the default foreground color.
-.TP
-.HP
-.B \-\-btn, \-\-button <color>
-Sets the default button color.
-.TP
-.HP
-.B \-\-name <name>
-Sets the application name.
-.TP
-.HP
-.B \-\-title <title>
-Sets the application title (caption).
-.TP
-.HP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.HP
-.B \-\-inputstyle <inputstyle>
-Sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root.
-.TP
-.HP
-.B \-\-im <XIM server>
-Set XIM server.
-.TP
-.HP
-.B \-\-noxim
-Disable XIM.
-.TP
-.HP
-.B \-\-reverse
-Mirrors the whole layout of widgets.
-.TP
-.B TDE options:
-.TP
-.HP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar.
-.TP
-.HP
-.B \-\-icon <icon>
-Use 'icon' as the application icon.
-.TP
-.HP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar.
-.TP
-.HP
-.B \-\-config <filename>
-Use alternative configuration file.
-.TP
-.HP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'.
-.TP
-.HP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.HP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.HP
-.B \-\-style <style>
-Sets the application GUI style.
-.TP
-.HP
-.B \-\-geometry <geometry>
-Sets the client geometry of the main widget.
-
-.SH "SEE ALSO"
-.BR passwd (1).
-
-.SH AUTHOR
-Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdeprintfax-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdeprintfax-trinity.1
deleted file mode 100644
index e407c294e..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdeprintfax-trinity.1
+++ /dev/null
@@ -1,160 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDEPRINTFAX 1 "June 2006" "Trinity Desktop Environment" "A fax utility"
-.SH NAME
-tdeprintfax
-\- a interface to fax-packages
-.SH SYNOPSIS
-\fBtdeprintfax\fP [Qt\-options] [TDE\-options] [options] [file] 
-.SH DESCRIPTION
-\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File to fax (added to the file list)
-.SS Options:
-.TP
-.B  \-\-phone  
-Phone number to fax to
-.TP
-.B  \-\-immediate  
-Send fax immediately
-.TP
-.B  \-\-batch  
-Exit after sending
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH AUTHORS
-.nf
-Michael Goffioul <tdeprint@swing.be>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdesu-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdesu-trinity.1
deleted file mode 100644
index fa8c45e09..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdesu-trinity.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.TH TDESU 1 "May 2005" "Trinity Desktop Environment" "Runs a program with elevated privileges."
-.SH NAME
-tdesu \- Runs a program with elevated privileges.
-.SH SYNOPSIS
-\fBtdesu\fR [Qt\-options] [TDE\-options] [tdesu options] command 
-.SH DESCRIPTION
-Runs a program with elevated privileges.
-.PP
-TDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
-.PP
-\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
-.PP
-\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  --help
-Show help about options
-.TP
-.B  --help-qt
-Show Qt specific options
-.TP
-.B  --help-tde
-Show TDE specific options
-.TP
-.B  --help-all
-Show all options
-.TP
-.B  --author
-Show author information
-.TP
-.B -v,  --version
-Show version information
-.TP
-.B  --license
-Show license information
-.SS
-.SS tdesu Options:
-.TP
-.TP
-.B -c <command>
-Specifies the command to run
-.TP
-.B -f <file>
-Run command under target uid if <file> is not writable
-.TP
-.B -u <user>
-Specifies the target uid [default is root]
-.TP
-.B -n
-Do not keep password
-.TP
-.B -s
-Stop the daemon (forgets all passwords)
-.TP
-.B -t
-Enable terminal output (no password keeping)
-.TP
-.B -p <prio>
-Set priority value: 0 <= prio <= 100, 0 is lowest [default is 50]
-.TP
-.B -r
-Use realtime scheduling
-.TP
-.B  --nonewdcop
-Let command use existing dcopserver
-.TP
-.B -i <icon name>
-Specify icon to use in the password dialog
-.TP
-.B -d
-Do not show the command to be run in the dialog
-.SS 
-.SS Arguments:
-.TP
-.B command
-Specifies the command to run
-
-.SH CONFIGURATION FILES
-.PP
-\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .trinity/share/config/tdesurc. Alternative a section could be added to kdeglobals.
-.SH EXAMPLE
-The configuration item for the configuration files is the following:
-.br
-[super-user-command] 
-.br
-super-user-command=sudo
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center. You can also enter the URL
-.BR help:/tdesu/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/tdesu/'"
-from the command-line.
-.br
-.SH AUTHORS
-.br
-Geert Jansen <jansen@kde.org>
-.br
-Pietro Iglio <iglio@fub.it>
-.PP
-This manual page was written by Christopher Martin <chrsmrtn@debian.org> for Debian GNU/Linux, but may be used by others. It borrows from an earlier manpage by Karolina Lindqvist <pgd\-karolinali@algonet.se>.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdm-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdm-trinity.1
deleted file mode 100644
index 1150fe5a8..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdm-trinity.1
+++ /dev/null
@@ -1,116 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDM 1 "June 2006" "Trinity Desktop Environment" "Trinity Display Manager"
-.SH NAME
-tdm
-\- Trinity Display Manager
-.SH SYNOPSIS
-\fBtdm\fP [options] [tty]
-.SH DESCRIPTION
-\fBtdm\fP is the Trinity display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session.
-.br
-\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network.
-.sp 1
-\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP.
-.SH OPTIONS
-.TP
-.B \-daemon
-Daemonize even when started by init
-.TP
-.B \-nodaemon
-Don't daemonize even when started from command line
-.TP
-.BI \-config\  file
-Use alternative master configuration file
-.TP
-.BR \-xrm \ res
-Override frontend\-specific resource
-.TP
-.BI \-error\  file
-Use alternative log file
-.TP
-.BR \-debug \ num
-Debug option bitfield:
-.RS 11
-0x1   \- core log
-.br
-0x2   \- config reader log
-.br
-0x4   \- greeter log
-.br
-0x8   \- IPC log
-.br
-0x10  \- session sub-daemon post-fork delay
-.br
-0x20  \- config reader post-start delay
-.br
-0x40  \- greeter post-start delay
-.br
-0x80  \- don't use syslog
-.br
-0x100 \- core Xauth log
-.br
-0x400 \- valgrind config reader and greeter
-.br
-0x800 \- strace config reader and greeter
-.RE
-.SH FILES
-.TP
-.I /etc/trinity/tdm/backgroundrc
-configuration file with background settings
-.TP
-.I /etc/trinity/tdm/tdm.options
-options for X display manager tdm
-.TP
-.I /etc/trinity/tdm/tdmrc
-the tdm configuration file
-.TP
-.I /etc/trinity/tdm/Xaccess
-access control file for XDMCP connections
-.TP
-.I /etc/trinity/tdm/Xservers
-list of local X-servers
-.TP
-.I /etc/trinity/tdm/Xreset
-script to run as root after session exits
-.TP
-.I /etc/trinity/tdm/Xsession
-script to run as user after login of user
-.TP
-.I /etc/trinity/tdm/Xsetup
-script to run as root before the login dialog appears
-.sp 1
-this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen
-.TP
-.I /etc/trinity/tdm/Xstartup
-script to run as root before session starts
-.TP
-.I /etc/trinity/tdm/Xwilling
-output of this script is displayed in the chooser window
-.SH SEE ALSO
-.BR tdm.options (5),\  tdmctl (1),\  tdm_config (1),\  tdm_greet (1),\  startx (1),\  X (7x),\  xconsole (1),\  xdm (1)
-.TP
-.I /opt/trinity/share/doc/tdm/README.gz
-Information about \fBtdm\fP and its options
-.sp 1
-.RE
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/tdm/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/tdm/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Steffen Hansen <hansen@kde.org>
-.br
-Thomas Tanghus <tanghus@earthling.net>
-.br
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdm_config-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdm_config-trinity.1
deleted file mode 100644
index b8753b168..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdm_config-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_CONFIG 1 "June 2006" "Trinity Desktop Environment" "helper program"
-.SH NAME
-tdm_config
-\- helper programm for tdm to read configuration files
-.SH SYNOPSIS
-\fBtdm_config\fP
-.SH DESCRIPTION
-\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files.
-.SH SEE ALSO
-\fBtdm\fP(1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdm_greet-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdm_greet-trinity.1
deleted file mode 100644
index 10b7bde6e..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdm_greet-trinity.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH  TDM_GREET 1 "June 2006" "Trinity Desktop Environment" "TDE greeter module"
-.SH NAME
-tdm_greet
-\- TDE greeter module for tdm
-.SH SYNOPSIS
-\fBtdm_greet\fP
-.SH DESCRIPTION
-\fBtdm_greet\fP is a TDE greeter module for \fBtdm\fP. It shows the login dialog.
-.SH SEE ALSO
-.BR tdm (1)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/man/tdmctl-trinity.1 b/ubuntu/_base/core/tdebase/debian/man/tdmctl-trinity.1
deleted file mode 100644
index 82be6ae16..000000000
--- a/ubuntu/_base/core/tdebase/debian/man/tdmctl-trinity.1
+++ /dev/null
@@ -1,220 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH TDMCTL 1 "June 2006" "Trinity Desktop Environment" "TDM remote control application"
-.SH NAME
-tdmctl
-\- tdm remote control application
-.SH SYNOPSIS
-\fBtdmctl\fP [options] [command [command arguments]]
-.SH DESCRIPTION
-\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets.
-.sp 1
-There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user).
-.sp 1
-The directory in which the sockets are located is determined this way:
-.RS 3
-\- the \fB\-s\fP option is examined
-.br
-\- the $DM_CONTROL variable is examined
-.br
-\- the tdm config file is searched for the FifoDir key
-.br
-.RI \- /var/run/xdmctl \ and\  /var/run \ are\ tried
-.RE
-.sp 1
-If $DISPLAY is set (or \fB\-d\fP was specified) and \fB\-g\fP was not specified, the
-display\-specific control socket will be used, otherwise the global one.
-.sp 1
-Tokens in the command and the reply are tab\-separated.
-Command arguments can be specified as separate command line parameters,
-in which case they are simply concatenated with tabs in between.
-.sp 1
-If the command is '\-', \fBtdmctl\fP reads commands from stdin.
-The default command is 'caps'.
-.SH OPTIONS
-.SS
-.SS Options:
-.TP
-.B \-h \-help
-print help message.
-.TP
-.B \-g \-global
-Use global control socket even if $DISPLAY is set
-.TP
-.B \-d \-display
-Override $DISPLAY
-.TP
-.B \-s \-sockets
-Override $DM_CONTROL
-.TP
-.B \-c \-config
-Use alternative tdm config file
-.SS Commands:
-.br
-.SS Global commands:
-.TP 
-.B login
-display (now|schedule) user password [session_arguments]
-.br
- login user at specified display. if "now" is specified, a possibly running session is killed, otherwise the login is done after the session exits.
-.br
-session_arguments are printf\-like escaped contents for \fI.dmrc\fP. Unlisted keys will default to previously saved values.
-.SS Per\-display commands:
-.TP 
-.B lock
-The display is marked as locked. If the X\-Server crashes in this state, no auto\-relogin will be performed even if the option is on.
-.TP 
-.B unlock
-Reverse the effect of "lock": re\-enable auto\-relogin.
-.TP 
-.B suicide
-The currently running session is forcibly terminated. No auto\-relogin is attempted, but a scheduled "login" command will be executed.
-.SS Commands for all sockets:
-.TP
-.B caps
-Returns a list of this socket's capabilities:
-.IP "    \- tdm"
-identifies tdm, in case some other DM implements this protocol, too.
-.IP "    \- list, activate, lock, suicide, login"
-the respective command is supported.
-.IP "    \- bootoptions"
-the "listbootoptions" command and the "=" option to "shutdown" are supported.
-.IP "    \- shutdown <list>"
-"shutdown" is supported and allowed to the listed users (comma\-separated). "*" means all authenticated users.
-.IP "    \- shutdown"
-"shutdown" is supported and allowed to everybody.
-.IP "    \- nuke <list>"
-forced shutdown is allowed to the listed users.
-.IP "    \- nuke"
-forced shutdown is allowed to everybody.
-.IP "    \- reserve <number>"
-reserve displays are configured and <number> are available at this time.
-.TP 
-\fBlist\fP [all|alllocal]
-.br
-Return a list of running sessions. By default all active sessions are listed. If "all" is specified, passive sessions are listed as well. If "alllocal" is specified, passive sessions are listed as well, but all incoming remote sessions are skipped.
-.sp 1
-Each session entry is a comma\-separated tuple of:
-.RS 7
-\- Display or TTY name
-.br
-\- VT name for local sessions
-.br
-\- Logged in user's name, empty for passive sessions and outgoing
-.br
-  remote sessions (local chooser mode)
-.br
-\- Session type or remote host for outgoing remote sessions,
-.br
-  empty for passive sessions
-.br
-\- A flag field:
-.RS 5
-\- "t" for tty sessions
-.br
-\- "*" for the display belonging to the requesting socket
-.br
-\- "!" for sessions that cannot be killed by the requesting
-.br
-  socket
-.br
-\- New flags might be added later
-.br
-.RE
-\- New fields might be added later
-.RE
-.TP
-\fBreserve\fP [timeout in seconds]
-.br
-Start a reserve login screen. If nobody logs in within the specified amount of time (one minute by default), the display is removed again. When the session on the display exits, the display is removed, too.
-.br
-Permitted only on sockets of local displays and the global socket.
-.TP
-\fBactivate\fP (vt|display)
-.br
-Switch to a particular VT (virtual terminal). The VT may be specified either directly (e.g., vt3) or by a display using it (e.g., :2).
-.br
-Permitted only on sockets of local displays and the global socket.
-.TP
-.B listbootoptions
-List available boot options.
-.br
-=> "ok" list default current default and current are indices into the list and are \-1 if unset or undeterminable.
-.TP
-\fBshutdown\fP (reboot|halt) [=bootchoice]
-.br
-  (ask|trynow|forcenow|schedule|start
-.br
-   (\-1|end (force|forcemy|cancel)))
-.br
-.RS 7
-Request a system shutdown, either a reboot or a halt/poweroff.
-.sp 1
-An OS choice for the next boot may be specified from the list returned by "listbootoptions".
-.sp 1
-Shutdowns requested from per\-display sockets are executed when the current session on that display exits. Such a request may pop up a dialog asking for confirmation and/or authentication.
-.sp 1
-start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately.
-.sp 1
-end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following:
-.RS 3
-- "cancel" \- give up the shutdown.
-.br
-- "force" \- shut down nonetheless.
-.br
-- "forcemy" \- shut down nonetheless if all active sessions
-.br
-   belong to the requesting user. Only for per\-display sockets.
-.RE
-.sp 1
-start and end are specified in seconds since the UNIX epoch.
-.sp 1
-"trynow" is a synonym for "0 0 cancel", "forcenow" for "0 0 force" and "schedule" for "0 \-1".
-.sp 1
-"ask" attempts an immediate shutdown and interacts with the user if active sessions are still running. Only for per\-display sockets.
-.RE
-.TP
-\fBshutdown cancel\fP [local|global]
-.br
-Cancel a scheduled shutdown. The global socket always cancels the currently pending shutdown, while per\-display sockets default to cancelling their queued request.
-.TP
-\fBshutdown status\fP
-Return a list with information about shutdowns.
-.br
-The entries are comma\-separated tuples of:
-.RS 10
-\- ("global"|"local") \- pending vs. queued shutdown. A local
-.br
-  entry can be returned only by a per\-display socket.
-.br
-\- ("halt"|"reboot")
-.br
-\- start
-.br
-\- end
-.br
-\- ("ask"|"force"|"forcemy"|"cancel")
-.br
-\- Numeric user ID of the requesting user, \-1 for the global
-.br
-  socket.
-.br
-\- The next boot OS choice or "\-" for none.
-.br
-\- New fields might be added later.
-.RE
-.SH SEE ALSO
-.BR tdm (1)
-.TP
-.I /opt/trinity/share/doc/tdm/README.gz
-Information about the command sockets (and \fBtdm\fP)
-.SH AUTHORS
-.nf
-Oswald Buddenhagen <ossi@kde.org>
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdebase/debian/prune-nonfree b/ubuntu/_base/core/tdebase/debian/prune-nonfree
deleted file mode 100644
index 4fa832d5c..000000000
--- a/ubuntu/_base/core/tdebase/debian/prune-nonfree
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-# Removes non-free files from the source tree. Must be done before
-# creating the orig.tar.gz.
-
-TOPLEVEL="$1"
-
-if [ "$TOPLEVEL" = "" ]; then
-	echo "Please provide the toplevel directory as the argument."
-	exit 1
-else
-	rm -f $TOPLEVEL/kcontrol/energy/pics/energybig.png
-	rm -f $TOPLEVEL/kcontrol/energy/pics/lo-energy.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr128-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr16-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr32-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr48-app-energy_star.png
-	rm -f $TOPLEVEL/kcontrol/pics/cr64-app-energy_star.png
-fi
-
-exit 0
diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules
index cceae87d8..092d78a29 100755
--- a/ubuntu/_base/core/tdebase/debian/rules
+++ b/ubuntu/_base/core/tdebase/debian/rules
@@ -82,15 +82,6 @@ PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-t
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
-makebuilddir::
-	touch kcontrol/energy/pics/energybig.png
-	touch kcontrol/energy/pics/lo-energy.png
-	uudecode -o kcontrol/pics/cr128-app-energy_star.png debian/img/cr128-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr16-app-energy_star.png debian/img/cr16-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr32-app-energy_star.png debian/img/cr32-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr48-app-energy_star.png debian/img/cr48-app-energy_star.png.uu
-	uudecode -o kcontrol/pics/cr64-app-energy_star.png debian/img/cr64-app-energy_star.png.uu
-
 common-install-prehook-arch::
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-i386
 	grep -v -e joystick -e view1394  debian/kcontrol-trinity.install > debian/kcontrol-trinity.install.kfreebsd-amd64
@@ -99,7 +90,6 @@ common-install-prehook-arch::
 
 clean::
 	rm -f debian/kcontrol-trinity.install.kfreebsd* debian/tdebase-tdeio-plugins-trinity.install.kfreebs*
-	rm -f kcontrol/pics/cr*-app-energy_star.png kcontrol/energy/pics/energybig.png kcontrol/energy/pics/lo-energy.png
 
 binary-install/tdebase-data-trinity::
 	# hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
index 5ffe84ca7..ffd4cc04a 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
@@ -57,6 +57,8 @@ debian/tmp/opt/trinity/share/apps/kcontrol/pics/gamma2.2.gif
 debian/tmp/opt/trinity/share/apps/kcontrol/pics/gamma2.2.png
 debian/tmp/opt/trinity/share/apps/kcontrol/pics/gamma2.4.gif
 debian/tmp/opt/trinity/share/apps/kcontrol/pics/gamma2.4.png
+debian/tmp/opt/trinity/share/apps/kcontrol/pics/energybig.png
+debian/tmp/opt/trinity/share/apps/kcontrol/pics/lo-energy.png
 debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/AAAAAAGeneral.ad
 debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/AAAMotif.ad
 debian/tmp/opt/trinity/share/apps/tdedisplay/app-defaults/AAATk.ad
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 40bc2dc02..0547eb7f9 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -107,7 +107,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/floppy
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/fonts
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ftp
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/ghelp
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gopher
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/gzip
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/help
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/http
@@ -146,6 +145,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/xz
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/zeroconf
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/zip
 debian/tmp/opt/trinity/share/icons/crystalsvg/*/apps/mac.png
+debian/tmp/opt/trinity/share/man/man1/tdeio_media_mounthelper.1
+debian/tmp/opt/trinity/share/man/man1/ktrash.1
 debian/tmp/opt/trinity/share/mimelnk/inode/system_directory.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/audiocd.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/blankbluray.desktop
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages b/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
deleted file mode 100644
index 249292ad7..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/tdeio_media_mounthelper-trinity.1
-debian/man/ktrash-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
index 49942d98a..c8666a793 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
@@ -100,3 +100,20 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/layout.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/switching.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/xkb.png
 debian/tmp/opt/trinity/share/services/kxkb.desktop
+debian/tmp/opt/trinity/share/man/man1/drkonqi.1
+debian/tmp/opt/trinity/share/man/man1/kblankscrn.kss.1
+debian/tmp/opt/trinity/share/man/man1/kcheckpass.1
+debian/tmp/opt/trinity/share/man/man1/kcminit.1
+debian/tmp/opt/trinity/share/man/man1/kdcop.1
+debian/tmp/opt/trinity/share/man/man1/kdialog.1
+debian/tmp/opt/trinity/share/man/man1/khotkeys.1
+debian/tmp/opt/trinity/share/man/man1/knetattach.1
+debian/tmp/opt/trinity/share/man/man1/krandom.kss.1
+debian/tmp/opt/trinity/share/man/man1/kreadconfig.1
+debian/tmp/opt/trinity/share/man/man1/kstart.1
+debian/tmp/opt/trinity/share/man/man1/ksystraycmd.1
+debian/tmp/opt/trinity/share/man/man1/kwriteconfig.1
+debian/tmp/opt/trinity/share/man/man1/kxkb.1
+debian/tmp/opt/trinity/share/man/man1/tdedebugdialog.1
+debian/tmp/opt/trinity/share/man/man1/tdeio_system_documenthelper.1
+debian/tmp/opt/trinity/share/man/man1/tdesu.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.links b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.links
index 975b98403..a384ff52d 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.links
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.links
@@ -1 +1 @@
-usr/share/man/man1/tdesu-trinity.1.gz usr/share/man/man1/tdesud-trinity.1.gz
+opt/trinity/share/man/man1/tdesu.1 opt/trinity/share/man/man1/tdesud.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.manpages b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.manpages
deleted file mode 100644
index 92b784172..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.manpages
+++ /dev/null
@@ -1,17 +0,0 @@
-debian/man/drkonqi-trinity.1
-debian/man/kblankscrn.kss-trinity.1
-debian/man/kcheckpass-trinity.1
-debian/man/kcminit-trinity.1
-debian/man/kdcop-trinity.1
-debian/man/tdedebugdialog-trinity.1
-debian/man/tdesu-trinity.1
-debian/man/kdialog-trinity.1
-debian/man/khotkeys-trinity.1
-debian/man/tdeio_system_documenthelper-trinity.1
-debian/man/knetattach-trinity.1
-debian/man/krandom.kss-trinity.1
-debian/man/kreadconfig-trinity.1
-debian/man/kstart-trinity.1
-debian/man/ksystraycmd-trinity.1
-debian/man/kwriteconfig-trinity.1
-debian/man/kxkb-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.install b/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.install
index a951e7daf..a113fb502 100644
--- a/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.install
@@ -36,3 +36,4 @@ debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.docbook
+debian/tmp/opt/trinity/share/man/man1/tdepasswd.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.manpages b/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.manpages
deleted file mode 100644
index 1a6f4abad..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdepasswd-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdepasswd-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.install b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.install
index ce3ec87b7..5611bb731 100644
--- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.install
@@ -123,6 +123,9 @@ debian/tmp/opt/trinity/share/icons/hicolor/*/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kjobviewer.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/printmgr.svgz
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/tdeprintfax.svgz
+debian/tmp/opt/trinity/share/man/man1/kjobviewer.1
+debian/tmp/opt/trinity/share/man/man1/kprinter.1
+debian/tmp/opt/trinity/share/man/man1/tdeprintfax.1
 debian/tmp/opt/trinity/share/mimelnk/print/class.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/driver.desktop
 debian/tmp/opt/trinity/share/mimelnk/print/folder.desktop
diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.manpages b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.manpages
deleted file mode 100644
index 55b9bfae7..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/tdeprintfax-trinity.1
-debian/man/kjobviewer-trinity.1
-debian/man/kprinter-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.config b/ubuntu/_base/core/tdebase/debian/tdm-trinity.config
index 26fc8427c..8e5c207d7 100644
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.config
+++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.config
@@ -40,7 +40,7 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
                                 head -n 1)
   # the debconf configuration stores the package name,
   # while the configuration files point to the binary name
-  # tdm-trinity package name must be used for the tdm binary
+  # therefore tdm-trinity package name must be used for the tdm binary
   if [ "$CURRENT_DEFAULT" = "/opt/trinity/bin/tdm" ]; then
     CURRENT_DEFAULT=${THIS_PACKAGE}
   else
diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.install b/ubuntu/_base/core/tdebase/debian/tdm-trinity.install
index dc7d5e37f..28a08b8c2 100644
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.install
@@ -51,3 +51,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/tdmrc-ref.docbook
+debian/tmp/opt/trinity/share/man/man1/gentdmconf.1
+debian/tmp/opt/trinity/share/man/man1/krootimage.1
+debian/tmp/opt/trinity/share/man/man1/tdm.1
+debian/tmp/opt/trinity/share/man/man1/tdm_config.1
+debian/tmp/opt/trinity/share/man/man1/tdm_greet.1
+debian/tmp/opt/trinity/share/man/man1/tdmctl.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.manpages b/ubuntu/_base/core/tdebase/debian/tdm-trinity.manpages
deleted file mode 100644
index 690a0f462..000000000
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.manpages
+++ /dev/null
@@ -1,6 +0,0 @@
-debian/man/gentdmconf-trinity.1
-debian/man/tdm-trinity.1
-debian/man/tdm_config-trinity.1
-debian/man/tdmctl-trinity.1
-debian/man/tdm_greet-trinity.1
-debian/man/krootimage-trinity.1
diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.templates b/ubuntu/_base/core/tdebase/debian/tdm-trinity.templates
index ac4f2df43..9c54e0e9d 100644
--- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.templates
+++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.templates
@@ -23,8 +23,8 @@ Description: internal use only
 Template: tdm-trinity/stop_running_server_with_children
 Type: boolean
 Default: false
-_Description: Stop the tdm-trinity daemon?
- The Trinity Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade
+_Description: Stop the tdm daemon?
+ The Trinity Desktop manager (tdm) daemon is typically stopped on package upgrade
  and removal, but it appears to be managing at least one running X session.
  .
  If tdm is stopped now, any X sessions it manages will be terminated.
diff --git a/ubuntu/_base/core/tdebindings/debian/control b/ubuntu/_base/core/tdebindings/debian/control
index c9e10a0f1..70f0637f3 100644
--- a/ubuntu/_base/core/tdebindings/debian/control
+++ b/ubuntu/_base/core/tdebindings/debian/control
@@ -1,7 +1,7 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
  python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
- default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc],
+ default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
  tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
diff --git a/ubuntu/_base/core/tdebindings/debian/juic-trinity.install b/ubuntu/_base/core/tdebindings/debian/juic-trinity.install
index b29210f2c..685deb0bf 100644
--- a/ubuntu/_base/core/tdebindings/debian/juic-trinity.install
+++ b/ubuntu/_base/core/tdebindings/debian/juic-trinity.install
@@ -4,3 +4,4 @@ qtjava/designer/juic/common/*.xsl	/opt/trinity/share/juic/common
 qtjava/designer/juic/java/*.xml	/opt/trinity/share/juic/java
 qtjava/designer/juic/java/*.xsl	/opt/trinity/share/juic/java
 qtjava/designer/juic/juic.xsl	/opt/trinity/share/juic
+debian/tmp/opt/trinity/share/man/man1/juic.1
diff --git a/ubuntu/_base/core/tdebindings/debian/juic-trinity.manpages b/ubuntu/_base/core/tdebindings/debian/juic-trinity.manpages
deleted file mode 100644
index 3b2609197..000000000
--- a/ubuntu/_base/core/tdebindings/debian/juic-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/juic.1
diff --git a/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install b/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install
index c1fa59ac4..9196450ca 100644
--- a/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install
+++ b/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.install
@@ -1 +1,2 @@
 debian/tmp/opt/trinity/bin/dcopidl2java
+debian/tmp/opt/trinity/share/man/man1/dcopidl2java.1
diff --git a/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages b/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages
deleted file mode 100644
index 74e63033b..000000000
--- a/ubuntu/_base/core/tdebindings/debian/libdcop3-java-trinity-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/local/dcopidl2java.1
diff --git a/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install b/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install
index 33de286bb..4caa2d2ab 100644
--- a/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install
+++ b/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.install
@@ -9,4 +9,8 @@ debian/tmp/opt/trinity/lib/ruby/*/TDE/korundum.rb
 debian/tmp/opt/trinity/lib/*/*/*/korundum.so*
 debian/tmp/opt/trinity/lib/*/*/*/korundum.la
 
+debian/tmp/opt/trinity/share/man/man1/krubyinit.1
+debian/tmp/opt/trinity/share/man/man1/rbtdesh.1
+debian/tmp/opt/trinity/share/man/man1/rbtdeapi.1
+
 korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby
diff --git a/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages
deleted file mode 100644
index ab2f0ee35..000000000
--- a/ubuntu/_base/core/tdebindings/debian/libkorundum0-ruby-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/local/krubyinit.1
-debian/local/rbtdesh.1
-debian/local/rbtdeapi.1
diff --git a/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.install b/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.install
index a18befa22..e778c96c1 100644
--- a/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.install
+++ b/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.install
@@ -12,4 +12,9 @@ debian/tmp/opt/trinity/lib/*/*/*/qtruby.la
 debian/tmp/opt/trinity/lib/*/*/*/tqui.so*
 debian/tmp/opt/trinity/lib/*/*/*/tqui.la
 
+debian/tmp/opt/trinity/share/man/man1/qtrubyinit.1
+debian/tmp/opt/trinity/share/man/man1/rbqtsh.1
+debian/tmp/opt/trinity/share/man/man1/rbqtapi.1
+debian/tmp/opt/trinity/share/man/man1/rbuic.1
+
 qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby
diff --git a/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.manpages b/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.manpages
deleted file mode 100644
index f2dc6de31..000000000
--- a/ubuntu/_base/core/tdebindings/debian/libqt0-ruby-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/local/qtrubyinit.1
-debian/local/rbqtsh.1
-debian/local/rbqtapi.1
-debian/local/rbuic.1
diff --git a/ubuntu/_base/core/tdebindings/debian/local/dcopidl2java.1 b/ubuntu/_base/core/tdebindings/debian/local/dcopidl2java.1
deleted file mode 100644
index 926d78391..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/dcopidl2java.1
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH LIBDCOP-JAVA 1 "July 31, 2002"
-.SH NAME
-dcopidl2java \- Convert a DCOP IDL file to Java language stubs
-.SH SYNOPSIS
-.B dcopidl2java
-.RI " [ " --no-skel " ]  [ " --no-stub " ]  [ " --package " " java-package " ] " file
-.SH DESCRIPTION
-This manual page documents briefly the
-.B dcopidl2java
-command.
-.PP
-\fBdcopidl2java\fP is a program that generates Java stubs from a DCOP IDL file,
-for use with the libdcop-java Java DCOP bindings.
-
-.SH OPTIONS
-A summary of options is included below.
-.TP
-.B --no-skel
-Do not generate skeleton code.
-.TP
-.B --no-stub
-Do not generate stub implementation code.
-.TP
-.B --package java-package 
-Set the name of the Java package to use in the generated code.
-.SH AUTHOR
-This manual page was written by Peter Hawkins <peterh@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdebindings/debian/local/juic.1 b/ubuntu/_base/core/tdebindings/debian/local/juic.1
deleted file mode 100644
index 9120f44d3..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/juic.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH JUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Java UI Compiler Manual"
-.SH NAME
-juic \- The Qt Java UI Compiler
-.SH SYNOPSIS
-.B juic
-[options] uifile
-.SH DESCRIPTION
-Juic is the Qt Java UI Compiler.  It generates Java\*(tm code from a
-XML UI Description file.  This XML UI Description file can be
-generated by Qt Designer, Qt's graphical UI designer.  Juic is the
-Java\*(tm equivalent for the C++ uic program.
-
-Juic generates Java code for the Qt UI Description File passed to it,
-and outputs it on standard output.
-.SH OPTIONS
-.TP
-.B \-proc   <xsltproc|xalan|saxon>
-Tells juic which xslt processor to use internally.  Possible values
-are "xsltproc", "xalan", "saxon".  The processor you specify must be
-available in the PATH or juic will give an error.  The default is to
-use xsltproc if it's available, and use saxon otherwise.
-.TP
-.B \-package   <the.package.for.the.class>
-Tells juic to add the given package declaration to the generated java
-class.
-.TP
-.B \-abstract   <true|false>
-Tells juic whether or not to define slots as abstract.
-.TP
-.B \-images   <dir>
-Tells juic where to find the images used in the given ui file.
-Default is "images".
-.TP
-.B \-os   <unix|msdos|mac>
-Tells juic what newline style to use in the generated java file.  Possible values are "unix", "msdos" and "mac", for UNIX, DOS and MacOS style newlines respectively.
-.SH AUTHOR
-Marco Ladermann
-.SH SEE ALSO
-uic(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/krubyinit.1 b/ubuntu/_base/core/tdebindings/debian/local/krubyinit.1
deleted file mode 100644
index f8a405452..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/krubyinit.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH KRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "KRubyInit Manual"
-.SH NAME
-krubyinit \- Start Korundum Ruby Scripts Faster
-.SH SYNOPSYS
-.B krubyinit
-[switches] [--] [programfile] [arguments]
-.SH DESCRIPTION
-Krubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the Korundum library ( the Ruby TDE bindings ).  It uses
-the tdeinit system to start the app so that they start a little bit
-faster when started in a running TDE session.
-
-The script takes exactly the same options as the ruby(1) program.
-Therefore, its options aren't documented here, please refer to the
-ruby(1) manpage.
-
-This script is part of Korundum, which is part of the TDE Bindings
-module.
-.SH OPTIONS
-Krubyinit takes exactly the same options as the ruby(1) program and
-they have exactly the same meaning.  Please refer to its manpage.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-ruby(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/qtrubyinit.1 b/ubuntu/_base/core/tdebindings/debian/local/qtrubyinit.1
deleted file mode 100644
index 1ab6e7f28..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/qtrubyinit.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH QTRUBYINIT 1 "Aug 2004" "Trinity Desktop Environment" "QtRubyInit Manual"
-.SH NAME
-qtrubyinit \- Start Qt Ruby Scripts Faster
-.SH SYNOPSYS
-.B qtrubyinit
-[switches] [--] [programfile] [arguments]
-.SH DESCRIPTION
-Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby
-scripts using the QtRuby library.  It uses the tdeinit system to start
-the app so that they start a little bit faster when started in a
-running TDE session.
-
-The script takes exactly the same options as the ruby(1) program.
-Therefore, its options aren't documented here, please refer to the
-ruby(1) manpage.
-
-This script is part of QtRuby, which is part of the TDE Bindings
-module.
-.SH OPTIONS
-Qtrubyinit takes exactly the same options as the ruby(1) program and
-they have exactly the same meaning.  Please refer to its manpage.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-ruby(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbqtapi.1 b/ubuntu/_base/core/tdebindings/debian/local/rbqtapi.1
deleted file mode 100644
index 7cafb5b8c..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbqtapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBQTAPI 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
-.SH NAME
-rbqtapi \- A QtRuby Introspection Tool
-.SH SYNOPSIS
-.B rbqtapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbqtapi is a QtRuby Introspection Tool, similar to javap(1).  Use it
-to find a list of method for a certain QtRuby class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbtdeapi(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbqtsh.1 b/ubuntu/_base/core/tdebindings/debian/local/rbqtsh.1
deleted file mode 100644
index bda49d962..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbqtsh.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH RBQTSH 1 "Aug 2004" "Trinity Desktop Environment" "Qt Ruby Bindings Manual"
-.SH NAME
-rbqtsh \- An Interactive QtRuby Shell
-.SH SYNOPSIS
-.B rbqtsh
-[options]
-.SH DESCRIPTION
-Rbqtsh is an interactive QtRuby shell.  It shows a GUI dialog box
-where you can enter Ruby code using the QtRuby library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbtdesh(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbtdeapi.1 b/ubuntu/_base/core/tdebindings/debian/local/rbtdeapi.1
deleted file mode 100644
index e3d166225..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbtdeapi.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH RBTDEAPI 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
-.SH NAME
-rbtdeapi \- A Korundum TDE Ruby Introspection Tool
-.SH SYNOPSIS
-.B rbtdeapi
-[options] [<class>]
-.SH DESCRIPTION
-Rbtdeapi is a Korundum TDE Ruby Introspection Tool, similar to
-javap(1).  Use it to find a list of method for a certain Korundum class.
-.SH OPTIONS
-.TP 
-.B \-r <re>
-Find all functions matching regular expression/keyword <re>
-.TP
-.B \-i
-Perform a case insensitive search ( only meaningful in combination with -r )
-.TP
-.B \-p
-Display also inherited methods.
-.TP
-.B \-v
-Print QtRuby and Qt versions.
-.TP
-.B \-h
-Print a help message.
-.SH AUTHOR
-Alexander Kellett
-.SH SEE ALSO
-rbqtapi(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbtdesh.1 b/ubuntu/_base/core/tdebindings/debian/local/rbtdesh.1
deleted file mode 100644
index 6e792e7fa..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbtdesh.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH RBTDESH 1 "Aug 2004" "Trinity Desktop Environment" "Korundum TDE Ruby Bindings Manual"
-.SH NAME
-rbtdesh \- An Interactive Korundum Shell
-.SH SYNOPSIS
-.B rbtdesh
-[options]
-.SH DESCRIPTION
-Rbtdesh is an interactive Korundum shell.  It shows a GUI dialog box
-where you can enter Ruby code using the Korundum TDE Ruby bindings
-library.
-.SH OPTIONS
-This program takes no options.
-.SH AUTHOR
-Germain Garand
-Alexander Kellett
-.SH SEE ALSO
-rbqtsh(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/local/rbuic.1 b/ubuntu/_base/core/tdebindings/debian/local/rbuic.1
deleted file mode 100644
index d59caa1ac..000000000
--- a/ubuntu/_base/core/tdebindings/debian/local/rbuic.1
+++ /dev/null
@@ -1,64 +0,0 @@
-.TH RBUIC 1 "Apr 2004" "Trinity Desktop Environment" "Qt Ruby UI Compiler Manual"
-.SH NAME
-rbuic \- The Qt Ruby UI Compiler
-.SH SYNOPSIS
-Generate implementation:
-.B rbuic
-[options] uifile
-.LP
-Generate subclass implementation:
-.B rbuic
-[options] -subimpl <classname> <uifile>
-.LP
-Generate image collection:
-.B rbuic
-[options] -embed <project> <image1> <image2> <image3> ...
-.SH DESCRIPTION
-Rbuic is the Qt Ruby UI Compiler.  It generates Ruby code from a XML
-UI Description file.  This XML UI Description file can be generated by
-Qt Designer, Qt's graphical UI designer.  Rbuic is the Ruby equivalent
-for the C++ uic program.
-
-When invoked to generate an implementation, rbuic generates Ruby code
-for the Qt UI Description File passed to it, and outputs it on
-standard output.
-
-When invoked to generate a subclass implementation, rbuic generates
-template Ruby code for a subclass of the widget in the Qt UI
-Description File passed to it, and outputs it on standard output.
-
-When invoked to generate an image collection, rbuic generates Ruby
-code containing the image data in strings.  This is useful to avoid
-having to distribute image files along with your application.  It is
-arguably more useful for C++ ( where the image strings can be compiled
-into an executable ), but still, it is available for Ruby as well.
-.SH OPTIONS
-.TP
-.B \-o <file>
-Write output to file rather than stdout.
-.TP
-.B \-p <indent>
-Set the indent in spaces (0 to use a tab)
-.TP
-.B \-nofwd
-Omit imports of custom widgets
-.TP
-.B \-kde
-Use TDE widgets, require 'Korundum' extension
-.TP
-.B \-tr <func>
-Use func(...) rather than trUtf8(...) for i18n
-.TP
-.B \-x
-Generate extra code to test the class
-.TP
-.B \-version
-Print the Rbuic and Qt versions
-.TP
-.B \-help
-Display some help information.
-.SH AUTHOR
-Germain Garand
-Phil Thompson
-.SH SEE ALSO
-uic(1)
diff --git a/ubuntu/_base/core/tdebindings/debian/rules b/ubuntu/_base/core/tdebindings/debian/rules
index fce67d163..63b19e54f 100755
--- a/ubuntu/_base/core/tdebindings/debian/rules
+++ b/ubuntu/_base/core/tdebindings/debian/rules
@@ -110,18 +110,7 @@ common-install-arch:: stamp-install-dcopjava
 ###
 
 binary-install/juic-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 	sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/opt/trinity|" debian/$(cdbs_curpkg)/opt/trinity/bin/juic
-
-binary-install/libdcop3-java-trinity-dev::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-binary-install/libkorundum0-ruby-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-binary-install/libqt0-ruby-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
 binary-install/python-dcop-trinity::
 	${DH_PYTHON2} -p$(cdbs_curpkg)
 
diff --git a/ubuntu/_base/core/tdegraphics/debian/control b/ubuntu/_base/core/tdegraphics/debian/control
index e1a7e944e..bb1c7c752 100644
--- a/ubuntu/_base/core/tdegraphics/debian/control
+++ b/ubuntu/_base/core/tdegraphics/debian/control
@@ -75,7 +75,7 @@ Package: tdegraphics-trinity-dev
 Section: devel
 Architecture: any
 Replaces: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~)
-Breaks: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~)
+Breaks: kdegraphics-kde3-dev (<< 4:14.0.0~), kdegraphics-trinity-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.12~)
 Depends: kghostview-trinity (= ${binary:Version}), kmrml-trinity (= ${binary:Version}), kpovmodeler-trinity (= ${binary:Version}), ksvg-trinity (= ${binary:Version}), kview-trinity (= ${binary:Version}), kviewshell-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the TDE graphics module
  This package contains headers and other development files for the TDE
@@ -375,8 +375,8 @@ Description: generic framework for viewer applications in Trinity
 Package: libkscan-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~)
-Breaks: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~)
+Replaces: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
+Breaks: libkscan-kde3-dev (<< 4:14.0.0~), libkscan-trinity-dev (<< 4:14.0.0~), tdegraphics-trinity-dev (<< 4:14.0.12~)
 Depends: libkscan1-trinity (= ${binary:Version}), tdelibs14-trinity-dev
 Description: development files for the Trinity scanner library
  This package contains development files for Trinity's scanner library.
diff --git a/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.install
index c760fe7d7..b66fea000 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.install
@@ -10,6 +10,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcolorchooser.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcoloredit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kcolorchooser.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcoloredit.png
+debian/tmp/opt/trinity/share/man/man1/kcolorchooser.1
+debian/tmp/opt/trinity/share/man/man1/kcoloredit.1
 
 debian/icons/kcolorchooser.xpm		/opt/trinity/share/pixmaps
 debian/icons/kcolorchooser-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.manpages
deleted file mode 100644
index e4673b667..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kcoloredit-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kcolorchooser.1
-debian/man/kcoloredit.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.install
index 0eeb3b15f..994691b8f 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.install
@@ -22,6 +22,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdvi.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdvi.svgz
+debian/tmp/opt/trinity/share/man/man1/kdvi.1
 debian/tmp/opt/trinity/share/services/kdvimultipage.desktop
 
 debian/icons/kdvi.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.manpages
deleted file mode 100644
index 6cab6e597..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kdvi-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdvi.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.install
index c38b88569..f49130c67 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.install
@@ -8,6 +8,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kfax.svgz
+debian/tmp/opt/trinity/share/man/man1/kfax.1
 
 debian/icons/kfax.xpm		/opt/trinity/share/pixmaps
 debian/icons/kfax-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.manpages
deleted file mode 100644
index 57b6c7961..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kfax-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfax.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.install
index 90e21b08c..b8967972c 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfaxview.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kfaxview.svgz
+debian/tmp/opt/trinity/share/man/man1/kfaxview.1
 debian/tmp/opt/trinity/share/services/kfaxmultipage.desktop
 debian/tmp/opt/trinity/share/services/kfaxmultipage_tiff.desktop
 
diff --git a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.manpages
deleted file mode 100644
index a30d1c56a..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfaxview.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.install
index add2d1e01..01ee36fbf 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.install
@@ -19,6 +19,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kghostview.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kghostview.png
+debian/tmp/opt/trinity/share/man/man1/kghostview.1
 debian/tmp/opt/trinity/share/services/kghostview_part.desktop
 
 debian/icons/kghostview.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.manpages
deleted file mode 100644
index 8cfcbdec7..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kghostview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kghostview.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.install
index 0f1bc5dcc..da3a7592c 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.install
@@ -167,6 +167,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kolourpaint.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kolourpaint.svgz
+debian/tmp/opt/trinity/share/man/man1/kolourpaint.1
 
 debian/icons/kolourpaint.xpm		/opt/trinity/share/pixmaps
 debian/icons/kolourpaint-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.manpages
deleted file mode 100644
index a10ddf05a..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kolourpaint-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kolourpaint.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.install
index 5330dc6ab..d25642f7a 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.install
@@ -27,6 +27,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/shortcut1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kooka/toolbar2.png
+debian/tmp/opt/trinity/share/man/man1/kooka.1
 
 debian/icons/kooka.xpm		/opt/trinity/share/pixmaps
 debian/icons/kooka-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.manpages
deleted file mode 100644
index 319f8652c..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kooka-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kooka.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.install
index 640ebdb6e..189e43274 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.install
@@ -16,6 +16,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kpdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kpdf.svgz
+debian/tmp/opt/trinity/share/man/man1/kpdf.1
 debian/tmp/opt/trinity/share/services/kpdf_part.desktop
 
 debian/icons/kpdf.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.manpages
deleted file mode 100644
index 36f3caafb..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kpdf-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpdf.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.install
index 4cbc774ae..28ebee7e7 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.install
@@ -421,6 +421,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kpovmodeler.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+debian/tmp/opt/trinity/share/man/man1/kpovmodeler.1
 
 debian/icons/kpovmodeler.xpm		/opt/trinity/share/pixmaps
 debian/icons/kpovmodeler-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.manpages
deleted file mode 100644
index 11c1a16f8..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kpovmodeler-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpovmodeler.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.install
index 87fa208d5..a2aa52cd8 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.install
@@ -14,6 +14,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kruler.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kruler.png
+debian/tmp/opt/trinity/share/man/man1/kruler.1
 
 debian/icons/kruler.xpm		/opt/trinity/share/pixmaps
 debian/icons/kruler-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.manpages
deleted file mode 100644
index aac20ba29..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kruler-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kruler.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.install b/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.install
index 9725e1d31..ac4bb7295 100644
--- a/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/ksnapshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/ksnapshot.svgz
+debian/tmp/opt/trinity/share/man/man1/ksnapshot.1
 
 debian/icons/ksnapshot.xpm		/opt/trinity/share/pixmaps
 debian/icons/ksnapshot-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.manpages
deleted file mode 100644
index efb781eba..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/ksnapshot-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ksnapshot.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.install
index d8f2d8f7e..c880ff0a4 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.install
@@ -20,6 +20,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kuickshow/screenshot.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kuickshow.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuickshow.png
+debian/tmp/opt/trinity/share/man/man1/kuickshow.1
 
 debian/icons/kuickshow.xpm		/opt/trinity/share/pixmaps
 debian/icons/kuickshow-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.manpages
deleted file mode 100644
index 3eadda903..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kuickshow.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kview-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kview-trinity.install
index ea22868e9..9c85b5c7d 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kview-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kview-trinity.install
@@ -52,6 +52,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kview.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kview.png
+debian/tmp/opt/trinity/share/man/man1/kview.1
 debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewcanvasconfig.desktop
 debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewgeneralconfig.desktop
 debian/tmp/opt/trinity/share/services/tdeconfiguredialog/kviewpluginsconfig.desktop
diff --git a/ubuntu/_base/core/tdegraphics/debian/kview-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kview-trinity.manpages
deleted file mode 100644
index bad8bf322..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kview-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kview.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.install b/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.install
index 78a5947e3..a36f0377a 100644
--- a/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.install
@@ -23,6 +23,7 @@ debian/tmp/opt/trinity/share/config.kcfg/kviewshell.kcfg
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kviewshell.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kviewshell.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kviewshell.png
+debian/tmp/opt/trinity/share/man/man1/kviewshell.1
 debian/tmp/opt/trinity/share/services/emptymultipage.desktop
 debian/tmp/opt/trinity/share/services/djvumultipage.desktop
 debian/tmp/opt/trinity/share/servicetypes/tdemultipage.desktop
diff --git a/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.manpages
deleted file mode 100644
index 89af3c5f2..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/kviewshell-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kviewshell.1
diff --git a/ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install b/ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
deleted file mode 100644
index 29764eb5d..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/libkscan-dev-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/lib/libkscan.so
diff --git a/ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install b/ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
new file mode 100644
index 000000000..2aff7e3a2
--- /dev/null
+++ b/ubuntu/_base/core/tdegraphics/debian/libkscan-trinity-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity/lib/libkscan.so
+debian/tmp/opt/trinity/share/cmake/libkscan.cmake
diff --git a/ubuntu/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install b/ubuntu/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install
index f737043af..5080bc09f 100644
--- a/ubuntu/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install
+++ b/ubuntu/_base/core/tdegraphics/debian/libpoppler-tqt-dev.install
@@ -2,3 +2,4 @@ debian/tmp/opt/trinity/include/poppler-link-qt3.h
 debian/tmp/opt/trinity/include/poppler-page-transition.h
 debian/tmp/opt/trinity/include/poppler-qt.h
 debian/tmp/opt/trinity/lib/pkgconfig/poppler-tqt.pc
+debian/tmp/opt/trinity/share/cmake/libpoppler-tqt.cmake
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kcolorchooser.1 b/ubuntu/_base/core/tdegraphics/debian/man/kcolorchooser.1
deleted file mode 100644
index d0fd9cfbb..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kcolorchooser.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KCOLORCHOOSER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kcolorchooser \- TDE Color Chooser
-.SH SYNOPSIS
-.B kcolorchooser
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kcolorchooser
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-TDE Color Chooser
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH AUTHOR
-KColorChooser was written by
-.nh
-Waldo Bastian <bastian@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kcoloredit.1 b/ubuntu/_base/core/tdegraphics/debian/man/kcoloredit.1
deleted file mode 100644
index 3318864e0..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kcoloredit.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.TH KCOLOREDIT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kcoloredit \- TDE Color Palette Editor
-.SH SYNOPSIS
-.B kcoloredit
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kcoloredit
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B KColorEdit
-is a palette files editor. It can be used for editing color palettes and for color choosing and naming.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-File
-file to open
-.SH "SEE ALSO"
-The full documentation for
-.B kcoloredit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kcoloredit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KColorEdit was written by
-.nh
-Artur Rataj <art@zeus.polsl.gliwice.pl>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kdvi.1 b/ubuntu/_base/core/tdegraphics/debian/man/kdvi.1
deleted file mode 100644
index f1df971ad..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kdvi.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH KDVI "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kdvi \- TDE DVI Viewer
-.SH SYNOPSIS
-.B kviewshell
-[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kdvi
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KDVI
-is a plugin for the KViewshell program which allows KViewshell to
-display DVI-files (.dvi) which are produced by the TeX typesetting
-system. KDVI supports many extensions of the DVI standard, for
-instance the inclusion of PostScript graphics or hyperlinks. More
-details, examples and all the technical specifications can be found in
-the file KDVI-features.dvi (or see KDVI-features.tex for the TeX
-source of that file). 
-.P
-For up-to-date information, consult KDVI's home page. 
-.P
-TeX is a high-end typesetting system geared towards scientific, and in
-particular mathematical typesetting. More information about TeX and
-DVI can be found on the homepage of the TeX user group or the German
-German DANTE e.V..  
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-part
-The part to use
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
-.TP
-\fB\-\-paper\fR
-Sets paper size (not implemented at the moment, only for compatibility with lyx)
-.TP
-file(s)
-Files to load
-.SH "SEE ALSO"
-The full documentation for
-.B kdvi
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kdvi
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KViewShell was written by
-.nh
-Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe,
-Markku Hihnala,
-David Faure,
-Daniel Duley,
-Espen Sand and
-Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kfax.1 b/ubuntu/_base/core/tdegraphics/debian/man/kfax.1
deleted file mode 100644
index ac7583ccf..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kfax.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.TH KFAX "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kfax \- TDE Fax Viewer
-.SH SYNOPSIS
-.B kfax
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kfax
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-A program to display raw and tiffed fax images (g3, g3-2d, g4).
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-f\fR, \fB\-\-fine\fR
-Fine resolution
-.TP
-\fB\-n\fR, \fB\-\-normal\fR
-Normal resolution
-.TP
-\fB\-\-height\fR
-Height (number of fax lines)
-.TP
-\fB\-w\fR, \fB\-\-width\fR
-Width (dots per fax line)
-.TP
-\fB\-l\fR, \fB\-\-landscape\fR
-Turn image 90 degrees (landscape mode)
-.TP
-\fB\-u\fR, \fB\-\-upsidedown\fR
-Turn image upside down
-.TP
-\fB\-i\fR, \fB\-\-invert\fR
-Invert black and white.
-.TP
-\fB\-m\fR, \fB\-\-mem\fR <bytes>
-Limit memory use to 'bytes'. [8M]
-.TP
-\fB\-r\fR, \fB\-\-reverse\fR
-Fax data is packed lsb first
-.TP
-\fB\-2\fR
-Raw files are g3-2d
-.TP
-\fB\-4\fR
-Raw files are g4
-.SS "Arguments:"
-.TP
-file(s)
-Fax file(s) to show
-.SH "SEE ALSO"
-The full documentation for
-.B kfax
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kfax
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KFax was written by
-.nh
-Bernd Johannes Wuebben <wuebben@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kfaxview.1 b/ubuntu/_base/core/tdegraphics/debian/man/kfaxview.1
deleted file mode 100644
index 592c64c09..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kfaxview.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.TH KFAXVIEWER "1" "October 2007" TDE "TDE Application"
-.SH NAME
-kfaxviewer \- TDE fax viewer using kviewshell
-.SH SYNOPSIS
-.B kfaxview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
-.SH DESCRIPTION
-This manual page briefly documents the
-.B kfaxview
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program doesn't have a manual page.
-.PP
-A fax viewer for TDE using kviewshell.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another KFaxView instance.
-If it is, bring up the other KFaxView. Otherwise, load the file.
-.TP
-\fB\-g\fR, \fB\-\-goto\fR <pagenumber>
-Navigate to this page
-.TP
-.SS "Arguments:"
-.TP
-file(s)
-Files to load
-.SH AUTHOR
-KFaxview was written by
-.nh
-Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Francesco Pedrini<francesco.pedrini@gmail.com>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kghostview.1 b/ubuntu/_base/core/tdegraphics/debian/man/kghostview.1
deleted file mode 100644
index be63ba0f3..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kghostview.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH KGHOSTVIEW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kghostview \- TDE PS/PDF Viewer
-.SH SYNOPSIS
-.B kghostview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KGhostView
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B  KGhostView
-displays and prints PostScript (.ps, .eps) and Portable
-Document Format (.pdf) files. It a port to TDE of Tim Theisen's
-Ghostview program which uses Alladin Ghostscript to view documents
-prepared in Adobe's PostScript page description
-language. PostScript is the major page description language for
-printing on UNIX(rg systems and this application can be used to preview
-material intended for printing or for reading documents online.  
-.P
-You can use KGhostView with all recent versions of Ghostscript. Newer
-versions offer much improved performance which you can take advantage
-of with KGhostView.  
-.P
-If a document does not conform to the Adobe document structuring
-convention the functionality of the viewer is limited. For example, if
-there is no table of contents, skipping around the document and
-marking pages is not possible. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-URL
-Location to open
-.SH "SEE ALSO"
-The full documentation for
-.B KGhostView
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kghostview
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KGhostView was written by
-.nh
-Wilco Greven <greven@kde.org>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe <donohoe@kde.org>,
-David Faure <faure@kde.org>,
-Daniel Duley <mosfet@kde.org> and
-Espen Sand <espen@kde.org>
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kolourpaint.1 b/ubuntu/_base/core/tdegraphics/debian/man/kolourpaint.1
deleted file mode 100644
index 42a126a85..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kolourpaint.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH KPAINT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kolourpaint \- TDE Paint Program
-.SH SYNOPSIS
-.B kolourpaint
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KPaint
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KPaint
-is a simple bitmap drawing program that can also be used to modify
-existing image files and convert between image file formats. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file
-File or URL to open
-.SH "SEE ALSO"
-The full documentation for
-.B KPaint
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kolourpaint
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KPaint was written by
-.nh
-Richard J. Moore <rich@kde.org>,
-Robert Williams <rwilliams@jrcmaui.com>,
-Mario Weilguni <mweilguni@kde.org>,
-Christian Oppel <uzs84g@uni-bonn.de>,
-John Califf <jcaliff@compuzone.net> and
-Laurent Montel <lmontel@mandrakesoft.com>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kooka.1 b/ubuntu/_base/core/tdegraphics/debian/man/kooka.1
deleted file mode 100644
index a8f34e419..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kooka.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH KOOKA "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kooka \- TDE Scan & OCR Program
-.SH SYNOPSIS
-.B kooka
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kooka
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kooka
-is a TDE application which provides access to scanner
-hardware using the SANE library.
-.P
-Kooka helps you scan, save your
-image in the correct image format and perform \fBO\fRptical
-\fBC\fRharacter \fBR\fRecognition on it,using \fIgocr\fR, Joerg
-Schulenburg's and friends' Open Source ocr program.
-.P
-Kooka is a TDE application that enables easy scanning using SANE
-libraries. Therefore, SANE the package must be installed to use
-Kooka. Clear and concise use was the focus of its development. 
-.P
-Character recognition is also provided by the built-in text
-recognition program gocr. Install gocr to use this
-functionality. After character recognition is complete, the recognized
-material can be opened in the text editor Kate with just one click,
-where you can edit the contents. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-d\fR
-the SANE compatible device specification (e.g. umax:/dev/sg0) []
-.TP
-\fB\-g\fR
-gallery mode - do not connect to scanner []
-.SH "SEE ALSO"
-The full documentation for
-.B Kooka
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kooka
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-Kooka was written by
-.nh
-Klaas Freitag <freitag@suse.de> and
-Mat Colton <mat@colton.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kpdf.1 b/ubuntu/_base/core/tdegraphics/debian/man/kpdf.1
deleted file mode 100644
index fc0c59534..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kpdf.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KPDF 1 "June 2006" "Trinity Desktop Environment" "pdf viewer"
-.SH NAME
-kpdf
-\- a TDE pdf viewer based on xpdf
-.SH SYNOPSIS
-\fBkpdf\fP [Qt\-options] [TDE\-options] [URL]
-.SH DESCRIPTION
-\fBkpdf\fP is a TDE PDF viewer based on \fBxpdf\fP code. Although being based on \fBxpdf\fP code, \fBkpdf\fP has some unique features like continuous mode and presentation support.
-.sp 1
-The PDF format is widely used for publishing documents that are mostly not meant to be edited again. \fBkpdf\fP is only a viewer for these files and therefore it doesn't provide any functionality to edit or create PDF documents.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Document to open
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-\fBxpdf\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kpdf/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kpdf/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Wilco Greven <greven@kde.org>
-.br
-Christophe Devriese <oelewapperke@oelewapperke.org>
-.br
-Laurent Montel <montel@kde.org>
-.br
-Albert Astals Cid <astals11@terra.es>
-.br
-Enrico Ros <eros.kde@email.it>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kpovmodeler.1 b/ubuntu/_base/core/tdegraphics/debian/man/kpovmodeler.1
deleted file mode 100644
index 3d536d26e..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kpovmodeler.1
+++ /dev/null
@@ -1,82 +0,0 @@
-.TH KPOVMODELER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kpovmodeler \- TDE Povray Modeler
-.SH SYNOPSIS
-.B kpovmodeler
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Povray Modeler
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KPovModeler
-is a 3D modeling application to generate POV-Ray scenes.
-.P
-While it is not necessary to fully understand the POV-Ray application
-in order to make good use of KPovModeler, it is highly recommended
-that you read and try to understand the POV-Ray documentation. 
-.P
-To find out more about POV-Ray go to www.povray.org.
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file
-File to open
-.SH OPTIONS
-.TP
-\fB\-\-no\-opengl\fR
-Disables OpenGL rendering
-.SH "SEE ALSO"
-The full documentation for
-.B Povray Modeler
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kpovmodeler
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KPovModeler was written by
-.nh
-Andreas Zehender <zehender@kde.org>,
-Luis Passos Carvalho <lpassos@mail.telepac.pt>,
-Philippe Van Hecke <lephiloux@tiscalinet.be> and
-.hy
-Leonardo Skorianez <skorianez@bol.com.br>.
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kruler.1 b/ubuntu/_base/core/tdegraphics/debian/man/kruler.1
deleted file mode 100644
index 9e32021cd..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kruler.1
+++ /dev/null
@@ -1,81 +0,0 @@
-.TH KRULER "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kruler \- TDE Screen Ruler
-.SH SYNOPSIS
-.B kruler
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KRuler
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B KRuler
-is a very simple application, with only one aim in life. To
-measure distances on your screen. 
-.P
-To start KRuler, choose Graphics->TDE Screen Ruler from your T menu.
-.P
-left mouse button clicking on the KRuler will turn the cursor into a
-hand icon, and enable you to drag KRuler around the screen. 
-.P
-When you move the mouse over KRuler, your cursor will turn into an
-elongated arrow, with a circle at one end. As you move the cursor,
-KRuler will display how far from the point marked 0 the circle on the
-end of the cursor currently is. KRuler will also display the HTML
-color code of the color currently under the circle. This is very
-useful for picking out colors from an image. If you move the mouse far
-enough that the arrow cursor is no longer touching KRuler, the cursor
-will revert to normal, allowing you to carry on working with your
-other applications. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH "SEE ALSO"
-The full documentation for
-.B KRuler
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kruler
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDE Screen Ruler was written by
-.nh
-Till Krech <till@snafu.de>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/ksnapshot.1 b/ubuntu/_base/core/tdegraphics/debian/man/ksnapshot.1
deleted file mode 100644
index 250ca0ef6..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/ksnapshot.1
+++ /dev/null
@@ -1,71 +0,0 @@
-.TH KSNAPSHOT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-ksnapshot \- TDE Screen Capture Program
-.SH SYNOPSIS
-.B ksnapshot
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KSnapshot
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KSnapshot
-is a simple applet for taking screenshots. It is capable of
-capturing images of either the whole desktop or just a single
-window. The images can then be saved in a variety of formats. 
-.PP
-TDE Screenshot utility
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH "SEE ALSO"
-The full documentation for
-.B KSnapshot
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/ksnapshot
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KSnapshot was written by
-.nh
-Richard J. Moore <rich@kde.org>,
-Matthias Ettrich <ettrich@kde.org> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kuickshow.1 b/ubuntu/_base/core/tdegraphics/debian/man/kuickshow.1
deleted file mode 100644
index bf5caf30c..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kuickshow.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.TH KUICKSHOW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kuickshow \- TDE Image Viewer
-.SH SYNOPSIS
-.B kuickshow
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfiles\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kuickshow
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KuickShow
-is a comfortable image browser/viewer. It displays a
-filebrowser where you can select images which are then shown.
-.P
-The following image formats are supported:
-.P
-.RS 
-\(bu jpg
-.br
-\(bu gif
-.br
-\(bu tiff
-.br
-\(bu png
-.br
-\(bu bmp
-.br
-\(bu psd
-.br
-\(bu xmp
-.br
-\(bu xbm
-.br
-\(bu eim
-.RE
-.P
-Images can be displayed either in their own window, as large as the
-image, or fullscreen. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-lastdir\fR
-Start in the last visited directory, not the current working directory
-.SS "Arguments:"
-.TP
-files
-Optional image filenames/urls to show
-.SH "SEE ALSO"
-The full documentation for
-.B Kuickshow
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kuickshow
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KuickShow was written by
-.nh
-Carsten Pfeiffer <pfeiffer@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kview.1 b/ubuntu/_base/core/tdegraphics/debian/man/kview.1
deleted file mode 100644
index 64a2b6928..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kview.1
+++ /dev/null
@@ -1,78 +0,0 @@
-.TH KVIEW "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kview \- TDE Image Viewer
-.SH SYNOPSIS
-.B kview
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KView
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B KView
-is an image viewer for the Trinity desktop. You can view graphics of
-many different formats such as PostScript, TIFF etc. By saving your
-files in a different format than the original you can easily convert
-images to other graphics formats. In addition, KView provides some
-nice little features for doing simple image processing, like
-stretching/shrinking, rotation and filtering. You can tile your images
-directly onto the desktop as a background picture, or arrange them in
-a little slideshow. 
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-URL
-Image to open
-.SH "SEE ALSO"
-The full documentation for
-.B KView
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kview
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-KView was written by
-.nh
-Matthias Kretz <kretz@kde.org>,
-Sirtaj Singh Kang <taj@kde.org>
-and Simon Hausmann <hausmann@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/kviewshell.1 b/ubuntu/_base/core/tdegraphics/debian/man/kviewshell.1
deleted file mode 100644
index 83d0e24da..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/kviewshell.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.TH KVIEWSHELL "1" "September 2002" TDE "TDE Application"
-.SH NAME
-kviewshell \- Generic framework for viewer applications
-.SH SYNOPSIS
-.B kviewshell
-[\fIQt-options\fR] [\fITDE-options\fR] \fIpart file(s)\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kviewshell
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-Generic framework for viewer applications.
-.P
-This program is part of the official TDE graphics module.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-part
-The part to use
-.SH OPTIONS
-.TP
-\fB\-\-unique\fR
-Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
-.TP
-\fB\-\-paper\fR
-Sets paper size (not implemented at the moment, only for compatibility with lyx)
-.TP
-file(s)
-Files to load
-.SH AUTHOR
-KViewShell was written by
-.nh
-Matthias Hoelzer-Kluepfel <mhk@caldera.de>,
-David Sweet <dsweet@kde.org>,
-Mark Donohoe,
-Markku Hihnala,
-David Faure,
-Daniel Duley,
-Espen Sand,
-and Stefan Kebekus <kebekus@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/man/tdeiconedit.1 b/ubuntu/_base/core/tdegraphics/debian/man/tdeiconedit.1
deleted file mode 100644
index 70bcb510a..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/man/tdeiconedit.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH TDEICONEDIT "1" "September 2002" TDE "TDE Application"
-.SH NAME
-tdeiconedit \- TDE Icon Editor
-.SH SYNOPSIS
-.B tdeiconedit
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIfile(s)\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B TDEIconEdit
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B TDEIconEdit
-is designed to help create icons for TDE using the standard
-icon palette.  
-.PP
-TDE Icon Editor
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com> and
-Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SS "Arguments:"
-.TP
-file(s)
-Icon file(s) to open
-.SH "SEE ALSO"
-The full documentation for
-.B TDEIconEdit
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/tdeiconedit
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-TDEIconEdit was written by
-.nh
-Thomas Tanghus <tanghus@kde.org>,
-John Califf <jcaliff@compuzone.net>,
-Laurent Montel <lmontel@mandrakesoft.com>
-and Aaron J. Seigo <aseigo@olympusproject.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdegraphics/debian/rules b/ubuntu/_base/core/tdegraphics/debian/rules
index c25fd3f31..2fb30108c 100755
--- a/ubuntu/_base/core/tdegraphics/debian/rules
+++ b/ubuntu/_base/core/tdegraphics/debian/rules
@@ -26,9 +26,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DBUILD_ALL="ON" \
- -DWITH_TIFF="ON" \
- -DWITH_OPENEXR="ON" \
- -DWITH_PDF="ON"
+ -DWITH_ALL_OPTIONS="ON"
 
 DEB_DH_STRIP_ARGS  := --dbg-package=tdegraphics-trinity-dbg
 
@@ -46,65 +44,3 @@ binary-post-install/kuickshow-trinity::
 ifeq ($(DEB_HOST_ARCH), powerpc)
 	chrpath -d -k debian/kuickshow-trinity/opt/trinity/lib/libtdeinit_kuickshow.so
 endif
-
-#shlibs_ver = 4:3.5.0-1
-#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
-
-kuickshow-trinity-tar:
-	mkdir ../kuickshow-trinity-3.5.8
-	cp -f * ../kuickshow-trinity-3.5.8 || true
-	mkdir ../kuickshow-trinity-3.5.8/doc
-	cp doc/Makefile.am ../kuickshow-trinity-3.5.8/doc
-	cp -r doc/kuickshow ../kuickshow-trinity-3.5.8/doc
-	cp -r kuickshow ../kuickshow-trinity-3.5.8
-	cp -r admin ../kuickshow-trinity-3.5.8
-	cd ../kuickshow-trinity-3.5.8; make -f admin/Makefile.common dist
-	cd ..; tar zcf kuickshow-trinity_3.5.8.orig.tar.gz kuickshow-trinity-3.5.8
-
-binary-post-install/kpdf-trinity::
-	mv debian/kpdf-trinity/usr/share/man debian/kpdf-trinity/opt/trinity/share/
-
-binary-post-install/kghostview-trinity::
-	mv debian/kghostview-trinity/usr/share/man debian/kghostview-trinity/opt/trinity/share/
-
-binary-post-install/kcolorchooser-trinity::
-	mv debian/kcolorchooser-trinity/usr/share/man debian/kcolorchooser-trinity/opt/trinity/share/
-
-binary-post-install/kdvi-trinity::
-	mv debian/kdvi-trinity/usr/share/man debian/kdvi-trinity/opt/trinity/share/
-
-binary-post-install/kfaxview-trinity::
-	mv debian/kfaxview-trinity/usr/share/man debian/kfaxview-trinity/opt/trinity/share/
-
-binary-post-install/tdeiconedit-trinity::
-	mv debian/tdeiconedit-trinity/usr/share/man debian/tdeiconedit-trinity/opt/trinity/share/
-
-binary-post-install/kooka-trinity::
-	mv debian/kooka-trinity/usr/share/man debian/kooka-trinity/opt/trinity/share/
-
-binary-post-install/kpovmodeler-trinity::
-	mv debian/kpovmodeler-trinity/usr/share/man debian/kpovmodeler-trinity/opt/trinity/share/
-
-binary-post-install/ksnapshot-trinity::
-	mv debian/ksnapshot-trinity/usr/share/man debian/ksnapshot-trinity/opt/trinity/share/
-
-binary-post-install/kview-trinity::
-	mv debian/kview-trinity/usr/share/man debian/kview-trinity/opt/trinity/share/
-
-binary-post-install/kcoloredit-trinity::
-	mv debian/kcoloredit-trinity/usr/share/man debian/kcoloredit-trinity/opt/trinity/share/
-
-binary-post-install/kfax-trinity::
-	mv debian/kfax-trinity/usr/share/man debian/kfax-trinity/opt/trinity/share/
-
-binary-post-install/kolourpaint-trinity::
-	mv debian/kolourpaint-trinity/usr/share/man debian/kolourpaint-trinity/opt/trinity/share/
-
-binary-post-install/kruler-trinity::
-	mv debian/kruler-trinity/usr/share/man debian/kruler-trinity/opt/trinity/share/
-
-binary-post-install/kuickshow-trinity::
-	mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
-
-binary-post-install/kviewshell-trinity::
-	mv debian/kviewshell-trinity/usr/share/man debian/kviewshell-trinity/opt/trinity/share/
diff --git a/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install b/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
index f5f48fee4..cf86e92ab 100644
--- a/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
+++ b/ubuntu/_base/core/tdegraphics/debian/tdegraphics-trinity-dev.install
@@ -194,4 +194,4 @@ debian/tmp/opt/trinity/lib/libksvg.so
 debian/tmp/opt/trinity/lib/libtext2path.la
 debian/tmp/opt/trinity/lib/libtext2path.so
 
-debian/tmp/opt/trinity/share/cmake
+debian/tmp/opt/trinity/share/cmake/kviewshell.cmake
diff --git a/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.install b/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.install
index cb2ca7535..45e92ea19 100644
--- a/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.install
+++ b/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.install
@@ -36,6 +36,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/tdeiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/tdeiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdeiconedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdeiconedit.png
+debian/tmp/opt/trinity/share/man/man1/tdeiconedit.1
 
 debian/icons/tdeiconedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/tdeiconedit-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.manpages b/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.manpages
deleted file mode 100644
index e975ab6b6..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/tdeiconedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdeiconedit.1
diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control
index a7d9d8b91..1e2a8a633 100644
--- a/ubuntu/_base/core/tdelibs/debian/control
+++ b/ubuntu/_base/core/tdelibs/debian/control
@@ -9,8 +9,9 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharu
  libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev,
  libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev,
- liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
+ libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev,
+ liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
+ libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev, libdbus-1-tqt-dev,
  libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
@@ -100,8 +101,9 @@ Breaks: kdelibs4-kde3-dev (<< 4:14.0.0~), kdelibs4-trinity-dev (<< 4:14.0.0~)
 Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~),
  libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
  libaspell-dev, hspell, libbz2-dev, libcupsys2-dev | libcups2-dev,
- libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
- libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev,
+ libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev,
+ libopenexr-dev (>= 1.2.2-3), libpcre3-dev,
+ liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqtinterface-dev,
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
index 92a201781..d06f09083 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
@@ -1749,6 +1749,7 @@ debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2
 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V3
 debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0
 debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc
+debian/tmp/opt/trinity/share/apps/tdemarkdown
 debian/tmp/opt/trinity/share/autostart/tdeab2tdeabc.desktop
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/1.png
@@ -1762,6 +1763,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/8.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/9.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/appheader.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/artistic-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_bottom.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_mid.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/block_title_top.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-left.png
@@ -1778,30 +1782,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/favicon.ico
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-notice.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/flat.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/footer.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/grad.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-web.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kmenu.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainfooter.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainheader.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/print.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/qpl-license.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/shadow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tabs.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-web.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top.jpg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.jpg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-middle.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right-konqueror.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right.jpg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-trinity.jpg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html
@@ -1905,6 +1918,7 @@ debian/tmp/opt/trinity/share/services/tdetexteditor_insertfile.desktop
 debian/tmp/opt/trinity/share/services/tdetexteditor_isearch.desktop
 debian/tmp/opt/trinity/share/services/tdetexteditor_kdatatool.desktop
 debian/tmp/opt/trinity/share/services/kxzfilter.desktop
+debian/tmp/opt/trinity/share/services/markdown_part.desktop
 debian/tmp/opt/trinity/share/services/metainfo.protocol
 debian/tmp/opt/trinity/share/services/mms.protocol
 debian/tmp/opt/trinity/share/services/mmst.protocol
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
index b5e80c4b4..eea7555c3 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
@@ -195,6 +195,8 @@ debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.la
 debian/tmp/opt/trinity/lib/trinity/libtdeprint_management_module.so
 debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.la
 debian/tmp/opt/trinity/lib/trinity/libtdehtmlpart.so
+debian/tmp/opt/trinity/lib/trinity/libtdemarkdown.la
+debian/tmp/opt/trinity/lib/trinity/libtdemarkdown.so
 debian/tmp/opt/trinity/lib/trinity/libtdemultipart.la
 debian/tmp/opt/trinity/lib/trinity/libtdemultipart.so
 debian/tmp/opt/trinity/lib/trinity/libshellscript.la
diff --git a/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.install
index b3b2e7b91..6612af4b0 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.install
@@ -22,6 +22,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/juk.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/juk.png
+debian/tmp/opt/trinity/share/man/man1/juk.1
 
 debian/icons/juk.xpm		/opt/trinity/share/pixmaps
 debian/icons/juk-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.manpages
deleted file mode 100644
index cc1b91a74..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/juk-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/juk-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.install
index e16be8952..e7650b74f 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.install
@@ -15,6 +15,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kaboodle.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kaboodle.png
+debian/tmp/opt/trinity/share/man/man1/kaboodle.1
 debian/tmp/opt/trinity/share/services/kaboodle_component.desktop
 debian/tmp/opt/trinity/share/services/kaboodleengine.desktop
 
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.manpages
deleted file mode 100644
index 56aa78551..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/kaboodle-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kaboodle-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install
index 4569bbf20..411add448 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.install
@@ -35,6 +35,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kaudiocreator.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kaudiocreator.png
+debian/tmp/opt/trinity/share/man/man1/kaudiocreator.1
 
 debian/icons/kaudiocreator.xpm		/opt/trinity/share/pixmaps
 debian/icons/kaudiocreator-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.manpages
deleted file mode 100644
index e3f09d6dd..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/kaudiocreator-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kaudiocreator-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
index fd8ea15e1..3e0d2daf7 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install
@@ -48,6 +48,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kmix.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kmix.png
+debian/tmp/opt/trinity/share/man/man1/kmix.1
+debian/tmp/opt/trinity/share/man/man1/kmixctrl.1
 debian/tmp/opt/trinity/share/services/kmixctrl_restore.desktop
 
 debian/icons/kmix.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.manpages
deleted file mode 100644
index e0adce8b6..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kmix-trinity.1
-debian/man/kmixctrl-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.install
index 40832458b..19db44587 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.install
@@ -32,6 +32,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/krec.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/krec.png
+debian/tmp/opt/trinity/share/man/man1/krec.1
 debian/tmp/opt/trinity/share/services/kcm_krec.desktop
 debian/tmp/opt/trinity/share/services/kcm_krec_files.desktop
 debian/tmp/opt/trinity/share/services/krec_exportogg.desktop
diff --git a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.manpages
deleted file mode 100644
index 8a59c57a8..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/krec-trinity.1
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/juk-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/juk-trinity.1
deleted file mode 100644
index 0981892b5..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/juk-trinity.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH "JuK" "1" "April 2006"
-.SH "NAME"
-juk \- music organizer and player for TDE
-.SH "SYNOPSIS"
-\fBjuk\fR
-.SH "DESCRIPTION"
-.LP 
-
-JuK (pronounced "jook") is a jukebox and music manager for the TDE
-desktop similar to jukebox software on other platforms such as
-iTunes or RealOne.
-
-.
-.SH "OPTIONS"
-.l
-\fIjuk\fP does not accept any command-line options.
-.
-
-.SH "DCOP"
-
-\fIjuk\fP has a DCOP (Desktop Communications Protocol) interface
-that may be used to start, stop, skip forward to the next song,
-etc.  This may be done from the command line using \fIdcop\fP
-as follows:
-
-.RS
-$ dcop juk Player forward
-
-$ dcop juk Player back
-
-$ dcop juk Player stop
-
-$ dcop juk Player play
-.RE
-
-.SH "AUTHOR"
-This page was written by David Schleef <ds@schleef.org> for Debian,
-but may be used elsewhere.
-
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/kaboodle-trinity.1
deleted file mode 100644
index 13745bc95..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/kaboodle-trinity.1
+++ /dev/null
@@ -1,261 +0,0 @@
-.lf 1 info/tdemultimedia.kaboodle.1
-.TH KABOODLE 1 "May 2003" TDE "TDE Application"
-.SH NAME
-kaboodle \- TDE simple and lean Media Player
-.SH SYNOPSIS
-.B kaboodle
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIURL\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kaboodle
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kaboodle
-is a simple KMedia (aRts) player for TDE, which can play standalone,
-or embedded in Konqueror. The embedded player should work for media embedded in tdehtml, too.
-It is meant for simple stuff like playing a quick video or sound file. 
-.B Kaboodle
-does not accept plugins, does not have a playlist or volume control and other such features.
-.P
-To get a media-player with a full-fledged user interface, look at
-.BR noatun (1)
-.SH OPTIONS
-.SS "Arguments:"
-.TP
-URL
-URL of media file to play
-.SS "General Options"
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.lf 1 info/kdeqtoptions
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
-icon, which can either be an absolute filename path, or otherwise the
-icon is sought for in places according to the normal TDE rules.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
-of the icon, according to the same rules as for the \-\-icon parameter.
-.TP
-.BI \-\-config \ filename
-Use an alternative configuration file, instead of the default, which
-is normally located in
-.I /usr/share/config
-or in
-.RB $ TDEHOME\fI/share/config
-.TP
-.BI \-\-dcopserver \ server
-Set the address of the DCOP server to attach to.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps. This option has the same
-effect as definiting the environment variable TDE_DEBUG.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-The geometry parameter follows the normal X convention for geometry,
-which is on the form:
-.RS
-.IP
-[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
-.P
-Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
-height, of the main application window. Both in pixels. A value of 0
-specifies the default size. The optional \fIxpos\fR and \fIypos\fR
-specifies the x,y-position that which is desired for the application
-window. Specifying negative values for x or y implies that the x or y
-position is to be measured from the left or bottom screen edge,
-instead of as in the normal case, with positive values, from the left
-and top edges. 
-.RE
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-Defines the default application font. The \fIfontname\fP should be in
-the X logical font name description format XLFD. For a full description of
-the format see
-.I /usr/X11R6/lib/X11/doc/xlfd.TXT
-Note that the application might override the font specified with
-its own font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-Sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-Sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-Sets the default button color.
-.TP
-.BI \-\-name \ name
-Sets the application name.
-.TP
-.BI \-\-title \ title
-Sets the application title. This option might, or might not appear
-in the title bar caption, depending on the application. To change the caption, use the 
-.B \-\-caption
-option instead. 
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-Sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirror reverses the whole layout of widgets. This means that menus
-will go in the opposite direction, the scroll bar will be on the
-opposite side, etc. For a normal western layout that means that menus
-and tool bars will go from the right edge to the left, the vertical
-scroll bar will be on the left side and so on.
-
-.lf 53 info/tdemultimedia.kaboodle.1
-.SH ENVIRONMENT
-.lf 1 info/kdeenviron
-.SS "standard TDE environment variables"
-.IP TDE_LANG
-Language locale setting to use. This option makes it possible to set
-another language environment for a program than what is the default. The
-correct language pack for this language has to be installed for this option
-to work. The default language when there is none set is en_US. When
-deciding upon a language, the following resources are looked up, in
-order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
-LANG.
-.IP TDE_UTF8_FILENAMES
-Assume that all filenames are in UTF-8 format regardless of the
-current language setting. Otherwise the filename format is defined by
-the language.
-.IP TDE_MULTIHEAD
-If this variable has the value
-.B true
-multihead multiple display mode is enabled. The TDE display will be
-shared over more than one screen.
-.IP DISPLAY
-Specifies the X display to run TDE on.
-.IP TDESYCOCA
-Specifies and alternative path for the 
-.I tdesycoca
-TDE system configuration cache file.
-The default path is
-/tmp/tde-$USER/tdesycoca
-.IP DCOPSERVER
-Specifies an alternative path for the DCOP server file. The default
-file is
-$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
-.IP SESSION_MANAGER
-The session manager to use. This option is set automatically by TDE
-and is a network path to the session manager socket.
-.IP HOME
-Path to the home directory for the current user. 
-.IP TDEHOME
-The TDE per-user setting directory. Default if not specified is
-.I $HOME/.trinity
-.lf 55 info/tdemultimedia.kaboodle.1
-.SH FILES
-.TP
-.I $HOME/.trinity/share/config/kaboodlerc
-configuration file.
-.SH AUTHOR
-Kaboodle was written by
-.nh
-.ad l
-Neil Stevens <neil@qualityassistant.com>,
-Nikolas Zimmermann <wildfox@kde.org>,
-and Charles Samuels <charles@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-.BR noatun (1)
-.br
-The full documentation for
-.B kaboodle
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kaboodle
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kaboodle
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/kaudiocreator-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/kaudiocreator-trinity.1
deleted file mode 100644
index 35600bcda..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/kaudiocreator-trinity.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.TH kaudiocreator 1 "Nov 2005" "Trinity Desktop Environment" ""
-.SH NAME
-kaudiocreator \- CD ripper and audio encoder front-end
-.SH SYNOPSIS
-kaudiocreator [Qt-options] [TDE-options] 
-.SH DESCRIPTION
-.B kaudiocreator 
-is the CD ripper and audio encoder front-end for the Trinity Desktop Environment. It
-supports many encoders like 
-.BR lame (1),
-.BR oggenc (1),
-.BR flac (1),
-and performs CDDB queries.
-
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  --help  
-Show help about options
-.TP
-.B  --help-qt  
-Show Qt specific options
-.TP
-.B  --help-tde  
-Show TDE specific options
-.TP
-.B  --help-all  
-Show all options
-.TP
-.B  --author  
-Show author information
-.TP
-.B -v,  --version  
-Show version information
-.TP
-.B  --license  
-Show license information
-.TP
-.B  --  
-End of options
-.SS 
-.SS TDE options:
-.TP
-.B  --caption  <caption>
-Use 'caption' as name in the title bar
-.TP
-.B  --icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  --miniicon  <icon>
-Use 'icon' as the icon in the title bar
-.TP
-.B  --config  <filename>
-Use alternative configuration file
-.TP
-.B  --dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  --nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  --waitforwm  
-Waits for a WM_NET compatible window manager
-.TP
-.B  --style  <style>
-sets the application GUI style
-.TP
-.B  --geometry  <geometry>
-sets the client geometry of the main widget
-.SS 
-.SS Qt options:
-.TP
-.B  --display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  --session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  --cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  --ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  --nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  --dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  --sync  
-switches to synchronous mode for debugging
-.TP
-.B --fn,  --font  <fontname>
-defines the application font
-.TP
-.B --bg,  --background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B --fg,  --foreground  <color>
-sets the default foreground color
-.TP
-.B --btn,  --button  <color>
-sets the default button color
-.TP
-.B  --name  <name>
-sets the application name
-.TP
-.B  --title  <title>
-sets the application title (caption)
-.TP
-.B  --visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  --inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  --im  <XIM server>
-set XIM server
-.TP
-.B  --noxim  
-disable XIM
-.TP
-.B  --reverse  
-mirrors the whole layout of widgets
- 
-
-.SH AUTHOR
-Benjamin Meyer <ben+kaudiocreator@meyerhome.net>
-
-Please use <http://bugs.trinitydesktop.org> to report bugs, do not mail the authors
-directly.
-
-
-This man-page was written by Francois Wendling <frwendling@free.fr>
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/kmix-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/kmix-trinity.1
deleted file mode 100644
index e603facb3..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/kmix-trinity.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH KMIX 1 "August, 15 2003"
-.SH NAME
-Kmix \- TDE audio mini-mixer
-.SH SYNOPSIS
-.B kmix 
-.RI [ OPTIONS ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmix
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fBKmix\fP is a mini audio mixer for TDE. It allows the user to change
-volume settings for each sound device (master, CD, line, mic, ...).
-.SH OPTIONS
-A summary of options for Kmix is included below.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-
-.SH SEE ALSO
-.BR kmixctrl (1),
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmix was written by the KDE project.
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/kmixctrl-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/kmixctrl-trinity.1
deleted file mode 100644
index 58a586b18..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/kmixctrl-trinity.1
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH KMIXCTRL 1 "August, 25 2003"
-.SH NAME
-kmixctrl \- Settings loader/saver for kmix
-.SH SYNOPSIS
-.B kmixctrl 
-.RI [ OPTIONS ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B kmixctrl
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-.PP
-\fBkmixctrl\fP is used to save or restore the settings of \fIkmix\fP.
-.SH OPTIONS
-A summary of options for kmixctrl is included below.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B  \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show QT specific help (common for all QT apps).
-.TP
-.B \-\-help\-tde
-Show TDE specific help (common for all TDE apps).
-.TP
-.B \-\-help\-all
-Show the complete help.
-.TP
-.B \-\-author
-Show program author(s).
-.TP
-.B \-\-license
-Show program license.
-.TP
-.B \-s, \-\-save
-Save the current settings as default
-.TP
-.B \-r, \-\-restore
-Restores the default settings
-
-.SH SEE ALSO
-.BR kmix (1),
-.PP
-For more details, you should have a look at the TDE Help center, available
-from the T menu.
-.SH AUTHOR
-This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
-for the Debian GNU/Linux project (but may be used by others).
-.PP
-kmixctrl was written by the KDE project.
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/krec-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/krec-trinity.1
deleted file mode 100644
index 9e2c57e3c..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/krec-trinity.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH krec "1" "July 2004" "Debian" "User Commands"
-.SH NAME
-krec \- A voice recording program
-.SH SYNOPSIS
-.B krec
-[\fIoptions\fR]
-.SH DESCRIPTION
-This is a recording tool for TDE.
-It uses aRts, just look at the audiomanager
-and you will find it there accepting sound
-for recording.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-
-
-.SH USAGE
-Details  are shown in the built-in help system to krec.  Run krec and go to help-krec handbook to access this data
-	
-.SH AUTHORS
-krec is (C)2002-2003 By Arnold Krille (arnold@arnoldarts.de)
-.P
-This man page was written and maintained by Ryan Waye (rmw998@gmail.com) 
-.PP
-.
-.
-.SH "STANDARD DISCLAIMER"
-Use only at your own risk!
-There may be errors and inaccuracies that could be damaging to your system or
-your eye.
-Proceed with caution, and although this is highly unlikely, the authors don't
-take any responsibility for that!
-.PP
-
-This document is licensed under the GPL.
-.P
-KDE: 3.2.2
-.P
-KRec: 0.5
diff --git a/ubuntu/_base/core/tdemultimedia/debian/man/noatun-trinity.1 b/ubuntu/_base/core/tdemultimedia/debian/man/noatun-trinity.1
deleted file mode 100644
index 1ed42ae02..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/man/noatun-trinity.1
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH NOATUN 1 "June 2006" "Trinity Desktop Environment" "Media Player"
-.SH NAME
-noatun
-\- fully-featured plugin-based media player for TDE
-.SH SYNOPSIS
-\fBnoatun\fP [Qt\-options] [TDE\-options] [URL] 
-.SH DESCRIPTION
-\fBNoatun\fP is a fully\-featured plugin\-based media player for TDE.
-It is an elaborate front-end to aRts - the Analog Real\-Time Synthesizer.
-By default aRts supports MP3 and MPEG\-1. Vorbis is also supported.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B URL
-Files/URLs to open
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-To find additional playobjects, go to \fBhttp://noatun.kde.org/plugins.phtml\fP, or \fBhttp://mpeglib.sf.net\fP.
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can enter the URL
-.BR help:/noatun/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/noatun/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Charles Samuels <charles@kde.org>
-.br
-Stefan Westerfeld <stefan@space.twc.de>
-.br
-Martin Vogt <mvogt@rhrk.uni\-kl.de>
-.br
-Malte Starostik <malte@kde.org>
-.br
-Nikolas Zimmermann <wildfox@kde.org>
-.br
-Stefan Schimanski <1Stein@gmx.de>
-.br
-Stefan Gehn <metz@gehn.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.install
index e5adf0383..407d649f1 100644
--- a/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.install
+++ b/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.install
@@ -323,6 +323,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/noatun.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/noatun.png
+debian/tmp/opt/trinity/share/man/man1/noatun.1
 debian/tmp/opt/trinity/share/mimelnk/interface/x-winamp-skin.desktop
 
 debian/icons/noatun.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.manpages b/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.manpages
deleted file mode 100644
index e5196f799..000000000
--- a/ubuntu/_base/core/tdemultimedia/debian/noatun-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/noatun-trinity.1
diff --git a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install
index 7d57f12cf..8712a1ebd 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install
@@ -24,6 +24,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdict.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdict.svgz
+debian/tmp/opt/trinity/share/man/man1/kdict.1
 
 debian/icons/kdict-16.xpm	/opt/trinity/share/pixmaps
 debian/icons/kdict.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.manpages
deleted file mode 100644
index 3128a0e9a..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kdict-trinity.1
diff --git a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install
index d2a0707c9..623f76912 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install
@@ -73,6 +73,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kget_list.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kget.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kget_list.png
+debian/tmp/opt/trinity/share/man/man1/kget.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-kgetlist.desktop
 debian/tmp/opt/trinity/share/sounds/KGet_Added.ogg
 debian/tmp/opt/trinity/share/sounds/KGet_Finished.ogg
diff --git a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kget-trinity.manpages
deleted file mode 100644
index 585b03129..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kget-trinity.1
diff --git a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install
index 7d5c96219..8ac850cbf 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install
@@ -330,7 +330,6 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_invisible.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_na.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_offline.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_online.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_original.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_raw.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_serv_off.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/jabber_serv_on.png
@@ -446,7 +445,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_invisible.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_na.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_offline.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_online.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_original.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_raw.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_serv_off.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/jabber_serv_on.png
@@ -476,6 +474,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/jabber_protocol.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kopete.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kopete.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kopete2.svgz
+debian/tmp/opt/trinity/share/man/man1/kopete.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-icq.desktop
 debian/tmp/opt/trinity/share/mimelnk/application/x-kopete-emoticons.desktop
 debian/tmp/opt/trinity/share/services/aim.protocol
diff --git a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.manpages
deleted file mode 100644
index 214a24d2e..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/kopete-trinity.1
diff --git a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install
index 328c9ae44..f4eb51a58 100644
--- a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install
@@ -29,6 +29,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwifimanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kwifimanager.svgz
+debian/tmp/opt/trinity/share/man/man1/kwifimanager.1
 
 debian/icons/kwifimanager-16.xpm	/opt/trinity/share/pixmaps
 debian/icons/kwifimanager.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages
deleted file mode 100644
index 4f390510b..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kwifimanager-trinity.1
diff --git a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install b/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install
index 728eed390..47ab05c03 100644
--- a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install
+++ b/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install
@@ -15,6 +15,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/lanbrowser/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.docbook
+debian/tmp/opt/trinity/share/man/man8/lisa.8
+debian/tmp/opt/trinity/share/man/man8/reslisa.8
 debian/tmp/opt/trinity/share/services/lan.protocol
 debian/tmp/opt/trinity/share/services/rlan.protocol
 
diff --git a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.manpages
deleted file mode 100644
index 306f0c52e..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/lisa-trinity.8
-debian/man/reslisa-trinity.8
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/kdict-trinity.1 b/ubuntu/_base/core/tdenetwork/debian/man/kdict-trinity.1
deleted file mode 100644
index aff5138c4..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/kdict-trinity.1
+++ /dev/null
@@ -1,180 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDICT 1 "June 2006" "Trinity Desktop Environment" "TDE Dictionary Client"
-.SH NAME
-kdict
-\- The TDE Dictionary Client
-.SH SYNOPSIS
-\fBkdict\fP [Qt\-options] [TDE\-options] [options] [word/phrase] 
-.SH DESCRIPTION
-\fBKDict\fP is a graphical client for the \fBDICT Protocol\fP. It enables you to search through dictionary databases for a word or phrase, then displays suitable definitions. \fBKDict\fP tries to ease basic as well as advanced queries. A separate list offers a convenient way to deal with the enormous number of matching words that a advanced query can return.
-.sp 1
-The remainder of \fBKDict\fP's user interface resembles a web browser. For instance, you can jump to the definition of a synonym by simply clicking on the highlighted word. The back/forward functionality is also implemented, enabling you to quickly go back to the result of previous queries.
-.sp 1
-\fBKDict\fP is able to process the content of the clipboard, so it's easy to combine \fBKDict\fP with your web browser or text editor.
-.sp 1
-If your machine is behind a firewall, has no permanent internet connection or the server of dict.org is too slow for you, you can set up your own local server, all you need is available at \fBwww.dict.org\fP. The advantages of a local server are optimal performance and the ability to install additional databases of your choice.
-.SH OPTIONS
-.SS
-.SS Arguments:
-word/phrase               Lookup the given word/phrase
-.SS Options:
-.TP
-.B \-c,  \-\-clipboard  
-Define X11-clipboard content (selected text)
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-.SH FILES
-.I ~/.trinity/share/config/kdictrc
-.br
-.I ~/.trinity/share/config/kdict_panelappletrc
-.RS
-\fBkdict\fP configuration files
-.SH SEE ALSO
-.TP
-\fBwww.dict.org\fP
-DICT Development Group home page
-.RE
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdict/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdict/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Christian Gebauer <gebauer@kde.org>
-.br
-Matthias Hoelzer <hoelzer@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/kget-trinity.1 b/ubuntu/_base/core/tdenetwork/debian/man/kget-trinity.1
deleted file mode 100644
index 72b2d3305..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/kget-trinity.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KGET 1 "June 2006" "Trinity Desktop Environment" "download manager"
-.SH NAME
-kget
-\- An advanced download manager for TDE
-.SH SYNOPSIS
-\fBkget\fP [Qt\-options] [TDE\-options] [options] [URL(s)] 
-.SH DESCRIPTION
-\fBKGet\fP is an advanced download manager for TDE. It allows you to group downloads. In some cases, \fBKGet\fP can resume these downloads even if you shutdown your computer before the downloads have completed.
-.sp 1
-To download a document or package, drag and drop the URL on to \fBKGet\fP.
-.SH OPTIONS
-.SS
-.SS Arguments:
-URL(s)                    URL(s) to download
-.SS Options:
-.TP
-.B  \-\-showDropTarget  
-Start KGet with drop target
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B  \-\-nofork  
-Don't run in the background.
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kget/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kget/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Matej Moss
-.br
-Patrick  Charbonnier <pch@freeshell.org>
-.br
-Carsten Pfeiffer <pfeiffer@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/kopete-trinity.sgml b/ubuntu/_base/core/tdenetwork/debian/man/kopete-trinity.sgml
deleted file mode 100644
index 87922999d..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/kopete-trinity.sgml
+++ /dev/null
@@ -1,334 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-  -->
-
-  <!ENTITY dhfirstname "<firstname>Daniel</firstname>">
-  <!ENTITY dhsurname   "<surname>Stone</surname>">
-  <!ENTITY dhdate      "<date>April 20, 2002</date>">
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>dstone@kde.org</email>">
-  <!ENTITY dhusername  "Daniel Stone">
-  <!ENTITY dhucpackage "<refentrytitle>KOPETE</refentrytitle>">
-  <!ENTITY dhpackage   "kopete">
-
-  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2001</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>A TDE-based Instant Messaging client.</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--help<replaceable></replaceable></option></arg>
-      <arg><option>--help-tde<replaceable></replaceable></option></arg>
-      <arg><option>--help-qt<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable> -v</replaceable></option></arg>
-      <arg><option>--license<replaceable></replaceable</option></arg>
-      <arg><option>--author<replaceable></replaceable></option></arg>
-      <arg><option>--caption &lt;caption&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--icon &lt;icon&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--miniicon &lt;icon&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--dcopserver &lt;server&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--nocrashhandler<replaceable></replaceable></option></arg>
-      <arg><option>--waitforwm<replaceable></replaceable></option></arg>
-      <arg><option>--style &lt;style&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--geometry &lt;geometry&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--display &lt;display&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--session &lt;sessionid&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--cmap<replaceable></replaceable></option></arg>
-      <arg><option>--ncols &lt;columns&gt;<replaceable></replaceable></option></arg>
-      <arg><option>--nograb<replaceable></replaceable></option></arg>
-      <arg><option>--dograb<replaceable></replaceable></option></arg>
-      <arg><option>--sync<replaceable></replaceable></option></arg>
-      <arg><option>--font<replaceable> --fn &lt;fontname&gt;</replaceable></option></arg>
-      <arg><option>--background<replaceable> --bg &lt;colour&gt;</replaceable></option></arg>
-      <arg><option>--button<replaceable> --btn &lt;colour&gt;</replaceable></option></arg>
-      <arg><option>--name<replaceable> &lt;name&gt;</replaceable></option></arg>
-      <arg><option>--title<replaceable> &lt;title&gt;</replaceable></option></arg>
-      <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg>
-      <arg><option>--inputstyle<replaceable> &lt;style&gt;</replaceable></option></arg>
-      <arg><option>--im<replaceable> &lt;server&gt;</replaceable></option></arg>
-      <arg><option>--noxim<replaceable></replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> is a TDE-based multi-protocol Instant
-    Messaging client. Currently, it supports AIM, ICQ, MSN, IRC and Jabber.
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below. However, the ordering is very strict -
-      --help/-h must come before hostname.</para>
-    <variablelist>
-      <varlistentry>
-        <term><option>-v</option>
-	  <option>--version</option>
-	</term>
-	<listitem>
-	  <para>Show version information.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--author</option>
-	</term>
-	<listitem>
-	  <para>Show information about the author.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--license</option>
-	</term>
-	<listitem>
-	  <para>Show license information.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--caption &lt;caption&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the caption of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--icon &lt;icon&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the icon of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--miniicon &lt;icon&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the mini-icon of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--dcopserver &lt;server&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specify the DCOP server to use.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--nocrashhandler</option>
-	</term>
-	<listitem>
-	  <para>Disable TDE crash handler (enables core dumps).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--waitforwm</option>
-	</term>
-	<listitem>
-	  <para>Waits for a compatible window manager to start.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--style &lt;style&gt;</option>
-	</term>
-	<listitem>
-	  <para>Sets the application's GUI style (overrides TDE).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--geometry &lt;geometry&gt;</option>
-	</term>
-	<listitem>
-	  <para>Sets the geometry of the window.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--display &lt;display&gt;</option>
-	</term>
-	<listitem>
-	  <para>Specifies the X display to use.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--session &lt;sessionid&gt;</option>
-	</term>
-	<listitem>
-	  <para>Restores the application for the given session ID.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cmap</option>
-	</term>
-	<listitem>
-	  <para>Forces use of an internal colour map on an 8-bit display.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--ncols &lt;count&gt;</option>
-	</term>
-	<listitem>
-	  <para>Limits the number of colours allowed in an 8-bit display.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--nograb</option>
-	</term>
-	<listitem>
-	  <para>Forces Qt to never grab the mouse or keyboard.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--dograb</option>
-	</term>
-	<listitem>
-	  <para>Overrides --nograb, which may be implicitly set.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--sync</option>
-	</term>
-	<listitem>
-	  <para>Forces synchronous mode (for debugging).</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--font &lt;font&gt;</option>
-	  <option>--fn &lt;font&gt;</option></term>
-	<listitem>
-	  <para>Sets the default application font.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--background &lt;colour&gt;</option>
-	  <option>--bg &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default background colour and application
-	  pallette.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--foreground &lt;colour&gt;</option>
-	  <option>--fg &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default foreground colour.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--button &lt;colour&gt;</option>
-	  <option>--btn &lt;colour&gt;</option></term>
-	<listitem>
-	  <para>Sets the default button colour.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--name &lt;name&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets the application name.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--title &lt;name&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets the application title.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--visual TrueColor</option>
-	  </term>
-	<listitem>
-	  <para>Forces the application to use a True Colour visual on 8-bit
-	  displays.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--inputstyle &lt;style&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets X Input Method (XIM) input style. Possible values are: 
-	  onthespot, overthespot, offthespot, and root.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--im &lt;server&gt;</option>
-	  </term>
-	<listitem>
-	  <para>Sets X Input Method (XIM) server.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--noxim</option>
-	  </term>
-	<listitem>
-	  <para>Disables X Input Method (XIM) support.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the <acronym>GNU</acronym> General Public License
-      version 2 or any later version published by the Free Software Foundation.</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1 b/ubuntu/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1
deleted file mode 100644
index 5f12be561..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1
+++ /dev/null
@@ -1,121 +0,0 @@
-.TH KWIFIMANAGER "1" "October 2006" "kwifimanager" "User Commands"
-.SH NAME
-kwifimanager \- manual page for kwifimanager
-.SH SYNOPSIS
-.B kwifimanager
-[\fIOPTIONS\fR]
-.SH DESCRIPTION
-\fBkwifimanager\fR is a TDE wireless management program.
-.SH GENERIC OPTIONS:
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show QT specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR,  \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.SH QT OPTIONS:
-.TP
-\fB\-\-display <displayname>\fR
-Use the X-server display 'displayname'
-.TP
-\fB\-\-session <sessionId>\fR
-Restore the application for the given 'sessionId'
-.TP
-\fB\-\-cmap\fR
-Causes the application to install a private color map on an 8-bit display
-.TP
-\fB\-\-ncols <count>\fR
-Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification
-.TP
-\fB\-\-nograb\fR
-Tells Qt to never grab the mouse or the keyboard
-.TP
-\fB\-\-dograb\fR
-Running under a debugger can cause an implicit -nograb, use -dograb to override
-.TP
-\fB\-\-sync\fR
-Switches to synchronous mode for debugging
-.TP
-\fB\-\-fn, \-\-font <fontname>\fR
-Defines the application font
-.TP
-\fB\-\-bg, \-\-background <color>\fR
-Sets the default background color and an application palette (light and dark shades are calculated)
-.TP
-\fB\-\-fg, \-\-foreground <color>\fR
-Sets the default foreground color
-.TP
-\fB\-\-btn, \-\-button <color>\fR
-Sets the default button color
-.TP
-\fB\-\-name <name>\fR
-Sets the application name
-.TP
-\fB\-\-title <title>\fR
-Sets the application title (caption)
-.TP
-\fB\-\-visual TrueColor\fR
-Forces the application to use a TrueColor visual on an 8-bit display
-.TP
-\fB\-\-inputstyle <inputstyle>\fR
-Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root
-.TP
-\fB\-\-im <XIM server>\fR
-Set XIM server
-.TP
-\fB\-\-noxim\fR
-Disable XIM
-.TP
-\fB\-\-reverse\fR
-Mirrors the whole layout of widgets
-.SH TDE OPTIONS:
-.TP
-\fB\-\-caption <caption>\fR
-Use 'caption' as name in the titlebar
-.TP
-\fB\-\-icon <icon>\fR
-Use 'icon' as the application icon
-.TP
-\fB\-\-miniicon <icon>\fR
-Use 'icon' as the icon in the titlebar
-.TP
-\fB\-\-config <filename>\fR
-Use alternative configuration file
-.TP
-\fB\-\-dcopserver <server>\fR
-Use the DCOP Server specified by 'server'
-.TP
-\fB\-\-nocrashhandler\fR
-Disable crash handler, to get core dumps
-.TP
-\fB\-\-waitforwm\fR
-Waits for a WM_NET compatible windowmanager
-.TP
-\fB\-\-style <style>\fR
-Sets the application GUI style
-.TP
-\fB\-\-geometry <geometry>\fR
-Sets the client geometry of the main widget - see man X for the argument format
-.SH AUTHOR
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-This manual page was written by Chris Bier <chris.bier@cymor.com>.
-Based on the xchat man page written by Davide Puricelli <evo@debian.org>,
-and the kwifimanager help options.  It was written for the Debian GNU/Linux
-system (but may be used by others).
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/lisa-trinity.8 b/ubuntu/_base/core/tdenetwork/debian/man/lisa-trinity.8
deleted file mode 100644
index 9b3192e14..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/lisa-trinity.8
+++ /dev/null
@@ -1,77 +0,0 @@
-.TH "lisa" "8" "December 2005" 
-
-.SH "NAME" 
-lisa \-  LAN Information Server
-
-.SH "SYNOPSIS"
-.PP 
-.B lisa 
-[options]
-
-.SH "DESCRIPTION" 
-.PP 
-This manual page documents briefly the 
-.B lisa
-command. 
-.PP
-.B lisa
-is intended to provide a kind of "network neighbourhood" but only relaying on
-the TCP/IP protocol stack, no smb or whatever. The list of running hosts is
-provided via TCP port 7741.
-
-.SH "OPTIONS" 
-.TP
-.B \-c, \-\-config=\fIFILE\fR
-Read
-.I FILE
-instead of $(HOME)/.lisarc and /etc/lisarc. 
-.TP
-.BI "\-p, \-\-port" " PORTNR"
-Start the server on the portnumber
-.IR PORTNR .
-If you use this, LISa won't be able to
-cooperate with other LISa's in the network.
-.TP
-.B \-q, \-\-quiet
-Start quiet without the greeting message.
-.TP
-.B \-u, \-\-unix
-Deprecated.
-.TP
-.B \-k, \-\-kde1
-Deprecated.
-.TP
-.B \-K, \-\-kde2
-Deprecated.
-.TP
-.B \-h, \-\-help
-Show usage.
-.TP
-.B \-v, \-\-version
-Print out a short version info.
-
-.SH SIGNALS
-.PP
-If you send the Hangup-Signal to \fBlisa\fR, it will reread its
-configuration file (killall -HUP lisa).
-.PP
-If you send the User1-Signal to \fBlisa\fR, it will print some status
-information to the standard output (killall -USR1 lisa). You won't see 
-anything if the console from which \fBlisa\fR was started has terminated.
-
-.SH "SEE ALSO"
-.TP
-.BR reslisa (8)
-.TP
-.I /opt/trinity/share/doc/lisa/README.gz
-
-.SH "AUTHOR" 
-.PP
-.B LISa
-is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>.
-.PP 
-This manual page was written by Francois Wendling <frwendling@free.fr>. 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. 
-
diff --git a/ubuntu/_base/core/tdenetwork/debian/man/reslisa-trinity.8 b/ubuntu/_base/core/tdenetwork/debian/man/reslisa-trinity.8
deleted file mode 100644
index eb2ca8f48..000000000
--- a/ubuntu/_base/core/tdenetwork/debian/man/reslisa-trinity.8
+++ /dev/null
@@ -1,72 +0,0 @@
-.TH "reslisa" "8" "December 2005" 
-
-.SH "NAME" 
-reslisa \-  Restricted LAN Information Server
-
-.SH "SYNOPSIS"
-.PP 
-.B reslisa 
-[options]
-
-.SH "DESCRIPTION" 
-.PP 
-This manual page documents briefly the 
-.B reslisa
-command. 
-.PP
-If you have very strict security rules in your network or you don't want to
-have another port open or whatever, you can use 
-.B resLISa
-instead of
-.BR lisa (1).
-
-.SH "OPTIONS" 
-.TP
-.B \-c, \-\-config=\fIFILE\fR
-Read
-.I FILE
-instead of $(HOME)/.reslisarc and /etc/reslisarc. 
-.TP
-.B \-q, \-\-quiet
-Start quiet without the greeting message.
-.TP
-.B \-u, \-\-unix
-Deprecated.
-.TP
-.B \-k, \-\-kde1
-Deprecated.
-.TP
-.B \-K, \-\-kde2
-Deprecated.
-.TP
-.B \-h, \-\-help
-Show usage.
-.TP
-.B \-v, \-\-version
-Print out a short version info.
-
-.SH SIGNALS
-.PP
-If you send the Hangup-Signal to \fBreslisa\fR, it will reread its
-configuration file (killall -HUP reslisa).
-.PP
-If you send the User1-Signal to \fBreslisa\fR, it will print some status
-information to the standard output (killall -USR1 reslisa). You won't see 
-anything if the console from which \fBreslisa\fR was started has terminated.
-
-.SH "SEE ALSO"
-.TP
-.BR lisa (8)
-.TP
-.I /opt/trinity/share/doc/lisa/README.gz
-
-.SH "AUTHOR" 
-.PP
-.B LISa
-is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>.
-.PP 
-This manual page was written by Francois Wendling <frwendling@free.fr>. 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. 
-
diff --git a/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.install b/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.install
index a10e6654c..4898037e6 100644
--- a/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.install
@@ -1,2 +1,3 @@
 debian/tmp/opt/trinity/bin/kapptemplate
 debian/tmp/opt/trinity/share/apps/kapptemplate
+debian/tmp/opt/trinity/share/man/man1/kapptemplate.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.manpages
deleted file mode 100644
index e558b802c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kapptemplate-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kapptemplate.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.install b/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.install
index 0765b223f..4cfe9a49a 100644
--- a/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.install
@@ -87,6 +87,9 @@ debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/catalogmanager.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabeldict.png
+debian/tmp/opt/trinity/share/man/man1/catalogmanager.1
+debian/tmp/opt/trinity/share/man/man1/kbabel.1
+debian/tmp/opt/trinity/share/man/man1/kbabeldict.1
 debian/tmp/opt/trinity/share/services/dbsearchengine.desktop
 debian/tmp/opt/trinity/share/services/tdefile_po.desktop
 debian/tmp/opt/trinity/share/services/pothumbnail.desktop
diff --git a/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.manpages
deleted file mode 100644
index e85be5938..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kbabel-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/catalogmanager.1
-debian/man/kbabel.1
-debian/man/kbabeldict.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.install b/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.install
index 50b9c1fe5..d30028494 100644
--- a/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.install
@@ -18,5 +18,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbugbuster.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbugbuster.png
+debian/tmp/opt/trinity/share/man/man1/kbugbuster.1
 debian/tmp/opt/trinity/share/services/tderesources/kcal/bugzilla.desktop
 debian/icons/kbugbuster.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.manpages
deleted file mode 100644
index 8fc558a77..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kbugbuster-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kbugbuster.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.install b/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.install
index a163246b9..c327592b6 100644
--- a/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.install
@@ -7,3 +7,7 @@ debian/tmp/opt/trinity/lib/kmtrace/libktrace.la
 debian/tmp/opt/trinity/lib/kmtrace/libktrace.so
 debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a
 debian/tmp/opt/trinity/share/apps/kmtrace/kde.excludes
+debian/tmp/opt/trinity/share/man/man1/demangle.1
+debian/tmp/opt/trinity/share/man/man1/kminspector.1
+debian/tmp/opt/trinity/share/man/man1/kmmatch.1
+debian/tmp/opt/trinity/share/man/man1/kmtrace.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.manpages
deleted file mode 100644
index 92133295d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kmtrace-trinity.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/man/demangle.1
-debian/man/kmtrace.1
-debian/man/kminspector.1
-debian/man/kmmatch.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kompare-trinity.install b/ubuntu/_base/core/tdesdk/debian/kompare-trinity.install
index aca239beb..1876a13f0 100644
--- a/ubuntu/_base/core/tdesdk/debian/kompare-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kompare-trinity.install
@@ -29,4 +29,5 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kompare.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kompare.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kompare.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kompare.svgz
+debian/tmp/opt/trinity/share/man/man1/kompare.1
 debian/icons/kompare.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/kompare-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kompare-trinity.manpages
deleted file mode 100644
index acf918455..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kompare-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kompare.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kspy-trinity.install b/ubuntu/_base/core/tdesdk/debian/kspy-trinity.install
index 12523ee90..56d2f0262 100644
--- a/ubuntu/_base/core/tdesdk/debian/kspy-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kspy-trinity.install
@@ -3,3 +3,4 @@ debian/tmp/opt/trinity/lib/libkspy.la
 debian/tmp/opt/trinity/lib/libkspy.so
 debian/tmp/opt/trinity/lib/libkspy.so.1
 debian/tmp/opt/trinity/lib/libkspy.so.1.2.0
+debian/tmp/opt/trinity/share/man/man1/testkspy.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kspy-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kspy-trinity.manpages
deleted file mode 100644
index 34831ba91..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kspy-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/testkspy.1
diff --git a/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.install b/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.install
index 0fbde204f..d1b7104cb 100644
--- a/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.install
@@ -11,6 +11,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kuiviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kuiviewer.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kuiviewer.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kuiviewer.png
+debian/tmp/opt/trinity/share/man/man1/kuiviewer.1
 debian/tmp/opt/trinity/share/services/designerthumbnail.desktop
 debian/tmp/opt/trinity/share/services/kuiviewer_part.desktop
 debian/icons/kuiviewer.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.manpages
deleted file mode 100644
index abcf3310b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/kuiviewer-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kuiviewer.1
diff --git a/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.install b/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.install
index 6f6370493..08ab2520e 100644
--- a/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.install
@@ -8,4 +8,6 @@ debian/tmp/opt/trinity/lib/trinity/cvsaskpass.la
 debian/tmp/opt/trinity/lib/trinity/cvsaskpass.so
 debian/tmp/opt/trinity/lib/trinity/cvsservice.la
 debian/tmp/opt/trinity/lib/trinity/cvsservice.so
+debian/tmp/opt/trinity/share/man/man1/cvsaskpass.1
+debian/tmp/opt/trinity/share/man/man1/cvsservice.1
 debian/tmp/opt/trinity/share/services/cvsservice.desktop
diff --git a/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.manpages
deleted file mode 100644
index 9afa8b3e7..000000000
--- a/ubuntu/_base/core/tdesdk/debian/libcvsservice0-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/cvsaskpass.1
-debian/man/cvsservice.1
diff --git a/ubuntu/_base/core/tdesdk/debian/man/adddebug.1 b/ubuntu/_base/core/tdesdk/debian/man/adddebug.1
deleted file mode 100644
index d78dad43c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/adddebug.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ADDDEBUG 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-adddebug \- modifies Makefile(s) to add debug info
-.SH SYNOPSIS
-.B adddebug
-.RB "[ " \-k " ] [ " \-n " ] [ " \-r " ]"
-.SH DESCRIPTION
-\fBadddebug\fP modifies the \fIMakefile\fP in the current directory
-(and optionally in its subdirectories) to add debug info (\fI\-g3\fP).
-It will also remove optimisations (\fI\-O[1-9]?\fP), and can optionally
-remove \fI\-DNDEBUG\fP and \fI\-DNO_DEBUG\fP as well.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-.B \-k
-Keep optimisations (do not remove \fI\-O[1-9]?\fP flags which are
-removed by default).
-.TP
-.B \-n
-Compile without \fINDEBUG\fP and \fINO_DEBUG\fP being defined (this
-makes kdDebug calls work).
-.TP
-.B \-r
-Recursively search through all subdirectories of the current directory
-and operate on every Makefile that is found.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/build-progress.sh.1 b/ubuntu/_base/core/tdesdk/debian/man/build-progress.sh.1
deleted file mode 100644
index 28c9d9016..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/build-progress.sh.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BUILD-PROGRESS.SH 1 "June 16, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-build-progress.sh \- show kde-build progress in your konsole/xterm title bar
-.SH SYNOPSIS
-.B build-progress.sh
-.SH DESCRIPTION
-\fBbuild-progress.sh\fP can be used to watch the progress of a large TDE
-build in the title bar of your konsole or xterm.
-.PP
-The TDE build must be running elsewhere as a separate process, and it
-must be done using
-.BR kde-build (1).
-.PP
-When you run build-progress.sh, it will sit in a permanent loop while
-kde-build runs.  The title bar of the konsole/xterm in which you ran
-build-progress.sh will be continually updated with the directory in
-which the TDE build is currently working.
-.PP
-You must run build-progress.sh from the top-level directory of the TDE
-build tree.  This directory must contain a file named
-\fIkde-buildrc\fP (which is also used by kde-build).  This
-\fIkde-buildrc\fP must contain valid settings for
-\fITDELOGDIR\fP and \fITDESRCDIR\fP, or else build-progress.sh will
-fail to work.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH FILES
-.TP
-\fIkde-buildrc\fP
-This file must be contained in the current directory, which must be the
-root of the TDE build tree.  See
-.BR kde-build (1)
-for further information.
-.SH SEE ALSO
-.BR kde-build (1).
-.SH AUTHOR
-build-progress.sh was written by Malte Starostik <malte@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/catalogmanager.1 b/ubuntu/_base/core/tdesdk/debian/man/catalogmanager.1
deleted file mode 100644
index db8b17613..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/catalogmanager.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CATALOGMANAGER 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-catalogmanager \- advanced catalog manager for KBabel
-.SH SYNOPSIS
-.B catalogmanager
-.RI "[ " generic-options " ]"
-[ \fB\-\-project\fP \fIconfig-file\fP ]
-.SH DESCRIPTION
-\fBCatalogManager\fP is part of a suite of programs for editing gettext
-message files (PO-files).  This suite is designed to help you translate fast
-and consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager (this program)
-is a multi functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the catalogmanager-specific options.
-For a full summary of options, run \fIcatalogmanager \-\-help\fP.
-.TP
-\fB\-\-project\fP \fIconfig-file\fP
-Load the configuration from the given file.
-.SH SEE ALSO
-.BR kbabel (1),
-.BR kbabeldict (1).
-.PP
-Full user documentation for KBabel is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cheatmake.1 b/ubuntu/_base/core/tdesdk/debian/man/cheatmake.1
deleted file mode 100644
index 098449a0b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cheatmake.1
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CHEATMAKE 1 "September 27, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cheatmake \- fool make into not rebuilding certain files
-.SH SYNOPSIS
-.B cheatmake hidechange
-.I file
-.br
-.B cheatmake show
-.br
-.B cheatmake why
-.I file
-.SH DESCRIPTION
-\fBcheatmake\fP is used to save time when recompiling.  It can fool \fBmake\fP
-into skipping files that haven't changed in a meaningful way.  This can be
-used for instance when you change a comment in a file but none of the actual
-code.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-The different modes of operation are as follows.
-.TP
-\fBhidechange\fP \fIfile\fP
-Hides the fact that the given file has changed by moving its timestamp
-back into the past.  Use this option with care!
-.TP
-\fBshow\fP
-Lists which files make currently needs to rebuild.
-.TP
-\fBwhy\fP \fIfile\fP
-Explains why make must rebuild the given file.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR make (1).
-.SH AUTHOR
-cheatmake was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/create_cvsignore.1 b/ubuntu/_base/core/tdesdk/debian/man/create_cvsignore.1
deleted file mode 100644
index ce63f6f55..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/create_cvsignore.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CREATE_CVSIGNORE 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-create_cvsignore \- creates preliminary .cvsignore in current directory
-.SH SYNOPSIS
-.B create_cvsignore
-[ \fB\-r\fP ]
-.SH DESCRIPTION
-\fBcreate_cvsignore\fP is used to create a preliminary \fI.cvsignore\fP
-file in the current directory.  It does this by adding some standard
-stuff according to what it finds in \fIMakefile.am\fP.
-.PP
-No lines will be removed from any existing \fI.cvsignore\fP.
-If there is not already a \fI.cvsignore\fP, it will be added to the CVS
-repository.
-.PP
-Note that you must have a \fIMakefile.am\fP in the current directory for
-this tool to work.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB-r\fP
-Recursively process this directory and all directories beneath it.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/create_makefile.1 b/ubuntu/_base/core/tdesdk/debian/man/create_makefile.1
deleted file mode 100644
index e128f23e9..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/create_makefile.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CREATE_MAKEFILE 1 "September 26, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-create_makefile \- creates Makefile.in and Makefile from a Makefile.am
-.SH SYNOPSIS
-.B create_makefile
-.I relativepath/Makefile
-.br
-.B create_makefile
-.I relativepath
-.SH DESCRIPTION
-\fBcreate_makefile\fP creates the \fIMakefile.in\fP and \fIMakefile\fP
-in a subdirectory containing a \fIMakefile.am\fP.
-This script saves time compared to re-running configure completely.
-.PP
-Note that you must supply the path to the desired \fIMakefile\fP, not the
-existing \fIMakefile.am\fP (though the final \fI/Makefile\fP may be omitted).
-.PP
-This script may be run from the toplevel directory (the
-one containing \fIconfigure\fP) or from one of its subdirectories.
-Note that \fIrelativepath\fP must be a relative path, not an absolute path.
-.PP
-If the source directory is different from the build directory (see the
-environment variables below), it will be assumed that the \fIMakefile.am\fP
-and \fIMakefile.in\fP belong beneath the source directory and that the
-\fIMakefile\fP belongs beneath the build directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR create_makefiles (1).
-.SH AUTHOR
-create_makefile was written by David Faure <faure@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/create_makefiles.1 b/ubuntu/_base/core/tdesdk/debian/man/create_makefiles.1
deleted file mode 100644
index 2efc03795..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/create_makefiles.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CREATE_MAKEFILES 1 "September 27, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-create_makefiles \- recreates all Makefiles beneath a directory
-.SH SYNOPSIS
-.B create_makefiles
-.I dir
-.SH DESCRIPTION
-\fBcreate_makefiles\fP recreates all \fIMakefile\fPs in
-\fIdir\fP and its (recursed) subdirectories from the corresponding
-\fIMakefile.am\fP templates.
-.PP
-This script must be run from the toplevel directory (the
-one containing \fIconfigure\fP).
-This script saves time compared to re-running configure completely.
-.PP
-If the source directory is different from the build directory (see the
-environment variables below), it will be assumed that each \fIMakefile.am\fP
-and \fIMakefile.in\fP belongs beneath the source directory and that each
-\fIMakefile\fP belongs beneath the build directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the
-source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR create_makefile (1).
-.SH AUTHOR
-create_makefiles was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvs-clean.1 b/ubuntu/_base/core/tdesdk/debian/man/cvs-clean.1
deleted file mode 100644
index 0706e485c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvs-clean.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVS-CLEAN 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvs\-clean \- delete all files and directories not registered with CVS
-.SH SYNOPSIS
-.B cvs\-clean
-[ \fB-n, \-\-dry-run\fP ]
-[ \fB-h, \-\-help\fP ]
-.SH DESCRIPTION
-\fBcvs\-clean\fP recursively deletes everything in or beneath the
-current directory that is not known to CVS (i.e., that has not been
-checked out of or checked into a CVS repository).
-.PP
-A list of all files and directories that are deleted will be written to
-the console.
-.PP
-This script behaves similarly to the \fIcvs-clean\fP target from the
-file \fIadmin/Makefile.common\fP found in most TDE application sources.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB-n, \-\-dry-run\fP
-Print the intended actions to the console, but do not change anything on
-the filesystem.
-.TP
-\fB-h, \-\-help\fP
-Display usage information.
-.SH SEE ALSO
-.BR cvs (1).
-.SH AUTHOR
-This utility was written by Oswald Buddenhagen <ossi@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvs2dist.1 b/ubuntu/_base/core/tdesdk/debian/man/cvs2dist.1
deleted file mode 100644
index f0bc71a3e..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvs2dist.1
+++ /dev/null
@@ -1,201 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVS2DIST 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvs2dist \- convert subdirectories within TDE CVS into standalone
-source packages
-.SH SYNOPSIS
-.B cvsdist
-.I path-to-module
-.I directory-in-module
-[ \fB\-n, \-\-name\fP \fIname\fP ]
-[ \fB\-v, \-\-version\fP \fIversion\fP ]
-[ \fB\-\-admin-dir\fP \fIdir\fP ]
-[ \fB\-\-cvs-root\fP \fIroot\fP ]
-[ \fB\-B, \-\-branch\fP \fIbranch\fP ]
-[ \fB\-\-no-i18n\fP ]
-[ \fB\-\-no-i18n-lang\fP \fIlanguages\fP ]
-[ \fB\-\-log=\fP\fIlogfile\fP | \fB\-l\fP ]
-[ \fB\-m, \-\-make-unpackaged\fP ]
-[ \fB\-g, \-\-no-gzip\fP ]
-[ \fB\-b, \-\-no-bz2, \-\-no-bzip2\fP ]
-[ \fB\-o, \-\-only-directory\fP ]
-[ \fB\-r, \-\-required-header\fP \fIheader\fP ]
-[ \fB\-e, \-\-required-header-error-message\fP \fImessage\fP ]
-[ \fB\-d, \-\-remove-hidden\fP ]
-[ \fB\-\-replace-files\fP \fIpairs\fP ]
-[[--] \fIaddfile\fP ... ]
-.PP
-.B cvsdist
-\fB\-h, \-\-help\fP
-.SH DESCRIPTION
-Each module in the TDE CVS tree contains a large number of applications
-all bundled together.
-\fBcvs2dist\fP is used to extract a single application or component from
-one of these large CVS modules and bundle it into a standalone package.
-The application or component will be bundled into a standard
-distribution tarball (with a configure script and so on) that users can
-download, build and install.
-.PP
-By default, cvs2dist automatically tries to check out all translations
-of strings and documentation from the corresponding parts of the
-\fItde-i18n\fP CVS module and include them in the final packages.
-This can be suppressed or modified using the options \-\-no-i18n or
-\-\-no-i18n-lang.
-.PP
-The initial argument \fIpath-to-module\fP should specify where the CVS
-module has been checked out on your system, and the second argument
-\fIdirectory-in-module\fP should specify which directory within this
-module is to be packaged (all subdirectories beneath it will be included
-and so on).  See the EXAMPLE section below for details.
-.PP
-Both gzip and bzip2 compressed tarballs will be created by default and
-will be called \fIname[-version].tar.gz\fP and \fIname[-version].tar.bz2\fP.
-The \fIname\fP component will be the last directory component of
-\fIdirectory-in-module\fP unless otherwise specified by \-\-name, and
-the \fIversion\fP component will not be included unless it is specified by
-\-\-version.
-.PP
-Additional files from outside the CVS tree can be included in the final
-packages by passing them after all other options (these are the
-\fIaddfile\fP arguments displayed above).  These additional files will
-be placed in the top level directory of the final packages.
-The \-\- that precedes them is optional.
-.PP
-Many options are available for customising these procedures, as seen below.
-Note that cvs2dist will remove any temporary files that it creates.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-n, \-\-name\fP \fIname\fP
-The name of the package (to be used in the names of the final tarballs
-and directories).  Specifically, the compressed tarballs will be called
-\fIname-version.tar.gz\fP and \fIname-version.tar.bz2\fP (see the
-\-\-version option below for further information).
-This package name defaults to the last directory component of
-\fIdirectory-in-module\fP.
-.TP
-\fB\-v, \-\-version\fP \fIversion\fP
-The version of the package (to be used in the names of the final
-tarballs and directories).  If this is not supplied, no version is used
-at all (i.e., the compressed tarballs will just be called \fIname.tar.gz\fP
-and \fIname.tar.bz2\fP).
-.TP
-\fB\-\-admin-dir\fP \fIdir\fP
-The location of \fIadmin/\fP on the filesystem.  Symbolic links may
-be used.  Defaults to \fIpath-to-module/admin\fP.
-.TP
-\fB\-\-cvs-root\fP \fIroot\fP
-The value to use as CVSROOT when checking out translations from CVS.
-Defaults to the CVSROOT environment variable.
-If \-\-no-i18n is passed then this option has no effect.
-.TP
-\fB\-B, \-\-branch\fP \fIbranch\fP
-Use the given CVS branch for checking out translations from CVS.
-If \-\-no-i18n is passed then this option has no effect.
-.TP
-\fB\-\-no-i18n\fP
-Do not check out any translations from CVS.
-.TP
-\fB\-\-no-i18n-lang\fP \fIlanguages\fP
-Exclude the given language(s) when checking out translations from CVS.
-The list of languages should be comma-separated,
-such as \fI\-\-no-i18n-lang uk,de,en_GB\fP .
-.TP
-\fB\-\-log=\fP\fIlogfile\fP
-Log all proceedings to the given logfile.  Note that the = is essential,
-and may not be omitted.
-.TP
-\fB\-l\fP
-Log all proceedings to the default logfile in the current directory.
-.TP
-\fB\-m, \-\-make-unpackaged\fP
-In addition to the compressed tarballs, an unpacked distribution will be
-created in the current directory.
-.TP
-\fB\-g, \-\-no-gzip\fP
-Do not create a gzip package (\fIname-version.tar.gz\fP).
-.TP
-\fB\-b, \-\-no-bz2, \-\-no-bzip2\fP
-Do not create a bzip2 package (\fIname-version.tar.bz2\fP).
-.TP
-\fB\-o, \-\-only-directory\fP
-Alias for \-mgb.  No packages will be created, only an unpacked directory.
-.TP
-\fB\-r, \-\-required-header\fP \fIheader\fP
-When the user runs configure, an error will be generated if
-\fIheader\fP is not found on the user's system.
-.TP
-\fB\-e, \-\-required-header-error-message\fP \fImessage\fP
-The error to display to a user when the header passed with
-\-\-required-header is not found on the user's system.  Defaults to a
-sensible message.
-.TP
-\fB\-d, \-\-remove-hidden\fP
-Remove hidden files and directories (e.g., dotfiles) from the packages.
-.TP
-\fB\-h, \-\-help\fP
-Display instructions on how to use cvs2dist.
-.TP
-\fB\-\-replace-files\fP \fIpairs\fP
-Move one or more files around in the final distribution packages.
-The \fIpairs\fP argument should be a comma-separated list of
-replacements to make.  Each replacement specifies a single file to move, and
-should be of the form \fIsource\fP@\fIdest\fP.
-.br
-For each replacement, the source file will be moved to the
-destination file (in particular, the source file will be deleted).
-All filenames are relative to the top-level directory
-of the package.  Spaces in filenames are not allowed.
-.br
-Please be careful when using this option!  Try to avoid the use of ..
-in the filenames, since it may cause unexpected problems.
-.br
-An example of this option might be
-\fI\-\-replace-files take_this_file@move_it_here,configure.in.bot.dist@configure.in.bot\fP .
-.SH EXAMPLE
-The following example creates packages of the kolf picture plugin from
-the CVS source tree currently checked out in \fI/sources\fP.
-.PP
-.RS
-\fIexample$\fP cvs2dist /sources/tdegames kolf/objects/picture
-\-n kolf-picture \-v 0.9 \-r "kolf/game.h" \-\-log ~/tmp/extra-file
-.RE
-.PP
-The packages will be named \fIkolf-picture-0.9\fP and
-the process will be logged.  For configure to succeed when a user builds
-these packages, the header \fIkolf/game.h\fP must be installed or an
-error will occur.  The additional file \fI~/tmp/extra-file\fP will be
-included in the packages even though it is not part of the CVS source tree.
-.SH FILES
-.TP
-\fI~/.cvs2distrc\fP
-Any options found in this file will be
-added to the beginning of the command-line arguments.
-.SH SEE ALSO
-.BR cvs (1).
-.PP
-For the latest updates to this script, see the cvs2dist website
-\fIhttp://www.katzbrown.com/shiritsu/programming/cvs2dist/\fP.
-.SH AUTHOR
-cvs2dist was written by Jason Katz-Brown <jason@katzbrown.com>,
-Sebastian Stein <seb.stein@hpfsc.de>, Dominique Devriese <devriese@kde.org>
-and Michael Buesch <mbuesch@freenet.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvsaskpass.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsaskpass.1
deleted file mode 100644
index d4b7e5dfd..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsaskpass.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSASKPASS 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsaskpass \- prompt for a password for the CVS DCOP service
-.SH SYNOPSIS
-.B cvsaskpass
-.RI "[ " generic-options " ]"
-.I prompt
-.SH DESCRIPTION
-This utility displays a dialog box prompting the user for the password to
-a CVS repository, then writes the password to standard output and exits.
-You should not need to run this program directly \- it is designed for
-the internal use of
-.BR cvsservice (1).
-.PP
-The prompt should be of the following form:
-.RS
-.PP
-\fIuser\fP@\fIhost\fP's password:
-.RE
-.PP
-This will allow the dialog box to display the details of the CVS
-repository to the user.
-.PP
-This utility is part of the CVS service provided with Cervisia, which in
-turn is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIcvsaskpass \-\-help\fP.
-.SH RETURN VALUE
-If a password was succefully obtained, 0 is returned.  If no prompt was
-supplied on the command-line or if the dialog was cancelled, 1 is returned.
-.SH SEE ALSO
-.BR cervisia (1),
-.BR cvsservice (1),
-.BR dcop (1).
-.PP
-Details of how to use the CVS service from within another script or C++
-program can be found in \fI/usr/share/doc/libcvsservice0/DESIGN\fP.
-.SH AUTHOR
-The CVS service was written by Christian Loose <christian.loose@kdemail.net>.
-.br
-Cervisia was written by Bernd Gehrmann <bernd@physik.hu-berlin.de>,
-Christian Loose <christian.loose@kdemail.net>,
-Andre Woebbeking <woebbeking@web.de>,
-Carlos Woelz <carloswoelz@imap-mail.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvsbackport.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsbackport.1
deleted file mode 100644
index 7181ac671..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsbackport.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSBACKPORT 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsbackport \- backport the last change in HEAD to a branch
-.SH SYNOPSIS
-.B cvsbackport
-\fIfile\fP ...
-.SH DESCRIPTION
-For each file given on the command line,
-\fBcvsbackport\fP will attempt to determine the last change made to
-the file in HEAD and then backport that change to a CVS branch (the
-branch name is hard-coded; see below).
-.PP
-The changes to be backported will be displayed on screen, and you will
-have the chance to confirm or abort before any commits are made.
-.PP
-The files must be checked out from HEAD when you run this utility.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNINGS
-The branch tag is hard-coded into the script (currently it is set to
-KDE_3_4_BRANCH).
-.PP
-If you abort (i.e., you do not make the suggested commits), your files
-will be checked out from the branch (and not from HEAD as they were
-before).
-.SH SEE ALSO
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This utility was written by Dirk Mueller and David Faure.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvscheck.1 b/ubuntu/_base/core/tdesdk/debian/man/cvscheck.1
deleted file mode 100644
index 3d79c255b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvscheck.1
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSCHECK 1 "March 26, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvscheck \- offline status report for files in a checked-out CVS module
-.SH SYNOPSIS
-.B cvscheck
-[ \fB\-u, \-\-unknown\fP ]
-[ \fB\-m, \-\-modified\fP ]
-[ \fB\-\-missing\fP ]
-[ \fB\-t, \-\-tagged\fP ]
-[ \fB\-a, \-\-added\fP ]
-[ \fB\-r, \-\-removed\fP ]
-[ \fB\-c, \-\-conflicts\fP ]
-[ \fB\-l, \-\-local\fP ]
-[ \fIdir\fP ... ]
-.SH DESCRIPTION
-\fBcvscheck\fP prints information about the status of your local CVS
-checkout without communicating with the server.  This means it is
-extremely fast and does not require a network connection.
-.PP
-The given directories and all of their subdirectories will be processed
-recursively (though see the \-\-local option below).
-If no directory is given, the current directory and its
-recursed subdirectories will be used.
-.PP
-Each file with an interesting status will be printed with a status
-character in front of its name.  The status characters are as follows.
-.TP
-? \fIfoobar.c\fP
-The file is not known to CVS.  Maybe you should add it?
-.TP
-M \fIfoobar.c\fP
-The file is for sure locally modified.
-.TP
-m \fIfoobar.c\fP
-The file \fImight\fP have local changes.  You should diff with the
-server to make sure.
-.TP
-C \fIfoobar.c\fP
-The file has a CVS conflict and therefore cannot be committed.
-.TP
-U \fIfoobar.c\fP
-The file is in CVS but is somehow missing in your local checkout.
-.TP
-T \fIfoobar.c\fP
-The file has an unusual sticky CVS tag.
-.TP
-A \fIfoobar.c\fP
-You have "cvs add"ed this file but you have not yet committed.
-.TP
-R \fIfoobar.c\fP
-You have "cvs remove"d this file but you have not yet committed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-By default cvscheck will display the status for all files in and
-beneath the requested directories.  The following options however can be
-used to display only files with a particular status and/or in a
-particular directory.
-.TP
-\fB\-u, \-\-unknown\fP
-Show only unknown (?) files.
-.TP
-\fB\-m, \-\-modified\fP
-Show only modified (m/M) files.
-.TP
-\fB\-\-missing\fP
-Show only missing (U) files.
-.TP
-\fB\-t, \-\-tagged\fP
-Show only tagged (T) files.
-.TP
-\fB\-a, \-\-added\fP
-Show only added (A) files.
-.TP
-\fB\-r, \-\-removed\fP
-Show only removed (R) files.
-.TP
-\fB\-c, \-\-conflicts\fP
-Show only conflict (C) files.
-.TP
-\fB\-l, \-\-local\fP
-Do not recurse.  That is, process the given directory but none of its
-subdirectories.
-.SH SEE ALSO
-.BR cvs (1).
-.SH AUTHOR
-cvscheck was written by Dirk Mueller <mueller@kde.org> and
-Sirtaj Singh Kang <taj@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvsforwardport.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsforwardport.1
deleted file mode 100644
index 0ca6d29f5..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsforwardport.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSFORWARDPORT 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsforwardport \- forwardport the last change in a branch to HEAD
-.SH SYNOPSIS
-.B cvsforwardport
-\fIfile\fP ...
-.SH DESCRIPTION
-For each file given on the command line,
-\fBcvsforwardport\fP will attempt to determine the last change made to
-the file in the primary CVS branch and then forwardport that change to HEAD.
-The branch name is hard-coded; see below.
-.PP
-The changes to be forwardported will be displayed on screen, and you will
-have the chance to confirm or abort before any commits are made.
-.PP
-The files must be checked out from the branch when you run this utility.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNINGS
-The branch tag is hard-coded into the script (currently it is set to
-KDE_3_4_BRANCH).
-.PP
-If you abort (i.e., you do not make the suggested commits), your files
-will be checked out from HEAD (and not from the branch as they were
-before).
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This utility was written by Dirk Mueller and David Faure.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvslastchange.1 b/ubuntu/_base/core/tdesdk/debian/man/cvslastchange.1
deleted file mode 100644
index b651e4414..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvslastchange.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSLASTCHANGE 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvslastchange \- display the last committed changes for a file
-.SH SYNOPSIS
-.B cvslastchange
-\fIfile\fP [ \fIrevision\fP ]
-.br
-.B cvslastchange
-\fBM\fP +\fIdigits\fP -\fIdigits\fP
-.I file revision
-.SH DESCRIPTION
-\fBcvslastchange\fP displays the last changes committed to the CVS
-for the given file.
-It does this by launching '\fIcvs log\fP' and '\fIcvs diff\fP'.
-.PP
-If a revision is passed, the changes committed for that particular revision
-will be displayed.  Otherwise the currently checked out revision will be used.
-.PP
-This tool works with other branches as well as with HEAD.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fBM\fP +\fIdigits\fP -\fIdigits\fP
-These options are currently ignored.
-.SH ENVIRONMENT VARIABLES
-.TP
-CVSLASTCHANGE_KEEP_WHITESPACE
-Define this variable if you do not want the whitespace to be modified
-in any way when displaying changes.  Usually the whitespace is tidied
-up a little before the changes are displayed on screen.
-.br
-This variable is useful if you are using cvslastchange to extract a
-patch that can be applied elsewhere.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastlog (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvslastlog.1 b/ubuntu/_base/core/tdesdk/debian/man/cvslastlog.1
deleted file mode 100644
index 445a1a74a..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvslastlog.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSLASTLOG 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvslastlog \- prints the log of the last commit for a file
-.SH SYNOPSIS
-.B cvslastlog
-.I file
-.SH DESCRIPTION
-\fBcvslastlog\fP shows the log associated with the last CVS commit for the
-given file.
-It depends on the version of the local file, not the one on the server.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvsrevertlast (1).
-.SH AUTHOR
-cvslastlog was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvsrevertlast.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsrevertlast.1
deleted file mode 100644
index aedf45aa6..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsrevertlast.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSREVERTLAST 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsrevertlast \- revert files in CVS by one version
-.SH SYNOPSIS
-.B cvsrevertlast
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBcvsrevertlast\fP is used to revert all the files on the command line
-by one version in CVS.  The files will not be committed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR cvsbackport (1),
-.BR cvsblame (1),
-.BR cvsforwardport (1),
-.BR cvslastchange (1),
-.BR cvslastlog (1).
-.SH AUTHOR
-This utility was written by Charles Samuels <charles@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cvsservice.1 b/ubuntu/_base/core/tdesdk/debian/man/cvsservice.1
deleted file mode 100644
index 9d5c791d7..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cvsservice.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CVSSERVICE 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cvsservice \- a DCOP service for accessing CVS repositories
-.SH SYNOPSIS
-.B cvsservice
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-The CVS service is a DCOP service for accessing and working with
-remote CVS repositories.  Applications may link with this library to
-access the DCOP service directly from C++.  Alternatively, scripts may
-access the service using the standard
-.BR dcop (1)
-command-line tool.
-.PP
-DCOP is the Desktop Communication Protocol used throughout TDE.
-.PP
-The CVS DCOP service consists of the following three parts:
-.TP
-\fBCvsService\fP
-The main interface to the functionality of the
-.BR cvs (1)
-command line client.  There is one method for each CVS command, e.g., add,
-checkout, commit, etc.  The methods assemble the command line
-arguments, create a CvsJob and return a DCOPRef object for it
-to the caller.  There is one instance of this service for each
-application instance.
-.TP
-\fBRepository\fP
-This DCOPObject manages the configuration data of the current
-CVS repository.  The data is automatically updated when other
-service instances change it.
-.TP
-\fBCvsJob\fP
-This class represents a CVS job.  You can execute and cancel it,
-and you can retrieve the output of the cvs client by either
-connecting to the proper DCOP signals or by using the output()
-method.  There are two types of jobs.  First the non-concurrent
-job which has to run alone, like cvs update or import.  Second
-the jobs which can run concurrently like cvs log or annotate.
-.PP
-The CVS service is provided with Cervisia, which is part of the TDE
-Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIcvsservice \-\-help\fP.
-.SH SEE ALSO
-.BR cervisia (1),
-.BR cvs (1),
-.BR cvsaskpass (1),
-.BR dcop (1).
-.PP
-Details of how to use the CVS service from within a shell script, a C++
-program or through the JavaScript bindings can be found in
-\fI/usr/share/doc/libcvsservice0/DESIGN\fP.
-.SH AUTHOR
-The CVS service was written by Christian Loose <christian.loose@kdemail.net>.
-.br
-Cervisia was written by Bernd Gehrmann <bernd@physik.hu-berlin.de>,
-Christian Loose <christian.loose@kdemail.net>,
-Andre Woebbeking <woebbeking@web.de>,
-Carlos Woelz <carloswoelz@imap-mail.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/cxxmetric.1 b/ubuntu/_base/core/tdesdk/debian/man/cxxmetric.1
deleted file mode 100644
index a8a855cde..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/cxxmetric.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CXXMETRIC 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-cxxmetric \- simple source metrics for C and C++
-.SH SYNOPSIS
-.B cxxmetric
-.RI "[ " file " ... ]"
-.SH DESCRIPTION
-\fBcxxmetric\fP counts lines of code, comment and blank space and
-calculates various other statistics for each given source file.
-Source files must be in C or C++.
-.PP
-If no source files are specified then all C/C++ files in or beneath the
-current directory will be used.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/demangle.1 b/ubuntu/_base/core/tdesdk/debian/man/demangle.1
deleted file mode 100644
index 8f4f3922f..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/demangle.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH DEMANGLE 1 "February 25, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-demangle \- undo C++ name mangling for symbols
-.SH SYNOPSIS
-.B demangle
-.SH DESCRIPTION
-\fBDemangle\fP reads a list of C++ mangled symbol names from standard
-input and converts these names to human-readable form on standard
-output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLE
-Create a file called \fInames\fP containing the following mangled symbol
-names:
-.PP
-.RS
-_ZNK6Object10metaObjectEv
-.br
-_ZN8QPtrListI5ArrowE5clearEv
-.br
-_ZTC4Kolf0_11TDEMainWindow
-.RE
-.PP
-These names can then be demangled as follows:
-.PP
-.RS
-\fIexample$\fP demangle < names
-.br
-Object::metaObject() const
-.br
-QPtrList<Arrow>::clear()
-.br
-construction vtable for TDEMainWindow-in-Kolf
-.RE
-.SH SEE ALSO
-.BR kminspector (1),
-.BR kmmatch (1),
-.BR kmtrace (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/dprof2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/dprof2calltree.1
deleted file mode 100644
index 88bcd0b0d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/dprof2calltree.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH DPROF2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-dprof2calltree \- convert perl's DProf profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B dprof2calltree
-\fB\-f\fP \fIinput\fP
-[ \fB\-o\fP \fIoutput\fP ]
-.SH DESCRIPTION
-\fBdprof2calltree\fP reads the \fItmon.out\fP profiling data output by
-Perl's Devel::DProf profiling package, and converts it into calltree format
-for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP \fIinput\fP
-Specifies the DProf \fItmon.out\fP file to convert.
-.TP
-\fB\-o\fP \fIoutput\fP
-Write the calltree output to the given file for use by KCachegrind.
-If omitted, the output will be written to file of the form
-\fIcachgrind.out.<input>\fP.
-.SH EXAMPLE
-If you run a perl script as:
-.PP
-.RS
-perl -d:DProf yourscript.pl
-.RE
-.PP
-then this will write profiling data to \fItmon.out\fP.  You can then
-work with this data in KCachegrind as follows:
-.PP
-.RS
-dprof2calltree -f tmin.out -o cachegrind.out.foo
-.br
-tdecachegrind cachegrind.out.foo
-.RE
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by George Schlossnagle <george@omniti.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/extend_dmalloc.1 b/ubuntu/_base/core/tdesdk/debian/man/extend_dmalloc.1
deleted file mode 100644
index 0078442ef..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/extend_dmalloc.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTEND_DMALLOC 1 "April 29, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extend_dmalloc \- analyse return-addresses from dmalloc logfiles
-.SH SYNOPSIS
-.B extend_dmalloc
-.I dmalloc-log binary
-.SH DESCRIPTION
-\fBextend_dmalloc\fP will run
-.BR gdb (1)
-to get information on the return-addresses from a
-.BR dmalloc (1)
-logfile.  Specifically it will examine any \fIra=\fP lines and try to
-get the corresponding line numbers.
-.PP
-The argument \fIbinary\fP must be the binary that generated the log
-\fIdmalloc-log\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH NOTES
-You may wish to direct the output from extend_dmalloc to a file, since
-otherwise gdb seems to prompt for a return as if you are at the end of a
-page.
-.SH AUTHOR
-extend_dmalloc was written by Gray Watson <gray.watson@letters.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/extractattr.1 b/ubuntu/_base/core/tdesdk/debian/man/extractattr.1
deleted file mode 100644
index 7e506e449..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/extractattr.1
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTRACTATTR 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extractattr \- extract element attributes from UI and XML GUI files
-.SH SYNOPSIS
-.B extractattr
-\fB\-\-attr=\fP\fIname\fP
-[ \fB\-\-attr=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.PP
-.B extractattr \-\-help
-.SH DESCRIPTION
-\fBextractattr\fP finds all of the given element attributes within the
-given files.  It then writes the corresponding \fIi18n()\fP calls to
-standard output (usually redirected to rc.cpp) so that xgettext can parse
-them.  Only the attributes specified by \fB\-\-attr\fP will be extracted.
-.PP
-Both Qt designer (.ui) files and XML GUI (.rc) files are understood.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\-attr=\fP\fIname\fP
-Specifies an attribute to be extracted.  This option may be used
-multiple times.
-.br
-The \fIname\fP argument must be of the form
-\fIElement\fP,\fIattribute\fP or
-\fIElement\fP,\fIattribute\fP,\fIcontext\fP.
-.br
-The context is optional, and is used in constructing the i18n() calls.
-If specified it will override the default context set by \fB\-\-context\fP.
-.TP
-\fB\-\-context=\fP\fIname\fP
-Give all i18n() calls the given context: i18n("\fIname\fP", ...).
-.TP
-\fB\-\-help\fP
-Display a summary of options.
-.SH EXAMPLE
-extractattr \-\-attr=Title,data \-\-attr=Description,data,Stencils file.ui
-.SH AUTHOR
-This utility was written by Richard Evans <rich@ridas.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/extractrc.1 b/ubuntu/_base/core/tdesdk/debian/man/extractrc.1
deleted file mode 100644
index 130fdb089..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/extractrc.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH EXTRACTRC 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-extractrc \- extract message strings from UI and XML GUI files
-.SH SYNOPSIS
-.B extractrc
-[ \fB\-\-tag\-group=\fP\fIgroup\fP ]
-[ \fB\-\-tag=\fP\fIname\fP ... ]
-[ \fB\-\-context=\fP\fIname\fP ]
-\fIfile\fP ...
-.PP
-.B extractrc \-\-help
-.SH DESCRIPTION
-\fBextractrc\fP finds all text tags and other message strings within the
-given files.  It then writes the corresponding \fIi18n()\fP calls to
-standard output (usually redirected to rc.cpp) so that xgettext can parse
-them.
-.PP
-It understands both Qt designer (.ui) files and XML GUI (.rc) files.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Note that the old \fB\-\-lines\fP option is deprecated; source line
-numbers are now always included in comments.
-.TP
-\fB\-\-tag\-group=\fP\fIgroup\fP
-Use a predefined group of tags that we are interested in.
-Valid groups are default, koffice and none.
-The default group will be used if this option is omitted.
-.TP
-\fB\-\-tag=\fP\fIname\fP
-Extract also the contents of the tag \fIname\fP.
-This option may be used multiple times
-(e.g., \-\-tag=tag_one \-\-tag=tag_two).
-.TP
-\fB\-\-context=\fP\fIname\fP
-Give all i18n() calls the given context: i18n("\fIname\fP", ...).
-.TP
-\fB\-\-help\fP
-Display a summary of options.
-.SH AUTHOR
-This utility was written by Richard Evans <rich@ridas.com> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/findmissingcrystal.1 b/ubuntu/_base/core/tdesdk/debian/man/findmissingcrystal.1
deleted file mode 100644
index 32b23294e..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/findmissingcrystal.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FINDMISSINGCRYSTAL 1 "February 6, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-findmissingcrystal \- determine which TDE Crystal icons are the same as
-the TDE Classic hicolor icons
-.SH SYNOPSIS
-.B findmissingcrystal
-.I module
-.SH DESCRIPTION
-\fBfindmissingcrystal\fP is a small utility that runs through the icons
-in the given TDE module and determines which Crystal icons from that
-module are identical to the old TDE Classic hicolor icons.
-.PP
-This script \fBmust\fP be run from the top-level directory of a TDE source
-tree (i.e., the directory containing \fItdelibs\fP, \fItdebase\fP, etc.).
-It is assumed that \fImodule\fP is a top-level module in the source tree,
-and it is also assumed that the source tree contains the \fItdeartwork\fP
-module (which contains the old hicolor icons).
-.PP
-For each Crystal icon in the given module, a message will be output
-describing whether the icon is new (no matching hicolor icon was found),
-different from the hicolor icon or the same as the hicolor icon.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/fixkdeincludes.1 b/ubuntu/_base/core/tdesdk/debian/man/fixkdeincludes.1
deleted file mode 100644
index 43ae3dfff..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/fixkdeincludes.1
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FIXTDEINCLUDES 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fixkdeincludes \- reduce the number of #includes in TDE source files
-.SH SYNOPSIS
-.B fixkdeincludes
-[ \fB\-v, \-\-verbose\fP ]
-[ \fB\-e, \-\-experimental\fP ]
-[ \fB\-m, \-\-modify\fP ]
-[ \fIfile\fP ... ]
-.br
-.B fixkdeincludes \-\-help
-.SH DESCRIPTION
-\fBfixkdeincludes\fP tries to reduce the number of #includes in C++ source
-files.  Much of its processing is specific to TDE sources and so it
-might not work so well with sources for non-TDE applications.
-.PP
-The following problems are identified by fixkdeincludes:
-.PP
-.RS
-Including headers that are no longer supported but which exist for
-compatibility with older Qt/KDE versions;
-.PP
-Including the same file multiple times;
-.PP
-Using #include <...> instead of #include "...".
-.RE
-.PP
-There is also an experimental mode which tries removing each #include
-one at a time (with a few exceptions) to see whether the source still
-compiles.  Note that this experimental mode will modify the original sources.
-.PP
-By default the sources will not be modified; the identified problems
-will simply be written to standard output.
-.PP
-The list of C++ sources to examine should be given on the command-line.
-If no files are given, all C++ sources in or beneath the current
-directory will be examined (with the exception of directories whose
-\fIMakefile.am\fP contains \-UQT_NO_COMPAT or \-UTDE_NO_COMPAT).
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-v, \-\-verbose\fP
-Verbose mode.  Additional debugging information is written to standard output.
-.TP
-\fB\-e, \-\-experimental\fP
-Experimental mode, as described above in detail.  Note that this option
-implies \fB\-\-modify\fP.
-.TP
-\fB\-m, \-\-modify\fP
-As well as writing messages to standard output, actually modify the
-original sources to fix any problems that were found.
-.SH AUTHOR
-fixkdeincludes was written by Dirk Mueller <mueller@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/fixuifiles.1 b/ubuntu/_base/core/tdesdk/debian/man/fixuifiles.1
deleted file mode 100644
index 17ce46a61..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/fixuifiles.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FIXUIFILES 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fixuifiles \- remove undesirable features from TQt/TDE .ui files
-.SH SYNOPSIS
-.B fixuifiles
-[ \fB\-v, \-\-verbose\fP ]
-[ \fB\-\-omitqtcheck\fP ]
-[ \fIfile\fP ... ]
-.br
-.B fixuifiles \-\-help
-.SH DESCRIPTION
-\fBfixuifiles\fP processes one or more TQt/TDE user interface definition
-files (.ui files) and tries to remove some of the insanities found
-therein.  If no filenames are given, fixuifiles will process all .ui
-files in or beneath the current directory.
-.PP
-The following problems are fixed:
-.PP
-.RS
-Too high minimum Qt version;
-.PP
-Hardcoded untranslatable Alt+Letter accels (auto-added by Qt Designer);
-.PP
-Captions that are equal to class names (auto-added by Qt Designer).
-.RE
-.PP
-The threshold Qt version can be set
-using either a \fI.qt_minversion\fP file (containing simply the Qt version
-number) or a \fIconfigure.in.in\fP file (containing an appropriate
-MIN_CONFIG macro).  These files may be in the directory containing the .ui
-file or any parent directory.  If no threshold Qt version is found,
-a sensible default will be used.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-v, \-\-verbose\fP
-Verbose mode.  Additional debugging information is written to standard output.
-.TP
-\fB\-\-omitqtcheck\fP
-Do not check the minimum Qt version.
-.SH AUTHOR
-fixuifiles was written by David Faure <faure@kde.org> and
-Dirk Mueller <mueller@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/hotshot2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/hotshot2calltree.1
deleted file mode 100644
index 8c4d4441c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/hotshot2calltree.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH HOTSHOT2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-hotshot2calltree \- convert hotshot profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B hotshot2calltree
-[ \fB\-\-file\-limit\fP \fIlimit\fP ]
-\fB\-o\fP \fIoutput\fP \fIinput\fP [ \fIinput\fP ... ]
-.SH DESCRIPTION
-\fBhotshot2calltree\fP reads one or more pstat profiling data files
-as output by the hotshot python profiler, and converts them into
-calltree format for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-o\fP \fIoutput\fP
-Write the calltree output into the given file for use by KCachegrind.
-This may be \fB\-\fP if you wish to write to standard output.
-.TP
-\fIinput\fP ...
-Read the hotshot profiling data from the given file(s).
-.TP
-\fB\-\-file\-limit\fP \fIlimit\fP
-Stop after the given number of input files.
-.SH EXAMPLE
-Suppose that you have used hotshot to profile a python app, with results
-dumped to the file \fIpythongrind.prof\fP.  You may then work with this
-data in KCachegrind as follows.
-.PP
-.RS
-hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof
-.br
-tdecachegrind cachegrind.out.0
-.RE
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Jorg Beyer <job@webde-ag.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kapptemplate.1 b/ubuntu/_base/core/tdesdk/debian/man/kapptemplate.1
deleted file mode 100644
index 1010ecd52..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kapptemplate.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KAPPTEMPLATE 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kapptemplate \- creates a framework to develop a TDE application
-.SH SYNOPSIS
-.B kapptemplate
-[ \fB\-\-noinit\fP ] [ \fB\-\-default\fP ]
-.RB "[ " \-\-full\-app " | " \-\-kpart\-app " | " \-\-kpart\-plugin
-.RB " | " \-\-existing " ]"
-.PP
-.B kapptemplate \-\-help
-.SH DESCRIPTION
-\fBKAppTemplate\fP is a shell script that will create the necessary
-framework to develop various TDE applications.  It takes care of the
-autoconf/automake code as well as providing a skeleton and example of
-what the code typically looks like.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.SS General Options
-.TP
-\-\-help
-Display a full summary of options.
-.TP
-\-\-noinit
-Don't run 'make \-f Makefile.cvs'.
-.TP
-\-\-default
-Use default values instead of prompting.
-.SS Framework Types
-.TP
-\-\-full\-app
-Create a full featured TDE application.
-.TP
-\-\-kpart\-app
-Create a full featured KPart application.
-.TP
-\-\-kpart\-plugin
-Create a KPart plugin framework.
-.TP
-\-\-existing
-Converting existing source to an automake/autoconf TDE framework.
-.SH FILES
-.TP
-.I ~/.kapptemplate
-Stores default values.
-.SH SEE ALSO
-The original documentation from the program author
-is available in \fI/usr/share/doc/kapptemplate/\fP.
-.SH AUTHOR
-KAppTemplate was written by Kurt Granroth <granroth@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kbabel.1 b/ubuntu/_base/core/tdesdk/debian/man/kbabel.1
deleted file mode 100644
index 047e3626d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kbabel.1
+++ /dev/null
@@ -1,74 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBABEL 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbabel \- a PO-file editor for TDE
-.SH SYNOPSIS
-.B kbabel
-.RI "[ " generic-options " ]"
-[ \fB\-\-gotomsgid\fP \fImsgid\fP ] [ \fB\-\-nosplash\fP ]
-[ \fB\-\-project\fP \fIconfig-file\fP ]
-.RI "[ " file " ]"
-.SH DESCRIPTION
-\fBKBabel\fP is part of a suite of programs for editing gettext message
-files (PO-files).  It is designed to help you translate fast and
-consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel (this
-program) is an advanced and easy to use PO-file editor with full navigational
-and editing capabilities, syntax checking and statistics.  CatalogManager is
-a multi functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict is a dictionary to assist with searching
-for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbabel-specific options.
-For a full summary of options, run \fIkbabel \-\-help\fP.
-.TP
-\fB\-\-gotomsgid\fP \fImsgid\fP
-Go to the entry with the given message ID.
-.TP
-.B \-\-nosplash
-Disable splashscreen at startup.
-.TP
-\fB\-\-project\fP \fIconfig-file\fP
-Load the configuration from the given file.
-.SH SEE ALSO
-.BR catalogmanager (1),
-.BR kbabeldict (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kbabeldict.1 b/ubuntu/_base/core/tdesdk/debian/man/kbabeldict.1
deleted file mode 100644
index ffd9b4658..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kbabeldict.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBABELDICT 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbabeldict \- the KBabel dictionary for translators
-.SH SYNOPSIS
-.B kbabeldict
-.RI "[ " generic-options " ]"
-.RB "[ " \-\-nosplash " ]"
-.SH DESCRIPTION
-\fBKBabelDict\fP is part of a suite of programs for editing gettext message
-files (PO-files).  This suite is designed to help you translate fast and
-consistently.
-.PP
-This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
-advanced and easy to use PO-file editor with full navigational and editing
-capabilities, syntax checking and statistics.  CatalogManager is a multi
-functional catalog manager which allows you to keep track of many
-PO-files at once.  KBabelDict (this program) is a dictionary to assist
-with searching for common translations.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbabeldict-specific options.
-For a full summary of options, run \fIkbabeldict \-\-help\fP.
-.TP
-.B \-\-nosplash
-Disable splashscreen at startup.
-.SH SEE ALSO
-.BR kbabel (1),
-.BR catalogmanager (1).
-.PP
-Full user documentation for KBabel is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbabel/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbabel/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kbabel/\fP.
-.SH AUTHOR
-KBabel was written by Matthias Kiefer <kiefer@kde.org>,
-Wolfram Diestel <wolfram@steloj.de>, Andrea Rizzi <rizzi@kde.org>,
-Stanislav Visnovsky <visnovsky@kde.org>, Marco Wegner <dubbleu@web.de>,
-Asgeir Frimannsson <asgeirf@redhat.com>,
-Dwayne Bailey <dwayne@translate.org.za>,
-Bram Schoenmakers <bramschoenmakers@kde.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kbugbuster.1 b/ubuntu/_base/core/tdesdk/debian/man/kbugbuster.1
deleted file mode 100644
index 29b9c38d7..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kbugbuster.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBUGBUSTER 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbugbuster \- front end for the TDE bug tracking system
-.SH SYNOPSIS
-.B kbugbuster
-.RI "[ " generic-options " ]"
-[ \fB\-d, \-\-disconnected\fP ]
-[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
-[ \fB\-\-bug\fP \fInumber\fP ]
-.SH DESCRIPTION
-\fBKBugBuster\fP is a GUI front end for the TDE bug tracking system.
-It allows the user to view and manipulate bug reports and provides a
-variety of options for searching through reports.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kbugbuster-specific options.
-For a full summary of options, run \fIkbugbuster \-\-help\fP.
-.TP
-[ \fB\-d, \-\-disconnected\fP ]
-Start in disconnected mode.
-.TP
-[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
-Start with the bug list for the given package.
-.TP
-[ \fB\-\-bug\fP \fInumber\fP ]
-Start with the given bug report.
-.SH AUTHOR
-KBugBuster was written by Martijn Klingens <klingens@kde.org>,
-Simon Hausmann <hausmann@kde.org>, Cornelius Schumacher <schumacher@kde.org>
-and David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kdedoc.1 b/ubuntu/_base/core/tdesdk/debian/man/kdedoc.1
deleted file mode 100644
index 1911442c2..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kdedoc.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDEDOC 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kdedoc \- view documentation for a TDE class
-.SH SYNOPSIS
-.B kdedoc
-.I classname
-.SH DESCRIPTION
-\fBkdedoc\fP opens the documentation for the TDE class \fIclassname\fP
-in kfm/konqueror.  Note that the class name is case sensitive.  It is
-assumed that you have the tdelibs documentation installed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLES
-To bring up help on the class TDEAboutDialog:
-.PP
-.RS
-kdedoc TDEAboutDialog
-.RE
-.SH DEBIAN USERS
-The tdelibs documentation is in the Debian package \fItdelibs4-doc\fP,
-which will need to be installed.
-.SH SEE ALSO
-.BR qtdoc (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kdelnk2desktop.py.1 b/ubuntu/_base/core/tdesdk/debian/man/kdelnk2desktop.py.1
deleted file mode 100644
index 41cce73a5..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kdelnk2desktop.py.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KDELNK2DESKTOP.PY 1 "November 14, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kdelnk2desktop.py \- converts .kdelnk to .desktop
-.SH SYNOPSIS
-.B kdelnk2desktop.py
-.RI "[ " kdelnk-file " ] ..."
-.SH DESCRIPTION
-\fBkdelnk2desktop.py\fP is used to convert
-a \fI.kdelnk\fP file (used by KDE 1) into a \fI.desktop\fP
-file (used by KDE 2 and later).
-.PP
-File \fIkdelnk-file\fP must have a name ending in \fI.kdelnk\fP.
-After kdelnk2desktop.py is run, this will be replaced by a new file
-ending in \fI.desktop\fP.  The original \fIkdelnk-file\fP will be
-removed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNING
-If \fIkdelnk-file\fP does not end in \fI.kdelnk\fP,
-the results of this script are unpredictable.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kdemangen.pl.1 b/ubuntu/_base/core/tdesdk/debian/man/kdemangen.pl.1
deleted file mode 100644
index 8acd79df1..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kdemangen.pl.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KDEMANGEN.PL 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kdemangen.pl \- automatically create a draft manpage for a TDE app
-.SH SYNOPSIS
-.B kdemangen.pl
-.I /path/to/application
-.SH DESCRIPTION
-\fBkdemangen.pl\fP will automatically create a draft manpage for a TDE
-application.  Manpages are always better when hand-tailored, but this
-should give you a fairly good start.
-.PP
-To create the manpage, it will use the \-\-author and \-\-help\-all
-output for the application passed on the command line.
-It will also use the description in the
-Debian control file if one is available.  To make use of this additional
-feature, you must run kdemangen.pl from within the \fIdebian/\fP
-subdirectory of the application sources.
-.PP
-The new manpage will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH WARNING
-This utility will only work for a full TDE application that uses
-TDECmdLineArgs (which most full TDE applications do).
-.SH EXAMPLE
-.RS
-cd /path/to/tde/srcs/tdeedu/debian
-.br
-kdemangen /usr/bin/kstars > kstars.1
-.RE
-.SH AUTHOR
-kdemangen.pl was written by Dominique Devriese <devriese@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kminspector.1 b/ubuntu/_base/core/tdesdk/debian/man/kminspector.1
deleted file mode 100644
index 29cb70e5b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kminspector.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMINSPECTOR 1 "February 25, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kminspector \- run a program with the TDE memory leak tracer
-.SH SYNOPSIS
-.B kminspector
-\fIprogram\fP [ \fIprogram-args\fP ]
-.SH DESCRIPTION
-\fBKMinspector\fP runs the given program, examines its memory
-allocation behaviour using \fIlibktrace\fP and pipes the resulting
-allocation tree through \fIless\fP.
-.PP
-The given program does not need to be specially compiled.
-.PP
-This utility is provided with KMtrace,
-a TDE tool to assist with malloc debugging using
-glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
-current (9/9/2000) glibc versions only logs the return-address of the
-malloc/free call. The library included with KMtrace
-logs a complete backtrace upon malloc/free.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kmmatch (1),
-.BR kmtrace (1).
-.PP
-Much more extensive documentation for KMtrace can be found in
-\fI/usr/share/doc/kmtrace/README\fP.
-.SH AUTHOR
-KMtrace was written by Waldo Bastian <bastian@kde.org>,
-Mike Haertel <mike@ai.mit.edu> and Andi Kleen <ak@suse.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kmmatch.1 b/ubuntu/_base/core/tdesdk/debian/man/kmmatch.1
deleted file mode 100644
index d80c15542..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kmmatch.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMMATCH 1 "February 26, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmmatch \- search for symbols in a map file
-.SH SYNOPSIS
-.B kmmatch
-.I map-file call-file
-.SH DESCRIPTION
-\fBKMMatch\fP determines which symbols from a given set (\fIcall-file\fP) are
-present in a given map file.
-.PP
-The \fImap-file\fP should contain output from \fInm\fP (which extracts
-information from object files).  It must \fBnot\fP contain any blank
-lines or header information (such as the name of the object file); this
-means you may need to strip the first few lines of \fInm\fP output from
-the \fImap-file\fP.
-.PP
-The \fIcall-file\fP should contain a list of symbols (such as function
-calls made by a program), one per line.
-.PP
-This utility will find which of the symbols in \fIcall-file\fP are
-present in \fImap-file\fP and write them to standard error, one per
-line, in the order in which they appear in \fIcall-file\fP.
-.PP
-Note that this utility is called \fBmatch\fP in the original TDE
-distribution; it has been renamed to \fBkmmatch\fP in Debian to
-avoid conflicts with unrelated packages.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kminspector (1),
-.BR kmtrace (1),
-.BR nm (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kmtrace.1 b/ubuntu/_base/core/tdesdk/debian/man/kmtrace.1
deleted file mode 100644
index 14f5f9fc8..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kmtrace.1
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KMTRACE 1 "February 25, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kmtrace \- a TDE memory leak tracer
-.SH SYNOPSIS
-.B kmtrace
-[ \fIgeneric-options\fP ]
-[ \fB\-x, \-\-exclude\fP \fIfile\fP ]
-[ \fB\-e, \-\-exe\fP \fIfile\fP ]
-[ \fB\-t, \-\-tree\fP \fIfile\fP
-[ \fB\-\-th, \-\-treethreshold\fP \fIvalue\fP ]
-[ \fB\-\-td, \-\-treedepth\fP \fIvalue\fP ]]
-[ \fItrace-log\fP ]
-.SH DESCRIPTION
-\fBKMtrace\fP is a TDE tool to assist with malloc debugging using
-glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
-current (9/9/2000) glibc versions only logs the return-address of the
-malloc/free call. The library included with KMtrace
-logs a complete backtrace upon malloc/free.
-.PP
-KMtrace will investigate the trace log specified on the command line,
-or \fIktrace.out\fP if no trace log is specified.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kmtrace-specific options.
-For a full summary of options, run \fIkmtrace \-\-help\fP.
-.TP
-\fB\-x, \-\-exclude\fP \fIfile\fP
-File containing symbols to exclude from output.
-.TP
-\fB\-e, \-\-exe\fP \fIfile\fP
-Executable to use for looking up unknown symbols.
-.TP
-\fB\-t, \-\-tree\fP \fIfile\fP
-Write a tree of the allocations to the given file.
-.TP
-\fB\-\-th, \-\-treethreshold\fP \fIvalue\fP
-When writing the allocations tree, hide subtrees allocating less than the
-given memory amount.
-.TP
-\fB\-\-td, \-\-treedepth\fP \fIvalue\fP
-When writing the allocations tree, hide subtrees that are deeper than the
-specified depth.
-.SH SEE ALSO
-.BR demangle (1),
-.BR kminspector (1),
-.BR kmmatch (1).
-.PP
-Much more extensive documentation can be found in
-\fI/usr/share/doc/kmtrace/README\fP.
-.SH AUTHOR
-KMtrace was written by Waldo Bastian <bastian@kde.org>,
-Mike Haertel <mike@ai.mit.edu> and Andi Kleen <ak@suse.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kompare.1 b/ubuntu/_base/core/tdesdk/debian/man/kompare.1
deleted file mode 100644
index e777752e1..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kompare.1
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOMPARE 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kompare \- a TDE GUI for viewing differences between files
-.SH SYNOPSIS
-.B kompare
-[ \fIgeneric-options\fP ]
-.br
-.B kompare
-[ \fIgeneric-options\fP ] [ \fB\-c\fP ] \fIURL1 URL2\fP
-.br
-.B kompare
-[ \fIgeneric-options\fP ] [ \fB\-o\fP [ \fB\-n\fP ]] \fIdiff\fP
-.br
-.B kompare
-[ \fIgeneric-options\fP ] \fB\-b\fP \fIURL diff\fP
-.SH DESCRIPTION
-\fBKompare\fP is a graphical user interface for viewing the differences
-between two files.  It will also optionally create a diff file.
-.PP
-Depending upon what is passed on the command line, Kompare can compare
-documents, display diff files and blend diff files back into original
-documents.
-.PP
-If an url is given as - then Kompare will read the corresponding file
-from standard input.  Thus (for instance) Kompare can be used as:
-.PP
-.RS
-cvs diff | kompare \-o \-
-.RE
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kompare-specific options.
-For a full summary of options, run \fIkompare \-\-help\fP.
-.TP
-\fB\-b\fP \fIURL diff\fP
-Blends \fIdiff\fP into URL.  \fIdiff\fP is expected to be diff output and
-\fIURL\fP the file or folder that the diff output needs to be blended into.
-.TP
-\fB\-c\fP \fIURL1 URL2\fP
-Compares \fIURL1\fP with \fIURL2\fP.  This is the default mode if two
-URLs are passed.
-.TP
-\fB\-n\fP
-Used with \fB\-o\fP to stop Kompare from checking for the original file.
-.TP
-\fB\-o\fP \fIdiff\fP
-Opens the given diff file.  This is the default mode if only one URL is
-passed.
-.br
-Kompare will check to see if it can find
-the original file(s).  If it can, it will blend the original file(s) into
-the diff output and show the result in the viewer.  Passing \fB\-n\fP
-will disable this check.
-.SH SEE ALSO
-The original documentation from the program author
-is available in \fI/usr/share/doc/kompare/\fP.
-.SH AUTHOR
-Kompare was written by John Firebaugh <jfirebaugh@kde.org>,
-Otto Bruggeman <otto.bruggeman@home.nl> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/kuiviewer.1 b/ubuntu/_base/core/tdesdk/debian/man/kuiviewer.1
deleted file mode 100644
index 5439127ae..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/kuiviewer.1
+++ /dev/null
@@ -1,65 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUIVIEWER 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kuiviewer \- a viewer for Qt Designer user interface files
-.SH SYNOPSIS
-.B kuiviewer
-.RI "[ " generic-options " ]"
-.RI "[ " ui-file ... " ]"
-.PP
-.B kuiviewer
-.RI "[ " generic-options " ]"
-{ \fB\-s, \-\-takescreenshot\fP \fIfilename\fP }
-[ \fB\-w, \-\-screenshotwidth\fP \fIint\fP ]
-[ \fB\-h, \-\-screenshotheight\fP \fIint\fP ]
-.I ui-file
-.SH DESCRIPTION
-\fBKUIViewer\fP is a utility to display and test the user interface (.ui)
-files generated by \fBQt Designer\fP.  The interfaces can be displayed in a
-variety of different widget styles.
-.PP
-Normally KUIViewer launches a full GUI, allowing the user to interact with
-the given interface.
-By passing the \fB\-\-takescreenshot\fP option, you can make KUIViewer dump a
-screenshot of the interface instead and exit immediately.  Other options
-are available to control precisely how this screenshot is constructed.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the kuiviewer-specific options.
-For a full summary of options, run \fIkuiviewer \-\-help\fP.
-.TP
-\fB\-s, \-\-takescreenshot\fP \fIfilename\fP
-Take a screenshot of the given interface and exit immediately.
-The \fIfilename\fP argument specifies where the screenshot will be saved.
-This screenshot will be saved in PNG format.
-.TP
-\fB\-w, \-\-screenshotwidth\fP \fIint\fP
-Before taking a screenshot, resize the interface to the given width.
-.TP
-\fB\-h, \-\-screenshotheight\fP \fIint\fP
-Before taking a screenshot, resize the interface to the given height.
-.SH SEE ALSO
-.BR designer (1).
-.SH AUTHOR
-KUIViewer was written by Richard Moore <rich@kde.org>,
-Ian Reinhart Geiser <geiseri@kde.org> and
-Benjamin C. Meyer <ben+kuiviewer@meyerhome.net>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/licensecheck.1 b/ubuntu/_base/core/tdesdk/debian/man/licensecheck.1
deleted file mode 100644
index 48728f2c2..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/licensecheck.1
+++ /dev/null
@@ -1,37 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH LICENSECHECK 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-licensecheck \- simple license checker for source files
-.SH SYNOPSIS
-.B licensecheck
-.RB "[ " \-v " ]"
-\fIfile\fP ...
-.SH DESCRIPTION
-\fBlicensecheck\fP examines the comments at the beginning of each given
-source file and tries to determine which license the file is placed
-under.  It does this by searching for blocks of text that it recognises
-as belonging to various licenses.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-.B \-v
-Verbose mode.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/makeobj.1 b/ubuntu/_base/core/tdesdk/debian/man/makeobj.1
deleted file mode 100644
index 50a9f864f..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/makeobj.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH MAKEOBJ 1 "March 20, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-makeobj \- run make from the correct directory
-.SH SYNOPSIS
-.B makeobj
-[ \fImake-argument\fP ... ]
-.SH DESCRIPTION
-\fBmakeobj\fP is a wrapper around \fBmake\fP which basically checks
-whether it's in the source directory or the build directory and changes
-to the correct directory before calling make.
-.PP
-The command-line arguments will (generally) be passed directly to make.
-.PP
-This script is useful if the source directory is different from the
-build directory and the Makefiles are kept in the build directory, as is
-common for instance when building the TDE sources.  This script can however
-be used in more standard scenarios (such as non-TDE projects for which the
-source and build directories are the same), where it will behave just like
-make.
-.PP
-One of the environment variables OBJ_SUBDIR or OBJ_REPLACEMENT
-should be set to indicate where the build directory is in relation to
-the source directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-Note that only one of OBJ_SUBDIR and OBJ_REPLACEMENT should be used.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#src/tdesdk#src/tdesdk-obj#\fP.
-.SH SEE ALSO
-.BR make (1),
-.BR sed (1).
-.SH AUTHOR
-makeobj was written by Stephan Kulow <coolo@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/memprof2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/memprof2calltree.1
deleted file mode 100644
index d4f52ead4..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/memprof2calltree.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH MEMPROF2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-memprof2calltree \- convert memprof profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B memprof2calltree
-.SH DESCRIPTION
-\fBmemprof2calltree\fP reads the memory profiles of memprof and
-converts them into calltree format for use by KCachegrind.
-.PP
-The memprof data must be supplied on standard input, and the
-corresponding calltree data will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/op2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/op2calltree.1
deleted file mode 100644
index 0242e6cd6..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/op2calltree.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH OP2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-op2calltree \- convert OProfile profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B op2calltree
-.SH DESCRIPTION
-\fBop2calltree\fP reads the profiling data output by OProfile v0.8 and
-converts it into calltree format for use by KCachegrind.
-.PP
-The OProfile data must be supplied on standard input, and should be
-obtained by running:
-.PP
-.RS
-opreport \-gdf
-.RE
-.PP
-This converter will then write a separate calltree data file for each
-application, to a file of the form \fIoprof.out.<app>\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/package_crystalsvg.1 b/ubuntu/_base/core/tdesdk/debian/man/package_crystalsvg.1
deleted file mode 100644
index 32d8644e9..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/package_crystalsvg.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PACKAGE_CRYSTALSVG 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-package_crystalsvg \- bundle up Crystal SVG sources from a TDE checkout
-.SH SYNOPSIS
-.B package_crystalsvg
-.SH DESCRIPTION
-\fBpackage_crystalsvg\fP assumes that the current directory contains one
-or more checked-out TDE modules.  It searches these modules for Crystal
-SVG vector sources (.svgz or .svg.gz files)
-and packages them up into a tarball.  The tarball will also
-contain \fIFILES\fP (describing the contents of the tarball and which
-TDE modules/paths they were copied from) as well as some other bits and
-pieces.
-.PP
-Note that you must at least have tdelibs checked out for this utility to
-run.
-.PP
-The final tarball will be created in the current working directory.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-package_crystalsvg was written by Frans Englich <frans.englich@telia.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/png2mng.pl.1 b/ubuntu/_base/core/tdesdk/debian/man/png2mng.pl.1
deleted file mode 100644
index c86c17275..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/png2mng.pl.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PNG2MNG.PL 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-png2mng.pl \- combine a set of PNG images into an animated MNG image
-.SH SYNOPSIS
-.B png2mng.pl
-.I basename width height
-.SH DESCRIPTION
-\fBpng2mng.pl\fP reads a sequence of PNG images and combines them into
-a single animated MNG image.
-.PP
-The individual PNG images should be numbered consecutively from zero up,
-and should have names of the form
-.I basenameXXXX
-where
-.I XXXX
-is the four-digit sequence number (0000, 0001, 0002, etc).
-The width and height of the PNG images should
-also be included on the command line.
-.PP
-The final animated MNG image will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH EXAMPLE
-The following example will combine the files hi32-action-kde-0000.png,
-hi32-action-kde-0001.png, hi32-action-kde-0002.png, etc., and write
-the resulting animated image to hi32-action-kde.mng:
-.PP
-.RS
-png2mng.pl hi32-action-kde- 32 32 > hi32-action-kde.mng
-.RE
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/po2xml.1 b/ubuntu/_base/core/tdesdk/debian/man/po2xml.1
deleted file mode 100644
index d2f7fe5df..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/po2xml.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PO2XML 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-po2xml \- translates a DocBook XML file using a PO-file
-.SH SYNOPSIS
-.B po2xml
-.I original-XML translated-PO
-.SH DESCRIPTION
-\fBpo2xml\fP is a command-line tool that translates the DocBook
-XML file \fIoriginal-XML\fP using the gettext message file
-\fItranslated-PO\fP.  The resulting translated XML file is sent to standard
-output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR split2po (1),
-.BR swappo (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/pprof2calltree.1 b/ubuntu/_base/core/tdesdk/debian/man/pprof2calltree.1
deleted file mode 100644
index b5cf9082c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/pprof2calltree.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PPROF2CALLTREE 1 "October 15, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-pprof2calltree \- convert APD profiling data to KCachegrind calltree format
-.SH SYNOPSIS
-.B pprof2calltree
-\fB\-f\fP \fIinput\fP
-.SH DESCRIPTION
-\fBpprof2calltree\fP reads the pprof profiling data output by
-APD (http://pecl.php.net/apd/), and converts it into calltree format
-for use by KCachegrind.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP \fIinput\fP
-Specifies the APD pprof trace file to convert.  This generally has a
-name of the form \fIpprof.XXXXX.Y\fP.  The calltree output for
-KCachegrind will then be written to the file \fIcachegrind.out.XXXXX.Y\fP.
-.SH EXAMPLE
-Suppose you profile a script with APD and obtain the pprof trace file
-\fIpprof.12345.1\fP.  You can then work with this data in KCachegrind as
-follows.
-.PP
-.RS
-pprof2calltree -f pprof.12345.1
-.br
-tdecachegrind cachegrind.out.12345.1
-.RE
-.PP
-.SH SEE ALSO
-.BR tdecachegrind (1).
-.SH AUTHOR
-This converter was written by George Schlossnagle <george@omniti.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/pruneemptydirs.1 b/ubuntu/_base/core/tdesdk/debian/man/pruneemptydirs.1
deleted file mode 100644
index 108c7e4db..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/pruneemptydirs.1
+++ /dev/null
@@ -1,65 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH PRUNEEMPTYDIRS 1 "September 27, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-pruneemptydirs \- detects stale source dirs in a CVS tree
-.SH SYNOPSIS
-.B pruneemptydirs
-[ \fB\-f\fP ]
-.SH DESCRIPTION
-\fBpruneemptydirs\fP is used to clean up a local CVS tree.
-It detects directories containing remnants of old stuff which has been
-removed from the CVS.  Such stale directories often break compilation.
-The current directory and all directories beneath it will be examined.
-.PP
-Note that this tool does not remove anything; it simply prints what to
-do as a series of remove commands.  You can copy and paste these commands,
-or use them with eval in a script.
-.PP
-This tool works better if the source directory is not the same as the
-build directory, since it will not print directories containing old
-executables.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-f\fP
-Actually perform the deletions instead of just printing them out.
-Use this option with care (no warranties, etc.)!
-.SH ENVIRONMENT VARIABLES
-One of the following variables (but not both) should be set if the source
-directory is different from the build directory.
-If the build directory is simply a subdirectory of the source directory,
-the simpler variable OBJ_SUBDIR should be used.
-.TP
-OBJ_SUBDIR
-Indicates that the build directory is in the given subdirectory of the
-source directory.  For instance, if the source directory is \fItdesdk\fP
-and the build directory is \fItdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
-should be set to \fIobj-i386-linux\fP.
-.TP
-OBJ_REPLACEMENT
-A \fBsed\fP expression that is used to transform the source directory
-into the build directory.
-For instance, if the source directory is \fI~/src/tdesdk\fP and the
-build directory is \fI~/src/tdesdk-obj\fP, then OBJ_REPLACEMENT could
-be set to \fIs#tdesdk#tdesdk-obj#\fP.
-.SH AUTHOR
-pruneemptydirs was written by David Faure <faure@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/qtdoc.1 b/ubuntu/_base/core/tdesdk/debian/man/qtdoc.1
deleted file mode 100644
index 3b7c09f60..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/qtdoc.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH QTDOC 1 "January 31, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-qtdoc \- view documentation for a Qt class
-.SH SYNOPSIS
-.B qtdoc
-.RI "[ " classname " ]"
-.SH DESCRIPTION
-\fBqtdoc\fP opens a Qt help page in kfm/konqueror.
-If \fIclassname\fP is given, it opens the help page for that class (note
-that the class name is case insensitive).  Otherwise the main Qt help
-page is opened.  It is assumed that you have the Qt documentation
-installed.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-.TP
-QTDIR
-The directory beneath which the Qt documentation is installed.
-Thus the main Qt help page should be in \fI$QTDIR/doc/html/\fP.
-If $QTDIR is not set, \fI/usr/share/qt3\fP will be assumed.
-.SH EXAMPLES
-To bring up help on class QString:
-.PP
-.RS
-qtdoc QString
-.RE
-.SH DEBIAN USERS
-The Qt documentation is in the Debian package \fIqt3-doc\fP, which will
-need to be installed.
-.SH SEE ALSO
-.BR kdedoc (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/split2po.1 b/ubuntu/_base/core/tdesdk/debian/man/split2po.1
deleted file mode 100644
index 539e2f6c8..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/split2po.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH SPLIT2PO 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-split2po \- creates a PO-file from two DocBook XML files
-.SH SYNOPSIS
-.B split2po
-.I original-XML translated-XML
-.SH DESCRIPTION
-\fBsplit2po\fP is a command-line tool that takes the two given DocBook
-XML files and produces a gettext message file (PO-file) that represents
-the changes between them.  The resulting PO-file is sent to standard
-output.
-.PP
-.I translated-XML
-must be the result of translating
-.I original-XML
-into another language.  It is this translation that the resulting
-PO-file will represent.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH ENVIRONMENT VARIABLES
-.TP
-NO_CREDITS
-If set, the "ROLES_OF_TRANSLATORS" and "CREDIT_FOR_TRANSLATORS" messages
-will be omitted.  By default these are always included at the end of
-the PO-file, with empty message strings.
-.br
-These messages are used with TDE documentation, so you may wish to set
-NO_CREDITS if you are working with some other type of non-TDE documentation.
-.TP
-REPORT_MISMATCHES
-Set this variable to "no" if you wish mismatch reporting to be
-suppressed.  By default, any apparent mismatches between the two XML
-files will be noted on standard error.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR swappo (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/swappo.1 b/ubuntu/_base/core/tdesdk/debian/man/swappo.1
deleted file mode 100644
index bb1289d9b..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/swappo.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH SWAPPO 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-swappo \- swap msgid and msgstr fields in a PO-file
-.SH SYNOPSIS
-.B swappo
-.I PO-file
-.SH DESCRIPTION
-\fBswappo\fP reads the given PO-file and swaps the \fImsgid\fP and
-\fImsgstr\fP fields for every message.  The result is a new PO-file that
-translates in the opposite direction.  For example, if \fIPO-file\fP
-translates from English to French, the new PO-file will translate from
-French to English.
-.PP
-The new PO-file will be written to standard output.  The old PO-file
-will remain untouched.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR transxx (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/tdecachegrind.1 b/ubuntu/_base/core/tdesdk/debian/man/tdecachegrind.1
deleted file mode 100644
index d5f3ea064..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/tdecachegrind.1
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDECACHEGRIND 1 "March 25, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdecachegrind \- a visualisation tool for valgrind profiling output
-.SH SYNOPSIS
-.B tdecachegrind
-.RI "[ " generic-options " ]"
-[ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ]
-.SH DESCRIPTION
-\fBKCachegrind\fP is a visualisation tool for the profiling data generated
-by \fBcalltree\fP, a profiling skin for \fBvalgrind\fP.  Applications can be
-profiled using calltree without being recompiled, and shared libraries
-and plugin architectures are supported.
-.PP
-For visualising the output from other profiling tools, several converters
-are available.  On Debian systems these can be found in the
-\fItdecachegrind-converters\fP package.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-Below are the tdecachegrind-specific options.
-For a full summary of options, run \fItdecachegrind \-\-help\fP.
-.TP
-\fB\-r\fP \fIexec\fP
-Run the program \fIexec\fP under cachegrind.
-.TP
-\fItrace-file\fP
-Visualise data from the given trace.
-.SH SEE ALSO
-.BR calltree (1),
-.BR dprof2calltree (1),
-.BR hotshot2calltree (1),
-.BR memprof2calltree (1),
-.BR op2calltree (1),
-.BR pprof2calltree (1),
-.BR valgrind (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/tdecachegrind/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/tdecachegrind/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/tdecachegrind/\fP.
-.SH AUTHOR
-KCachegrind was written by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/tdekillall.1 b/ubuntu/_base/core/tdesdk/debian/man/tdekillall.1
deleted file mode 100644
index 92bf4380c..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/tdekillall.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TDEKILLALL 1 "April 29, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-tdekillall \- kills processes started with tdeinit
-.SH SYNOPSIS
-.B tdekillall
-[ \fB\-\fP\fIsignal\fP ] \fIprocess-name\fP
-.SH DESCRIPTION
-\fBtdekillall\fP kills all processes with a particular name
-that were started through tdeinit.  Specifically, it kills all processes
-\fBtdeinit:\fP \fIprocess-name\fP.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\fP\fIsignal\fP
-Kill the processes with signal \fIsignal\fP.  This option defaults to
-SIGTERM.  Run \fIkill \-l\fP for a list of possible signals.
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/testkspy.1 b/ubuntu/_base/core/tdesdk/debian/man/testkspy.1
deleted file mode 100644
index afdc702a4..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/testkspy.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TESTKSPY 1 "May 3, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-testkspy \- show off KSpy's capabilities
-.SH SYNOPSIS
-.B testkspy
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBtestkspy\fP is a small application that shows off KSpy's capabilities.
-It simply uses KSpy to spy on itself.
-.PP
-\fBKSpy\fP is a tiny library which can be used to graphically display
-the TQObjects in use by a TQt/TDE app.  In addition to the object tree,
-you can also view the properties, signals and slots of any QObject.
-.PP
-Basically it provides much the same info as QObject::dumpObjectTree() and
-QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
-minimal overhead for the application, because the kspy library is
-loaded dynamically using KLibLoader.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fItestkspy \-\-help\fP.
-.SH SEE ALSO
-Instructions on using KSpy with your own applications can be found in
-\fI/usr/share/doc/kspy/README\fP.
-.SH AUTHOR
-KSpy was written by Richard Moore <rich@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/transxx.1 b/ubuntu/_base/core/tdesdk/debian/man/transxx.1
deleted file mode 100644
index 6dba22392..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/transxx.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TRANSXX 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-transxx \- create a basic fleshed-out PO-file from a PO-template file
-.SH SYNOPSIS
-.B transxx
-[ \fB\-\-text\fP \fItranslation\fP ]
-.I template
-.SH DESCRIPTION
-\fBtransxx\fP is a command-line tool that produces a basic fleshed-out
-PO-file from a PO-template file.  Some of the formatting and
-structure of the \fImsgid\fP strings will be copied to the \fImsgstr\fP
-strings, but otherwise text will be translated to "xx".
-.PP
-The fleshed-out PO-file is sent to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH OPTIONS
-.TP
-\fB\-\-text\fP \fItranslation\fP
-Use the given translation everywhere instead of "xx".
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR swappo (1),
-.BR xml2pot (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/umbrello.1 b/ubuntu/_base/core/tdesdk/debian/man/umbrello.1
deleted file mode 100644
index 3c5d77d5e..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/umbrello.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH UMBRELLO 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-umbrello \- a UML modelling tool and code generator
-.SH SYNOPSIS
-.B umbrello
-.RI "[ " generic-options " ]"
-[ \fIfile\fP ]
-.SH DESCRIPTION
-\fBUmbrello UML Modeller\fP is a Unified Modelling Language editor for TDE.
-With UML you can create diagrams of software and other systems in an
-industry standard format.  Umbrello can also generate code from your
-UML diagrams in a number of programming languages.
-.PP
-The program supports class diagrams, sequence diagrams, collaboration
-diagrams, use case diagrams, state diagrams, activity diagrams, component
-diagrams and deployment diagrams.
-.PP
-This application is part of the TDE Software Development Kit.
-.SH OPTIONS
-For a full summary of options, run \fIumbrello \-\-help\fP.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/umbrello/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/umbrello/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdesdk-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/umbrello/\fP.
-.SH AUTHOR
-Umbrello was written by Paul Hensgen <phensgen@users.sourceforge.net> and
-many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/xml2pot.1 b/ubuntu/_base/core/tdesdk/debian/man/xml2pot.1
deleted file mode 100644
index 0b1a293d5..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/xml2pot.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH XML2POT 1 "March 19, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-xml2pot \- creates a PO-template file from a DocBook XML file
-.SH SYNOPSIS
-.B xml2pot
-.I original-XML
-.SH DESCRIPTION
-\fBxml2pot\fP is a command-line tool that produces a gettext message
-template file from the DocBook XML file \fIoriginal-XML\fP.
-The template file is sent to standard output.
-.PP
-The resulting template file can be used to create gettext message files
-(PO-files) for a variety of languages.  These can then be used in conjunction
-with
-.BR po2xml (1)
-to translate the original XML file into these other languages.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH SEE ALSO
-.BR po2xml (1),
-.BR split2po (1),
-.BR swappo (1),
-.BR transxx (1).
-.SH AUTHOR
-The PO-XML tools were written by Stephan Kulow <coolo@kde.org> and
-Peter Wells <pete@yamuna.demon.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/man/zonetab2pot.py.1 b/ubuntu/_base/core/tdesdk/debian/man/zonetab2pot.py.1
deleted file mode 100644
index d6a4330ad..000000000
--- a/ubuntu/_base/core/tdesdk/debian/man/zonetab2pot.py.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ZONETAB2POT.PY 1 "November 14, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-zonetab2pot.py \- converts a timezone list to a PO-file template
-.SH SYNOPSIS
-.B zonetab2pot.py
-[ \fItimezone-list\fP ]
-.SH DESCRIPTION
-\fBzonetab2pot.py\fP reads the timezone list given on the command-line
-and converts it to a gettext message file (PO-file) template containing
-the names of the individual timezones.
-.PP
-The given timezone list should be in the same format as the system
-\fIzone.tab\fP.  If no timezone list is specified on the command-line,
-\fI/usr/share/zoneinfo/zone.tab\fP will be used.
-.PP
-The new PO-file template will be written to standard output.
-.PP
-This utility is part of the TDE Software Development Kit.
-.SH AUTHOR
-zonetab2pot.py was written by Lukas Tinkl <lukas@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/core/tdesdk/debian/poxml-trinity.install b/ubuntu/_base/core/tdesdk/debian/poxml-trinity.install
index 290c62266..c82e32dc2 100644
--- a/ubuntu/_base/core/tdesdk/debian/poxml-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/poxml-trinity.install
@@ -3,3 +3,8 @@ debian/tmp/opt/trinity/bin/split2po
 debian/tmp/opt/trinity/bin/swappo
 debian/tmp/opt/trinity/bin/transxx
 debian/tmp/opt/trinity/bin/xml2pot
+debian/tmp/opt/trinity/share/man/man1/po2xml.1
+debian/tmp/opt/trinity/share/man/man1/split2po.1
+debian/tmp/opt/trinity/share/man/man1/swappo.1
+debian/tmp/opt/trinity/share/man/man1/transxx.1
+debian/tmp/opt/trinity/share/man/man1/xml2pot.1
diff --git a/ubuntu/_base/core/tdesdk/debian/poxml-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/poxml-trinity.manpages
deleted file mode 100644
index 05e2191bf..000000000
--- a/ubuntu/_base/core/tdesdk/debian/poxml-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/po2xml.1
-debian/man/split2po.1
-debian/man/swappo.1
-debian/man/transxx.1
-debian/man/xml2pot.1
diff --git a/ubuntu/_base/core/tdesdk/debian/rules b/ubuntu/_base/core/tdesdk/debian/rules
index d7be7d400..2a1a0c921 100755
--- a/ubuntu/_base/core/tdesdk/debian/rules
+++ b/ubuntu/_base/core/tdesdk/debian/rules
@@ -32,25 +32,10 @@ DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog
 DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog
 
 binary-install/tdesdk-scripts-trinity::
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/kdemangen.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdemangen.pl.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/pl/man1/png2mng.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/png2mng.pl.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/kdelnk2desktop.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/kdelnk2desktop.py.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/py/man1/zonetab2pot.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/zonetab2pot.py.1
-	mv -f debian/tdesdk-scripts-trinity/usr/share/man/sh/man1/build-progress.1 \
-		debian/tdesdk-scripts-trinity/usr/share/man/man1/build-progress.sh.1
 	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean \
 		debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
 	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \
 		debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/pl
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/py
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/sh
-	mv debian/tdesdk-scripts-trinity/usr/share/man/man1/* debian/tdesdk-scripts-trinity/opt/trinity/share/man/man1/
-	rm -rf debian/tdesdk-scripts-trinity/usr/share/man
 	install -p -D -m644 scripts/kde-buildrc \
 		debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
 
@@ -72,37 +57,3 @@ binary-install/kapptemplate-trinity::
 			Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \
 		chmod 755 debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
 	done
-	mv debian/kapptemplate-trinity/usr/share/man debian/kapptemplate-trinity/opt/trinity/share/
-
-binary-install/kbabel-trinity::
-	mv debian/kbabel-trinity/usr/share/man debian/kbabel-trinity/opt/trinity/share/
-
-binary-install/kbugbuster-trinity::
-	mv debian/kbugbuster-trinity/usr/share/man debian/kbugbuster-trinity/opt/trinity/share/
-
-binary-install/kmtrace-trinity::
-	mv debian/kmtrace-trinity/usr/share/man debian/kmtrace-trinity/opt/trinity/share/
-
-binary-install/kompare-trinity::
-	mv debian/kompare-trinity/usr/share/man debian/kompare-trinity/opt/trinity/share/
-
-binary-install/kspy-trinity::
-	mv debian/kspy-trinity/usr/share/man debian/kspy-trinity/opt/trinity/share/
-
-binary-install/kuiviewer-trinity::
-	mv debian/kuiviewer-trinity/usr/share/man debian/kuiviewer-trinity/opt/trinity/share/
-
-binary-install/libcvsservice0-trinity::
-	mv debian/libcvsservice0-trinity/usr/share/man debian/libcvsservice0-trinity/opt/trinity/share/
-
-binary-install/poxml-trinity::
-	mv debian/poxml-trinity/usr/share/man debian/poxml-trinity/opt/trinity/share/
-
-binary-install/tdecachegrind-converters-trinity::
-	mv debian/tdecachegrind-converters-trinity/usr/share/man debian/tdecachegrind-converters-trinity/opt/trinity/share/
-
-binary-install/tdecachegrind-trinity::
-	mv debian/tdecachegrind-trinity/usr/share/man debian/tdecachegrind-trinity/opt/trinity/share/
-
-binary-install/umbrello-trinity::
-	mv debian/umbrello-trinity/usr/share/man debian/umbrello-trinity/opt/trinity/share/
diff --git a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install
index 742cfc523..59f576d85 100644
--- a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.install
@@ -3,3 +3,8 @@ debian/tmp/opt/trinity/bin/hotshot2calltree
 debian/tmp/opt/trinity/bin/memprof2calltree
 debian/tmp/opt/trinity/bin/op2calltree
 debian/tmp/opt/trinity/bin/pprof2calltree
+debian/tmp/opt/trinity/share/man/man1/dprof2calltree.1
+debian/tmp/opt/trinity/share/man/man1/hotshot2calltree.1
+debian/tmp/opt/trinity/share/man/man1/memprof2calltree.1
+debian/tmp/opt/trinity/share/man/man1/op2calltree.1
+debian/tmp/opt/trinity/share/man/man1/pprof2calltree.1
diff --git a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages
deleted file mode 100644
index 977c48e2d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-converters-trinity.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/man/dprof2calltree.1
-debian/man/hotshot2calltree.1
-debian/man/memprof2calltree.1
-debian/man/op2calltree.1
-debian/man/pprof2calltree.1
diff --git a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.install b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.install
index b1b9b739e..eae1a8494 100644
--- a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.install
@@ -15,5 +15,6 @@ debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/tdecachegrind.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/tdecachegrind.png
+debian/tmp/opt/trinity/share/man/man1/tdecachegrind.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-tdecachegrind.desktop
 debian/icons/tdecachegrind.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.manpages
deleted file mode 100644
index 367c3db5d..000000000
--- a/ubuntu/_base/core/tdesdk/debian/tdecachegrind-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/tdecachegrind.1
diff --git a/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install b/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install
index 8d88a20a5..7b71e3bd9 100644
--- a/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.install
@@ -50,15 +50,48 @@ debian/tmp/opt/trinity/bin/svngettags
 debian/tmp/opt/trinity/bin/svnchangesince
 debian/tmp/opt/trinity/bin/svn-clean
 debian/tmp/opt/trinity/share/apps/katepart/syntax/tdesvn-buildrc.xml
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.docbook
+
 debian/tmp/opt/trinity/share/man/man1/cvsblame.1
 debian/tmp/opt/trinity/share/man/man1/cvsversion.1
-debian/tmp/opt/trinity/share/man/man1/kde-build.1
 debian/tmp/opt/trinity/share/man/man1/includemocs.1
+debian/tmp/opt/trinity/share/man/man1/kde-build.1
 debian/tmp/opt/trinity/share/man/man1/noncvslist.1
 debian/tmp/opt/trinity/share/man/man1/tdesvn-build.1
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdesvn-build/index.docbook
+
+debian/tmp/opt/trinity/share/man/man1/adddebug.1
+debian/tmp/opt/trinity/share/man/man1/build-progress.sh.1
+debian/tmp/opt/trinity/share/man/man1/cheatmake.1
+debian/tmp/opt/trinity/share/man/man1/create_cvsignore.1
+debian/tmp/opt/trinity/share/man/man1/create_makefile.1
+debian/tmp/opt/trinity/share/man/man1/create_makefiles.1
+debian/tmp/opt/trinity/share/man/man1/cvs-clean.1
+debian/tmp/opt/trinity/share/man/man1/cvs2dist.1
+debian/tmp/opt/trinity/share/man/man1/cvsbackport.1
+debian/tmp/opt/trinity/share/man/man1/cvscheck.1
+debian/tmp/opt/trinity/share/man/man1/cvsforwardport.1
+debian/tmp/opt/trinity/share/man/man1/cvslastchange.1
+debian/tmp/opt/trinity/share/man/man1/cvslastlog.1
+debian/tmp/opt/trinity/share/man/man1/cvsrevertlast.1
+debian/tmp/opt/trinity/share/man/man1/cxxmetric.1
+debian/tmp/opt/trinity/share/man/man1/extend_dmalloc.1
+debian/tmp/opt/trinity/share/man/man1/extractattr.1
+debian/tmp/opt/trinity/share/man/man1/extractrc.1
+debian/tmp/opt/trinity/share/man/man1/findmissingcrystal.1
+debian/tmp/opt/trinity/share/man/man1/fixkdeincludes.1
+debian/tmp/opt/trinity/share/man/man1/fixuifiles.1
+debian/tmp/opt/trinity/share/man/man1/kdedoc.1
+debian/tmp/opt/trinity/share/man/man1/kdelnk2desktop.py.1
+debian/tmp/opt/trinity/share/man/man1/kdemangen.pl.1
+debian/tmp/opt/trinity/share/man/man1/makeobj.1
+debian/tmp/opt/trinity/share/man/man1/package_crystalsvg.1
+debian/tmp/opt/trinity/share/man/man1/png2mng.pl.1
+debian/tmp/opt/trinity/share/man/man1/pruneemptydirs.1
+debian/tmp/opt/trinity/share/man/man1/qtdoc.1
+debian/tmp/opt/trinity/share/man/man1/tdekillall.1
+debian/tmp/opt/trinity/share/man/man1/zonetab2pot.py.1
 scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts
 scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts
 scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts
diff --git a/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.manpages
deleted file mode 100644
index bcab66ddd..000000000
--- a/ubuntu/_base/core/tdesdk/debian/tdesdk-scripts-trinity.manpages
+++ /dev/null
@@ -1,31 +0,0 @@
-debian/man/adddebug.1
-debian/man/build-progress.sh.1
-debian/man/cheatmake.1
-debian/man/create_cvsignore.1
-debian/man/create_makefile.1
-debian/man/create_makefiles.1
-debian/man/cvs-clean.1
-debian/man/cvs2dist.1
-debian/man/cvsbackport.1
-debian/man/cvscheck.1
-debian/man/cvsforwardport.1
-debian/man/cvslastchange.1
-debian/man/cvslastlog.1
-debian/man/cvsrevertlast.1
-debian/man/cxxmetric.1
-debian/man/extend_dmalloc.1
-debian/man/extractattr.1
-debian/man/extractrc.1
-debian/man/fixkdeincludes.1
-debian/man/fixuifiles.1
-debian/man/findmissingcrystal.1
-debian/man/kdedoc.1
-debian/man/tdekillall.1
-debian/man/kdelnk2desktop.py.1
-debian/man/kdemangen.pl.1
-debian/man/makeobj.1
-debian/man/package_crystalsvg.1
-debian/man/png2mng.pl.1
-debian/man/pruneemptydirs.1
-debian/man/qtdoc.1
-debian/man/zonetab2pot.py.1
diff --git a/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.install b/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.install
index dbb79a2ad..7f0fe3b2a 100644
--- a/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.install
+++ b/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.install
@@ -48,5 +48,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/umbrello.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/mimetypes/umbrellofile.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/umbrello.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/mimetypes/umbrellofile.png
+debian/tmp/opt/trinity/share/man/man1/umbrello.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-umbrello.desktop
 debian/icons/umbrello.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.manpages b/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.manpages
deleted file mode 100644
index 537bedefe..000000000
--- a/ubuntu/_base/core/tdesdk/debian/umbrello-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/umbrello.1
diff --git a/ubuntu/_base/core/tdetoys/debian/control b/ubuntu/_base/core/tdetoys/debian/control
index 65b51897e..e56160909 100644
--- a/ubuntu/_base/core/tdetoys/debian/control
+++ b/ubuntu/_base/core/tdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdetoys-trinity
diff --git a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
index ae0fb921e..34499d446 100644
--- a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
+++ b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.install
@@ -10,7 +10,11 @@ debian/tmp/opt/trinity/lib/trinity/kweatherreport.so
 debian/tmp/opt/trinity/lib/trinity/kweatherreport.la
 debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.la
 debian/tmp/opt/trinity/lib/trinity/weather_panelapplet.so
+debian/tmp/opt/trinity/lib/trinity/weather_sidebar.la
+debian/tmp/opt/trinity/lib/trinity/weather_sidebar.so
 debian/tmp/opt/trinity/share/apps/kicker/applets/kweather.desktop
+debian/tmp/opt/trinity/share/apps/konqsidebartng/add/weatherbar_add.desktop
+debian/tmp/opt/trinity/share/apps/konqsidebartng/entries/weatherbar.desktop
 debian/tmp/opt/trinity/share/apps/kweather
 debian/tmp/opt/trinity/share/apps/kweatherservice/stations.dat
 debian/tmp/opt/trinity/share/apps/kweatherservice/weather_stations.desktop
diff --git a/ubuntu/_base/core/tdeutils/debian/ark-trinity.install b/ubuntu/_base/core/tdeutils/debian/ark-trinity.install
index 27b3cea81..d09a8b0e4 100644
--- a/ubuntu/_base/core/tdeutils/debian/ark-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/ark-trinity.install
@@ -31,6 +31,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/ark.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/ark.svgz
+debian/tmp/opt/trinity/share/man/man1/ark.1
 debian/tmp/opt/trinity/share/services/ark_part.desktop
 
 debian/icons/ark.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/ark-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/ark-trinity.manpages
deleted file mode 100644
index 37ed04716..000000000
--- a/ubuntu/_base/core/tdeutils/debian/ark-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ark-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.install b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.install
index e5c35395d..6e4aab038 100644
--- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kcalc.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kcalc.svgz
+debian/tmp/opt/trinity/share/man/man1/kcalc.1
 
 debian/icons/kcalc.xpm		/opt/trinity/share/pixmaps
 debian/icons/kcalc-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.manpages
deleted file mode 100644
index ee2f0ad0a..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcalc-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.install b/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.install
index 46f690528..e362682f0 100644
--- a/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.install
@@ -11,6 +11,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcharselect/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kcharselect.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kcharselect.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kcharselect.png
+debian/tmp/opt/trinity/share/man/man1/kcharselect.1
 
 debian/icons/kcharselect.xpm		/opt/trinity/share/pixmaps
 debian/icons/kcharselect-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.manpages
deleted file mode 100644
index 6a1e28fb7..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kcharselect-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kcharselect-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kdf-trinity.install b/ubuntu/_base/core/tdeutils/debian/kdf-trinity.install
index f8e6118ce..12a5d1ae6 100644
--- a/ubuntu/_base/core/tdeutils/debian/kdf-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kdf-trinity.install
@@ -28,6 +28,8 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwikdisk.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdf.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwikdisk.png
+debian/tmp/opt/trinity/share/man/man1/kdf.1
+debian/tmp/opt/trinity/share/man/man1/kwikdisk.1
 
 debian/icons/kdf.xpm		/opt/trinity/share/pixmaps
 debian/icons/kdf-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kdf-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kdf-trinity.manpages
deleted file mode 100644
index ac5e86975..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kdf-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kdf-trinity.1
-debian/man/kwikdisk-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.install b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.install
index 40d08d1ab..a03e4587a 100644
--- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kedit.png
+debian/tmp/opt/trinity/share/man/man1/kedit.1
 
 debian/icons/kedit.xpm		/opt/trinity/share/pixmaps
 debian/icons/kedit-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.manpages
deleted file mode 100644
index 84374715a..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kedit-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.install b/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.install
index 5c1588041..645753df5 100644
--- a/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.install
@@ -10,6 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kfloppy.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kfloppy.png
+debian/tmp/opt/trinity/share/man/man1/kfloppy.1
 
 debian/icons/kfloppy.xpm		/opt/trinity/share/pixmaps
 debian/icons/kfloppy-16.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.manpages
deleted file mode 100644
index 02c1ea86f..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kfloppy-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kfloppy-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.install b/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.install
index 2317f8bad..81993777a 100644
--- a/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.install
@@ -39,6 +39,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kgpg.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kgpg.png
+debian/tmp/opt/trinity/share/man/man1/kgpg.1
 
 debian/icons/kgpg.xpm		/opt/trinity/share/pixmaps
 debian/icons/kgpg-16.xpm	/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.manpages
deleted file mode 100644
index 111b73663..000000000
--- a/ubuntu/_base/core/tdeutils/debian/kgpg-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kgpg-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.install b/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.install
index 7ac6b4f2e..9ee6fc10c 100644
--- a/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khexedit/khexedit1.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/khexedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/khexedit.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/khexedit.png
+debian/tmp/opt/trinity/share/man/man1/khexedit.1
 debian/tmp/opt/trinity/share/services/kbyteseditwidget.desktop
 debian/tmp/opt/trinity/share/services/khexedit2part.desktop
 
diff --git a/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.manpages
deleted file mode 100644
index 41235ebfd..000000000
--- a/ubuntu/_base/core/tdeutils/debian/khexedit-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/khexedit-trinity.1
diff --git a/ubuntu/_base/core/tdeutils/debian/man/ark-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/ark-trinity.1
deleted file mode 100644
index d738284f4..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/ark-trinity.1
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH Ark "1" "May 2006" "Ark" "User Commands"
-.SH NAME
-Ark \- manual page for Ark
-.SH SYNOPSIS
-.B ark
-[\fIQt-options\fR] [\fITDE-options\fR] [\fITDE-tempfile-options\fR] [\fIoptions\fR] [\fIfolder\fR] [\fIfiles\fR] [\fIarchive\fR]
-.SH DESCRIPTION
-TDE Archiving tool
-Ark is a graphical program for managing various archive formats within the
-TDE environment. Archives can be viewed, extracted, created and modified
-from within Ark.
-The program can handle various formats such as tar, gzip, bzip2, zip, rar and
-lha (if the appropriate command-line programs are installed).
-Ark can work closely with Konqueror in the TDE environment to handle archives,
-if you install the Konqueror Integration plugin available in the konq-plugins
-package.
-.SS "Generic options"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-tde\-tempfile\fR
-Show TDE\-tempfile specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-\-extract\fR
-Open extract dialog, quit when finished
-.TP
-\fB\-\-extract\-to\fR
-Extract 'archive' to 'folder'. Quit when finished.
-\&'folder' will be created if it does not exist.
-.TP
-\fB\-\-add\fR
-Ask for the name of the archive to add 'files' to. Quit when finished.
-.TP
-\fB\-\-add\-to\fR
-Add 'files' to 'archive'. Quit when finished.
-\&'archive' will be created if it does not exist.
-.TP
-\fB\-\-guess\-name\fR
-Used with '\-\-extract\-to'. When specified, 'archive'
-will be extracted to a subfolder of 'folder'
-whose name will be the name of 'archive' without the filename extension.
-.SS "Arguments"
-.TP
-folder
-Folder to extract to
-.TP
-files
-Files to be added
-.TP
-archive
-Open 'archive'
-.SH AUTHOR
-Ark was written by Matthias Elter <elter@kde.org> and many others.
-.br
-Ark is released under the GNU General Public License.
-.PP
-This manual page was written by Sune Vuorela <debian@pusling.com>
-for the Debian Project, and is released under the same terms as the program.
diff --git a/ubuntu/_base/core/tdeutils/debian/man/kcalc-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kcalc-trinity.1
deleted file mode 100644
index eff470650..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kcalc-trinity.1
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KCALC 1 "June 2006" "Trinity Desktop Environment" "TDE Calculator"
-.SH NAME
-kcalc
-\- TDE Calculator
-.SH SYNOPSIS
-\fBkcalc\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKCalc\fP is a scientific calculator for TDE. In addition to the usual functionality offered by most scientific calculators, \fBKCalc\fP offers a number of features:
-.br
-.IP "     \-"
-\fBKCalc\fP provides trigonometric functions, logic operations, and it is able to do statistical calculations.
-.IP "     \-"
-\fBKCalc\fP allows you to cut and paste numbers from/into its display.
-.IP "     \-"
-\fBKCalc\fP features a results\-stack which lets you conveniently recall previous results.
-.IP "     \-"
-You can configure \fBKCalc\fP's display colors and font.
-.IP "     \-"
-You can configure \fBKCalc\fP's precision and the number of digits after the period.
-.IP "     \-"
-\fBKCalc\fP offers a great number of useful  key\-bindings, which make using \fBKCalc\fP without using a pointing device easy.
-.PP
-Hint: Pressing (and holding) the Ctrl\-key, displays on every button, the corresponding key\-binding.
-
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-
-.SH FILES
-.TP
-.I ~/.trinity/share/config/kcalcrc
-\fBkcalc\fP configuration file
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kcalc/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kcalc/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Klaus Niederkruger <kniederk@math.uni\-koeln.de>
-.br
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-Evan Teran <eteran@alum.rit.edu>
-.br
-Espen Sand <espen@kde.org>
-.br
-Chris Howells <howells@kde.org>
-.br
-Aaron J. Seigo <aseigo@olympusproject.org>
-.br
-Charles Samuels <charles@altair.dhs.org>
-.br
-René Mérou <ochominutosdearco@yahoo.es>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kcharselect-trinity.1
deleted file mode 100644
index cc54866fa..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kcharselect-trinity.1
+++ /dev/null
@@ -1,257 +0,0 @@
-.lf 1 info/tdeutils.kcharselect.1
-.TH KCHARSELECT 1 "May 2003" TDE "TDE Application"
-.SH NAME
-kcharselect \- TDE Character Selector
-.SH SYNOPSIS
-.B kcharselect
-[\fIQt-options\fR] [\fITDE-options\fR]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B KCharSelect
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-Using
-.B KCharSelect
-one can view all the glyphs, organized by character table, available from any
-installed font.  One can also assemble a string of characters by clicking on
-characters in the table.  The string can be exported to the clipboard for
-later use.
-.PP
-.B KCharSelect
-is helpful for determining which characters in a font have glyphs as well as
-for selecting characters that may be difficult to produce.
-.P
-This program is part of the official TDE utils module.
-.SH OPTIONS
-.SS "General Options"
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.lf 1 info/kdeqtoptions
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
-icon, which can either be an absolute filename path, or otherwise the
-icon is sought for in places according to the normal TDE rules.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
-of the icon, according to the same rules as for the \-\-icon parameter.
-.TP
-.BI \-\-config \ filename
-Use an alternative configuration file, instead of the default, which
-is normally located in
-.I /usr/share/config
-or in
-.RB $ TDEHOME\fI/share/config
-.TP
-.BI \-\-dcopserver \ server
-Set the address of the DCOP server to attach to.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps. This option has the same
-effect as definiting the environment variable TDE_DEBUG.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-The geometry parameter follows the normal X convention for geometry,
-which is on the form:
-.RS
-.IP
-[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
-.P
-Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
-height, of the main application window. Both in pixels. A value of 0
-specifies the default size. The optional \fIxpos\fR and \fIypos\fR
-specifies the x,y-position that which is desired for the application
-window. Specifying negative values for x or y implies that the x or y
-position is to be measured from the left or bottom screen edge,
-instead of as in the normal case, with positive values, from the left
-and top edges. 
-.RE
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-Defines the default application font. The \fIfontname\fP should be in
-the X logical font name description format XLFD. For a full description of
-the format see
-.I /usr/X11R6/lib/X11/doc/xlfd.TXT
-Note that the application might override the font specified with
-its own font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-Sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-Sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-Sets the default button color.
-.TP
-.BI \-\-name \ name
-Sets the application name.
-.TP
-.BI \-\-title \ title
-Sets the application title. This option might, or might not appear
-in the title bar caption, depending on the application. To change the caption, use the 
-.B \-\-caption
-option instead. 
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-Sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirror reverses the whole layout of widgets. This means that menus
-will go in the opposite direction, the scroll bar will be on the
-opposite side, etc. For a normal western layout that means that menus
-and tool bars will go from the right edge to the left, the vertical
-scroll bar will be on the left side and so on.
-
-.lf 48 info/tdeutils.kcharselect.1
-.SH ENVIRONMENT
-.lf 1 info/kdeenviron
-.SS "standard TDE environment variables"
-.IP TDE_LANG
-Language locale setting to use. This option makes it possible to set
-another language environment for a program than what is the default. The
-correct language pack for this language has to be installed for this option
-to work. The default language when there is none set is en_US. When
-deciding upon a language, the following resources are looked up, in
-order: TDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
-LANG.
-.IP TDE_UTF8_FILENAMES
-Assume that all filenames are in UTF-8 format regardless of the
-current language setting. Otherwise the filename format is defined by
-the language.
-.IP TDE_MULTIHEAD
-If this variable has the value
-.B true
-multihead multiple display mode is enabled. The TDE display will be
-shared over more than one screen.
-.IP DISPLAY
-Specifies the X display to run TDE on.
-.IP TDESYCOCA
-Specifies and alternative path for the 
-.I tdesycoca
-TDE system configuration cache file.
-The default path is
-/tmp/tde-$USER/tdesycoca
-.IP DCOPSERVER
-Specifies an alternative path for the DCOP server file. The default
-file is
-$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
-.IP SESSION_MANAGER
-The session manager to use. This option is set automatically by TDE
-and is a network path to the session manager socket.
-.IP HOME
-Path to the home directory for the current user. 
-.IP TDEHOME
-The TDE per-user setting directory. Default if not specified is
-.I $HOME/.trinity
-.lf 50 info/tdeutils.kcharselect.1
-.SH FILES
-.TP
-.I $HOME/.trinity/share/config/kcharselectrc
-configuration file.
-.SH AUTHOR
-KCharSelect was written by
-.nh
-.ad l
-Reginald Stadlbauer <reggie@kde.org>.
-.hy
-.br
-Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
-.br
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-The full documentation for
-.B KCharSelect
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kcharselect
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kcharselect
-
diff --git a/ubuntu/_base/core/tdeutils/debian/man/kdf-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kdf-trinity.1
deleted file mode 100644
index 58bbbec90..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kdf-trinity.1
+++ /dev/null
@@ -1,154 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KDF 1 "June 2006" "Trinity Desktop Environment" "TDE free disk space utility"
-.SH NAME
-kdf
-\- TDE free disk space utility
-.SH SYNOPSIS
-\fBkdf\fP [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBKDiskFree\fP displays available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.
-.sp 1
-\fBKDiskFree\fP is similar to \fBkwikdisk\fP and is useful if you want to keep a \fBKDiskFree\fP window available at all times.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-
-.SH SEE ALSO
-\fBkwikdisk\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kdf/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kdf/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Michael Kropfberger <michael.kropfberger@gmx.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdeutils/debian/man/kedit-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kedit-trinity.1
deleted file mode 100644
index ebf6a588b..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kedit-trinity.1
+++ /dev/null
@@ -1,165 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE text editor"
-.SH NAME
-kedit
-\- TDE text editor
-.SH SYNOPSIS
-\fBkedit\fP [Qt\-options] [TDE\-options] [options] \fIfile\fP
-.SH DESCRIPTION
-\fBKEdit\fP is a text editor for the Trinity Desktop. It is a small editor which can be used with \fBKonqueror\fP for text and configuration file browsing. \fBKEdit\fP also serves well for creating small plain text documents. It is not meant to be a programmers editor, in particular it is not meant to replace any of the more powerful editors such as \fBKate\fP, \fBXEmacs\fP or \fBEmacs\fP.
-.sp 1
-\fBKEdit\fP's functionality will intentionally remain rather limited to ensure a reasonably fast start.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File or URL to open
-.SS Options:
-.TP
-.B  \-\-encoding  <encoding>
-Encoding to use for the following documents
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-\fBkate\fP(1), \fBkwrite\fP(1)
-.sp 1
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kedit/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kedit/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdeutils/debian/man/kfloppy-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kfloppy-trinity.1
deleted file mode 100644
index 412893a1a..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kfloppy-trinity.1
+++ /dev/null
@@ -1,182 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KFLOPPY 1 "June 2006" "Trinity Desktop Environment" "TDE Floppy Disk Utility"
-.SH NAME
-kfloppy
-\- TDE Floppy Disk Utility
-.SH SYNOPSIS
-\fBkfloppy\fP [Qt\-options] [TDE\-options] [device] 
-.SH DESCRIPTION
-\fBKfloppy Formatter\fP is a utility that provides a straightforward graphical means to format 3.5" and 5.25" floppy disks.
-.sp 1
-Starting \fBKfloppy\fP opens a single window by which the user may choose appropriate settings and control the formatting process.
-.sp 1
-\fBCaution\fP
-.br
-Make sure that your floppy disk is not mounted. \fBKfloppy\fP cannot format a mounted floppy disk.
-.sp 1
-\fBKfloppy\fP offers the following settings for floppy size:
-.RS 3
-.TP
-\- 3.5" 1.44MB
-.TP
-\- 3.5" 720KB
-.TP
-\- 5.25" 1.2MB
-.TP
-\- 5.25" 360KB
-.TP
-\- Auto-Detect
-.RE
-.sp 1
-\fBNote\fP
-.br
-The 800KB disk format used by Mac floppy drives cannot be supported on PC floppy drives since they are not capable of formatting disks in that fashion.
-.sp 1
-\fBKfloppy\fP supports the file systems DOS, ext2 and Minix.
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B device
-Default device
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/kfloppy/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/kfloppy/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Bernd Johannes Wuebben <wuebben@kde.org>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdeutils/debian/man/kgpg-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kgpg-trinity.1
deleted file mode 100644
index 9ea82bb85..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kgpg-trinity.1
+++ /dev/null
@@ -1,187 +0,0 @@
-.TH KGPG "1" "December 2002" "TDE" "TDE Application"
-.SH NAME
-kgpg \- a TDE frontend for GNU Privacy Guard (GnuPG)
-.SH SYNOPSIS
-.B kgpg
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] \fIfile\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B Kgpg
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.PP
-.B Kgpg
-is a simple graphical interface for gpg (http://gnupg.org).
-Basically, It allows you to encrypt and decrypt files or messages, and to manage your keys. 
-.PP
-Kgpg can be used in different ways: 
-.IP "1 -" 4
-Open Kgpg. You will see an editor. Just type or paste your text in the editor. You can then easily encrypt/decrypt the text. 
-.IP "2 -" 4
-On your Desktop or from a Konqueror window, right click on a file and you will see an encrypt file entry in the menu. just select it to encrypt the file. In the same way, simply left click on an encrypted file to decrypt it. 
-.IP "3 -" 4
-If you enable Kgpg's Klipper action, as soon as you copy an encrypted text to the clipboard, a popup menu will ask you if you want to decrypt it. 
-.SH OPTIONS
-.TP
-.B \-e
-encrypt file
-.TP
-.B \-s
-show encrypted file
-.TP
-.B \-S
-sign file
-.TP
-.B \-V
-verify signature
-.SS "Arguments:"
-.TP 12
-file
-file to open
-.SS "Generic options:"
-.TP 12
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v\fR, \fB\-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS "Qt options"
-.TP 12
-.BI \-\-display \ displayname
-Use the X-server display \fIdisplayname\fP.
-.TP
-.BI \-\-session \ sessionId
-Restore the application for the given \fIsessionId\fP.
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display.
-.TP
-.BI \-\-ncols \ count
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
-.B \-nograb, use \fB\-dograb\fR to override.
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging.
-.TP
-.BI "\-\-fn\fR, \fP\-\-font" \ fontname
-defines the application font.
-.TP
-.BI "-\-bg\fR, \fB\-\-background"  \ color
-sets the default background color and an
-application palette (light and dark shades are
-calculated).
-.TP
-.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
-sets the default foreground color.
-.TP
-.BI \-\-btn\fR, \fB\-\-button \ color
-sets the default button color.
-.TP
-.BI \-\-name \ name
-sets the application name.
-.TP
-.BI \-\-title \ title
-sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display.
-.TP
-.BI \-\-inputstyle \ inputstyle
-sets XIM (X Input Method) input style. Possible
-values are 
-.BR onthespot ", " overthespot ", " offthespot and root .
-.TP
-.BI \-\-im " XIM-server"
-set XIM server.
-.TP
-.B \-\-noxim
-disable XIM.
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets.
-.SS "TDE options"
-.TP 12
-.BI \-\-caption \ caption
-Use \fIcaption\fP as name in the titlebar.
-.TP
-.BI \-\-icon \ icon
-Use \fIicon\fP as the application icon.
-.TP
-.BI \-\-miniicon \ icon
-Use \fIicon\fP as the icon in the titlebar.
-.TP
-.BI \-\-config \ filename
-Use alternative configuration file.
-.TP
-.BI \-\-dcopserver \ server
-Use the DCOP Server specified by \fIserver\fP.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.BI \-\-style \ style
-sets the application GUI style.
-.TP
-.BI \-\-geometry \ geometry
-sets the client geometry of the main widget.
-.SH AUTHOR
-kgpg was written by
-.nh
-.ad l
-y0k0 <bj@altern.org>,
-.br
-.hy
-This manual page was prepared by
-.nh
-.ad l
-Karolina Lindqvist <pgd\-karolinali@algonet.se>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
-.SH "SEE ALSO"
-The full documentation for
-.B Kgpg
-is maintained as a docbook manual.  If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/kgpg
-.PP
-should give you access to the complete manual.
-.P
-Alternatively the manual can be browsed in
-.B konqueror
-giving it the URL help:/kgpg
-
diff --git a/ubuntu/_base/core/tdeutils/debian/man/khexedit-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/khexedit-trinity.1
deleted file mode 100644
index 968d438f5..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/khexedit-trinity.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KHEXEDIT 1 "June 2006" "Trinity Desktop Environment" "TDE hex editor"
-.SH NAME
-khexedit
-\- TDE hex editor
-.SH SYNOPSIS
-\fBkhexedit\fP [Qt\-options] [TDE\-options] [options] [file(s)] 
-.SH DESCRIPTION
-\fBKHexEdit\fP is an editor for the raw data of binary files. It includes find/replace functions, bookmarks, many configuration options, drag and drop support and other powerful features.
-.sp 1
-When a document is opened, the bytes are displayed in hexadecimal format in the data editor window. The data can be edited, cut, copied, pasted, dragged and dropped much as text is in an text editor or word processor. A cursor marks the current position. Pressing the Insert key toggles between overwrite and insert text entry modes. The data can also be displayed as octal, binary or decimal values, by choosing the desired format in the View menu.
-.sp 1
-The offset column on the left indicates the position of a particular byte in the file. The text field on the right displays the ASCII encoding of the file. The cursor position and edits in the data editor window are reflected in the text field. The text field can also be edited, and those changes are reflected in the data editor window.
-.sp 1
-The search bar allows the user to search for a specific value \-\- hexadecimal, octal, binary, decimal or text.
-.sp 1
-The conversion field displays the value of the byte at the cursor position in a variety of bases. It also displays the value of all standard data types starting at the cursor.
-.sp 1
-Multiple documents can be open at the same time but only one can be active. Use the Documents menu to select which document will be active.
-.SH OPTIONS
-.SS
-.SS Arguments:
-file(s)                   File(s) to open
-.SS Options:
-.TP
-.B  \-\-offset  <offset>
-Jump to 'offset'
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center.  You can also enter the URL
-.BR help:/khexedit/
-directly into konqueror or you can run 
-.BR "khelpcenter help:/khexedit/"
-from the command\-line.
-.br
-.SH AUTHORS
-.nf
-Espen Sand <espensa@online.no>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the author directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdeutils/debian/man/kwikdisk-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/kwikdisk-trinity.1
deleted file mode 100644
index 74aaad6ca..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/kwikdisk-trinity.1
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KWIKDISK 1 "June 2006" "Trinity Desktop Environment" "TDE Free disk space utility"
-.SH NAME
-kwikdisk
-\- TDE Free disk space utility
-.SH SYNOPSIS
-\fBkwikdisk\fB [Qt\-options] [TDE\-options] 
-.SH DESCRIPTION
-\fBkwikdisk\fP is a kicker applet to display the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their free space, type and mount point. It also allows you to mount and unmount drives.
-.sp 1
-\fBkwikdisk\fP is similar to \fBKDiskFree\fP, but takes up less screen space.
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-tde  
-Show TDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8\-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8\-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
-\-nograb, use \-dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8\-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.SS 
-.SS TDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-miniicon  <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-dcopserver  <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget \- see man X for the argument format
-
-.SH SEE ALSO
-\fBkdf\fP(1)
-.SH AUTHORS
-.nf
-Michael Kropfberger <michael.kropfberger@gmx.net>
-.br
-Espen Sand <espen@kde.org>
-.br
-Stanislav Karchebny <Stanislav.Karchebny@kdemail.net>
-.br
-
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly.
-.PP
-This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
diff --git a/ubuntu/_base/core/tdeutils/debian/man/superkaramba-trinity.1 b/ubuntu/_base/core/tdeutils/debian/man/superkaramba-trinity.1
deleted file mode 100644
index ab0ec0f49..000000000
--- a/ubuntu/_base/core/tdeutils/debian/man/superkaramba-trinity.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH SUPERKARAMBA 1 "juli  27, 2003"
-.SH NAME
-superkaramba \- a program based on karamba improving the eyecandy of TDE.
-.SH SYNOPSIS
-.B superkaramba
-[\fIQt-options\fR] [\fITDE-options\fR] \fIfile\fR
-.SH DESCRIPTION
-This manual page documents briefly the
-.B superkaramba
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.PP
-.B Superkaramba
-is a tool based on karamba that allows anyone to easily create and run little
-interactive widgets on a Trinity desktop. Widgets are defined in a simple text file
-and can be augmented with Python code to make them interactive.
-.SH OPTIONS
-A summary of options are included below.
-.TP
-.B \-\-help
-Show summary of options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show license information
-.TP
-.B file
-A required argument 'file'
-.SH AUTHOR
-.B Superkaramba
-was written by Adam Geitgey <adam@rootnode.org> and Hans Karlsson
-<d98hk@efd.lth.se>.
-.PP
-This manual page was written by Jean-Michel Kelbert <kelbert@debian.org>,
-for the Debian project (but may be used by others).
diff --git a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install
index 8e4b39209..b56555797 100644
--- a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install
+++ b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install
@@ -18,6 +18,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/superkaramba.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/apps/superkaramba.svgz
 debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+debian/tmp/opt/trinity/share/man/man1/superkaramba.1
 debian/tmp/opt/trinity/share/mimelnk/application/x-superkaramba.desktop
 
 debian/icons/superkaramba.xpm		/opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.manpages b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.manpages
deleted file mode 100644
index 730ac7f62..000000000
--- a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/superkaramba-trinity.1
diff --git a/ubuntu/_base/dependencies/akode/debian/control b/ubuntu/_base/dependencies/akode/debian/control
index f9d05d552..cbfa4bb85 100644
--- a/ubuntu/_base/dependencies/akode/debian/control
+++ b/ubuntu/_base/dependencies/akode/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Isaac Clerencia <isaac@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libflac-dev (>= 1.1.1-3), libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev, libavformat-dev
 Standards-Version: 3.7.3
 
 Package: libakode2
@@ -20,6 +20,21 @@ Description: akode plugin for aRts
  FLAC and Speex. aKode also focuses on performance, and so it means a
  big enhancement for users runing aRts in non-realtime mode.
 
+Package: libakode2-ffmpeg
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: akode
+Replaces: akode
+Enhances: libarts1c2, libarts1c2a-trinity
+Description: ffmpeg plugins for akode
+ aKode is a new multithreaded audio library that provides aRts with
+ plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC),
+ FLAC and Speex. aKode also focuses on performance, and so it means a
+ big enhancement for users runing aRts in non-realtime mode.
+ .
+ This package provides for akode formats supported by FFMPEG.
+
 Package: libakode2-mpeg
 Section: libs
 Architecture: any
diff --git a/ubuntu/_base/dependencies/akode/debian/docs b/ubuntu/_base/dependencies/akode/debian/docs
new file mode 100644
index 000000000..0b6e0f321
--- /dev/null
+++ b/ubuntu/_base/dependencies/akode/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README.md
diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install b/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install
new file mode 100644
index 000000000..83c5e777b
--- /dev/null
+++ b/ubuntu/_base/dependencies/akode/debian/libakode2-ffmpeg.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libakode_ffmpeg_decoder.so
diff --git a/ubuntu/_base/dependencies/akode/debian/rules b/ubuntu/_base/dependencies/akode/debian/rules
index d93e5d960..1788b4f36 100755
--- a/ubuntu/_base/dependencies/akode/debian/rules
+++ b/ubuntu/_base/dependencies/akode/debian/rules
@@ -23,7 +23,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DWITH_ALL_OPTIONS="ON" \
  -DWITH_LIBLTDL="OFF" \
- -DWITH_FFMPEG_DECODER="OFF"
+ -DWITH_FFMPEG_DECODER="ON"
 
 common-install-prehook-arch::
 	grep -v libakode_alsa_sink debian/libakode2.install > debian/libakode2.install.kfreebsd-i386
diff --git a/ubuntu/_base/dependencies/arts/debian/docs b/ubuntu/_base/dependencies/arts/debian/docs
new file mode 100644
index 000000000..6f7727790
--- /dev/null
+++ b/ubuntu/_base/dependencies/arts/debian/docs
@@ -0,0 +1,2 @@
+README.md
+TODO
diff --git a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install
index 856cad6c5..cfc14e7c5 100644
--- a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install
+++ b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install
@@ -60,3 +60,5 @@ debian/tmp/opt/trinity/lib/mcop/kmedia2.mcopclass
 debian/tmp/opt/trinity/lib/mcop/kmedia2.mcoptype
 debian/tmp/opt/trinity/lib/mcop/soundserver.mcopclass
 debian/tmp/opt/trinity/lib/mcop/soundserver.mcoptype
+debian/tmp/opt/trinity/share/man/man1/artscat-trinity.1
+debian/tmp/opt/trinity/share/man/man1/artsdsp-trinity.1
diff --git a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
deleted file mode 100644
index 8d7f5c573..000000000
--- a/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/out/artscat-trinity.1
-debian/man/artsdsp-trinity.1
-
diff --git a/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages b/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
deleted file mode 100644
index cef6ee689..000000000
--- a/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/artsc-config-trinity.1
diff --git a/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
index 125ebc39e..fcecb09b2 100644
--- a/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
+++ b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
@@ -4,6 +4,7 @@ debian/tmp/opt/trinity/include/artsc/artsc_export.h
 debian/tmp/opt/trinity/lib/libartsc.la
 debian/tmp/opt/trinity/lib/libartsc.so
 debian/tmp/opt/trinity/lib/libartsgsl.a
+debian/tmp/opt/trinity/share/man/man1/artsc-config-trinity.1
 
 debian/tmp/usr/lib/pkgconfig/arts.pc
 debian/tmp/usr/lib/pkgconfig/artsc.pc
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml
deleted file mode 100644
index 8072e337d..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSC-CONFIG</refentrytitle>">
-  <!ENTITY dhpackage   "artsc-config">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>Get information about a libartsc installation</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--arts-prefix<replaceable></replaceable></option></arg>
-      <arg><option>--arts-version<replaceable></replaceable></option></arg>
-      <arg><option>--cflags<replaceable></replaceable></option></arg>
-      <arg><option>--libs<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable></replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> displays information about a previous libartsc installation.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--arts-prefix</option>
-        </term>
-        <listitem>
-          <para>This is the prefix used when libartsc was installed.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--arts-version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed arts.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cflags</option>
-        </term>
-        <listitem>
-          <para>Set of compiler options (CFLAGS) to use when compiling files that use libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--libs</option>
-        </term>
-        <listitem>
-          <para>Shows the complete set of libs and other linker options you will need in order to link your application with libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed libartsc.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (but may be used by
-      others).  Permission is granted to copy, distribute and/or
-      modify this document under the terms of the &gnu; General Public
-      License, Version 2 or any later version published by the Free
-      Software Foundation.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
deleted file mode 100644
index 8072e337d..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
+++ /dev/null
@@ -1,160 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSC-CONFIG</refentrytitle>">
-  <!ENTITY dhpackage   "artsc-config">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>Get information about a libartsc installation</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>--arts-prefix<replaceable></replaceable></option></arg>
-      <arg><option>--arts-version<replaceable></replaceable></option></arg>
-      <arg><option>--cflags<replaceable></replaceable></option></arg>
-      <arg><option>--libs<replaceable></replaceable></option></arg>
-      <arg><option>--version<replaceable></replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> displays information about a previous libartsc installation.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>--arts-prefix</option>
-        </term>
-        <listitem>
-          <para>This is the prefix used when libartsc was installed.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--arts-version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed arts.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--cflags</option>
-        </term>
-        <listitem>
-          <para>Set of compiler options (CFLAGS) to use when compiling files that use libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--libs</option>
-        </term>
-        <listitem>
-          <para>Shows the complete set of libs and other linker options you will need in order to link your application with libartsc.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>--version</option>
-        </term>
-        <listitem>
-          <para>Outputs version information about the installed libartsc.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (but may be used by
-      others).  Permission is granted to copy, distribute and/or
-      modify this document under the terms of the &gnu; General Public
-      License, Version 2 or any later version published by the Free
-      Software Foundation.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml b/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml
deleted file mode 100644
index 7dff34d95..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSCAT</refentrytitle>">
-  <!ENTITY dhpackage   "artscat">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>pipe data to sound device</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable> options </replaceable></option></arg>
-      <arg><option><replaceable> filename </replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> pipes data from a pipe to the sound device through arts.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-b <replaceable>bits</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of bits (8 or 16)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-c <replaceable>channels</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of channels (1 or 2)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h</option>
-        </term>
-        <listitem>
-          <para>display help and exit</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-r <replaceable>samplingrate</replaceable></option>
-        </term>
-        <listitem>
-          <para>set samplingrate to use</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-t <replaceable>title</replaceable></option>
-        </term>
-        <listitem>
-          <para>set stream title</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-        </term>
-        <listitem>
-          <para>show version</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (but may be used by
-      others).  Permission is granted to copy, distribute and/or
-      modify this document under the terms of the &gnu; General Public
-      License, Version 2 or any later version published by the Free
-      Software Foundation.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml b/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml
deleted file mode 100644
index 7dff34d95..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
-  <!ENTITY dhsurname   "<surname>Cheney</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>ccheney@debian.org</email>">
-  <!ENTITY dhusername  "Chris Cheney">
-  <!ENTITY dhucpackage "<refentrytitle>ARTSCAT</refentrytitle>">
-  <!ENTITY dhpackage   "artscat">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2002</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>pipe data to sound device</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable> options </replaceable></option></arg>
-      <arg><option><replaceable> filename </replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> command.</para>
-
-    <para><command>&dhpackage;</command> pipes data from a pipe to the sound device through arts.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This program follows the usual GNU command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-b <replaceable>bits</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of bits (8 or 16)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-c <replaceable>channels</replaceable></option>
-        </term>
-        <listitem>
-          <para>set number of channels (1 or 2)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h</option>
-        </term>
-        <listitem>
-          <para>display help and exit</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-r <replaceable>samplingrate</replaceable></option>
-        </term>
-        <listitem>
-          <para>set samplingrate to use</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-t <replaceable>title</replaceable></option>
-        </term>
-        <listitem>
-          <para>set stream title</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-        </term>
-        <listitem>
-          <para>show version</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername;
-      &lt;&dhemail;&gt; for the &debian; system (but may be used by
-      others).  Permission is granted to copy, distribute and/or
-      modify this document under the terms of the &gnu; General Public
-      License, Version 2 or any later version published by the Free
-      Software Foundation.
-    </para>
-
-    <para>On Debian systems, the complete text of the GNU General
-      Public License can be found in /usr/share/common-licenses/GPL.
-    </para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1 b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1
deleted file mode 100644
index 2615f47c2..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.TH ARTSDSP "1" "February 2008" "artsdsp" "User Commands"
-.SH NAME
-artsdsp \- manual page for artsdsp
-.SH DESCRIPTION
-artsdsp \- attempt to reroute audio device to artsd
-.PP
-artsdsp [options] binary
-.PP
-options:
-.TP
-.B \-h, \-\-help
-Show brief help.
-.TP
-.B \-n, \-\-name\fR=\fINAME\fR
-Use name to identify player to artsd.
-.TP
-.B \-m, \-\-mmap
-Emulate memory mapping (i.e. for quake).
-.TP
-.B \-s, \-\-single\-threaded
-Use the single\-threaded version.
-.TP
-.B \-v, \-\-verbose
-Show parameters.
-.TP
-.B \-V, \-\-version
-Show version.
-.PP
-This manual page was written by Fathi Boudra <fabo@debian.org>,
-for the Debian project (but may be used by others).
-
diff --git a/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1 b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1
deleted file mode 100644
index 2615f47c2..000000000
--- a/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.TH ARTSDSP "1" "February 2008" "artsdsp" "User Commands"
-.SH NAME
-artsdsp \- manual page for artsdsp
-.SH DESCRIPTION
-artsdsp \- attempt to reroute audio device to artsd
-.PP
-artsdsp [options] binary
-.PP
-options:
-.TP
-.B \-h, \-\-help
-Show brief help.
-.TP
-.B \-n, \-\-name\fR=\fINAME\fR
-Use name to identify player to artsd.
-.TP
-.B \-m, \-\-mmap
-Emulate memory mapping (i.e. for quake).
-.TP
-.B \-s, \-\-single\-threaded
-Use the single\-threaded version.
-.TP
-.B \-v, \-\-verbose
-Show parameters.
-.TP
-.B \-V, \-\-version
-Show version.
-.PP
-This manual page was written by Fathi Boudra <fabo@debian.org>,
-for the Debian project (but may be used by others).
-
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/polkit-tqt/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/polkit-tqt/debian/changelog b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog
new file mode 100644
index 000000000..58e4a45de
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/changelog
@@ -0,0 +1,66 @@
+polkit-tqt (0.103.0-2) unstable; urgency=low
+
+  * Port to TQt3 and package renaming
+  * Initial release for TDE
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Mon, 01 Nov 2021 14:03:00 +0900
+
+polkit-qt-1 (0.103.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - fix annoying crash on shutdown. (Closes: #651815)
+
+  [ Felix Geyer ]
+  * Modify CFLAGS/CXXFLAGS after including debian-qt-kde.mk so the changes are
+    not overwritten.
+
+  [ Fathi Boudra ]
+  * Update debian/compat: bump to 8.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 14 Dec 2011 09:15:10 -0500
+
+polkit-qt-1 (0.99.0-3) unstable; urgency=low
+
+  [ Modestas Vainius ]
+  * Update symbol files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 May 2011 00:31:01 +0300
+
+polkit-qt-1 (0.99.0-2) experimental; urgency=low
+
+  * Bump Standards-Version to 3.9.2: no changes needed.
+  * Build library with -fvisibility=hidden -fvisibility-inlines-hidden.
+  * Update symbol file: many private symbols are gone due to above.
+
+ -- Modestas Vainius <modax@debian.org>  Thu, 28 Apr 2011 11:53:35 +0300
+
+polkit-qt-1 (0.99.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+  [ Modestas Vainius ]
+  * Add Vcs fields to debian/control.
+  * Switch debian/rules engine to qt-kde-team/2/*.
+  * Bump Standards-Version to 3.9.1: no changes needed.
+  * Remove dupe "Section" field from debian/control.
+  * Include verbatim BSD license to debian/copyright.
+  * Override lintian libpolkit-qt-1-0: package-name-doesnt-match-sonames.
+  * Use more failsafe wildcards in libpolkit-qt-1-0.install.
+  * Add myself to Uploaders.
+  * SONAME bumped: rename libpolkit-qt-1-0 to libpolkit-qt-1-1.
+  * Add symbol file for libpolkit-qt-1-1.
+  * Update debian/copyright.
+
+  [ Didier Raboud ]
+  * Bump B-D of libpolkit to >= 0.98.
+
+  [ José Manuel Santamaría Lema ]
+  * Update installed files.
+
+ -- Modestas Vainius <modax@debian.org>  Mon, 14 Mar 2011 01:03:06 +0200
+
+polkit-qt-1 (0.95.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #565395)
+
+ -- Fathi Boudra <fabo@debian.org>  Fri, 15 Jan 2010 12:50:13 +0100
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/compat b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/control b/ubuntu/_base/dependencies/polkit-tqt/debian/control
new file mode 100644
index 000000000..7da8dc684
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/control
@@ -0,0 +1,61 @@
+Source: polkit-tqt
+Section: devel
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev,
+               libpolkit-gobject-1-dev, libpolkit-agent-1-dev, libdbus-1-tqt-dev
+Standards-Version: 3.9.2
+
+Package: libpolkit-tqt
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, policykit-1
+Description: PolicyKit-tqt library
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the files necessary for running applications that use
+ the libpolkit-tqt library.
+
+Package: libpolkit-tqt-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: libpolkit-tqt (= ${binary:Version}), libtqtinterface-dev
+Suggests: libpolkit-tqt-examples
+Description: PolicyKit-tqt development files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains the development libraries and headers.
+
+Package: libpolkit-tqt-examples
+Section: libs
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, policykit-1
+Description: PolicyKit-tqt library example files
+ PolicyKit is an application-level toolkit for defining and handling the policy
+ that allows unprivileged processes to speak to privileged processes.
+ .
+ It is a framework for centralizing the decision making process with respect to
+ granting access to privileged operations for unprivileged (desktop) applications.
+ .
+ libpolkit-tqt provides convenience classes and methods for TQt/TDE
+ applications that want to use PolicyKit.
+ .
+ This package contains example files and applications.
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/copyright b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright
new file mode 100644
index 000000000..19e2663aa
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/copyright
@@ -0,0 +1,101 @@
+This code was ported to TQt3 and packaged for Debian by:
+    Michele Calgaro <michele.calgaro@yahoo.it>
+and is based on the code downloaded from Debian Snapshot Archive at:
+    https://snapshot.debian.org/package/polkit-qt-1/0.103.0-1/
+
+Original polkit-qt-1 code was packaged for Debian by:
+
+    Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
+
+Upstream Authors:
+
+    Daniel Nicoletti <dantti85-dev@yahoo.com.br>
+    Dario Freddi <drf@kde.org>
+    Jaroslav Reznik <jreznik@redhat.com>
+    Radek Novacek <rnovacek@redhat.com>
+    Lukas Tinkl <ltinkl@redhat.com>
+    Pino Toscano <pino@kde.org>
+
+Copyright:
+
+    Copyright (C) 2008-2009 Daniel Nicoletti
+    Copyright (C) 2009-2010 Dario Freddi
+    Copyright (C) 2009 Jaroslav Reznik
+    Copyright (C) 2009 Radek Novacek
+    Copyright (C) 2009 Lukas Tinkl
+
+Copyright for polkit-tqt-export.h file:
+
+    Copyright (C) 2009 Dario Freddi <drf@kde.org>
+    Copyright (C) 2007 David Faure <faure@kde.org>
+
+Copyright for polkittqt1-version.h.cmake file:
+
+    Copyright (C) 2009 Dario Freddi <drf@kde.org>
+    Copyright (C) 2007 Sebastian Trueg <trueg@kde.org>
+
+Copyright for cmake/modules/FindAutomoc4.cmake file:
+
+    Copyright (C) 2008-2009 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/MacroPushRequiredVars.cmake file:
+
+    Copyright (C) 2006 Alexander Neundorf <neundorf@kde.org>
+
+Copyright for cmake/modules/InstallSettings.cmake file:
+
+    Copyright (C) 2008 Kevin Krammer <kevin.krammer@gmx.at>
+
+License for cmake modules:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License:
+
+    This package 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 of the License, or (at your option) any later version.
+
+    This package 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2' and
+`/usr/share/common-licenses/LGPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Fathi Boudra <fabo@debian.org>
+    Copyright (C) 2011 Modestas Vainius <modax@debian.org>
+
+and is licensed under the GPL version 2 or any later version.
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/docs b/ubuntu/_base/dependencies/polkit-tqt/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
new file mode 100644
index 000000000..698c043d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-dev.install
@@ -0,0 +1,31 @@
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/ActionDescription
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Listener
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Agent/Session
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Authority
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Details
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/Action
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButton
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Gui/ActionButtons
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Identity
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/Subject
+debian/tmp/usr/include/polkit-tqt/PolkitTQt/TemporaryAuthorization
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-actiondescription.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-listener.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-agent-session.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-authority.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-details.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-export.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-action.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbutton.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbuttons.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-identity.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-subject.h
+debian/tmp/usr/include/polkit-tqt/polkit-tqt-temporaryauthorization.h
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-agent.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-core.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-gui.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-agent.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-core.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-gui.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/polkit-tqt.cmake
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
new file mode 100644
index 000000000..5bb70628a
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt-examples.install
@@ -0,0 +1,8 @@
+debian/tmp/etc/dbus-1/system.d/org.tqt.policykit.examples.conf
+debian/tmp/usr/bin/polkit-tqt-agent-example
+debian/tmp/usr/bin/polkit-tqt-example
+debian/tmp/usr/bin/polkit-tqt-example-helper
+debian/tmp/usr/share/apps/polkit-tqt/examples/*
+debian/tmp/usr/share/apps/polkit-tqt/icons/*
+debian/tmp/usr/share/dbus-1/system-services/org.tqt.policykit.examples.service
+debian/tmp/usr/share/polkit-1/actions/org.tqt.policykit.examples.policy
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
new file mode 100644
index 000000000..1bbe0900a
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/libpolkit-tqt.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-*.so.*
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/patches/series
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/rules b/ubuntu/_base/dependencies/polkit-tqt/debian/rules
new file mode 100755
index 000000000..71edffe1c
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/rules
@@ -0,0 +1,23 @@
+#!/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
+
+# Build options
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DBUILD_ALL="ON"
+
+DEB_MAKE_CHECK_TARGET = check
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/source/format b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/polkit-tqt/debian/source/options b/ubuntu/_base/dependencies/polkit-tqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/dependencies/polkit-tqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/control b/ubuntu/_base/dependencies/python-tqt/debian/control
deleted file mode 100644
index 8af7946c1..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/control
+++ /dev/null
@@ -1,126 +0,0 @@
-Source: python-tqt
-Section: python
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python, python-all-dbg
-Standards-Version: 3.8.4
-
-Package: python-tqt
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
-Replaces: python-tqt (<< 4:14.0.0~)
-Breaks: python-tqt (<< 4:14.0.0~)
-Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
-Provides: ${python:Provides}
-Description: TQt bindings for Python
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- At this moment PyTQt offers a vast subset of TQt API. There are
- some minor issues related to the differences between C++ and Python
- (types, etc), but usually you'll be able to write code pretty much the
- same way in both languages (with syntax differences, of course)
-
-Package: python-tqt-dbg
-Architecture: any
-Priority: extra
-Replaces: python-tqt-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-dbg (<< 4:14.0.0~)
-Section: debug
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends}
-Description: TQt bindings for Python (debug extension)
- Python binding module that allows use of TQt X Window toolkit v3.
- You can use it to create portable graphics-capable scripts (there
- are PyTQt versions for Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-tqt-gl
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
-Replaces: python-tqt-gl (<< 4:14.0.0~)
-Breaks: python-tqt-gl (<< 4:14.0.0~)
-Suggests: python-tqt-doc
-Provides: ${python:Provides}
-Description: TQt OpenGL bindings for Python
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
-
-Package: python-tqt-gl-dbg
-Priority: extra
-Section: debug
-Replaces: python-tqt-gl-dbg (<< 4:14.0.0~)
-Breaks: python-tqt-gl-dbg (<< 4:14.0.0~)
-Architecture: any
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt OpenGL bindings for Python (debug extension)
- Python binding module that allows use of the OpenGL facilities
- offered by the TQt X Window toolkit v3. You can use it to create
- portable graphics-capable scripts (there are PyTQt versions for
- Linux, Windows and MacOS X).
- .
- This package contains the extension built for the Python debug interpreter.
-
-Package: python-tqtext
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
-Replaces: python-tqtext (<< 4:14.0.0~)
-Breaks: python-tqtext (<< 4:14.0.0~)
-Provides: ${python:Provides}
-Description: TQt extensions for PyTQt
- PyTQt Extensions. Contains:
- .
-   * QScintilla: a featureful TQt source code editing component based
-                 on Scintilla.
-
-Package: python-tqtext-dbg
-Priority: extra
-Section: debug
-Replaces: python-tqtext-dbg (<< 4:14.0.0~)
-Breaks: python-tqtext-dbg (<< 4:14.0.0~)
-Architecture: any
-Depends: ${shlibs:Depends}, python-all-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
-Description: TQt debug extensions for PyTQt
- PyTQt debug Extensions. Contains:
- .
-   * QScintilla: a featureful TQt source code editing component based
-                 on Scintilla.
-
-Package: pytqt-tools
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: pytqt-tools (<< 4:14.0.0~)
-Breaks: pytqt-tools (<< 4:14.0.0~)
-Description: pyuic and pylupdate for TQt
- pyuic is the PyTQt counterpart for TQt's uic. It takes an XML
- user interface file and generates Python code.
- .
- pylupdate is the counterpart for TQt's lupdate. It updates TQt
- Linguist translation files from Python code.
-
-Package: python-tqt-dev
-Depends: python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Suggests: python-sip-tqt-dev
-Replaces: python-tqt-dev (<< 4:14.0.0~)
-Breaks: python-tqt-dev (<< 4:14.0.0~)
-Architecture: all
-Description: TQt bindings for Python - Development files
- Development .sip files with definitions of PyTQt classes. They
- are needed to build PyTQt, but also as building blocks of other
- packages based on them, like PyTDE.
-
-Package: python-tqt-doc
-Section: doc
-Architecture: all
-Replaces: python-tqt-doc (<< 4:14.0.0~)
-Breaks: python-tqt-doc (<< 4:14.0.0~)
-Depends: ${misc:Depends}
-Suggests: python-tqt
-Description: TQt bindings for Python - Documentation and examples
- Documentation and examples for the PyTQt (bindings that allow
- the use of TQt library from within a Python script).
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples
deleted file mode 100644
index 3162f69a8..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-examples3/*
-
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install
deleted file mode 100644
index 288f3cb88..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtgl.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install
deleted file mode 100644
index 61a9363d0..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtcanvas.so
-usr/lib/python*/*-packages/python_tqt/qtnetwork.so
-usr/lib/python*/*-packages/python_tqt/qtsql.so
-usr/lib/python*/*-packages/python_tqt/qttable.so
-usr/lib/python*/*-packages/python_tqt/qtui.so
-usr/lib/python*/*-packages/python_tqt/qtxml.so
-usr/lib/python*/*-packages/python_tqt/qt.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install
deleted file mode 100644
index 582be1bb1..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/python_tqt/qtext.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/rules b/ubuntu/_base/dependencies/python-tqt/debian/rules
deleted file mode 100755
index 0d9bda729..000000000
--- a/ubuntu/_base/dependencies/python-tqt/debian/rules
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# 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
-
-export DH_OPTIONS
-
--include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
-py_sitename = site-packages
-py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-py_sitename_sh = $(py_sitename)
-py_libdir_sh = $(py_libdir)
-endif
-
-
-DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc
-INSTDIR=$(CURDIR)/debian
-
-export QTDIR=/usr/share/tqt3
-export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
-else
-	CXXFLAGS += -O1
-endif
-CXXFLAGS += "-I/usr/include/tqt"
-
-PYTHONS	:= $(shell pyversions -vr debian/control)
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
-
-GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
-ifneq (,$(filter $(GCCVER),4.2 4.3))
-	SPLIT=40
-else
-	SPLIT=10
-endif
-
-.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
-
-configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
-build-%/configure-stamp:
-	dh_testdir
-	mkdir -p build-$*
-	cd build-$* && echo yes \
-                | python$* ../configure.py \
-                        -c -n /usr/include/tqscintilla \
-                        -e python$* \
-                        -o /usr/lib -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-                        -l /usr/include/python$* \
-                        -v /usr/share/sip/tqt \
-                        -m /usr/lib/python$*/config \
-                        CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
-	touch $@
-
-dbg-build-%/configure-stamp:
-	dh_testdir
-	mkdir -p dbg-build-$*
-	cd dbg-build-$* && echo yes \
-                | python$*-dbg ../configure.py \
-                        -c -n /usr/include/tqscintilla \
-                        -e python$* \
-                        -o /usr/lib -u -j $(SPLIT) \
-                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-                        -l /usr/include/python$*_d \
-                        -v /usr/share/sip/tqt \
-                        -m /usr/lib/python$*/config_d \
-                        CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
-	touch $@
-
-build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
-build-indep:
-
-build-%/build-stamp: build-%/configure-stamp
-	dh_testdir
-	$(MAKE) -C build-$*
-	touch $@
-
-dbg-build-%/build-stamp: dbg-build-%/configure-stamp
-	dh_testdir
-	$(MAKE) -C dbg-build-$*
-	touch $@
-
-install-indep: configure
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
-	for version in ${PYTHONS}; do\
-		pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
-		mkdir -p debian/python-tqt-dev/$$pylib;\
-		install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
-	done
-	dh_install -i
-
-install-arch: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k -a
-	dh_installdirs -a
-	for version in ${PYTHONS}; do \
-	  $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
-	done
-	for version in ${PYTHONS}; do \
-	  pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
-	  $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-tqt-dbg;\
-	  mkdir -p debian/python-tqt/$$pylib;\
-	  cp -a debian/tmp/$$pylib/__init__.py \
-	        debian/python-tqt/$$pylib/__init__.py;\
-	  mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
-	  mv debian/python-tqt-dbg/$$pylib/qtgl.so \
-             debian/python-tqt-gl-dbg/$$pylib/;\
-	  mkdir -p debian/python-tqtext-dbg/$$pylib;\
-	  mv debian/python-tqt-dbg/$$pylib/qtext.so \
-             debian/python-tqtext-dbg/$$pylib/;\
-	done
-
-	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-
-	for i in $$(find debian/python-*-dbg -name '*.so'); do \
-	  b=$$(basename $$i .so); \
-	  mv $$i $$(dirname $$i)/$${b}_d.so; \
-	done
-	find debian/python-*-dbg ! -type d \
-                ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
-	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) 
-	rm -f *-stamp
-	dh_clean
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_installdocs -A NEWS THANKS
-	dh_installexamples
-	dh_link
-ifeq (,$(findstring -i, $(DH_OPTIONS)))
-	DH_OPTIONS= dh_strip -ppytqt-tools
-	set -e; \
-	for p in python-tqt python-tqt-gl python-tqtext; do \
-	  DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
-	  rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
-	  ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
-	done
-endif
-#	dh_strip
-	dh_compress -X.py -X.bmp -X.ui -X.sql
-	dh_fixperms
-	${DH_PYTHON2}
-	dh_sip_tqt
-	dh_lintian
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture independant packages using the common target.
-binary-indep: install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build build-arch clean binary-indep binary-arch binary configure
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/README.Debian b/ubuntu/_base/dependencies/pytqt/debian/README.Debian
index 33603ec40..33603ec40 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/README.Debian
+++ b/ubuntu/_base/dependencies/pytqt/debian/README.Debian
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/changelog b/ubuntu/_base/dependencies/pytqt/debian/changelog
index 95e2f0cce..95e2f0cce 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/changelog
+++ b/ubuntu/_base/dependencies/pytqt/debian/changelog
diff --git a/ubuntu/_base/dependencies/pytqt/debian/compat b/ubuntu/_base/dependencies/pytqt/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/dependencies/pytqt/debian/control b/ubuntu/_base/dependencies/pytqt/debian/control
new file mode 100644
index 000000000..577566cd9
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/control
@@ -0,0 +1,200 @@
+Source: python-tqt
+Section: python
+Priority: optional
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
+Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python3-all-dev, python3-all-dbg, libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python
+Standards-Version: 3.8.4
+XS-Python-Version: >= 2.3
+X-Python3-Version: >= 3.0
+
+Package: python-tqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
+Replaces: python-tqt (<< 4:14.0.0~)
+Breaks: python-tqt (<< 4:14.0.0~)
+Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python:Provides}
+Description: TQt bindings for Python
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ At this moment PyTQt offers a vast subset of TQt API. There are
+ some minor issues related to the differences between C++ and Python
+ (types, etc), but usually you'll be able to write code pretty much the
+ same way in both languages (with syntax differences, of course)
+
+Package: python-tqt-dbg
+Architecture: any
+Priority: extra
+Replaces: python-tqt-dbg (<< 4:14.0.0~)
+Breaks: python-tqt-dbg (<< 4:14.0.0~)
+Section: debug
+Depends: ${shlibs:Depends}, python-all-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends}
+Description: TQt bindings for Python (debug extension)
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-tqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends}
+Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python3:Provides}
+Description: TQt bindings for Python 3
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ At this moment PyTQt offers a vast subset of TQt API. There are
+ some minor issues related to the differences between C++ and Python
+ (types, etc), but usually you'll be able to write code pretty much the
+ same way in both languages (with syntax differences, of course)
+
+Package: python3-tqt-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends}
+Description: TQt bindings for Python 3 (debug extension)
+ Python binding module that allows use of TQt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyTQt versions for Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-tqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
+Replaces: python-tqt-gl (<< 4:14.0.0~)
+Breaks: python-tqt-gl (<< 4:14.0.0~)
+Suggests: python-tqt-doc
+Provides: ${python:Provides}
+Description: TQt OpenGL bindings for Python
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+
+Package: python-tqt-gl-dbg
+Priority: extra
+Section: debug
+Replaces: python-tqt-gl-dbg (<< 4:14.0.0~)
+Breaks: python-tqt-gl-dbg (<< 4:14.0.0~)
+Architecture: any
+Depends: ${shlibs:Depends}, python-all-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt OpenGL bindings for Python (debug extension)
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python3-tqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends}
+Suggests: python-tqt-doc
+Provides: ${python3:Provides}
+Description: TQt OpenGL bindings for Python 3
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+
+Package: python3-tqt-gl-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt-gl (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt OpenGL bindings for Python 3 (debug extension)
+ Python binding module that allows use of the OpenGL facilities
+ offered by the TQt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyTQt versions for
+ Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+Package: python-tqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
+Replaces: python-tqtext (<< 4:14.0.0~)
+Breaks: python-tqtext (<< 4:14.0.0~)
+Provides: ${python:Provides}
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: python-tqtext-dbg
+Priority: extra
+Section: debug
+Replaces: python-tqtext-dbg (<< 4:14.0.0~)
+Breaks: python-tqtext-dbg (<< 4:14.0.0~)
+Architecture: any
+Depends: ${shlibs:Depends}, python-all-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt debug extensions for PyTQt
+ PyTQt debug Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: python3-tqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends}
+Provides: ${python3:Provides}
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: python3-tqtext-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt debug extensions for PyTQt
+ PyTQt debug Extensions. Contains:
+ .
+   * QScintilla: a featureful TQt source code editing component based
+                 on Scintilla.
+
+Package: pytqt-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: pytqt-tools (<< 4:14.0.0~)
+Breaks: pytqt-tools (<< 4:14.0.0~)
+Description: pyuic and pylupdate for TQt
+ pyuic is the PyTQt counterpart for TQt's uic. It takes an XML
+ user interface file and generates Python code.
+ .
+ pylupdate is the counterpart for TQt's lupdate. It updates TQt
+ Linguist translation files from Python code.
+
+Package: python-tqt-dev
+Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Suggests: python3-sip-tqt-dev | python-sip-tqt-dev
+Replaces: python-tqt-dev (<< 4:14.0.0~)
+Breaks: python-tqt-dev (<< 4:14.0.0~)
+Architecture: all
+Description: TQt bindings for Python - Development files
+ Development .sip files with definitions of PyTQt classes. They
+ are needed to build PyTQt, but also as building blocks of other
+ packages based on them, like PyTDE.
+
+Package: python-tqt-doc
+Section: doc
+Architecture: all
+Replaces: python-tqt-doc (<< 4:14.0.0~)
+Breaks: python-tqt-doc (<< 4:14.0.0~)
+Depends: ${misc:Depends}
+Suggests: python-tqt
+Description: TQt bindings for Python - Documentation and examples
+ Documentation and examples for the PyTQt (bindings that allow
+ the use of TQt library from within a Python script).
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/copyright b/ubuntu/_base/dependencies/pytqt/debian/copyright
index 715a83f24..715a83f24 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/copyright
+++ b/ubuntu/_base/dependencies/pytqt/debian/copyright
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/docs b/ubuntu/_base/dependencies/pytqt/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/docs
+++ b/ubuntu/_base/dependencies/pytqt/debian/docs
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pylupdate.1 b/ubuntu/_base/dependencies/pytqt/debian/manpages/pylupdate.1
index 4d2c8919a..4d2c8919a 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pylupdate.1
+++ b/ubuntu/_base/dependencies/pytqt/debian/manpages/pylupdate.1
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pyuic.1 b/ubuntu/_base/dependencies/pytqt/debian/manpages/pyuic.1
index f1ffa41ff..f1ffa41ff 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/manpages/pyuic.1
+++ b/ubuntu/_base/dependencies/pytqt/debian/manpages/pyuic.1
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/ubuntu/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff
index 131e9dbdc..131e9dbdc 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff
+++ b/ubuntu/_base/dependencies/pytqt/debian/patches/debian_configure_changes.diff
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/patches/series b/ubuntu/_base/dependencies/pytqt/debian/patches/series
index 573069d8d..573069d8d 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/patches/series
+++ b/ubuntu/_base/dependencies/pytqt/debian/patches/series
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-dev.dirs
index ae635cbcd..ae635cbcd 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
+++ b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-dev.dirs
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-dev.install
index 7b6aca191..7b6aca191 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
+++ b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-dev.install
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-dev.lintian-overrides
index 36e6c1349..36e6c1349 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-dev.lintian-overrides
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-doc.dirs
index 43a4fa9fa..43a4fa9fa 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-doc.dirs
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python-tqt-doc.examples b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-doc.examples
new file mode 100644
index 000000000..c48447a3e
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-doc.examples
@@ -0,0 +1,2 @@
+examples/*
+
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-doc.install
index 65f82036b..65f82036b 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install
+++ b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-doc.install
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python-tqt-gl.install b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-gl.install
new file mode 100644
index 000000000..d58e26ab5
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python-tqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python2.*/*-packages/python_tqt/qtgl.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python-tqt.install b/ubuntu/_base/dependencies/pytqt/debian/python-tqt.install
new file mode 100644
index 000000000..4ec8f4d19
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python-tqt.install
@@ -0,0 +1,7 @@
+usr/lib/python2.*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python2.*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python2.*/*-packages/python_tqt/qtsql.so
+usr/lib/python2.*/*-packages/python_tqt/qttable.so
+usr/lib/python2.*/*-packages/python_tqt/qtui.so
+usr/lib/python2.*/*-packages/python_tqt/qtxml.so
+usr/lib/python2.*/*-packages/python_tqt/qt.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python-tqtext.install b/ubuntu/_base/dependencies/pytqt/debian/python-tqtext.install
new file mode 100644
index 000000000..00345e2e7
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python-tqtext.install
@@ -0,0 +1 @@
+usr/lib/python2.*/*-packages/python_tqt/qtext.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-tqt-gl.install b/ubuntu/_base/dependencies/pytqt/debian/python3-tqt-gl.install
new file mode 100644
index 000000000..ead3920cf
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python3-tqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtgl.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-tqt.install b/ubuntu/_base/dependencies/pytqt/debian/python3-tqt.install
new file mode 100644
index 000000000..4ceda8c75
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python3-tqt.install
@@ -0,0 +1,7 @@
+usr/lib/python3*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python3*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python3*/*-packages/python_tqt/qtsql.so
+usr/lib/python3*/*-packages/python_tqt/qttable.so
+usr/lib/python3*/*-packages/python_tqt/qtui.so
+usr/lib/python3*/*-packages/python_tqt/qtxml.so
+usr/lib/python3*/*-packages/python_tqt/qt.so
diff --git a/ubuntu/_base/dependencies/pytqt/debian/python3-tqtext.install b/ubuntu/_base/dependencies/pytqt/debian/python3-tqtext.install
new file mode 100644
index 000000000..4d58d8a28
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/python3-tqtext.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtext.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.install b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.install
index 1df36c612..1df36c612 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.install
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.install
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages
index 7d27d0034..7d27d0034 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages
+++ b/ubuntu/_base/dependencies/pytqt/debian/pytqt-tools.manpages
diff --git a/ubuntu/_base/dependencies/pytqt/debian/rules b/ubuntu/_base/dependencies/pytqt/debian/rules
new file mode 100755
index 000000000..932c1bc35
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/rules
@@ -0,0 +1,214 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# 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
+
+export DH_OPTIONS
+
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+py_sitename = site-packages
+py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+py_sitename_sh = $(py_sitename)
+py_libdir_sh = $(py_libdir)
+endif
+
+
+DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc
+INSTDIR=$(CURDIR)/debian
+
+export QTDIR=/usr/share/tqt3
+export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CXXFLAGS += -O0
+else
+	CXXFLAGS += -O1
+endif
+CXXFLAGS += "-I/usr/include/tqt"
+
+PYTHONS	:= $(shell pyversions -vr debian/control) $(shell py3versions -vd)
+
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+
+DEB_PARALLEL_JOBS ?= 40
+
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+
+configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+
+build-%/configure-stamp:
+	dh_testdir
+	mkdir -p build-$*
+	cd build-$* && echo yes \
+                | python$* ../configure.py \
+                        -c -n /usr/include/tqt3 \
+                        -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
+                        -l /usr/include/python$* \
+                        -v /usr/share/sip/tqt \
+                        -m /usr/lib/python$*/config \
+                        -z \
+                        CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
+	touch $@
+
+dbg-build-%/configure-stamp:
+	dh_testdir
+	mkdir -p dbg-build-$*
+	cd dbg-build-$* && echo yes \
+                | python$*-dbg ../configure.py \
+                        -c -n /usr/include/tqt3 \
+                        -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
+                        -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
+                        -l /usr/include/python$*_d \
+                        -v /usr/share/sip/tqt \
+                        -m /usr/lib/python$*/config_d \
+                        -z \
+                        CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
+	touch $@
+
+build build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+build-indep:
+
+build-%/build-stamp: build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C build-$*
+	touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C dbg-build-$*
+	touch $@
+
+install-indep: configure
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i
+	dh_installdirs -i
+	for version in ${PYTHONS}; do\
+		pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/python_tqt;\
+		mkdir -p debian/python-tqt-dev/$$pylib;\
+		install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
+	done
+	dh_install -i
+
+install-arch: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k -a
+	dh_installdirs -a
+
+	for p in $(PYTHONS) ; do \
+		$(MAKE) -f debian/rules install-arch-$$p;\
+	done
+
+	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+
+	for i in $$(find debian/python-*-dbg -name '*.so'); do \
+	  b=$$(basename $$i .so); \
+	  mv $$i $$(dirname $$i)/$${b}_d.so; \
+	done
+	find debian/python-*-dbg ! -type d \
+                ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+	for i in $$(find debian/python3-*-dbg -name '*.so'); do \
+	  b=$$(basename $$i .so); \
+	  mv $$i $$(dirname $$i)/$${b}_d.so; \
+	done
+	find debian/python3-*-dbg ! -type d \
+                ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+	find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+install-arch-3.%:
+	$(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-tqt-dbg
+	mkdir -p debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+	cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+	      debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+	mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+	mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+	   debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+	mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+	mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+	   debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+
+install-arch-%:
+	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-tqt-dbg
+	mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+	cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+	      debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+	mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+	mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+	   debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+	mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+	mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+	   debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) 
+	rm -f *-stamp
+	dh_clean
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installman
+	dh_installchangelogs ChangeLog
+	dh_installdocs -A NEWS THANKS
+	dh_installexamples
+	dh_link
+ifeq (,$(findstring -i, $(DH_OPTIONS)))
+	DH_OPTIONS= dh_strip -ppytqt-tools
+	set -e; \
+	for p in python-tqt python-tqt-gl python-tqtext; do \
+	  DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
+	  rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+	  ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+	done
+endif
+#	dh_strip
+	dh_compress -X.py -X.bmp -X.ui -X.sql
+	dh_fixperms
+ifneq (dh_pysupport,${DH_PYTHON2})
+	${DH_PYTHON2} --no-dbg-cleaning
+else
+	${DH_PYTHON2}
+endif
+	dh_python3 --no-dbg-cleaning
+	dh_sip_tqt
+	dh_sip3_tqt
+	dh_lintian
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
+
+# Build architecture independant packages using the common target.
+binary-indep: install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build build-arch clean binary-indep binary-arch binary configure
diff --git a/ubuntu/_base/dependencies/pytqt/debian/source/format b/ubuntu/_base/dependencies/pytqt/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/pytqt/debian/source/options b/ubuntu/_base/dependencies/pytqt/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/dependencies/pytqt/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/watch b/ubuntu/_base/dependencies/pytqt/debian/watch
index 506321d38..506321d38 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/watch
+++ b/ubuntu/_base/dependencies/pytqt/debian/watch
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/control b/ubuntu/_base/dependencies/sip4-tqt/debian/control
index bdd8f4eb0..ca64055dd 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/control
@@ -4,20 +4,21 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev
+Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python3-all-dev, python3-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev, bison, flex
 Standards-Version: 3.8.4
 XS-Python-Version: all
+X-Python3-Version: >= 3.0
 
 Package: python-sip-tqt
 Architecture: any
 Section: python
 Replaces: python-sip-tqt (<< 4:14.0.0~)
 Breaks: python-sip-tqt (<< 4:14.0.0~)
-Provides: ${python:Provides}, sip-tqt-api-7.1, sip-api-7.1
+Provides: ${python:Provides}
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4 (<< 4.10)
 Description: Python/C++ bindings generator runtime library
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
 
@@ -31,7 +32,7 @@ Provides: ${python:Provides}
 Depends: python-sip-tqt (= ${binary:Version}), python-all-dbg, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4-dbg (<< 4.10)
 Description: Python/C++ bindings generator runtime library (debug extension)
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
@@ -47,17 +48,56 @@ Recommends: python-sip-tqt (>= ${source:Version})
 Provides: python-sip-dev, python-sip4-dev, sip4
 Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10)
 Description: Python/C++ bindings generator development files
- SIP is a tool for generating bindings for C++ classes with some ideas
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ SIP-TQt was originally designed to generate Python bindings for TDE and so
+ has explicit support for the signal slot mechanism used by the TQt/TDE
+ class libraries.
+ .
+ Features:
+     - connecting TQt signals to Python functions and class methods
+     - connecting Python signals to TQt slots
+     - overloading virtual member functions with Python class methods
+     - protected member functions
+     - abstract classes
+     - enumerated types
+     - global class instances
+     - static member functions.
+ .
+ This package contains the code generator tool and the development headers
+ needed to develop Python bindings with sip-tqt.
+
+Package: python3-sip-tqt
+Architecture: any
+Section: python
+Provides: ${python3:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ This package provides SIP-TQt with support for Python 3
+
+Package: python3-sip-tqt-dev
+Architecture: any
+Section: python
+Depends: ${python:Depends}, python3-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
+Recommends: python3-sip-tqt (>= ${source:Version})
+Description: Python/C++ bindings generator development files
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
- SIP was originally designed to generate Python bindings for TDE and so
+ SIP-TQt was originally designed to generate Python bindings for TDE and so
  has explicit support for the signal slot mechanism used by the TQt/TDE
  class libraries.
  .
  Features:
-     - connecting Qt signals to Python functions and class methods
-     - connecting Python signals to Qt slots
+     - connecting TQt signals to Python functions and class methods
+     - connecting Python signals to TQt slots
      - overloading virtual member functions with Python class methods
      - protected member functions
      - abstract classes
@@ -66,5 +106,16 @@ Description: Python/C++ bindings generator development files
      - static member functions.
  .
  This package contains the code generator tool and the development headers
- needed to develop Python bindings with sip.
+ needed to develop Python 3 bindings with sip-tqt.
 
+Package: python3-sip-tqt-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP-TQt is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ This package contains debugging symbols for python3-sip-tqt
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt
new file mode 100644
index 000000000..9b6387689
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_sip3_tqt - set the correct dependencies for Python 3 packages using sip
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_sip3_tqt>
+
+=head1 DESCRIPTION
+
+dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be
+used by Python 3 extensions built with sip3-tqt in order to depend on a version of
+python3-sip-tqt that exports the correct public API.
+
+=cut
+
+init();
+
+my $sip3_tqt_provides = `dpkg -s python3-sip-tqt`;
+$sip3_tqt_provides =~ /^Provides:\s*(.+)$/m;
+
+my @sip3_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1)));
+
+my $sip3_tqt_api_version=$sip3_tqt_apis[-1];
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+        addsubstvar($package, "sip3-tqt:Depends", $sip3_tqt_api_version);
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+
+=head1 AUTHORS
+
+Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
+
+=cut
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
index 3c6450bd9..c92f23529 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_sip_tqt - set the correct dependencies for Python packages using sip
+dh_sip_tqt - set the correct dependencies for Python packages using sip-tqt
 
 =cut
 
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1
new file mode 100644
index 000000000..a4284326a
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1
@@ -0,0 +1,151 @@
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "DH_SIP3_TQT 1"
+.TH DH_SIP3_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+dh_sip3_tqt \- set the correct dependencies for Python 3 packages using sip-tqt
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBdh_sip3_tqt\fR
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be used by
+Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt
+that exports the correct public \s-1API\s0.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIdebhelper\fR\|(7)
+.PP
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Torsten Marek <shlomme@debian.org>
+Adapted for Python3 by
+Slávek Banko <slavek.banko@axis.cz>
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
index ea429fe9a..6f0edd8f1 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
@@ -130,20 +130,20 @@
 .if n .ad l
 .nh
 .SH "NAME"
-dh_sip_tqt \- set the correct dependencies for Python packages using sip
+dh_sip_tqt \- set the correct dependencies for Python packages using sip-tqt
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 \&\fBdh_sip_tqt\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by
-Python extensions built with sip in order to depend on a version of python-sip
+dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be used by
+Python extensions built with sip-tqt in order to depend on a version of python-sip-tqt
 that exports the correct public \s-1API\s0.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIdebhelper\fR\|(7)
 .PP
-This program is a part of python-sip-dev but is made to work with debhelper.
+This program is a part of python-sip-tqt-dev but is made to work with debhelper.
 .SH "AUTHORS"
 .IX Header "AUTHORS"
 Torsten Marek <shlomme@debian.org>
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
index 1df36c612..8b1c81fa9 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
@@ -1 +1,2 @@
 usr/bin/*
+../../debian/dh_sip_tqt /usr/bin/
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..01bc123e7 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/sip4_tqt/sip.so
+usr/lib/python2.*/*-packages/sip4_tqt/sip.so
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
new file mode 100644
index 000000000..43fbfa385
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
@@ -0,0 +1 @@
+../../debian/dh_sip3_tqt /usr/bin/
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
new file mode 100644
index 000000000..db0d5945a
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
@@ -0,0 +1 @@
+debian/manpages/dh_sip3_tqt.1
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install
new file mode 100644
index 000000000..967fec5d9
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt.install
@@ -0,0 +1 @@
+usr/lib/python3.*/*-packages/sip4_tqt/sip.so
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
index 1feb9c154..4a6bf3466 100755
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
@@ -14,6 +14,10 @@ endif
 
 export DH_OPTIONS
 
+PY2_PROVIDES=sip-tqt-api-7.0, sip-tqt-api-7.1
+PY3_PROVIDES=sip-tqt-py3api-7.0, sip-tqt-py3api-7.1
+PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]")
+
 INSTDIR=$(CURDIR)/debian
 
 CFLAGS=
@@ -24,7 +28,7 @@ else
 	CFLAGS += -O2 -g
 endif
 
-PYTHONS	:= $(shell pyversions -vr debian/control)
+PYTHONS := $(shell pyversions -vr) $(shell py3versions -vd)
 
 DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
 DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
@@ -48,7 +52,6 @@ build-%/configure-stamp:
 	cd build-$* \
 		&& python$* ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-			-g python$* \
 			-u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE=""
 	touch $@
 
@@ -58,8 +61,6 @@ dbg-build-%/configure-stamp:
 	cd dbg-build-$* \
 		&& python$*-dbg ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt \
-			-g python$* \
-			-e /usr/include/python$*_d \
 			-u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP=""
 	touch $@
 
@@ -81,12 +82,14 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
-	dh_clean
+	dh_clean debian/python3-sip.pydist
 
 install-arch: build
 	dh_testdir
 	dh_testroot
 	dh_prep -a
+	echo "python:Provides=$(PY2_PROVIDES)" >> debian/python-sip-tqt.substvars
+	echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip-tqt.substvars
 	dh_installdirs -a
 	# This is needed to enforce that the install-arch-% rules are
 	# not run in parallel. Both rules install into the same directory,
@@ -101,11 +104,32 @@ install-arch: build
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
+	for i in $$(find debian/python3-sip-tqt-dbg -name '*.so'); do \
+		b=$$(basename $$i .so); \
+		mv $$i $$(dirname $$i)/$${b}_d.so; \
+	done
 	find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
 	find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \;
+	find debian/python3-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
+	find debian/python3-sip-tqt-dbg -depth -empty -exec rmdir {} \;
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-	install -m 755 -o root -g root debian/dh_sip_tqt debian/python-sip-tqt-dev/usr/bin
+
+install-arch-3.%:
+	$(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-sip-tqt-dbg
+	mkdir -p debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/
+	touch debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/__init__.py
+	install -m 644 -o root -g root debian/sipconfig_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig.py
+	install -m 644 -o root -g root build-3.$*/sipconfig.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig_nd.py
+	install -m 644 -o root -g root dbg-build-3.$*/sipconfig.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip4_tqt/sipconfig_d.py
+	mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	install -m 644 -o root -g root siplib/sip.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
+	mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip.h \
+	    debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip.h
+	mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages/sip4_tqt
+	install -m 644 -o root -g root sipdistutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages/sip4_tqt
 
 install-arch-%:
 	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
@@ -115,11 +139,11 @@ install-arch-%:
 	install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/
 	install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_nd.py
 	install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py
-	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*
-	install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/
-	mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
-	ln -s ../python$*/sip.h \
-	    debian/python-sip-tqt-dev/usr/include/python$*_d/sip.h
+	mkdir -p debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
+	mkdir -p debian/python-sip-tqt-dev$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
+	ln -s ../$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip.h \
+	    debian/python-sip-tqt-dev/$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip.h
 	mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
 	install -m 644 -o root -g root sipdistutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt
 
@@ -139,17 +163,23 @@ binary-common:
 ifneq (,$(findstring -a, $(DH_OPTIONS)))
 	DH_OPTIONS= dh_strip -ppython-sip-tqt-dev
 	DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg
+	DH_OPTIONS= dh_strip -ppython3-sip-tqt-dev
+	DH_OPTIONS= dh_strip -ppython3-sip-tqt -Npython3-sip-tqt-dev --dbg-package=python3-sip-tqt-dbg
 	rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
 	mkdir -p debian/python-sip-tqt-dbg/usr/share/doc
 	ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
+	rm -rf debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
+	mkdir -p debian/python3-sip-tqt-dbg/usr/share/doc
+	ln -s python3-sip-tqt debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
 endif
-	dh_compress 
+	dh_compress -X.inv
 	dh_fixperms
 ifneq (dh_pysupport,${DH_PYTHON2})
 	${DH_PYTHON2} --no-dbg-cleaning
 else
 	${DH_PYTHON2}
 endif
+	dh_python3 --no-dbg-cleaning
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
index a9e761f08..32cf8d5e7 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
@@ -4,10 +4,10 @@ import sys
 
 if getattr(sys, "pydebug", False):
     try:
-        from sipconfig_d import *
-        from sipconfig_d import _pkg_config, _default_macros
+        from sip4_tqt.sipconfig_d import *
+        from sip4_tqt.sipconfig_d import _pkg_config, _default_macros
     except ImportError, msg:
         raise ImportError, 'No module named sipconfig; package python-sip-tqt-dbg not installed'
 else:
-    from sipconfig_nd import *
-    from sipconfig_nd import _pkg_config, _default_macros
+    from sip4_tqt.sipconfig_nd import *
+    from sip4_tqt.sipconfig_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig_py3.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig_py3.py
new file mode 100644
index 000000000..3e6aa5aba
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig_py3.py
@@ -0,0 +1,13 @@
+# import the sipconfig.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+    try:
+        from sip4_tqt.sipconfig_d import *
+        from sip4_tqt.sipconfig_d import _pkg_config, _default_macros
+    except ImportError as msg:
+        raise ImportError('No module named sipconfig; package python-sip-tqt-dbg not installed')
+else:
+    from sip4_tqt.sipconfig_nd import *
+    from sip4_tqt.sipconfig_nd import _pkg_config, _default_macros
diff --git a/ubuntu/_base/dependencies/tqca/debian/control b/ubuntu/_base/dependencies/tqca/debian/control
index f3f6d4d7b..7da73e73c 100644
--- a/ubuntu/_base/dependencies/tqca/debian/control
+++ b/ubuntu/_base/dependencies/tqca/debian/control
@@ -27,7 +27,7 @@ Description:
 Package: tqca-tls
 Section: libs
 Architecture: any
-Multi-Arch: foreign
+Multi-Arch: same
 Replaces: tqca-tls (<< 4:14.0.0~)
 Breaks: tqca-tls (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install
index 893c5dd19..02d23f437 100644
--- a/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install
+++ b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install
@@ -1 +1 @@
-debian/tmp/usr/lib/tqt3/plugins
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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/tqscintilla/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/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/tqscintilla/debian/control b/ubuntu/_base/dependencies/tqscintilla/debian/control
index e89abba2a..9d4458b48 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/control
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/control
@@ -3,15 +3,17 @@ Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 Uploaders: Torsten Marek <shlomme@debian.org>
-Build-Depends: debhelper (>= 9~), libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev
 Standards-Version: 3.8.4
 
 Package: libtqscintilla7
 Section: libs
 Architecture: any
+Multi-Arch: same
 Replaces: libtqscintilla7 (<< 4:14.0.0~)
 Breaks: libtqscintilla7 (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
+Recommends: libtqscintilla7-i18n
 Description: TQt source code editing component based on Scintilla
  Scintilla is a free source code editing component. It has features found
  in standard editing components, as well as features especially useful
@@ -19,9 +21,23 @@ Description: TQt source code editing component based on Scintilla
  .
  TQScintilla is a port or Scintilla to the TQt GUI toolkit.
 
+Package: libtqscintilla7-i18n
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Replaces: libtqscintilla7 (<< 4:14.0.12~)
+Breaks: libtqscintilla7 (<< 4:14.0.12~)
+Description: i18n files for TQScintilla library
+ Scintilla is a free source code editing component. It has features found
+ in standard editing components, as well as features especially useful
+ when editing and debugging source code.
+ .
+ This package contains the internationalization files for the TQScintilla library.
+
 Package: libtqscintilla-dev
 Section: libdevel
-Architecture: all
+Architecture: any
+Multi-Arch: foreign
 Replaces: libtqscintilla-dev (<< 4:14.0.0~)
 Breaks: libtqscintilla-dev (<< 4:14.0.0~)
 Depends: libtqscintilla7 (>= ${source:Version})
@@ -36,6 +52,7 @@ Description: TQt source code editing component - development files
 Package: libtqscintilla-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Replaces: libtqscintilla-doc (<< 4:14.0.0~)
 Breaks: libtqscintilla-doc (<< 4:14.0.0~)
 Suggests: libtqscintilla-dev
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/dirs b/ubuntu/_base/dependencies/tqscintilla/debian/dirs
deleted file mode 100644
index ca882bbb7..000000000
--- a/ubuntu/_base/dependencies/tqscintilla/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/docs b/ubuntu/_base/dependencies/tqscintilla/debian/docs
index edc007104..50bd824bb 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/docs
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/docs
@@ -1 +1,2 @@
 NEWS
+README
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
index e183cf963..8a9449faa 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
@@ -1,2 +1,3 @@
 usr/include
-usr/lib/*.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
index 005276324..d66379c9a 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
@@ -1 +1 @@
-usr/share/doc/libtqscintilla-doc
+usr/share/doc/libtqscintilla/HTML
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
new file mode 100644
index 000000000..8fc621fc3
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7-i18n.install
@@ -0,0 +1 @@
+usr/share/tqt3/translations/*.qm
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
index 2cfef7f8a..b3c140659 100644
--- a/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
@@ -1,3 +1,2 @@
-usr/lib/*.so.*
-usr/lib/tqt3/plugins/designer/*.so
-usr/share/tqt3/translations/*.qm
+usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*.so
diff --git a/ubuntu/_base/dependencies/tqscintilla/debian/rules b/ubuntu/_base/dependencies/tqscintilla/debian/rules
index 4fdfd9914..bcf875516 100755
--- a/ubuntu/_base/dependencies/tqscintilla/debian/rules
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/rules
@@ -1,117 +1,20 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+#! /usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
 
-# 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)
+ifdef DEB_HOST_MULTIARCH
+  CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+  CMAKE_INSTALL_LIBDIR = lib
 endif
 
-# This is the debhelper compatibility version to use.
-export QTDIR=/usr/share/tqt3
-export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
-DOCDEST=$(CURDIR)/debian/tmp/usr/share/doc/libtqscintilla-doc/html
-HEADERDEST=$(CURDIR)/debian/tmp/usr/include/tqscintilla
-LIBSDEST=$(CURDIR)/debian/tmp/usr/lib
-TRANSDEST=$(CURDIR)/debian/tmp/$(QTDIR)/translations
-PLUGINDEST=$(CURDIR)/debian/tmp/usr/lib/tqt3/plugins/designer
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	cd qt; qmake "DESTDIR=$(CURDIR)/tmplib"
-	cd designer; qmake
-	touch configure-stamp
-
-build build-arch: build-stamp
-build-indep:
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	install -d $(CURDIR)/tmplib
-	$(MAKE) -C qt
-	$(MAKE) -C designer
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	[ ! -f qt/Makefile ] || $(MAKE) -C qt clean
-	[ ! -f designer/Makefile ] || $(MAKE) -C designer clean
-	-find -name 'Makefile' -exec rm {} \;
-	-rm -rf tmplib
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -d $(HEADERDEST)/private
-	install -d $(DOCDEST)
-	install -d $(TRANSDEST)
-	install -d $(LIBSDEST)
-	install -d $(PLUGINDEST)
-	for i in qt/qextscintilla*.h; do install -m 644 $$i $(HEADERDEST); done
-	for i in include/*.h; do install -m 644 $$i $(HEADERDEST)/private; done
-	for i in doc/html/*; do install -m 644 $$i $(DOCDEST); done
-	for i in qt/*.qm; do install -m 644 $$i $(TRANSDEST); done
-	mv designer/*.so $(PLUGINDEST)
-	for i in tmplib/*; do mv $$i $(LIBSDEST); done
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_install -i --sourcedir=$(CURDIR)/debian/tmp
-	dh_installdocs -i
-	dh_installchangelogs -i ChangeLog
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-	dh_installdocs -a
-	dh_installchangelogs -a ChangeLog
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a -V
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -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/tqt3/debian/control b/ubuntu/_base/dependencies/tqt3/debian/control
index 301caf4c8..5fe6f7d10 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/control
+++ b/ubuntu/_base/dependencies/tqt3/debian/control
@@ -19,10 +19,11 @@ Homepage: http://www.trinitydesktop.org
 
 Package: libtqt3-mt
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt (<< 4:14.0.0~)
 Breaks: libtqt3-mt (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, fontconfig
+Depends: libtqt3-mt-data (= ${binary:Version}), ${shlibs:Depends}, fontconfig
 Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
 Suggests: libtqt3-mt-psql, libtqt3-mt-mysql, libtqt3-mt-odbc
 Description: TQt GUI Library (Threaded runtime version), Version 3
@@ -30,8 +31,20 @@ Description: TQt GUI Library (Threaded runtime version), Version 3
  applications that link against the libtqt-mt.so.3, e.g. all Trinity
  applications.
 
+Package: libtqt3-mt-data
+Architecture: all
+Multi-Arch: foreign
+Section: libs
+Conflicts: libtqt3-mt (<< 4:14.0.12~)
+Depends: ${shlibs:Depends}
+Description: Data for TQt GUI Library (Threaded runtime version), Version 3
+ This is the Trolltech TQt library, version 3. It's necessary for
+ applications that link against the libtqt-mt.so.3, e.g. all Trinity
+ applications.
+
 Package: libtqt3-mt-mysql
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-mysql (<< 4:14.0.0~)
 Breaks: libtqt3-mt-mysql (<< 4:14.0.0~)
@@ -42,6 +55,7 @@ Description: MySQL database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-odbc
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-odbc (<< 4:14.0.0~)
 Breaks: libtqt3-mt-odbc (<< 4:14.0.0~)
@@ -52,6 +66,7 @@ Description: ODBC database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-psql
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-psql (<< 4:14.0.0~)
 Breaks: libtqt3-mt-psql (<< 4:14.0.0~)
@@ -63,6 +78,7 @@ Description: PostgreSQL database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-ibase
 Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Description: InterBase/FireBird database driver for TQt3 (Threaded)
@@ -72,6 +88,7 @@ Description: InterBase/FireBird database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-sqlite
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-sqlite (<< 4:14.0.0~)
 Breaks: libtqt3-mt-sqlite (<< 4:14.0.0~)
@@ -83,6 +100,7 @@ Description: SQLite database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-sqlite3
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Description: SQLite3 database driver for TQt3 (Threaded)
@@ -92,9 +110,11 @@ Description: SQLite3 database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-dev
 Architecture: any
+Multi-Arch: no
 Section: libdevel
 Replaces: libtqt3-mt-dev (<< 4:14.0.0~)
 Breaks: libtqt3-mt-dev (<< 4:14.0.0~)
+Conflicts: libtqt3-mt (<< 4:14.0.12~)
 Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
@@ -121,7 +141,8 @@ Description: TQt development files (Threaded)
  before you send a bugreport.
 
 Package: libtqt3-headers
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
 Section: devel
 Replaces: libtqt3-headers (<< 4:14.0.0~)
 Breaks: libtqt3-headers (<< 4:14.0.0~)
@@ -132,7 +153,8 @@ Description:  TQt3 header files
  have to install this package.
 
 Package: libtqt3-compat-headers
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
 Section: devel
 Replaces: libtqt3-compat-headers (<< 4:14.0.0~)
 Breaks: libtqt3-compat-headers (<< 4:14.0.0~)
@@ -149,6 +171,7 @@ Description: TQt 1.x and 2.x compatibility includes
 
 Package: tqt3-dev-tools
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-dev-tools (<< 4:14.0.0~)
 Breaks: tqt3-dev-tools (<< 4:14.0.0~)
@@ -161,10 +184,11 @@ Description: TQt3 development tools
 
 Package: tqt3-designer
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-designer (<< 4:14.0.0~)
 Breaks: tqt3-designer (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
+Depends: tqt3-designer-plugins (= ${binary:Version}), ${shlibs:Depends}
 Recommends: tqt3-dev-tools
 Suggests: tqt3-assistant, tqt3-doc
 Description: TQt3 Designer
@@ -177,8 +201,18 @@ Description: TQt3 Designer
  automatically for the developer with a project management with qmake
  or automake.
 
+Package: tqt3-designer-plugins
+Architecture: any
+Multi-Arch: same
+Section: devel
+Conflicts: tqt3-designer (<< 4:14.0.12~)
+Depends: ${shlibs:Depends}
+Description: TQt3 Designer plugins
+ This package contains plugins for TQt3 Designer
+
 Package: tqt3-apps-dev
 Architecture: any
+Multi-Arch: no
 Section: devel
 Replaces: tqt3-apps-dev (<< 4:14.0.0~)
 Breaks: tqt3-apps-dev (<< 4:14.0.0~)
@@ -194,6 +228,7 @@ Description: TQt3 Developer applications development files
 
 Package: tqt3-linguist
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-linguist (<< 4:14.0.0~)
 Breaks: tqt3-linguist (<< 4:14.0.0~)
@@ -207,6 +242,7 @@ Description: The TQt3 Linguist
 
 Package: tqt3-assistant
 Architecture: any
+Multi-Arch: foreign
 Section: x11
 Replaces: tqt3-assistant (<< 4:14.0.0~)
 Breaks: tqt3-assistant (<< 4:14.0.0~)
@@ -225,6 +261,7 @@ Description: The TQt3 assistant application
 
 Package: tqt3-qtconfig
 Architecture: any
+Multi-Arch: foreign
 Section: x11
 Replaces: tqt3-qtconfig (<< 4:14.0.0~)
 Breaks: tqt3-qtconfig (<< 4:14.0.0~)
@@ -240,6 +277,7 @@ Description: The TQt3 Configuration Application
 
 Package: tqt3-dev-tools-embedded
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0~)
 Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0~)
@@ -254,6 +292,7 @@ Description: Tools to develop embedded TQt applications
 
 Package: tqt3-dev-tools-compat
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-dev-tools-compat (<< 4:14.0.0~)
 Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~)
@@ -270,6 +309,7 @@ Description: Conversion utilities for TQt3 development
 
 Package: libtqt3-i18n
 Architecture: all
+Multi-Arch: foreign
 Section: libs
 Replaces: libtqt3-i18n (<< 4:14.0.0~)
 Breaks: libtqt3-i18n (<< 4:14.0.0~)
@@ -281,6 +321,7 @@ Description: i18n files for TQt3 library
 
 Package: tqt3-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Replaces: tqt3-doc (<< 4:14.0.0~)
 Breaks: tqt3-doc (<< 4:14.0.0~)
@@ -294,6 +335,7 @@ Description: TQt3 API documentation
 
 Package: tqt3-examples
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Replaces: tqt3-examples (<< 4:14.0.0~)
 Breaks: tqt3-examples (<< 4:14.0.0~)
@@ -308,6 +350,7 @@ Description:  Examples for TQt3
 Package: tqt-x11-free-dbg
 Section: libdevel
 Architecture: any
+Multi-Arch: no
 Replaces: tqt-x11-free-dbg (<< 4:14.0.0~)
 Breaks: tqt-x11-free-dbg (<< 4:14.0.0~)
 Priority: extra
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-data.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-data.install
new file mode 100644
index 000000000..b9308b1b4
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-data.install
@@ -0,0 +1 @@
+../../debian/qtrc etc/tqt3/
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
index 275c3ca79..c86cba1b1 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
@@ -1,9 +1,9 @@
-usr/lib/libtqt-mt.la
-usr/lib/libtqt-mt.prl
-usr/lib/libtqt-mt.so
-usr/lib/libtqui.prl
-usr/lib/libtqui.so
-usr/lib/pkgconfig/tqt-mt.pc
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc
 usr/include/tqt3/ntqconfig.h
 usr/include/tqt3/ntqgl.h
 usr/include/tqt3/ntqglcolormap.h
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links
index e382bae07..9da3a5e25 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links
@@ -1,7 +1,11 @@
-/usr/lib/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la
-/usr/lib/libtqui.prl /usr/share/tqt3/lib/libtqui.prl
-/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so
-/usr/lib/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl
-/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl /usr/share/tqt3/lib/libtqui.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5
+/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins /usr/share/tqt3/plugins
 /usr/include/tqt3 /usr/share/tqt3/include
-/usr/lib/tqt3/plugins /usr/share/tqt3/plugins
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install
index 37bbf0bb1..1cdae4fe4 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlibase.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlibase.so
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install
index efdb699be..8f5572965 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlmysql.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlmysql.so
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install
index 3b949c134..d51b3fd7f 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlodbc.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlodbc.so
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install
index b93ebe333..a5e2b70cd 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlpsql.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlpsql.so
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
index 928632aa1..d637b096b 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlite.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite.so
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
index fccd1c31b..3f3392374 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
@@ -1 +1 @@
-usr/lib/tqt3/plugins/sqldrivers/libqsqlite3.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite3.so
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install
index 519221dff..33303e90c 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install
@@ -1,6 +1,4 @@
-usr/lib/libtqt-mt.so.*
-usr/lib/libtqui.so.1.*
-usr/lib/tqt3/plugins/imageformats/libqmng.so
-usr/lib/tqt3/plugins/inputmethods/*.so
-../../debian/qtrc etc/tqt3/                                                                              
-../../debian/qt_plugins_3.3rc etc/tqt3/                                                                  
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.*
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libqmng.so
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/inputmethods/*.so
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.links b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.links
index fee2958d8..8c8f30e38 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.links
@@ -1,5 +1 @@
-/usr/lib/libtqui.so.1.0.0 /usr/lib/libtqui.so.1 
-/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1
-/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0
-/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3
-/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1
diff --git a/ubuntu/_base/dependencies/tqt3/debian/qtrc b/ubuntu/_base/dependencies/tqt3/debian/qtrc
index 3c977f4d1..4f44006ae 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/qtrc
+++ b/ubuntu/_base/dependencies/tqt3/debian/qtrc
@@ -1,6 +1,3 @@
-[3.3]
-libraryPath=/usr/lib/trinity/plugins/
-
 [General]
 GUIEffects=general^eanimatecombo^e
 embedFonts=true
@@ -12,7 +9,6 @@ style=Plastik
 
 [KDE]
 contrast=7
-kdeAddedLibraryPaths=/usr/lib/trinity/plugins/^e
 
 [KWinPalette]
 activeBackground=#1f26ad
@@ -29,4 +25,4 @@ inactiveTitleBtnBg=#ebebeb
 [Palette]
 active=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
 disabled=#808080^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#c7c7c7^e#ffffff^e#808080^e#ffffff^e#efefef^e#000000^e#567594^e#ffffff^e#0000ee^e#52188b^e
-inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
\ No newline at end of file
+inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules
index 43b2277de..463c7b7b9 100755
--- a/ubuntu/_base/dependencies/tqt3/debian/rules
+++ b/ubuntu/_base/dependencies/tqt3/debian/rules
@@ -60,7 +60,8 @@ CONFIGURE_OPTS = \
 		-datadir	"/usr/share/tqt3"		\
 		-headerdir	"/usr/include/tqt3"		\
 		-docdir		"/usr/share/tqt3/doc"		\
-		-plugindir	"/usr/lib/tqt3/plugins"		\
+		-libdir		"/usr/lib/$(DEB_HOST_MULTIARCH)"		\
+		-plugindir	"/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins"	\
 		-translationdir	"/usr/share/tqt3/translations"	\
 						\
 		-thread				\
@@ -217,6 +218,12 @@ clean::
 
 	cd examples/ && find . -name '.obj' | xargs rm -rf
 
+	# revert multi-arch path in install files
+	for a in debian/*install debian/*links; do \
+	    [ ! -f $$a.arch ] || \
+	    mv $$a.arch $$a; \
+	done
+
 	dh_clean
 
 install: build
@@ -227,8 +234,14 @@ install: build
 	dh_clean -i
 	dh_installdirs
 
+	# update multi-arch path in install files
+	for a in debian/*install debian/*links; do \
+	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+	done
+
 	# fix .prl files
-	for a in $(TMP_INSTALL)/usr/lib/*prl; do cat "$$a" | sed \
+	for a in $(TMP_INSTALL)/usr/lib/$(DEB_HOST_MULTIARCH)/*prl; do cat "$$a" | sed \
 	"s#$(QTDIR)#/usr/share/tqt3#g" > "$$a".new && mv "$$a".new "$$a"; done
 
 	dh_install $(IBASE) --sourcedir=$(TMP_INSTALL)
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
index 97e2de476..d60b07fc7 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libtqteditor.*
-usr/lib/libtqtdesignercore.*
-usr/lib/libtqassistantclient.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.*
 usr/include/tqt3/ntqassistantclient.h
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
index b62dc9759..72bd7093a 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
@@ -1,8 +1,8 @@
-/usr/lib/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl
-/usr/lib/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a
-/usr/lib/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl
-/usr/lib/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a
-/usr/lib/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl
-/usr/lib/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a
 /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor
 /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer-plugins.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer-plugins.install
new file mode 100644
index 000000000..13fed3016
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer-plugins.install
@@ -0,0 +1 @@
+usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/*
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install
index a5394810b..6cfffd9cd 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install
@@ -7,4 +7,3 @@ usr/share/tqt3/templates/*
 usr/share/tqt3/doc/html/designer*html
 usr/share/tqt3/doc/html/designer*dcf
 usr/share/tqt3/doc/html/designer*jpg
-usr/lib/tqt3/plugins/designer/*
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/control b/ubuntu/_base/dependencies/tqtinterface/debian/control
index 9000f3df6..16aa3485a 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/control
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/control
@@ -7,6 +7,7 @@ Standards-Version: 3.8.4
 
 Package: libtqtinterface
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqtinterface (<< 4:14.0.0~)
 Breaks: libtqtinterface (<< 4:14.0.0~)
@@ -31,6 +32,7 @@ Description: The Trinity Qt Interface Libraries (Development Files)
 
 Package: libtqtinterface-doc
 Architecture: all
+Multi-Arch: foreign
 Section: libs
 Replaces: libtqtinterface-doc (<< 4:14.0.0~)
 Breaks: libtqtinterface-doc (<< 4:14.0.0~)
@@ -43,6 +45,7 @@ Description: The Trinity Qt Interface Libraries (Debug Files)
 
 Package: libtqtinterface-dbg
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqtinterface-dbg (<< 4:14.0.0~)
 Breaks: libtqtinterface-dbg (<< 4:14.0.0~)
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules
index 1b9c978a0..1e56fa6e0 100755
--- a/ubuntu/_base/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules
@@ -7,9 +7,16 @@ include debian/cdbs/debian-tde.mk
 version=Debian Package $(DEB_VERSION)
 DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
 
+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" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
  -DWITH_QT3="ON"
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/control b/ubuntu/_base/libraries/libkdcraw/debian/control
index 96c4ee08e..1443f76ec 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/control
+++ b/ubuntu/_base/libraries/libkdcraw/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev,
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev,
  liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config,
- automake, autoconf, libtool, libltdl-dev
+ libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] | libiomp-dev [amd64 arm64 armhf i386 mips64el ppc64el]
 Standards-Version: 3.8.4
 Homepage: http://www.kipi-plugins.org/
 
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/docs b/ubuntu/_base/libraries/libkdcraw/debian/docs
index 50bd824bb..46a4ca718 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/docs
+++ b/ubuntu/_base/libraries/libkdcraw/debian/docs
@@ -1,2 +1,3 @@
+AUTHORS
 NEWS
-README
+README.md
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/rules b/ubuntu/_base/libraries/libkdcraw/debian/rules
index a5de48a38..f69d1ece9 100755
--- a/ubuntu/_base/libraries/libkdcraw/debian/rules
+++ b/ubuntu/_base/libraries/libkdcraw/debian/rules
@@ -1,19 +1,20 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -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" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
 
 # add installed liblcms*-dev to libkdcraw3-trinity-dev depends
 common-binary-arch::
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/docs b/ubuntu/_base/libraries/libkexiv2/debian/docs
index 6f83607c1..46a4ca718 100644
--- a/ubuntu/_base/libraries/libkexiv2/debian/docs
+++ b/ubuntu/_base/libraries/libkexiv2/debian/docs
@@ -1,3 +1,3 @@
 AUTHORS
 NEWS
-README
+README.md
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
index 9b1cac640..92d306bd5 100644
--- a/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
+++ b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
@@ -1,3 +1,4 @@
 debian/tmp/opt/trinity/lib/libksquirrel-libs*.so.*
 debian/tmp/opt/trinity/lib/ksquirrel-libs/libkls*.so.*
 debian/tmp/opt/trinity/share/ksquirrel-libs/*
+debian/tmp/opt/trinity/share/man/man1/*
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
deleted file mode 100644
index 51c0b6a04..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-camera2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-camera2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-camera2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
deleted file mode 100644
index df2cd06d1..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-dicom2png 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-dicom2png
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-dicom2png [OPTION]... [FILE]...
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH OPTIONS
-.TP
-.B  \-v
-Print verbose messages
-.TP
-.B  \-c
-Write image data to standard output
-.TP
-.B  \-e
-Extract embedded thumbnail image
-.TP
-.B  \-i
-Identify files without decoding them
-.TP
-.B  \-i -v
-Identify files and show metadata
-.TP
-.B  \-z
-Change file dates to camera timestamp
-.TP
-.B  \-w
-Use camera white balance, if possible
-.TP
-.B  \-a
-Average the whole image for white balance
-.TP
-.B  \-A <x y w h>
-Average a grey box for white balance
-.TP
-.B  \-r <r g b g>
-Set custom white balance
-.TP
-.B  \+M\/\-M
-Use/don't use an embedded color matrix
-.TP
-.B  \-C <r b>
-Correct chromatic aberration
-.TP
-.B  \-b <num>
-Adjust brightness (default = 1.0)
-.TP
-.B  \-n <num>
-Set threshold for wavelet denoising
-.TP
-.B  \-k <num>
-Set black point
-.TP
-.B  \-K <file>
-Subtract dark frame (16-bit raw PGM)
-.TP
-.B  \-H [0-9]
-Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)
-.TP
-.B  \-t [0-7]
-Flip image (0=none, 3=180, 5=90CCW, 6=90CW)
-.TP
-.B  \-o [0-5]
-Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)
-.TP
-.B  \-o <file>
-Apply output ICC profile from file
-.TP
-.B  \-p <file>
-Apply camera ICC profile from file or "embed"
-.TP
-.B  \-d
-Document mode (no color, no interpolation)
-.TP
-.B  \-D
-Document mode without scaling (totally raw)
-.TP
-.B  \-j
-Don't stretch or rotate raw pixels
-.TP
-.B  \-q [0-3]
-Set the interpolation quality
-.TP
-.B  \-h
-Half-size color image (twice as fast as "-q 0")
-.TP
-.B  \-f
-Interpolate RGGB as four colors
-.TP
-.B  \-m <num>
-Apply a 3x3 median filter to R-G and B-G
-.TP
-.B  \-s [0..N-1]
-Select one raw image or "all" from each file
-.TP
-.B  \-4
-Write 16-bit linear instead of 8-bit with gamma
-.TP
-.B  \-T
-Write TIFF instead of PPM
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
deleted file mode 100644
index cfe155b5a..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-dicom2png 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-dicom2png
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-dicom2png
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
deleted file mode 100644
index 9ddc44614..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-fig2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-fig2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-fig2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
deleted file mode 100644
index 4b1477bef..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-iff2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-iff2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-iff2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
deleted file mode 100644
index 81ce62873..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-leaf2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-leaf2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-leaf2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
deleted file mode 100644
index 6b38ef8da..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-ljpeg2ppm-s 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-ljpeg2ppm-s
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-ljpeg2ppm-s
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
deleted file mode 100644
index 21109a348..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-ljpeg2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-ljpeg2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-ljpeg2ppm [ -v -h ] [ inFile [outFile] ]
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
deleted file mode 100644
index 26aa84076..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-mac2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-mac2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-mac2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
deleted file mode 100644
index fcd6d5171..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-neo2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-neo2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-neo2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
deleted file mode 100644
index ba620502c..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-pi12ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-pi12ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-pi12ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
deleted file mode 100644
index d662bec23..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-pi32ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-pi32ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-pi32ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
deleted file mode 100644
index 585d8cb36..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-svg2png 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-svg2png
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-svg2png
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
deleted file mode 100644
index 7c0950acd..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-ttf2pnm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-ttf2pnm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-ttf2pnm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
deleted file mode 100644
index ddec06008..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-utah2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-utah2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-utah2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
deleted file mode 100644
index 3148b5faa..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-xcf2pnm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-xcf2pnm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-xcf2pnm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
deleted file mode 100644
index 041fdb9ed..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" This file was written by Harald Sitter <apachelogger@ubuntu.com>
-.TH ksquirrel-libs-xim2ppm 1 "Jan 2008" "Dmitry Baryshev" "Backend script used by KSquirrel"
-.SH NAME
-ksquirrel-libs-xim2ppm
-\- backend script used by KSquirrel
-.SH SYNOPSIS
-ksquirrel-libs-xim2ppm
-.SH DESCRIPTION
-Backend script used by KSquirrel
- Homepage: http://ksquirrel.sourceforge.net
-.SH AUTHORS
-.nf
-Dmitry Baryshev <ksquirrel@tut.by>
-.br
-.SH OTHER
-.nf
-This manual page was written by Harald Sitter <apachelogger@ubuntu.com> for the Debian
-system (but may be used by others).
-.br
diff --git a/ubuntu/_base/libraries/libksquirrel/debian/watch b/ubuntu/_base/libraries/libksquirrel/debian/watch
deleted file mode 100644
index d9b799728..000000000
--- a/ubuntu/_base/libraries/libksquirrel/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/ksquirrel/ksquirrel-libs-(.+).tar.bz2
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/docs b/ubuntu/_base/libraries/libtdeldap/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/ubuntu/_base/libraries/libtdeldap/debian/docs
+++ b/ubuntu/_base/libraries/libtdeldap/debian/docs
@@ -1 +1,2 @@
 AUTHORS
+README.md
diff --git a/ubuntu/_base/libraries/libtqt-perl/debian/rules b/ubuntu/_base/libraries/libtqt-perl/debian/rules
index c498ce8ca..85d92e923 100755
--- a/ubuntu/_base/libraries/libtqt-perl/debian/rules
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/rules
@@ -24,7 +24,6 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
 	--prefix=/opt/trinity \
 	--mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
-	--with-qt-dir=/usr/share/tqt3 \
 	--disable-rpath \
 
 DEB_MAKE_INSTALL_TARGET := install \
diff --git a/ubuntu/_base/libraries/python-trinity/debian/NEWS.Debian b/ubuntu/_base/libraries/pytde/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/NEWS.Debian
+++ b/ubuntu/_base/libraries/pytde/debian/NEWS.Debian
diff --git a/ubuntu/_base/libraries/python-trinity/debian/changelog b/ubuntu/_base/libraries/pytde/debian/changelog
index 12485eccd..12485eccd 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/changelog
+++ b/ubuntu/_base/libraries/pytde/debian/changelog
diff --git a/ubuntu/_base/libraries/pytde/debian/compat b/ubuntu/_base/libraries/pytde/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/libraries/python-trinity/debian/control b/ubuntu/_base/libraries/pytde/debian/control
index ccaad6fb3..ccaad6fb3 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/control
+++ b/ubuntu/_base/libraries/pytde/debian/control
diff --git a/ubuntu/_base/libraries/python-trinity/debian/copyright b/ubuntu/_base/libraries/pytde/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/copyright
+++ b/ubuntu/_base/libraries/pytde/debian/copyright
diff --git a/ubuntu/_base/libraries/pytde/debian/patches/.gitignore b/ubuntu/_base/libraries/pytde/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/patches/.gitignore
diff --git a/ubuntu/_base/libraries/python-trinity/debian/pytdeconfig.py b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
index eac264752..eac264752 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/pytdeconfig.py
+++ b/ubuntu/_base/libraries/pytde/debian/pytdeconfig.py
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-dev.dirs
index c395de89f..c395de89f 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-dev.dirs
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-dev.install
index f7d970bcb..f7d970bcb 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-dev.install
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.dirs
index 96235463f..96235463f 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.dirs
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
index bb9705168..bb9705168 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.doc-base
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.examples
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.install
index 20b273acb..20b273acb 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity-doc.install
diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity.install
index facee2907..facee2907 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install
+++ b/ubuntu/_base/libraries/pytde/debian/python-trinity-trinity.install
diff --git a/ubuntu/_base/libraries/python-trinity/debian/rules b/ubuntu/_base/libraries/pytde/debian/rules
index ddbb6b15f..ddbb6b15f 100755
--- a/ubuntu/_base/libraries/python-trinity/debian/rules
+++ b/ubuntu/_base/libraries/pytde/debian/rules
diff --git a/ubuntu/_base/libraries/pytde/debian/source/format b/ubuntu/_base/libraries/pytde/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/libraries/pytde/debian/source/options b/ubuntu/_base/libraries/pytde/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/libraries/pytde/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/libraries/python-trinity/debian/watch b/ubuntu/_base/libraries/pytde/debian/watch
index 8b3afcac0..8b3afcac0 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/watch
+++ b/ubuntu/_base/libraries/pytde/debian/watch
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
index bae0ab8af..a67cc83c9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.4
 Package: kubuntu-default-settings-trinity
 Architecture: all
 Depends: crystalcursors
-Conflicts: kubuntu-default-settings, kubuntu-settings-desktop
+Conflicts: desktop-base, desktop-base-trinity, kubuntu-default-settings, kubuntu-settings-desktop
 Recommends: tdmtheme-trinity, kubuntu-tdm-themes
 Description: Default settings and artwork for the Ubuntu Trinity desktop
  This package contains the default settings used by Ubuntu [Trinity].  It also
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
index 3727a65c1..22d39ff4b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
@@ -32,6 +32,9 @@ case "$1" in
   upgrade)
         ;;
 
+  abort-install)
+        ;;
+
   *)
 	echo "Unknown argument ($1) for $0"
     ;;
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
index 66762e775..5a651c331 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
@@ -12,9 +12,7 @@ Task-Key: kubuntu-desktop
 
 Power management:
 
- * acpi-support
  * (powernowd)
- * powermanagement-interface [i386 amd64 powerpc ia64]
 
 Bluetooth:
 
@@ -24,7 +22,7 @@ Bluetooth:
 == i386, i686, amd64 ==
 
  * acpi
- * acpid
+ * acpi-support | systemd | elogind
  * apmd [i386]
 
 == ppc32, ppc64 ==
@@ -65,17 +63,17 @@ These packages help with system integration
 
 Printing and printer configuration is a real weak spot in Debian, and in Linux in general. We will need to stay at the front of the curve here.
 
- * cupsys                       # our preferred printer management infrastructure
- * cupsys-bsd                   # gives us lpc, lpq, lpr, lprm
- * cupsys-client                # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove
+ * cups                         # our preferred printer management infrastructure
+ * cups-bsd                     # gives us lpc, lpq, lpr, lprm
+ * cups-client                  # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove
  * foomatic-db-engine           # integrate the foomatic printer driver engine
  * foomatic-db                  # the foomatic printer driver database
  * foomatic-filters             # converter from postscript to printer-specific formats
- * foomatic-db-hpijs            # printer drivers from the hp inkjet project
- * cupsys-driver-gutenprint     # a ton of cupsys ppds, for real comprehensive printer support
  * openprinting-ppds            # Most common drivers we want in desktop; less common are in o-p-extra
+ * printer-driver-gutenprint|foomatic-db-gutenprint	# a ton of cups ppds, for real comprehensive printer support
  * printer-driver-pnm2ppa|pnm2ppa	# several ppds require this
- * (hplip)				# support for HP all-in-one printers
+ * (printer-driver-hpcups|hplip)	# support for HP all-in-one printers
+ * (printer-driver-hpijs|foomatic-db-hpijs)	# printer drivers from the hp inkjet project
  * (printer-driver-min12xxw|min12xxw)	# support for KonicaMinolta PagePro 1200W, 1300W printers
  * (printer-driver-foo2zjs|foo2zjs)	# support for printing to ZjStream-based printers
  * (printer-driver-c2esp)		# support for Kodak ESP AiO color inkjet Series
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
index 77cb3dd4c..1442b10be 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
@@ -1,5 +1,4 @@
-acpid
-acpi-support
+acpi-support | systemd | elogind
 alsa-utils
 anacron
 ark-trinity
@@ -44,8 +43,7 @@ libglut3 | freeglut3
 libsasl2-modules
 libtqt-perl
 openprinting-ppds
-powermanagement-interface
-printer-driver-gutenprint | cups-driver-gutenprint
+printer-driver-gutenprint | foomatic-db-gutenprint
 printer-driver-pnm2ppa | pnm2ppa
 screen
 sudo-trinity
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
index 94566224e..5f60a373c 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
@@ -22,15 +22,11 @@ fonts-takao-gothic | ttf-takao-gothic
 fonts-takao-mincho | ttf-takao-mincho
 fonts-thai-tlwg | ttf-thai-tlwg
 fonts-unfonts-core | ttf-unfonts-core
-foomatic-db-gutenprint
 fortune-mod
 gcc
 gtk-qt-engine-trinity
 gtk3-tqt-engine-trinity
 gwenview-trinity
-hpijs-ppds
-hplip
-ijsgutenprint
 jockey-gtk
 k3b-trinity
 kaddressbook-trinity
@@ -85,6 +81,8 @@ plymouth-theme-kubuntu-logo-trinity
 powernowd
 printer-driver-c2esp
 printer-driver-foo2zjs | foo2zjs
+printer-driver-hpcups | hplip
+printer-driver-hpijs | hpijs-ppds
 printer-driver-min12xxw | min12xxw
 printer-driver-ptouch
 printer-driver-pxljr | pxljr
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/changelog b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/changelog
deleted file mode 100644
index c0e67bf63..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-tde-ubuntu-integration (0.1-0) maverick; urgency=low
-
-  * Initial version
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 08 Aug 2011 13:03:00 -0600
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/control b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/control
deleted file mode 100644
index 0ce0cb566..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: tde-ubuntu-integration
-Section: kde
-Priority: extra
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: debhelper (>= 9~), cdbs
-Standards-Version: 3.8.4
-
-Package: tde-ubuntu-integration
-Architecture: all
-Depends: policykit-1-gnome
-Description: TDE Ubuntu Integration
- Ubuntu integration for TDE
- This includes files needed for Polkit to function correctly under TDE
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/dirs b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/dirs
deleted file mode 100644
index ee19d5d17..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
deleted file mode 100644
index 7720f1ca8..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=PolicyKit Authentication Agent
-Comment=PolicyKit Authentication Agent
-Exec=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-OnlyShowIn=TDE;
-X-TDE-AutoRestart=true
-X-Ubuntu-Gettext-Domain=polkit-gnome-1
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/install b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/install
deleted file mode 100644
index 3853fc64c..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop	etc/xdg/autostart
diff --git a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules
deleted file mode 100755
index 013e64a11..000000000
--- a/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-# 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
-
-build: debian/stamp-distrospecific
-
-debian/stamp-distrospecific:
-	dh_testdir
-	[ -e debian/stamp-distrospecific ] || \
-	ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
-	tee debian/stamp-distrospecific | \
-	tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
-
-clean::
-	dh_testdir
-	[ ! -e debian/stamp-distrospecific ] || \
-	cat debian/stamp-distrospecific | \
-	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
-	rm -f debian/stamp-distrospecific
diff --git a/ubuntu/groovy b/ubuntu/jammy
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/groovy
+++ b/ubuntu/jammy
diff --git a/ubuntu/trusty b/ubuntu/kinetic
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/trusty
+++ b/ubuntu/kinetic